From d0e1d36144e1c1b2269be171c748a01f15ec32f2 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 18 Apr 2024 17:49:15 -0700
Subject: [PATCH] Data-Driven Keyboard Conversions: J (#23547)

---
 .../bear_65/rev1/{info.json => keyboard.json} | 10 ++++++++++
 keyboards/jacky_studio/bear_65/rev1/rules.mk  | 16 ----------------
 .../bear_65/rev2/{info.json => keyboard.json} | 10 ++++++++++
 keyboards/jacky_studio/bear_65/rev2/rules.mk  | 16 ----------------
 .../handwired/{info.json => keyboard.json}    |  0
 keyboards/jian/handwired/rules.mk             |  5 -----
 keyboards/jian/info.json                      |  3 +++
 .../jian/nsrev2/{info.json => keyboard.json}  |  3 +++
 keyboards/jian/nsrev2/rules.mk                |  6 ------
 .../jian/rev1/{info.json => keyboard.json}    |  5 +++++
 keyboards/jian/rev1/rules.mk                  |  7 -------
 .../jian/rev2/{info.json => keyboard.json}    |  4 ++++
 keyboards/jian/rev2/rules.mk                  |  6 ------
 keyboards/jian/rules.mk                       |  1 -
 .../jiran/rev1/{info.json => keyboard.json}   |  6 ++++++
 keyboards/jiran/rev1/rules.mk                 |  1 -
 .../jiran/rev2/{info.json => keyboard.json}   |  6 ++++++
 keyboards/jiran/rev2/rules.mk                 |  1 -
 keyboards/jiran/rules.mk                      | 13 -------------
 keyboards/jones/v03/info.json                 | 10 ++++++++++
 keyboards/jones/v03/rules.mk                  | 19 +------------------
 keyboards/jones/v03_1/info.json               | 11 +++++++++++
 keyboards/jones/v03_1/rules.mk                | 19 +------------------
 .../jones/v1/{info.json => keyboard.json}     | 11 +++++++++++
 keyboards/jones/v1/rules.mk                   | 15 ---------------
 .../jorne/rev1/{info.json => keyboard.json}   | 10 ++++++++++
 keyboards/jorne/rev1/rules.mk                 |  2 --
 keyboards/jorne/rules.mk                      | 13 -------------
 keyboards/joshajohnson/hub16/info.json        |  7 +++++++
 keyboards/joshajohnson/hub16/rules.mk         | 13 -------------
 keyboards/jpe230/big_knob/info.json           |  3 ++-
 keyboards/jpe230/big_knob/rules.mk            |  1 -
 32 files changed, 100 insertions(+), 153 deletions(-)
 rename keyboards/jacky_studio/bear_65/rev1/{info.json => keyboard.json} (97%)
 delete mode 100644 keyboards/jacky_studio/bear_65/rev1/rules.mk
 rename keyboards/jacky_studio/bear_65/rev2/{info.json => keyboard.json} (98%)
 delete mode 100644 keyboards/jacky_studio/bear_65/rev2/rules.mk
 rename keyboards/jian/handwired/{info.json => keyboard.json} (100%)
 delete mode 100644 keyboards/jian/handwired/rules.mk
 rename keyboards/jian/nsrev2/{info.json => keyboard.json} (98%)
 delete mode 100644 keyboards/jian/nsrev2/rules.mk
 rename keyboards/jian/rev1/{info.json => keyboard.json} (97%)
 delete mode 100644 keyboards/jian/rev1/rules.mk
 rename keyboards/jian/rev2/{info.json => keyboard.json} (97%)
 delete mode 100644 keyboards/jian/rev2/rules.mk
 rename keyboards/jiran/rev1/{info.json => keyboard.json} (96%)
 delete mode 100644 keyboards/jiran/rev1/rules.mk
 rename keyboards/jiran/rev2/{info.json => keyboard.json} (96%)
 delete mode 100644 keyboards/jiran/rev2/rules.mk
 rename keyboards/jones/v1/{info.json => keyboard.json} (96%)
 delete mode 100644 keyboards/jones/v1/rules.mk
 rename keyboards/jorne/rev1/{info.json => keyboard.json} (94%)
 delete mode 100644 keyboards/jorne/rev1/rules.mk

diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/keyboard.json
similarity index 97%
rename from keyboards/jacky_studio/bear_65/rev1/info.json
rename to keyboards/jacky_studio/bear_65/rev1/keyboard.json
index 098817dedb..2c79dc41f5 100644
--- a/keyboards/jacky_studio/bear_65/rev1/info.json
+++ b/keyboards/jacky_studio/bear_65/rev1/keyboard.json
@@ -5,6 +5,16 @@
     "maintainer": "qmk",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "build": {
+        "lto": true
+    },
     "usb": {
         "vid": "0xA13B",
         "pid": "0x000A",
diff --git a/keyboards/jacky_studio/bear_65/rev1/rules.mk b/keyboards/jacky_studio/bear_65/rev1/rules.mk
deleted file mode 100644
index 7e03810942..0000000000
--- a/keyboards/jacky_studio/bear_65/rev1/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-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
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-LTO_ENABLE = yes            # Use LTO flags to reduce firmware size
-
-RGB_MATRIX_ENABLE = no		# Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/keyboard.json
similarity index 98%
rename from keyboards/jacky_studio/bear_65/rev2/info.json
rename to keyboards/jacky_studio/bear_65/rev2/keyboard.json
index 52e8354fab..ec2ff1b7c7 100644
--- a/keyboards/jacky_studio/bear_65/rev2/info.json
+++ b/keyboards/jacky_studio/bear_65/rev2/keyboard.json
@@ -5,6 +5,16 @@
     "maintainer": "qmk",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "build": {
+        "lto": true
+    },
     "usb": {
         "vid": "0x45D4",
         "pid": "0x0428",
diff --git a/keyboards/jacky_studio/bear_65/rev2/rules.mk b/keyboards/jacky_studio/bear_65/rev2/rules.mk
deleted file mode 100644
index 7e03810942..0000000000
--- a/keyboards/jacky_studio/bear_65/rev2/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-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
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-LTO_ENABLE = yes            # Use LTO flags to reduce firmware size
-
-RGB_MATRIX_ENABLE = no		# Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
diff --git a/keyboards/jian/handwired/info.json b/keyboards/jian/handwired/keyboard.json
similarity index 100%
rename from keyboards/jian/handwired/info.json
rename to keyboards/jian/handwired/keyboard.json
diff --git a/keyboards/jian/handwired/rules.mk b/keyboards/jian/handwired/rules.mk
deleted file mode 100644
index a0c271ea25..0000000000
--- a/keyboards/jian/handwired/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/jian/info.json b/keyboards/jian/info.json
index f0b0261dc9..c9f6f46c1a 100644
--- a/keyboards/jian/info.json
+++ b/keyboards/jian/info.json
@@ -5,5 +5,8 @@
     "usb": {
         "vid": "0xC0DE",
         "pid": "0x1337"
+    },
+    "build": {
+        "lto": true
     }
 }
diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/keyboard.json
similarity index 98%
rename from keyboards/jian/nsrev2/info.json
rename to keyboards/jian/nsrev2/keyboard.json
index 4ea315f51e..2981adf9b5 100644
--- a/keyboards/jian/nsrev2/info.json
+++ b/keyboards/jian/nsrev2/keyboard.json
@@ -40,6 +40,9 @@
     },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
+    "features": {
+        "backlight": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/jian/nsrev2/rules.mk b/keyboards/jian/nsrev2/rules.mk
deleted file mode 100644
index a05436d218..0000000000
--- a/keyboards/jian/nsrev2/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-CONSOLE_ENABLE = no
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/keyboard.json
similarity index 97%
rename from keyboards/jian/rev1/info.json
rename to keyboards/jian/rev1/keyboard.json
index 3cfc026667..1a8957d8b3 100644
--- a/keyboards/jian/rev1/info.json
+++ b/keyboards/jian/rev1/keyboard.json
@@ -44,6 +44,11 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "backlight": true,
+        "rgblight": true,
+        "dip_switch": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/jian/rev1/rules.mk b/keyboards/jian/rev1/rules.mk
deleted file mode 100644
index bd3228c26e..0000000000
--- a/keyboards/jian/rev1/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-CONSOLE_ENABLE = no
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-DIP_SWITCH_ENABLE = yes
diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/keyboard.json
similarity index 97%
rename from keyboards/jian/rev2/info.json
rename to keyboards/jian/rev2/keyboard.json
index ebd015c9a4..e64df224a5 100644
--- a/keyboards/jian/rev2/info.json
+++ b/keyboards/jian/rev2/keyboard.json
@@ -43,6 +43,10 @@
     },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
+    "features": {
+        "backlight": true,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/jian/rev2/rules.mk b/keyboards/jian/rev2/rules.mk
deleted file mode 100644
index e8415063bc..0000000000
--- a/keyboards/jian/rev2/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-CONSOLE_ENABLE = no
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/jian/rules.mk b/keyboards/jian/rules.mk
index 7227083305..c19fa00b5c 100644
--- a/keyboards/jian/rules.mk
+++ b/keyboards/jian/rules.mk
@@ -1,2 +1 @@
 DEFAULT_FOLDER = jian/rev2
-LTO_ENABLE = yes
diff --git a/keyboards/jiran/rev1/info.json b/keyboards/jiran/rev1/keyboard.json
similarity index 96%
rename from keyboards/jiran/rev1/info.json
rename to keyboards/jiran/rev1/keyboard.json
index b9a6d56fe6..1e36d757ca 100644
--- a/keyboards/jiran/rev1/info.json
+++ b/keyboards/jiran/rev1/keyboard.json
@@ -3,6 +3,12 @@
         "pin": "B6",
         "levels": 5
     },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "backlight": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/jiran/rev1/rules.mk b/keyboards/jiran/rev1/rules.mk
deleted file mode 100644
index bd518d8f27..0000000000
--- a/keyboards/jiran/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/jiran/rev2/info.json b/keyboards/jiran/rev2/keyboard.json
similarity index 96%
rename from keyboards/jiran/rev2/info.json
rename to keyboards/jiran/rev2/keyboard.json
index 8f52510ff7..37bed5c796 100644
--- a/keyboards/jiran/rev2/info.json
+++ b/keyboards/jiran/rev2/keyboard.json
@@ -19,6 +19,12 @@
    "ws2812": {
        "pin": "B6"
    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/jiran/rev2/rules.mk b/keyboards/jiran/rev2/rules.mk
deleted file mode 100644
index 1e3cebb145..0000000000
--- a/keyboards/jiran/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/jiran/rules.mk b/keyboards/jiran/rules.mk
index d145031506..3ffe13302d 100644
--- a/keyboards/jiran/rules.mk
+++ b/keyboards/jiran/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-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
-
 DEFAULT_FOLDER = jiran/rev1
diff --git a/keyboards/jones/v03/info.json b/keyboards/jones/v03/info.json
index 2f8a7803d2..f5b18c9d2f 100644
--- a/keyboards/jones/v03/info.json
+++ b/keyboards/jones/v03/info.json
@@ -28,6 +28,16 @@
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "rgblight": true,
+    "encoder": true
+  },
+  "build": {
+    "lto": true
+  },
   "layouts": {
     "LAYOUT_ansi": {
       "layout": [
diff --git a/keyboards/jones/v03/rules.mk b/keyboards/jones/v03/rules.mk
index 0afd3b816a..30ce5d293b 100644
--- a/keyboards/jones/v03/rules.mk
+++ b/keyboards/jones/v03/rules.mk
@@ -1,19 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # 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
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-ENCODER_ENABLE = yes        # Rotary Encoder
-
-CUSTOM_MATRIX = lite        # Custom matrix for "Round-Robin Matrix"
+CUSTOM_MATRIX = lite
 SRC += matrix.c
-
-LTO_ENABLE = yes
diff --git a/keyboards/jones/v03_1/info.json b/keyboards/jones/v03_1/info.json
index 9e46cdd40a..ae89012884 100644
--- a/keyboards/jones/v03_1/info.json
+++ b/keyboards/jones/v03_1/info.json
@@ -29,6 +29,17 @@
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "rgblight": true,
+    "audio": true,
+    "encoder": true
+  },
+  "build": {
+    "lto": true
+  },
   "layouts": {
     "LAYOUT_ansi": {
       "layout": [
diff --git a/keyboards/jones/v03_1/rules.mk b/keyboards/jones/v03_1/rules.mk
index eff64d9a58..30ce5d293b 100644
--- a/keyboards/jones/v03_1/rules.mk
+++ b/keyboards/jones/v03_1/rules.mk
@@ -1,19 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
-
-ENCODER_ENABLE = yes        # Rotary Encoder
-
-CUSTOM_MATRIX = lite        # Custom matrix for "Round-Robin Matrix"
+CUSTOM_MATRIX = lite
 SRC += matrix.c
-
-LTO_ENABLE = yes
diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/keyboard.json
similarity index 96%
rename from keyboards/jones/v1/info.json
rename to keyboards/jones/v1/keyboard.json
index 54496d3164..df30c596d4 100644
--- a/keyboards/jones/v1/info.json
+++ b/keyboards/jones/v1/keyboard.json
@@ -38,6 +38,17 @@
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "rgblight": true,
+    "audio": true,
+    "encoder": true
+  },
+  "build": {
+    "lto": true
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/jones/v1/rules.mk b/keyboards/jones/v1/rules.mk
deleted file mode 100644
index 6f522a4365..0000000000
--- a/keyboards/jones/v1/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # 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
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
-ENCODER_ENABLE = yes        # Rotary Encoder
-
-LTO_ENABLE = yes
diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/keyboard.json
similarity index 94%
rename from keyboards/jorne/rev1/info.json
rename to keyboards/jorne/rev1/keyboard.json
index fedab8fd08..93ece816bb 100644
--- a/keyboards/jorne/rev1/info.json
+++ b/keyboards/jorne/rev1/keyboard.json
@@ -32,6 +32,16 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "oled": true
+    },
+    "build": {
+        "lto": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/jorne/rev1/rules.mk b/keyboards/jorne/rev1/rules.mk
deleted file mode 100644
index 52a6de4da9..0000000000
--- a/keyboards/jorne/rev1/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-OLED_ENABLE     = yes    # Enable OLED
-RGBLIGHT_ENABLE = yes    # Enable keyboard RGB underglow
diff --git a/keyboards/jorne/rules.mk b/keyboards/jorne/rules.mk
index fb1b47d106..c43649b348 100644
--- a/keyboards/jorne/rules.mk
+++ b/keyboards/jorne/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no      # 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
-NKRO_ENABLE = no           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no          # Audio output
-LTO_ENABLE     = yes
-
 DEFAULT_FOLDER = jorne/rev1
diff --git a/keyboards/joshajohnson/hub16/info.json b/keyboards/joshajohnson/hub16/info.json
index 920b42feec..7d8f0ab356 100644
--- a/keyboards/joshajohnson/hub16/info.json
+++ b/keyboards/joshajohnson/hub16/info.json
@@ -37,6 +37,13 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "encoder": true
+    },
     "debounce": 20,
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/joshajohnson/hub16/rules.mk b/keyboards/joshajohnson/hub16/rules.mk
index 51fa8f6ee6..9a337c23b8 100755
--- a/keyboards/joshajohnson/hub16/rules.mk
+++ b/keyboards/joshajohnson/hub16/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
 CUSTOM_MATRIX = lite		# Custom scanning of matrix
-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
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Rotary Encoder support
 
 SRC = matrix.c
diff --git a/keyboards/jpe230/big_knob/info.json b/keyboards/jpe230/big_knob/info.json
index 083a1ae690..e46aba594f 100644
--- a/keyboards/jpe230/big_knob/info.json
+++ b/keyboards/jpe230/big_knob/info.json
@@ -16,7 +16,8 @@
         "extrakey": true,
         "mousekey": true,
         "encoder": true,
-        "backlight": true
+        "backlight": true,
+        "quantum_painter": true
     },
     "matrix_pins": {
         "direct": [
diff --git a/keyboards/jpe230/big_knob/rules.mk b/keyboards/jpe230/big_knob/rules.mk
index 5f7b604a80..2031911ced 100644
--- a/keyboards/jpe230/big_knob/rules.mk
+++ b/keyboards/jpe230/big_knob/rules.mk
@@ -1,3 +1,2 @@
-QUANTUM_PAINTER_ENABLE = yes
 QUANTUM_PAINTER_DRIVERS += st7735_spi
 SRC += gfx/logo.qgf.c