diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
index 7ea1cffeafb..51a6fbc8803 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "bm60v2",
     "url": "",
     "maintainer": "kp republic",
-    "width": 15,
-    "height": 5,
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
index eb56a6b25f5..2275b773b5c 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
@@ -18,11 +18,9 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-
-
-#    include <i2c_master.h>
-#    include <is31fl3733.h>
-#    include <ws2812.h>
+#    include "i2c_master.h"
+#    include "is31fl3733.h"
+#    include "ws2812.h"
 
 const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
     { 0, B_1, A_1, C_1 },
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.h b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.h
index 119996cec93..de1df856666 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.h
@@ -30,8 +30,3 @@
     { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   KC_NO, K3B,   K3C,   K3D   }, \
     { K40,   K41,   K42,   KC_NO, KC_NO, K45,   KC_NO, KC_NO, KC_NO, K49,   K4A,   K4B,   K4C,   K4D   }, \
 }
-
-
-
-
-
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
index 4a49c22ed43..bd4513fd5d9 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
@@ -2,53 +2,29 @@
 MCU = atmega32u4
 
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes        # Virtual DIP switch configuration
-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
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic 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
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no          # Breathing sleep LED during USB suspend
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes              # USB Nkey Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-MIDI_ENABLE = no               # MIDI support
-BLUETOOTH_ENABLE = no          # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no              # Audio output on port C6
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
-
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+NO_USB_STARTUP_CHECK = no
 LTO_ENABLE = yes
-
-
-# RGB Matrix is required to support per-key LEDs connected to IS31FL3733.
 RGB_MATRIX_ENABLE = yes
-
-# The simpler RGB Lighting code can be enabled to control just the underglow
-# LEDs from it; leave it disabled to make the RGB Matrix code control all LEDs,
-# including underglow.
-RGBLIGHT_ENABLE = no
-
-# The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are
-# normally done by common_features.mk for both of these drivers need to be done
-# here manually.
 RGB_MATRIX_DRIVER = custom
+WS2812_DRIVER_REQUIRED = yes
+
 COMMON_VPATH += $(DRIVER_PATH)/led/issi
 SRC += is31fl3733.c
 QUANTUM_LIB_SRC += i2c_master.c
-WS2812_DRIVER_REQUIRED = yes
-
-
-
-