diff --git a/keyboards/jian/keymaps/advanced/keymap.c b/keyboards/jian/keymaps/advanced/keymap.c
index 417678f7e6a..25108aa13da 100644
--- a/keyboards/jian/keymaps/advanced/keymap.c
+++ b/keyboards/jian/keymaps/advanced/keymap.c
@@ -191,7 +191,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT_base_wrapper(QWERTY_base),
 
 #ifdef DIPS_ENABLE
-[_DIPS] = LAYOUT_DIPS(\
+[_DIPS] = LAYOUT_dips(\
   LAYOUT0, LAYOUT1, LAYOUT2, LAYOUT3, DIP_ISO, FLIP_TH, \
   LAYOUT0, LAYOUT1, LAYOUT2, LAYOUT3, DIP_ISO, FLIP_TH \
 ),
diff --git a/keyboards/jian/nsrev2/nsrev2.c b/keyboards/jian/nsrev2/nsrev2.c
index a7508ad9b24..c3acff55ee3 100644
--- a/keyboards/jian/nsrev2/nsrev2.c
+++ b/keyboards/jian/nsrev2/nsrev2.c
@@ -1,7 +1,7 @@
 #include "nsrev2.h"
 
-// TODO:
 #ifdef SWAP_HANDS_ENABLE
+__attribute__ ((weak))
 const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
   {{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}},
   {{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5}},
@@ -14,6 +14,7 @@ const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
 };
 #endif
 
+#ifdef BACKLIGHT_ENABLE
 static bool backlight_was_toggled = false;
 
 void suspend_power_down_kb(void) {
@@ -29,6 +30,7 @@ void suspend_wakeup_init_kb(void) {
         backlight_was_toggled = false;
     }
 }
+#endif
 
 #ifdef PHYSICAL_LEDS_ENABLE
 void led_init_kb(void)
diff --git a/keyboards/jian/rev1/rev1.c b/keyboards/jian/rev1/rev1.c
index f1cfe99180e..1c7e936270a 100644
--- a/keyboards/jian/rev1/rev1.c
+++ b/keyboards/jian/rev1/rev1.c
@@ -14,6 +14,7 @@ const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
 };
 #endif
 
+#ifdef BACKLIGHT_ENABLE
 static bool backlight_was_toggled = false;
 
 void suspend_power_down_kb(void) {
@@ -29,6 +30,7 @@ void suspend_wakeup_init_kb(void) {
         backlight_was_toggled = false;
     }
 }
+#endif
 
 #ifdef PHYSICAL_LEDS_ENABLE
 void led_init_kb(void)
diff --git a/keyboards/jian/rev2/rev2.c b/keyboards/jian/rev2/rev2.c
index 6f4808de730..09824c66529 100644
--- a/keyboards/jian/rev2/rev2.c
+++ b/keyboards/jian/rev2/rev2.c
@@ -14,6 +14,7 @@ const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
 };
 #endif
 
+#ifdef BACKLIGHT_ENABLE
 static bool backlight_was_toggled = false;
 
 void suspend_power_down_kb(void) {
@@ -29,6 +30,7 @@ void suspend_wakeup_init_kb(void) {
         backlight_was_toggled = false;
     }
 }
+#endif
 
 #ifdef PHYSICAL_LEDS_ENABLE
 void led_init_kb(void)