[Keyboard] Fixes fox idb_60 keyboard (#10827)

* Fixed VIA keymap build warning on gcc 10.2.0, Fixed misleading LED function names, Fixed formatting

* Fix: Allow layer LED indicators to be overriden on the keymap level

* Implemented suggested change from led_set_kb callback to led_update_kb callback

* Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/idb/idb_60/idb_60.c

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

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

8 files changed, 164 insertions, 201 deletions

diff --git a/keyboards/idb/idb_60/idb_60.c b/keyboards/idb/idb_60/idb_60.c
index a86606425e..1ca4b8796f 100644
--- a/keyboards/idb/idb_60/idb_60.c
+++ b/keyboards/idb/idb_60/idb_60.c
@@ -5,17 +5,6 @@ void keyboard_pre_init_kb(void) {
     setPinOutput(C5);
 }
 
-void led_set_kb(uint8_t usb_led) {
-
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-		_idb_60_caps_led_on();
-		} else {
-		_idb_60_caps_led_off();
-    }
-
-	led_set_user(usb_led);
-}
-
 inline void _idb_60_caps_led_on(void) {
     writePinLow(C5);
 }
@@ -31,3 +20,28 @@ inline void _idb_60_caps_led_off(void) {
 inline void _idb_60_fn_led_off(void) {
     writePinHigh(C4);
 }
+
+// Capslock LED indicator
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (res) {
+        if (led_state.caps_lock) {
+            _idb_60_caps_led_on();
+        } else {
+            _idb_60_caps_led_off();
+        }
+    }
+    return res;
+}
+
+// Layer LED indicator - drive LED when not on base layer
+
+__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
+    if (get_highest_layer(state) == 0) {
+        _idb_60_fn_led_off();
+    } else {
+        _idb_60_fn_led_on();
+    }
+    return state;
+}
diff --git a/keyboards/idb/idb_60/idb_60.h b/keyboards/idb/idb_60/idb_60.h
index 608c9ab7f1..069f4bcf56 100644
--- a/keyboards/idb/idb_60/idb_60.h
+++ b/keyboards/idb/idb_60/idb_60.h
@@ -11,41 +11,41 @@ void _idb_60_fn_led_off(void);
 #define _idb_60_esc_led_off() _idb_60_fn_led_off()
 
 #define LAYOUT( \
-	K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07,\
-	K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,\
-	K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56,\
-	K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76,\
-	K80, K90, K81,                     K93,                K95, K86, K96\
+        K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, \
+        K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, \
+        K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56, \
+        K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, \
+        K80, K90, K81,                     K93,                K95, K86, K96 \
 ) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07 }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15,   K16        }, \
-	{ K20,   K21,   K22,   K23,   K24,   K25,   K26        }, \
-	{ K30,   K31,   K32,   K33,   K34,   K35,   K36        }, \
-	{ K40,   K41,   K42,   K43,   K44,   K45,   KC_NO      }, \
-	{ K50,   K51,   K52,   K53,   K54,   K55,   K56        }, \
-	{ K60,   K61,   K62,   K63,   K64,   K65,   K66        }, \
-	{ K70,   K71,   K72,   K73,   K74,   K75,   K76        }, \
-	{ K80,   K81,   KC_NO, KC_NO, KC_NO, KC_NO, K86        }, \
-	{ K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   K96        } \
+        { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07 }, \
+        { K10,   K11,   K12,   K13,   K14,   K15,   K16        }, \
+        { K20,   K21,   K22,   K23,   K24,   K25,   K26        }, \
+        { K30,   K31,   K32,   K33,   K34,   K35,   K36        }, \
+        { K40,   K41,   K42,   K43,   K44,   K45,   KC_NO      }, \
+        { K50,   K51,   K52,   K53,   K54,   K55,   K56        }, \
+        { K60,   K61,   K62,   K63,   K64,   K65,   K66        }, \
+        { K70,   K71,   K72,   K73,   K74,   K75,   K76        }, \
+        { K80,   K81,   KC_NO, KC_NO, KC_NO, KC_NO, K86        }, \
+        { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   K96        } \
 }
 
 #define LAYOUT_all LAYOUT
 
 #define LAYOUT_default( \
-	K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16,\
-	K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,\
-	K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56,\
-	K60,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76,\
-	K80,      K81,                     K93,                K95,      K96\
+        K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, \
+        K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, \
+        K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56, \
+        K60,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, \
+        K80,      K81,                     K93,                K95,      K96 \
 ) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05,   K06,	KC_NO }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15,   K16        	  }, \
-	{ K20,   K21,   K22,   K23,   K24,   K25,   K26           }, \
-	{ K30,   K31,   K32,   K33,   K34,   K35,   K36           }, \
-	{ K40,   K41,   K42,   K43,   K44,   K45,   KC_NO         }, \
-	{ K50,   K51,   K52,   K53,   K54,   K55,   K56           }, \
-	{ K60,   K61,   K62,   K63,   K64,   K65,   K66           }, \
-	{ KC_NO, K71,   K72,   K73,   K74,   K75,   K76           }, \
-	{ K80,   K81,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO         }, \
-	{ KC_NO, KC_NO, KC_NO, K93,   KC_NO, K95,   K96           } \
+        { K00,   K01,   K02,   K03,   K04,   K05,   K06,	KC_NO }, \
+        { K10,   K11,   K12,   K13,   K14,   K15,   K16        	  }, \
+        { K20,   K21,   K22,   K23,   K24,   K25,   K26           }, \
+        { K30,   K31,   K32,   K33,   K34,   K35,   K36           }, \
+        { K40,   K41,   K42,   K43,   K44,   K45,   KC_NO         }, \
+        { K50,   K51,   K52,   K53,   K54,   K55,   K56           }, \
+        { K60,   K61,   K62,   K63,   K64,   K65,   K66           }, \
+        { KC_NO, K71,   K72,   K73,   K74,   K75,   K76           }, \
+        { K80,   K81,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO         }, \
+        { KC_NO, KC_NO, KC_NO, K93,   KC_NO, K95,   K96           } \
 }
diff --git a/keyboards/idb/idb_60/keymaps/all_keys/keymap.c b/keyboards/idb/idb_60/keymaps/all_keys/keymap.c
index 2edde98c26..87a6692090 100644
--- a/keyboards/idb/idb_60/keymaps/all_keys/keymap.c
+++ b/keyboards/idb/idb_60/keymaps/all_keys/keymap.c
@@ -2,45 +2,33 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_all(
-    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_NO,
-    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_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_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
-    KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RALT, KC_MENU, KC_RCTL
-  ),
-  [1] = LAYOUT_all(
-	RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______,                                     _______,                            _______, _______, _______
-  ),
-  [2] = LAYOUT_all(
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______,                                     _______,                            _______, _______, _______
-  ),
-  [3] = LAYOUT_all(
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______,                                     _______,                            _______, _______, _______
-  ),
+    [0] = LAYOUT_all(
+        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_NO,
+        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_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_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RALT, KC_MENU, KC_RCTL
+    ),
+    [1] = LAYOUT_all(
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                                     _______,                            _______, _______, _______
+    ),
+    [2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                                     _______,                            _______, _______, _______
+    ),
+    [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                                     _______,                            _______, _______, _______
+    ),
 
 };
-
-// Layer LED indicators
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    if (layer_state_cmp(state, 1)) {
-        _idb_60_fn_led_on();
-    } else {
-        _idb_60_fn_led_off();
-    }
-
-	return state;
-}
diff --git a/keyboards/idb/idb_60/keymaps/default/keymap.c b/keyboards/idb/idb_60/keymaps/default/keymap.c
index 1bf25867f9..373ff8ceed 100644
--- a/keyboards/idb/idb_60/keymaps/default/keymap.c
+++ b/keyboards/idb/idb_60/keymaps/default/keymap.c
@@ -2,45 +2,33 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_default(
-    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_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_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, MO(1),
-    KC_LCTL,          KC_LALT,                                     KC_SPC,                             KC_RALT,          KC_RCTL
-  ),
-  [1] = LAYOUT_default(
-	RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______,          _______,                                     _______,                            _______,          _______
-  ),
-  [2] = LAYOUT_default(
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______,          _______,                                     _______,                            _______,          _______
-  ),
-  [3] = LAYOUT_default(
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______,          _______,                                     _______,                            _______,          _______
-  ),
+    [0] = LAYOUT_default(
+        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_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_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, MO(1),
+        KC_LCTL,          KC_LALT,                                     KC_SPC,                             KC_RALT,          KC_RCTL
+    ),
+    [1] = LAYOUT_default(
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______,                                     _______,                            _______,          _______
+    ),
+    [2] = LAYOUT_default(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______,                                     _______,                            _______,          _______
+    ),
+    [3] = LAYOUT_default(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______,                                     _______,                            _______,          _______
+    ),
 
 };
-
-// Layer LED indicators
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    if (layer_state_cmp(state, 1)) {
-        _idb_60_fn_led_on();
-    } else {
-        _idb_60_fn_led_off();
-    }
-
-	return state;
-}
diff --git a/keyboards/idb/idb_60/keymaps/pngu/keymap.c b/keyboards/idb/idb_60/keymaps/pngu/keymap.c
index ac0ad10d34..c34d1774ea 100644
--- a/keyboards/idb/idb_60/keymaps/pngu/keymap.c
+++ b/keyboards/idb/idb_60/keymaps/pngu/keymap.c
@@ -2,38 +2,26 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT(
-    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_NO,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-    LT(2, 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_NUBS, KC_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
-    KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RALT, KC_MENU, KC_RGUI
-  ),
-   [1] = LAYOUT(
-	RESET,   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_DEL,  _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_INS,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______,                                     _______,                            _______, _______, _______
-  ),
-  [2] = LAYOUT(
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______,                                     _______,                            _______, _______, _______
-  )
+    [0] = LAYOUT(
+        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_NO,
+        KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        LT(2, 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_NUBS, KC_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+        KC_LCTL,          KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RALT, KC_MENU, KC_RGUI
+    ),
+    [1] = LAYOUT(
+        RESET,   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_DEL,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_INS,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                                     _______,                            _______, _______, _______
+    ),
+    [2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                                     _______,                            _______, _______, _______
+    )
 
 };
-
-// Layer LED indicators
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    if (layer_state_cmp(state, 1)) {
-        _idb_60_fn_led_on();
-    } else {
-        _idb_60_fn_led_off();
-    }
-
-	return state;
-}
diff --git a/keyboards/idb/idb_60/keymaps/via/keymap.c b/keyboards/idb/idb_60/keymaps/via/keymap.c
index 1bf25867f9..373ff8ceed 100644
--- a/keyboards/idb/idb_60/keymaps/via/keymap.c
+++ b/keyboards/idb/idb_60/keymaps/via/keymap.c
@@ -2,45 +2,33 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_default(
-    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_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_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, MO(1),
-    KC_LCTL,          KC_LALT,                                     KC_SPC,                             KC_RALT,          KC_RCTL
-  ),
-  [1] = LAYOUT_default(
-	RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______,          _______,                                     _______,                            _______,          _______
-  ),
-  [2] = LAYOUT_default(
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______,          _______,                                     _______,                            _______,          _______
-  ),
-  [3] = LAYOUT_default(
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______,          _______,                                     _______,                            _______,          _______
-  ),
+    [0] = LAYOUT_default(
+        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_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_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, MO(1),
+        KC_LCTL,          KC_LALT,                                     KC_SPC,                             KC_RALT,          KC_RCTL
+    ),
+    [1] = LAYOUT_default(
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______,                                     _______,                            _______,          _______
+    ),
+    [2] = LAYOUT_default(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______,                                     _______,                            _______,          _______
+    ),
+    [3] = LAYOUT_default(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______,                                     _______,                            _______,          _______
+    ),
 
 };
-
-// Layer LED indicators
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    if (layer_state_cmp(state, 1)) {
-        _idb_60_fn_led_on();
-    } else {
-        _idb_60_fn_led_off();
-    }
-
-	return state;
-}
diff --git a/keyboards/idb/idb_60/keymaps/via/rules.mk b/keyboards/idb/idb_60/keymaps/via/rules.mk
index 36b7ba9cbc..1e5b99807c 100644
--- a/keyboards/idb/idb_60/keymaps/via/rules.mk
+++ b/keyboards/idb/idb_60/keymaps/via/rules.mk
@@ -1,2 +1 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/idb/idb_60/rules.mk b/keyboards/idb/idb_60/rules.mk
index 7e11d4be75..607993b930 100644
--- a/keyboards/idb/idb_60/rules.mk
+++ b/keyboards/idb/idb_60/rules.mk
@@ -16,12 +16,10 @@ BOOTLOADER = atmel-dfu
 BOOTMAGIC_ENABLE = lite
 MOUSEKEY_ENABLE = yes			# 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
 KEYBOARD_LOCK_ENABLE = no		# Allow locking of keyboard via magic key
 SLEEP_LED_ENABLE = no			# Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes				# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes			# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 BACKLIGHT_ENABLE = no			# Enable keyboard backlight functionality
-MIDI_ENABLE = no				# MIDI controls
-UNICODE_ENABLE = no				# Unicode
-BLUETOOTH_ENABLE = no			# Enable Bluetooth with the Adafruit EZ-Key HID
+BLUETOOTH_ENABLE = no			# Enable Bluetooth