6 files changed, 21 insertions, 21 deletions
diff --git a/keyboards/xbows/knight/config.h b/keyboards/xbows/knight/config.h
index 0875283a78..c38628fef1 100644
--- a/keyboards/xbows/knight/config.h
+++ b/keyboards/xbows/knight/config.h
@@ -47,10 +47,10 @@
 #    define ENABLE_RGB_MATRIX_SPLASH                  // Full gradient & 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
 
-#    define DRIVER_ADDR_1 0b1110100
-#    define DRIVER_ADDR_2 0b1110110
-#    define DRIVER_ADDR_3 0b1110101
-#    define DRIVER_COUNT 3
+#    define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
+#    define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_SDA
+#    define DRIVER_ADDR_3 IS31FL3731_I2C_ADDRESS_SCL
+#    define IS31FL3731_DRIVER_COUNT 3
 #    define DRIVER_1_LED_TOTAL 36
 #    define DRIVER_2_LED_TOTAL 35
 #    define DRIVER_3_LED_TOTAL 15
diff --git a/keyboards/xbows/knight_plus/config.h b/keyboards/xbows/knight_plus/config.h
index f8ec6d273b..7a26ca9944 100644
--- a/keyboards/xbows/knight_plus/config.h
+++ b/keyboards/xbows/knight_plus/config.h
@@ -47,10 +47,10 @@
 #    define ENABLE_RGB_MATRIX_SPLASH                  // Full gradient & 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
 
-#    define DRIVER_ADDR_1 0b1110100
-#    define DRIVER_ADDR_2 0b1110110
-#    define DRIVER_ADDR_3 0b1110101
-#    define DRIVER_COUNT 3
+#    define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
+#    define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_SDA
+#    define DRIVER_ADDR_3 IS31FL3731_I2C_ADDRESS_SCL
+#    define IS31FL3731_DRIVER_COUNT 3
 #    define DRIVER_1_LED_TOTAL 36
 #    define DRIVER_2_LED_TOTAL 35
 #    define DRIVER_3_LED_TOTAL 15
diff --git a/keyboards/xbows/nature/config.h b/keyboards/xbows/nature/config.h
index be7fbeaa64..f408d62699 100644
--- a/keyboards/xbows/nature/config.h
+++ b/keyboards/xbows/nature/config.h
@@ -49,10 +49,10 @@
 #    define ENABLE_RGB_MATRIX_SPLASH                  // Full gradient & 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
 
-#    define DRIVER_ADDR_1 0b1110100
-#    define DRIVER_ADDR_2 0b1110110
-#    define DRIVER_ADDR_3 0b1110101
-#    define DRIVER_COUNT 3
+#    define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
+#    define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_SDA
+#    define DRIVER_ADDR_3 IS31FL3731_I2C_ADDRESS_SCL
+#    define IS31FL3731_DRIVER_COUNT 3
 #    define DRIVER_1_LED_TOTAL 36
 #    define DRIVER_2_LED_TOTAL 36
 #    define DRIVER_3_LED_TOTAL 15
diff --git a/keyboards/xbows/numpad/config.h b/keyboards/xbows/numpad/config.h
index 1276efe191..d0c5d88491 100644
--- a/keyboards/xbows/numpad/config.h
+++ b/keyboards/xbows/numpad/config.h
@@ -47,7 +47,7 @@
 #    define ENABLE_RGB_MATRIX_SPLASH                  // Full gradient & 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
 
-#    define DRIVER_ADDR_1 0b1110111
-#    define DRIVER_COUNT 1
+#    define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_VCC
+#    define IS31FL3731_DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 22
 #endif
diff --git a/keyboards/xbows/ranger/config.h b/keyboards/xbows/ranger/config.h
index 68c8227da0..81d9737449 100644
--- a/keyboards/xbows/ranger/config.h
+++ b/keyboards/xbows/ranger/config.h
@@ -46,10 +46,10 @@
 #    define ENABLE_RGB_MATRIX_SPLASH                  // Full gradient & 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
 
-#    define DRIVER_ADDR_1 0b1110100
-#    define DRIVER_ADDR_2 0b1110101
-#    define DRIVER_ADDR_3 0b1110110
-#    define DRIVER_COUNT 3
+#    define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
+#    define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_SCL
+#    define DRIVER_ADDR_3 IS31FL3731_I2C_ADDRESS_SDA
+#    define IS31FL3731_DRIVER_COUNT 3
 #    define DRIVER_1_LED_TOTAL 36
 #    define DRIVER_2_LED_TOTAL 36
 #    define DRIVER_3_LED_TOTAL 15
diff --git a/keyboards/xbows/woody/config.h b/keyboards/xbows/woody/config.h
index bfdbcce8c2..4b6ea9f70a 100644
--- a/keyboards/xbows/woody/config.h
+++ b/keyboards/xbows/woody/config.h
@@ -56,9 +56,9 @@
 // #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    define DRIVER_ADDR_1 0b1110100
-#    define DRIVER_ADDR_2 0b1110110
-#    define DRIVER_COUNT 2
+#    define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
+#    define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_SDA
+#    define IS31FL3731_DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 35
 #    define DRIVER_2_LED_TOTAL 32
 #    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)