summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/1upkeyboards/1up60rgb/rules.mk2
-rw-r--r--keyboards/1upkeyboards/sweet16/keymaps/switchtester/rules.mk3
-rw-r--r--keyboards/2key2crawl/rules.mk2
-rw-r--r--keyboards/40percentclub/gherkin/rules.mk2
-rw-r--r--keyboards/40percentclub/luddite/rules.mk2
-rw-r--r--keyboards/40percentclub/tomato/rules.mk2
-rw-r--r--keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk5
-rw-r--r--keyboards/7c8/framework/rules.mk3
-rw-r--r--keyboards/8pack/rules.mk2
-rw-r--r--keyboards/acr60/rules.mk2
-rw-r--r--keyboards/aeboards/ext65/rev2/rules.mk2
-rw-r--r--keyboards/akegata_denki/device_one/rules.mk2
-rwxr-xr-xkeyboards/alpha/rules.mk2
-rw-r--r--keyboards/alps64/rules.mk2
-rw-r--r--keyboards/amjpad/rules.mk2
-rw-r--r--keyboards/arabica37/rev1/rules.mk1
-rw-r--r--keyboards/at101_bh/rules.mk2
-rw-r--r--keyboards/at_at/660m/rules.mk3
-rw-r--r--keyboards/bantam44/rules.mk2
-rw-r--r--keyboards/bear_face/rules.mk1
-rw-r--r--keyboards/bfake/rules.mk4
-rw-r--r--keyboards/bioi/g60ble/rules.mk2
-rw-r--r--keyboards/blackplum/rules.mk2
-rw-r--r--keyboards/blank_tehnologii/manibus/rules.mk1
-rw-r--r--keyboards/boston_meetup/2019/rules.mk2
-rw-r--r--keyboards/butterstick/rules.mk3
-rw-r--r--keyboards/cannonkeys/an_c/rules.mk4
-rw-r--r--keyboards/cannonkeys/atlas/rules.mk3
-rw-r--r--keyboards/cannonkeys/chimera65/rules.mk4
-rw-r--r--keyboards/cannonkeys/db60/rules.mk2
-rw-r--r--keyboards/cannonkeys/devastatingtkl/rules.mk2
-rw-r--r--keyboards/cannonkeys/instant60/rules.mk3
-rw-r--r--keyboards/cannonkeys/iron165/rules.mk2
-rw-r--r--keyboards/cannonkeys/ortho48/rules.mk3
-rw-r--r--keyboards/cannonkeys/ortho60/rules.mk3
-rw-r--r--keyboards/cannonkeys/ortho75/rules.mk3
-rw-r--r--keyboards/cannonkeys/practice60/rules.mk3
-rw-r--r--keyboards/cannonkeys/practice65/rules.mk3
-rw-r--r--keyboards/cannonkeys/rekt1800/rules.mk2
-rw-r--r--keyboards/cannonkeys/satisfaction75/rules.mk7
-rw-r--r--keyboards/cannonkeys/savage65/rules.mk4
-rw-r--r--keyboards/cannonkeys/tmov2/rules.mk4
-rw-r--r--keyboards/catch22/rules.mk2
-rw-r--r--keyboards/centromere/rules.mk2
-rw-r--r--keyboards/chavdai40/rev1/rules.mk1
-rw-r--r--keyboards/chavdai40/rev2/rules.mk1
-rw-r--r--keyboards/chimera_ergo/rules.mk2
-rw-r--r--keyboards/chimera_ls/rules.mk2
-rw-r--r--keyboards/chimera_ortho/rules.mk2
-rw-r--r--keyboards/clueboard/66/rev3/rules.mk3
-rw-r--r--keyboards/clueboard/66_hotswap/prototype/rules.mk3
-rw-r--r--keyboards/coarse/ixora/rules.mk2
-rw-r--r--keyboards/coarse/vinta/rules.mk2
-rw-r--r--keyboards/comet46/rules.mk2
-rw-r--r--keyboards/converter/adb_usb/rules.mk2
-rw-r--r--keyboards/converter/m0110_usb/rules.mk2
-rw-r--r--keyboards/converter/siemens_tastatur/rules.mk3
-rw-r--r--keyboards/converter/usb_usb/rules.mk2
-rwxr-xr-xkeyboards/crawlpad/rules.mk2
-rw-r--r--keyboards/daji/seis_cinco/rules.mk2
-rw-r--r--keyboards/db/db63/rules.mk4
-rw-r--r--keyboards/delikeeb/vanana/rules.mk2
-rw-r--r--keyboards/delilah/rules.mk2
-rwxr-xr-xkeyboards/dichotomy/rules.mk2
-rw-r--r--keyboards/do60/rules.mk2
-rw-r--r--keyboards/donutcables/budget96/rules.mk4
-rw-r--r--keyboards/donutcables/scrabblepad/rules.mk2
-rw-r--r--keyboards/ergodox_ez/rules.mk2
-rw-r--r--keyboards/ergodox_infinity/rules.mk2
-rwxr-xr-xkeyboards/espectro/rules.mk2
-rw-r--r--keyboards/eve/meteor/rules.mk4
-rw-r--r--keyboards/evyd13/plain60/rules.mk2
-rw-r--r--keyboards/evyd13/wonderland/rules.mk2
-rw-r--r--keyboards/exclusive/e65/rules.mk2
-rw-r--r--keyboards/exclusive/e7v1/rules.mk2
-rw-r--r--keyboards/facew/rules.mk4
-rw-r--r--keyboards/fc660c/rules.mk2
-rw-r--r--keyboards/fc980c/rules.mk2
-rw-r--r--keyboards/ferris/0_1/rules.mk1
-rw-r--r--keyboards/ferris/0_2/rules.mk1
-rw-r--r--keyboards/flehrad/bigswitch/rules.mk2
-rw-r--r--keyboards/flehrad/numbrero/rules.mk2
-rw-r--r--keyboards/flehrad/snagpad/rules.mk2
-rw-r--r--keyboards/for_science/rules.mk1
-rw-r--r--keyboards/four_banger/rules.mk2
-rw-r--r--keyboards/foxlab/key65/hotswap/rules.mk3
-rw-r--r--keyboards/foxlab/key65/universal/rules.mk3
-rw-r--r--keyboards/foxlab/time_re/hotswap/rules.mk2
-rw-r--r--keyboards/foxlab/time_re/universal/rules.mk2
-rw-r--r--keyboards/ft/mars80/rules.mk4
-rw-r--r--keyboards/georgi/rules.mk3
-rw-r--r--keyboards/gergo/rules.mk3
-rw-r--r--keyboards/gh60/revc/rules.mk2
-rw-r--r--keyboards/gh60/satan/rules.mk2
-rw-r--r--keyboards/gh80_3000/rules.mk2
-rw-r--r--keyboards/gray_studio/hb85/rules.mk4
-rw-r--r--keyboards/hadron/ver2/rules.mk2
-rw-r--r--keyboards/hadron/ver3/rules.mk2
-rw-r--r--keyboards/handwired/2x5keypad/rules.mk4
-rw-r--r--keyboards/handwired/aek64/rules.mk2
-rw-r--r--keyboards/handwired/cans12er/rules.mk2
-rw-r--r--keyboards/handwired/ck4x4/rules.mk3
-rw-r--r--keyboards/handwired/co60/rev6/rules.mk2
-rw-r--r--keyboards/handwired/co60/rev7/rules.mk2
-rw-r--r--keyboards/handwired/dactyl/rules.mk2
-rw-r--r--keyboards/handwired/datahand/rules.mk2
-rw-r--r--keyboards/handwired/frenchdev/rules.mk2
-rw-r--r--keyboards/handwired/hexon38/rules.mk6
-rw-r--r--keyboards/handwired/jopr/rules.mk2
-rw-r--r--keyboards/handwired/k_numpad17/rules.mk2
-rw-r--r--keyboards/handwired/ms_sculpt_mobile/rules.mk4
-rw-r--r--keyboards/handwired/myskeeb/rules.mk1
-rw-r--r--keyboards/handwired/obuwunkunubi/spaget/rules.mk2
-rw-r--r--keyboards/handwired/postageboard/mini/rules.mk3
-rw-r--r--keyboards/handwired/postageboard/r1/rules.mk3
-rw-r--r--keyboards/handwired/pteron/rules.mk2
-rw-r--r--keyboards/handwired/retro_refit/rules.mk2
-rw-r--r--keyboards/handwired/rs60/rules.mk2
-rw-r--r--keyboards/handwired/space_oddity/rules.mk2
-rw-r--r--keyboards/handwired/steamvan/rev1/rules.mk2
-rw-r--r--keyboards/handwired/terminus_mini/keymaps/default/rules.mk4
-rw-r--r--keyboards/handwired/trackpoint/rules.mk4
-rw-r--r--keyboards/handwired/tritium_numpad/rules.mk2
-rw-r--r--keyboards/handwired/wulkan/rules.mk2
-rw-r--r--keyboards/hardlineworks/otd_plus/rules.mk2
-rw-r--r--keyboards/hhkb/ansi/rules.mk2
-rw-r--r--keyboards/hhkb/jp/rules.mk2
-rwxr-xr-xkeyboards/honeycomb/rules.mk2
-rw-r--r--keyboards/hotdox/rules.mk2
-rw-r--r--keyboards/hs60/v2/ansi/rules.mk2
-rw-r--r--keyboards/hs60/v2/hhkb/rules.mk2
-rw-r--r--keyboards/hs60/v2/iso/rules.mk2
-rwxr-xr-xkeyboards/hub16/rules.mk2
-rw-r--r--keyboards/idb/idb_60/rules.mk3
-rw-r--r--keyboards/jc65/v32a/rules.mk4
-rw-r--r--keyboards/jd40/rules.mk2
-rw-r--r--keyboards/jd45/rules.mk2
-rw-r--r--keyboards/kabedon/kabedon78s/rules.mk2
-rw-r--r--keyboards/kabedon/kabedon980/rules.mk2
-rwxr-xr-xkeyboards/kapcave/gskt00/rules.mk2
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk3
-rw-r--r--keyboards/kbdfans/kbd75/rev1/rules.mk2
-rw-r--r--keyboards/kbdfans/kbd75/rev2/rules.mk2
-rw-r--r--keyboards/kbdfans/kbdpad/mk1/rules.mk4
-rw-r--r--keyboards/kc60se/rules.mk1
-rw-r--r--keyboards/keebio/chocopad/rules.mk2
-rw-r--r--keyboards/keebio/dilly/rules.mk2
-rw-r--r--keyboards/keebio/rorschach/rules.mk3
-rw-r--r--keyboards/keebwerk/nano_slider/rules.mk2
-rw-r--r--keyboards/kingly_keys/little_foot/rules.mk2
-rw-r--r--keyboards/kingly_keys/romac/rules.mk2
-rw-r--r--keyboards/kingly_keys/smd_milk/rules.mk2
-rwxr-xr-xkeyboards/kprepublic/bm16s/rules.mk2
-rw-r--r--keyboards/kprepublic/jj50/rules.mk4
-rw-r--r--keyboards/ktec/ergodone/rules.mk2
-rwxr-xr-xkeyboards/ktec/staryu/rules.mk2
-rw-r--r--keyboards/latinpad/rules.mk1
-rw-r--r--keyboards/lazydesigners/the50/rules.mk2
-rwxr-xr-xkeyboards/lazydesigners/the60/rev1/rules.mk2
-rw-r--r--keyboards/le_chiffre/rules.mk3
-rw-r--r--keyboards/massdrop/alt/rules.mk2
-rw-r--r--keyboards/massdrop/ctrl/rules.mk2
-rw-r--r--keyboards/masterworks/classy_tkl/rev_a/rules.mk1
-rw-r--r--keyboards/matrix/m12og/rev2/rules.mk2
-rw-r--r--keyboards/matrix/m20add/rules.mk2
-rw-r--r--keyboards/matrix/me/rules.mk2
-rw-r--r--keyboards/matrix/noah/rules.mk2
-rw-r--r--keyboards/mechlovin/infinity87/rev2/rules.mk1
-rw-r--r--keyboards/mechmini/v1/rules.mk4
-rwxr-xr-xkeyboards/mechmini/v2/rules.mk2
-rw-r--r--keyboards/mehkee96/rules.mk2
-rw-r--r--keyboards/melody96/rules.mk2
-rw-r--r--keyboards/mitosis/rules.mk2
-rw-r--r--keyboards/mixi/rules.mk2
-rw-r--r--keyboards/montsinger/rebound/rev1/rules.mk3
-rw-r--r--keyboards/montsinger/rebound/rev2/rules.mk3
-rw-r--r--keyboards/montsinger/rebound/rev3/rules.mk3
-rw-r--r--keyboards/montsinger/rebound/rev4/rules.mk3
-rw-r--r--keyboards/montsinger/rewind/rules.mk3
-rw-r--r--keyboards/mt40/rules.mk4
-rw-r--r--keyboards/mt980/rules.mk2
-rwxr-xr-xkeyboards/nebula12/rules.mk2
-rwxr-xr-xkeyboards/nebula68/rules.mk2
-rw-r--r--keyboards/nek_type_a/rules.mk3
-rwxr-xr-xkeyboards/nk65/rules.mk2
-rwxr-xr-xkeyboards/novelpad/rules.mk2
-rw-r--r--keyboards/oddforge/vea/rules.mk2
-rw-r--r--keyboards/ok60/rules.mk2
-rw-r--r--keyboards/omnikey_bh/rules.mk2
-rw-r--r--keyboards/omnikeyish/rules.mk2
-rw-r--r--keyboards/opus/rules.mk1
-rw-r--r--keyboards/orange75/rules.mk2
-rw-r--r--keyboards/org60/rules.mk2
-rw-r--r--keyboards/panc60/rules.mk4
-rw-r--r--keyboards/pearl/rules.mk4
-rw-r--r--keyboards/percent/canoe/rules.mk4
-rw-r--r--keyboards/percent/skog/rules.mk4
-rw-r--r--keyboards/playkbtw/ca66/rules.mk2
-rw-r--r--keyboards/playkbtw/pk60/rules.mk2
-rw-r--r--keyboards/plut0nium/0x3e/rules.mk2
-rw-r--r--keyboards/polycarbdiet/s20/rules.mk3
-rw-r--r--keyboards/primekb/prime_r/rules.mk2
-rw-r--r--keyboards/projectkb/signature87/rules.mk2
-rw-r--r--keyboards/rainkeeb/rules.mk2
-rw-r--r--keyboards/rart/rartpad/rules.mk2
-rw-r--r--keyboards/redox_w/rules.mk2
-rw-r--r--keyboards/sck/gtm/rules.mk2
-rw-r--r--keyboards/senselessclay/had60/rules.mk2
-rw-r--r--keyboards/sets3n/kk980/rules.mk2
-rw-r--r--keyboards/signum/3_0/rules.mk2
-rw-r--r--keyboards/singa/rules.mk4
-rw-r--r--keyboards/sixkeyboard/rules.mk2
-rw-r--r--keyboards/southpole/rules.mk2
-rw-r--r--keyboards/spaceman/2_milk/rules.mk2
-rw-r--r--keyboards/spaceman/pancake/rev1/feather/rules.mk2
-rw-r--r--keyboards/spaceman/pancake/rev1/promicro/rules.mk2
-rw-r--r--keyboards/spaceman/yun65/rules.mk2
-rw-r--r--keyboards/splitish/rules.mk3
-rw-r--r--keyboards/squiggle/rev1/rules.mk3
-rwxr-xr-xkeyboards/sx60/rules.mk2
-rw-r--r--keyboards/tanuki/rules.mk2
-rw-r--r--keyboards/tenki/rules.mk2
-rwxr-xr-xkeyboards/tetris/rules.mk2
-rw-r--r--keyboards/tgr/910/rules.mk4
-rw-r--r--keyboards/tgr/alice/rules.mk4
-rw-r--r--keyboards/tgr/jane/v2/rules.mk4
-rw-r--r--keyboards/the_royal/liminal/rules.mk4
-rw-r--r--keyboards/thevankeyboards/bananasplit/rules.mk2
-rw-r--r--keyboards/tkc/candybar/lefty/rules.mk3
-rw-r--r--keyboards/tkc/candybar/righty/rules.mk3
-rw-r--r--keyboards/tkc/tkc1800/rules.mk1
-rw-r--r--keyboards/toad/rules.mk2
-rw-r--r--keyboards/uk78/rules.mk2
-rw-r--r--keyboards/unikorn/rules.mk4
-rw-r--r--keyboards/walletburner/cajal/rules.mk2
-rw-r--r--keyboards/walletburner/neuron/rules.mk2
-rw-r--r--keyboards/westfoxtrot/aanzee/rules.mk2
-rw-r--r--keyboards/westfoxtrot/prophet/rules.mk2
-rw-r--r--keyboards/winkeyless/bface/rules.mk4
-rw-r--r--keyboards/winkeyless/bmini/rules.mk4
-rw-r--r--keyboards/winkeyless/bminiex/rules.mk4
-rw-r--r--keyboards/wsk/houndstooth/rules.mk2
-rw-r--r--keyboards/wsk/jerkin/rules.mk3
-rw-r--r--keyboards/wsk/kodachi50/rules.mk2
-rw-r--r--keyboards/wsk/pain27/rules.mk2
-rw-r--r--keyboards/wsk/sl40/rules.mk2
-rw-r--r--keyboards/wuque/ikki68/rules.mk2
-rw-r--r--keyboards/xbows/woody/rules.mk4
-rw-r--r--keyboards/xelus/kangaroo/rules.mk3
-rw-r--r--keyboards/xelus/trinityxttkl/rules.mk3
-rw-r--r--keyboards/xiudi/xd004/v1/rules.mk2
-rw-r--r--keyboards/xiudi/xd60/rev2/rules.mk2
-rw-r--r--keyboards/xiudi/xd60/rev3/rules.mk2
-rw-r--r--keyboards/xiudi/xd68/rules.mk2
-rw-r--r--keyboards/xmmx/rules.mk2
-rw-r--r--keyboards/yasui/rules.mk2
-rw-r--r--keyboards/ymd75/rev1/rules.mk4
-rw-r--r--keyboards/ymd75/rev2/rules.mk4
-rw-r--r--keyboards/ymd96/rules.mk4
-rw-r--r--keyboards/ymdk/bface/rules.mk4
-rw-r--r--keyboards/ymdk/ymd67/rules.mk2
-rw-r--r--keyboards/z12/rules.mk2
-rw-r--r--keyboards/z150_bh/rules.mk2
-rw-r--r--keyboards/zj68/rules.mk2
-rwxr-xr-xkeyboards/zlant/rules.mk2
265 files changed, 397 insertions, 245 deletions
diff --git a/keyboards/1upkeyboards/1up60rgb/rules.mk b/keyboards/1upkeyboards/1up60rgb/rules.mk
index 2249753c14..69953e30bc 100644
--- a/keyboards/1upkeyboards/1up60rgb/rules.mk
+++ b/keyboards/1upkeyboards/1up60rgb/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/switchtester/rules.mk b/keyboards/1upkeyboards/sweet16/keymaps/switchtester/rules.mk
index 8773a03f9e..4abd80f20a 100644
--- a/keyboards/1upkeyboards/sweet16/keymaps/switchtester/rules.mk
+++ b/keyboards/1upkeyboards/sweet16/keymaps/switchtester/rules.mk
@@ -1,6 +1,3 @@
-# Build Options
-# comment out to disable the options.
-#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
diff --git a/keyboards/2key2crawl/rules.mk b/keyboards/2key2crawl/rules.mk
index 4404debffe..182637c7b7 100644
--- a/keyboards/2key2crawl/rules.mk
+++ b/keyboards/2key2crawl/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u2
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/40percentclub/gherkin/rules.mk b/keyboards/40percentclub/gherkin/rules.mk
index 268cf66575..46deafe514 100644
--- a/keyboards/40percentclub/gherkin/rules.mk
+++ b/keyboards/40percentclub/gherkin/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/40percentclub/luddite/rules.mk b/keyboards/40percentclub/luddite/rules.mk
index a3e45b5803..82b22fd8c1 100644
--- a/keyboards/40percentclub/luddite/rules.mk
+++ b/keyboards/40percentclub/luddite/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/40percentclub/tomato/rules.mk b/keyboards/40percentclub/tomato/rules.mk
index 25f6dc125a..96f92d8d25 100644
--- a/keyboards/40percentclub/tomato/rules.mk
+++ b/keyboards/40percentclub/tomato/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
index dfef68a160..35f765bc83 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
@@ -1,8 +1,11 @@
# MCU name
MCU = STM32F072
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/7c8/framework/rules.mk b/keyboards/7c8/framework/rules.mk
index 0d48ce19f9..797b8072ca 100644
--- a/keyboards/7c8/framework/rules.mk
+++ b/keyboards/7c8/framework/rules.mk
@@ -4,6 +4,9 @@ MCU = atmega328p
# Bootloader selection
BOOTLOADER = usbasploader
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/8pack/rules.mk b/keyboards/8pack/rules.mk
index d3fb26029a..1d62765274 100644
--- a/keyboards/8pack/rules.mk
+++ b/keyboards/8pack/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/acr60/rules.mk b/keyboards/acr60/rules.mk
index 768f0d332a..9ccce6abf4 100644
--- a/keyboards/acr60/rules.mk
+++ b/keyboards/acr60/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/aeboards/ext65/rev2/rules.mk b/keyboards/aeboards/ext65/rev2/rules.mk
index 7089fde65f..b2f7139899 100644
--- a/keyboards/aeboards/ext65/rev2/rules.mk
+++ b/keyboards/aeboards/ext65/rev2/rules.mk
@@ -5,7 +5,7 @@ MCU = STM32F072
BOOTLOADER = stm32-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/akegata_denki/device_one/rules.mk b/keyboards/akegata_denki/device_one/rules.mk
index d44857affb..e049b06252 100644
--- a/keyboards/akegata_denki/device_one/rules.mk
+++ b/keyboards/akegata_denki/device_one/rules.mk
@@ -6,7 +6,7 @@ BOARD = ST_NUCLEO32_F042K6
BOOTLOADER = stm32-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BACKLIGHT_ENABLE = no
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
diff --git a/keyboards/alpha/rules.mk b/keyboards/alpha/rules.mk
index cb60729631..e1a53a1521 100755
--- a/keyboards/alpha/rules.mk
+++ b/keyboards/alpha/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/alps64/rules.mk b/keyboards/alps64/rules.mk
index e5b3ef239f..347d50f26d 100644
--- a/keyboards/alps64/rules.mk
+++ b/keyboards/alps64/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u2
BOOTLOADER = atmel-dfu
# Build Options
-# change to no to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/amjpad/rules.mk b/keyboards/amjpad/rules.mk
index 7c63b8bdd1..c56fff39b3 100644
--- a/keyboards/amjpad/rules.mk
+++ b/keyboards/amjpad/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/arabica37/rev1/rules.mk b/keyboards/arabica37/rev1/rules.mk
index 1409d6c25e..7997604e23 100644
--- a/keyboards/arabica37/rev1/rules.mk
+++ b/keyboards/arabica37/rev1/rules.mk
@@ -6,6 +6,7 @@ BOOTLOADER = caterina
# 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
diff --git a/keyboards/at101_bh/rules.mk b/keyboards/at101_bh/rules.mk
index 3899ed1e5a..16dc2697bb 100644
--- a/keyboards/at101_bh/rules.mk
+++ b/keyboards/at101_bh/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = halfkay
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/at_at/660m/rules.mk b/keyboards/at_at/660m/rules.mk
index 2567c1ccf4..46b3df66bc 100644
--- a/keyboards/at_at/660m/rules.mk
+++ b/keyboards/at_at/660m/rules.mk
@@ -6,9 +6,8 @@ BOARD = GENERIC_STM32_F072XB
BOOTLOADER = stm32-dfu
# Build Options
-# comment out to disable the 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
diff --git a/keyboards/bantam44/rules.mk b/keyboards/bantam44/rules.mk
index 055079fdeb..eee48d6ef9 100644
--- a/keyboards/bantam44/rules.mk
+++ b/keyboards/bantam44/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = halfkay
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/bear_face/rules.mk b/keyboards/bear_face/rules.mk
index 5a95bd8ed5..f198cf7cc2 100644
--- a/keyboards/bear_face/rules.mk
+++ b/keyboards/bear_face/rules.mk
@@ -6,6 +6,7 @@ BOOTLOADER = atmel-dfu
# 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
diff --git a/keyboards/bfake/rules.mk b/keyboards/bfake/rules.mk
index 5b70617255..eb4db8cd61 100644
--- a/keyboards/bfake/rules.mk
+++ b/keyboards/bfake/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/bioi/g60ble/rules.mk b/keyboards/bioi/g60ble/rules.mk
index 6a1a4902fb..f610ca3b39 100644
--- a/keyboards/bioi/g60ble/rules.mk
+++ b/keyboards/bioi/g60ble/rules.mk
@@ -8,7 +8,7 @@ F_CPU = 8000000
BOOTLOADER = qmk-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/blackplum/rules.mk b/keyboards/blackplum/rules.mk
index ef29868faf..119591faaf 100644
--- a/keyboards/blackplum/rules.mk
+++ b/keyboards/blackplum/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = qmk-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/blank_tehnologii/manibus/rules.mk b/keyboards/blank_tehnologii/manibus/rules.mk
index 4d13eeee8b..3ad1939d71 100644
--- a/keyboards/blank_tehnologii/manibus/rules.mk
+++ b/keyboards/blank_tehnologii/manibus/rules.mk
@@ -6,6 +6,7 @@ BOOTLOADER = atmel-dfu
# 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
diff --git a/keyboards/boston_meetup/2019/rules.mk b/keyboards/boston_meetup/2019/rules.mk
index 4d7f5756a5..69919a16c6 100644
--- a/keyboards/boston_meetup/2019/rules.mk
+++ b/keyboards/boston_meetup/2019/rules.mk
@@ -6,7 +6,7 @@ BOARD = QMK_PROTON_C
BOOTLOADER = stm32-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/butterstick/rules.mk b/keyboards/butterstick/rules.mk
index cb969e8562..4229aa7eec 100644
--- a/keyboards/butterstick/rules.mk
+++ b/keyboards/butterstick/rules.mk
@@ -4,6 +4,9 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
+# Build Options
+# change yes to no to disable
+#
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug
diff --git a/keyboards/cannonkeys/an_c/rules.mk b/keyboards/cannonkeys/an_c/rules.mk
index 54ecf95405..e03a83f44c 100644
--- a/keyboards/cannonkeys/an_c/rules.mk
+++ b/keyboards/cannonkeys/an_c/rules.mk
@@ -8,10 +8,8 @@ BOOTLOADER = stm32-dfu
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
# Build Options
-# comment out to disable the 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
diff --git a/keyboards/cannonkeys/atlas/rules.mk b/keyboards/cannonkeys/atlas/rules.mk
index 65b25944d0..b14bde0fb5 100644
--- a/keyboards/cannonkeys/atlas/rules.mk
+++ b/keyboards/cannonkeys/atlas/rules.mk
@@ -5,7 +5,8 @@ MCU = STM32F072
BOOTLOADER = stm32-dfu
# Build Options
-# comment out to disable the 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
diff --git a/keyboards/cannonkeys/chimera65/rules.mk b/keyboards/cannonkeys/chimera65/rules.mk
index 739a7ebf75..c2cb86cc7d 100644
--- a/keyboards/cannonkeys/chimera65/rules.mk
+++ b/keyboards/cannonkeys/chimera65/rules.mk
@@ -5,10 +5,8 @@ MCU = STM32F072
BOOTLOADER = stm32-dfu
# Build Options
-# comment out to disable the 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
diff --git a/keyboards/cannonkeys/db60/rules.mk b/keyboards/cannonkeys/db60/rules.mk
index aa4fc085c7..91a8974c0c 100644
--- a/keyboards/cannonkeys/db60/rules.mk
+++ b/keyboards/cannonkeys/db60/rules.mk
@@ -8,7 +8,7 @@ BOOTLOADER = stm32-dfu
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/cannonkeys/devastatingtkl/rules.mk b/keyboards/cannonkeys/devastatingtkl/rules.mk
index 964cfcc65e..440b77bd26 100644
--- a/keyboards/cannonkeys/devastatingtkl/rules.mk
+++ b/keyboards/cannonkeys/devastatingtkl/rules.mk
@@ -8,7 +8,7 @@ BOOTLOADER = stm32-dfu
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/cannonkeys/instant60/rules.mk b/keyboards/cannonkeys/instant60/rules.mk
index 9683b8aabb..e03a83f44c 100644
--- a/keyboards/cannonkeys/instant60/rules.mk
+++ b/keyboards/cannonkeys/instant60/rules.mk
@@ -8,9 +8,8 @@ BOOTLOADER = stm32-dfu
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
# Build Options
-# comment out to disable the 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
diff --git a/keyboards/cannonkeys/iron165/rules.mk b/keyboards/cannonkeys/iron165/rules.mk
index 4e078f5203..c2cb86cc7d 100644
--- a/keyboards/cannonkeys/iron165/rules.mk
+++ b/keyboards/cannonkeys/iron165/rules.mk
@@ -5,7 +5,7 @@ MCU = STM32F072
BOOTLOADER = stm32-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/cannonkeys/ortho48/rules.mk b/keyboards/cannonkeys/ortho48/rules.mk
index b5b596c5a8..46b5bf7c4d 100644
--- a/keyboards/cannonkeys/ortho48/rules.mk
+++ b/keyboards/cannonkeys/ortho48/rules.mk
@@ -4,6 +4,9 @@ MCU = STM32F103
# Bootloader selection
BOOTLOADER = stm32duino
+# 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
diff --git a/keyboards/cannonkeys/ortho60/rules.mk b/keyboards/cannonkeys/ortho60/rules.mk
index 8707cef6b1..ee4390309c 100644
--- a/keyboards/cannonkeys/ortho60/rules.mk
+++ b/keyboards/cannonkeys/ortho60/rules.mk
@@ -4,6 +4,9 @@ MCU = STM32F103
# Bootloader selection
BOOTLOADER = stm32duino
+# 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
diff --git a/keyboards/cannonkeys/ortho75/rules.mk b/keyboards/cannonkeys/ortho75/rules.mk
index a8d07a222e..60b1a69199 100644
--- a/keyboards/cannonkeys/ortho75/rules.mk
+++ b/keyboards/cannonkeys/ortho75/rules.mk
@@ -4,6 +4,9 @@ MCU = STM32F103
# Bootloader selection
BOOTLOADER = stm32duino
+# 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
diff --git a/keyboards/cannonkeys/practice60/rules.mk b/keyboards/cannonkeys/practice60/rules.mk
index 6c1256a55f..423c4d15b1 100644
--- a/keyboards/cannonkeys/practice60/rules.mk
+++ b/keyboards/cannonkeys/practice60/rules.mk
@@ -4,6 +4,9 @@ MCU = STM32F103
# Bootloader selection
BOOTLOADER = stm32duino
+# 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
diff --git a/keyboards/cannonkeys/practice65/rules.mk b/keyboards/cannonkeys/practice65/rules.mk
index c1216e48aa..a644ef6371 100644
--- a/keyboards/cannonkeys/practice65/rules.mk
+++ b/keyboards/cannonkeys/practice65/rules.mk
@@ -4,6 +4,9 @@ MCU = STM32F103
# Bootloader selection
BOOTLOADER = stm32duino
+# 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
diff --git a/keyboards/cannonkeys/rekt1800/rules.mk b/keyboards/cannonkeys/rekt1800/rules.mk
index f566e88a30..b983f36c85 100644
--- a/keyboards/cannonkeys/rekt1800/rules.mk
+++ b/keyboards/cannonkeys/rekt1800/rules.mk
@@ -8,7 +8,7 @@ BOOTLOADER = stm32-dfu
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/cannonkeys/satisfaction75/rules.mk b/keyboards/cannonkeys/satisfaction75/rules.mk
index 289ba41032..4cf5e4b157 100644
--- a/keyboards/cannonkeys/satisfaction75/rules.mk
+++ b/keyboards/cannonkeys/satisfaction75/rules.mk
@@ -8,14 +8,13 @@ BOOTLOADER = stm32-dfu
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-# Build Options
-# comment out to disable the options.
-#
-
SRC += led.c \
satisfaction_encoder.c \
satisfaction_oled.c
+# 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
diff --git a/keyboards/cannonkeys/savage65/rules.mk b/keyboards/cannonkeys/savage65/rules.mk
index 7d6db5a038..4e43a2f56f 100644
--- a/keyboards/cannonkeys/savage65/rules.mk
+++ b/keyboards/cannonkeys/savage65/rules.mk
@@ -8,10 +8,8 @@ BOOTLOADER = stm32-dfu
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
# Build Options
-# comment out to disable the 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
diff --git a/keyboards/cannonkeys/tmov2/rules.mk b/keyboards/cannonkeys/tmov2/rules.mk
index 7b54d9fccb..440b77bd26 100644
--- a/keyboards/cannonkeys/tmov2/rules.mk
+++ b/keyboards/cannonkeys/tmov2/rules.mk
@@ -8,10 +8,8 @@ BOOTLOADER = stm32-dfu
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
# Build Options
-# comment out to disable the 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
diff --git a/keyboards/catch22/rules.mk b/keyboards/catch22/rules.mk
index 174ddec3b7..b5f690c805 100644
--- a/keyboards/catch22/rules.mk
+++ b/keyboards/catch22/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/centromere/rules.mk b/keyboards/centromere/rules.mk
index d1fd670b6b..ed777e1b9e 100644
--- a/keyboards/centromere/rules.mk
+++ b/keyboards/centromere/rules.mk
@@ -8,7 +8,7 @@ F_CPU = 8000000
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/chavdai40/rev1/rules.mk b/keyboards/chavdai40/rev1/rules.mk
index 343c3e8b32..f1995764b9 100644
--- a/keyboards/chavdai40/rev1/rules.mk
+++ b/keyboards/chavdai40/rev1/rules.mk
@@ -6,6 +6,7 @@ BOOTLOADER = stm32-dfu
# 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
diff --git a/keyboards/chavdai40/rev2/rules.mk b/keyboards/chavdai40/rev2/rules.mk
index 343c3e8b32..f1995764b9 100644
--- a/keyboards/chavdai40/rev2/rules.mk
+++ b/keyboards/chavdai40/rev2/rules.mk
@@ -6,6 +6,7 @@ BOOTLOADER = stm32-dfu
# 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
diff --git a/keyboards/chimera_ergo/rules.mk b/keyboards/chimera_ergo/rules.mk
index 689d3e02c9..a8bd3a027a 100644
--- a/keyboards/chimera_ergo/rules.mk
+++ b/keyboards/chimera_ergo/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/chimera_ls/rules.mk b/keyboards/chimera_ls/rules.mk
index 3aebf62fa6..377c379911 100644
--- a/keyboards/chimera_ls/rules.mk
+++ b/keyboards/chimera_ls/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/chimera_ortho/rules.mk b/keyboards/chimera_ortho/rules.mk
index 5ef0c66c8a..fbe6872001 100644
--- a/keyboards/chimera_ortho/rules.mk
+++ b/keyboards/chimera_ortho/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/clueboard/66/rev3/rules.mk b/keyboards/clueboard/66/rev3/rules.mk
index 56d1ab011f..924437d89b 100644
--- a/keyboards/clueboard/66/rev3/rules.mk
+++ b/keyboards/clueboard/66/rev3/rules.mk
@@ -1,4 +1 @@
-# Build Options
-# comment out to disable the options.
-#
BACKLIGHT_DRIVER = custom
diff --git a/keyboards/clueboard/66_hotswap/prototype/rules.mk b/keyboards/clueboard/66_hotswap/prototype/rules.mk
index 02ad91caa9..8193682fd3 100644
--- a/keyboards/clueboard/66_hotswap/prototype/rules.mk
+++ b/keyboards/clueboard/66_hotswap/prototype/rules.mk
@@ -1,6 +1,3 @@
-# Build Options
-# comment out to disable the options.
-#
BACKLIGHT_DRIVER = custom
LTO_ENABLE = yes
diff --git a/keyboards/coarse/ixora/rules.mk b/keyboards/coarse/ixora/rules.mk
index bcaf1857a6..559be109a9 100644
--- a/keyboards/coarse/ixora/rules.mk
+++ b/keyboards/coarse/ixora/rules.mk
@@ -5,7 +5,7 @@ MCU = STM32F042
BOOTLOADER = stm32-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BACKLIGHT_ENABLE = no
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
diff --git a/keyboards/coarse/vinta/rules.mk b/keyboards/coarse/vinta/rules.mk
index 6edbd45f67..b503edcdee 100644
--- a/keyboards/coarse/vinta/rules.mk
+++ b/keyboards/coarse/vinta/rules.mk
@@ -5,7 +5,7 @@ MCU = STM32F042
BOOTLOADER = stm32-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BACKLIGHT_ENABLE = no
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
diff --git a/keyboards/comet46/rules.mk b/keyboards/comet46/rules.mk
index 5d5608a08a..814622226a 100644
--- a/keyboards/comet46/rules.mk
+++ b/keyboards/comet46/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/converter/adb_usb/rules.mk b/keyboards/converter/adb_usb/rules.mk
index 447b547517..93bdbf6abf 100644
--- a/keyboards/converter/adb_usb/rules.mk
+++ b/keyboards/converter/adb_usb/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/converter/m0110_usb/rules.mk b/keyboards/converter/m0110_usb/rules.mk
index 0682edb7fe..20733dcd72 100644
--- a/keyboards/converter/m0110_usb/rules.mk
+++ b/keyboards/converter/m0110_usb/rules.mk
@@ -8,7 +8,7 @@ F_CPU = 8000000
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/converter/siemens_tastatur/rules.mk b/keyboards/converter/siemens_tastatur/rules.mk
index aaf37f5be8..2a119a9bab 100644
--- a/keyboards/converter/siemens_tastatur/rules.mk
+++ b/keyboards/converter/siemens_tastatur/rules.mk
@@ -6,6 +6,9 @@ BOOTLOADER = stm32duino
SRC = matrix.c
+# 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
diff --git a/keyboards/converter/usb_usb/rules.mk b/keyboards/converter/usb_usb/rules.mk
index 9f024b96d8..19903ed331 100644
--- a/keyboards/converter/usb_usb/rules.mk
+++ b/keyboards/converter/usb_usb/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
#MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/crawlpad/rules.mk b/keyboards/crawlpad/rules.mk
index 79b3482120..d0d974ebdb 100755
--- a/keyboards/crawlpad/rules.mk
+++ b/keyboards/crawlpad/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/daji/seis_cinco/rules.mk b/keyboards/daji/seis_cinco/rules.mk
index ffd623b9d1..255f225985 100644
--- a/keyboards/daji/seis_cinco/rules.mk
+++ b/keyboards/daji/seis_cinco/rules.mk
@@ -6,7 +6,7 @@ BOARD = GENERIC_STM32_F072XB
BOOTLOADER = stm32-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/db/db63/rules.mk b/keyboards/db/db63/rules.mk
index 3bff3ee31b..4dcdfe886a 100644
--- a/keyboards/db/db63/rules.mk
+++ b/keyboards/db/db63/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/delikeeb/vanana/rules.mk b/keyboards/delikeeb/vanana/rules.mk
index b105ce1bc7..ae0d105d92 100644
--- a/keyboards/delikeeb/vanana/rules.mk
+++ b/keyboards/delikeeb/vanana/rules.mk
@@ -5,6 +5,8 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# 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
diff --git a/keyboards/delilah/rules.mk b/keyboards/delilah/rules.mk
index af4ae2a88d..7c928a6cbf 100644
--- a/keyboards/delilah/rules.mk
+++ b/keyboards/delilah/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/dichotomy/rules.mk b/keyboards/dichotomy/rules.mk
index 48b73e817f..2b5eb0360c 100755
--- a/keyboards/dichotomy/rules.mk
+++ b/keyboards/dichotomy/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
#MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/do60/rules.mk b/keyboards/do60/rules.mk
index 31ce746d00..e8b6110b1d 100644
--- a/keyboards/do60/rules.mk
+++ b/keyboards/do60/rules.mk
@@ -5,6 +5,8 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
+# change yes to no to disable
+#
AUDIO_ENABLE = no # Audio output
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
diff --git a/keyboards/donutcables/budget96/rules.mk b/keyboards/donutcables/budget96/rules.mk
index 3bff3ee31b..4dcdfe886a 100644
--- a/keyboards/donutcables/budget96/rules.mk
+++ b/keyboards/donutcables/budget96/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/donutcables/scrabblepad/rules.mk b/keyboards/donutcables/scrabblepad/rules.mk
index 95925f7295..9365ea7c65 100644
--- a/keyboards/donutcables/scrabblepad/rules.mk
+++ b/keyboards/donutcables/scrabblepad/rules.mk
@@ -5,6 +5,8 @@ MCU = at90usb1286
BOOTLOADER = halfkay
# 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
diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk
index 61844f30a1..e648053922 100644
--- a/keyboards/ergodox_ez/rules.mk
+++ b/keyboards/ergodox_ez/rules.mk
@@ -10,7 +10,7 @@ BOOTLOADER = halfkay
# OPT_DEFS += -DLEFT_LEDS
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/ergodox_infinity/rules.mk b/keyboards/ergodox_infinity/rules.mk
index 469e785988..c35f54de30 100644
--- a/keyboards/ergodox_infinity/rules.mk
+++ b/keyboards/ergodox_infinity/rules.mk
@@ -12,7 +12,7 @@ BOOTLOADER = kiibohd
BOARD = IC_TEENSY_3_1
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/espectro/rules.mk b/keyboards/espectro/rules.mk
index cbe1c87145..ad15c847bd 100755
--- a/keyboards/espectro/rules.mk
+++ b/keyboards/espectro/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/eve/meteor/rules.mk b/keyboards/eve/meteor/rules.mk
index 4c4a33355e..7bc9adda6b 100644
--- a/keyboards/eve/meteor/rules.mk
+++ b/keyboards/eve/meteor/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/evyd13/plain60/rules.mk b/keyboards/evyd13/plain60/rules.mk
index 78a220109f..262bffdb16 100644
--- a/keyboards/evyd13/plain60/rules.mk
+++ b/keyboards/evyd13/plain60/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = qmk-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/evyd13/wonderland/rules.mk b/keyboards/evyd13/wonderland/rules.mk
index d5dbf4ae8f..e97fa9e99e 100644
--- a/keyboards/evyd13/wonderland/rules.mk
+++ b/keyboards/evyd13/wonderland/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = qmk-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/exclusive/e65/rules.mk b/keyboards/exclusive/e65/rules.mk
index 4fefcb0cb7..4362ef0fd1 100644
--- a/keyboards/exclusive/e65/rules.mk
+++ b/keyboards/exclusive/e65/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/exclusive/e7v1/rules.mk b/keyboards/exclusive/e7v1/rules.mk
index ea2b6e151a..efb00a6ba1 100644
--- a/keyboards/exclusive/e7v1/rules.mk
+++ b/keyboards/exclusive/e7v1/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/facew/rules.mk b/keyboards/facew/rules.mk
index 96f4fd3d71..ff226444b8 100644
--- a/keyboards/facew/rules.mk
+++ b/keyboards/facew/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/fc660c/rules.mk b/keyboards/fc660c/rules.mk
index 01372579fa..b1b11676bb 100644
--- a/keyboards/fc660c/rules.mk
+++ b/keyboards/fc660c/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/fc980c/rules.mk b/keyboards/fc980c/rules.mk
index 01372579fa..b1b11676bb 100644
--- a/keyboards/fc980c/rules.mk
+++ b/keyboards/fc980c/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/ferris/0_1/rules.mk b/keyboards/ferris/0_1/rules.mk
index 996e2af6b9..86db6e4d12 100644
--- a/keyboards/ferris/0_1/rules.mk
+++ b/keyboards/ferris/0_1/rules.mk
@@ -4,6 +4,7 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
+# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
diff --git a/keyboards/ferris/0_2/rules.mk b/keyboards/ferris/0_2/rules.mk
index de18ee5a87..0c12328cee 100644
--- a/keyboards/ferris/0_2/rules.mk
+++ b/keyboards/ferris/0_2/rules.mk
@@ -4,6 +4,7 @@ MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
+# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
diff --git a/keyboards/flehrad/bigswitch/rules.mk b/keyboards/flehrad/bigswitch/rules.mk
index 46074ad241..84bf0aa220 100644
--- a/keyboards/flehrad/bigswitch/rules.mk
+++ b/keyboards/flehrad/bigswitch/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/flehrad/numbrero/rules.mk b/keyboards/flehrad/numbrero/rules.mk
index b3d0d11190..bab0fd2837 100644
--- a/keyboards/flehrad/numbrero/rules.mk
+++ b/keyboards/flehrad/numbrero/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/flehrad/snagpad/rules.mk b/keyboards/flehrad/snagpad/rules.mk
index e6719cc95e..4d45c93abc 100644
--- a/keyboards/flehrad/snagpad/rules.mk
+++ b/keyboards/flehrad/snagpad/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/for_science/rules.mk b/keyboards/for_science/rules.mk
index 0f749577f0..33d28b3a89 100644
--- a/keyboards/for_science/rules.mk
+++ b/keyboards/for_science/rules.mk
@@ -6,6 +6,7 @@ BOOTLOADER = caterina
# 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
diff --git a/keyboards/four_banger/rules.mk b/keyboards/four_banger/rules.mk
index 3ada3a08a0..8f9b670fd9 100644
--- a/keyboards/four_banger/rules.mk
+++ b/keyboards/four_banger/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/foxlab/key65/hotswap/rules.mk b/keyboards/foxlab/key65/hotswap/rules.mk
index 58330e1b66..c483c98ee3 100644
--- a/keyboards/foxlab/key65/hotswap/rules.mk
+++ b/keyboards/foxlab/key65/hotswap/rules.mk
@@ -4,6 +4,9 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
diff --git a/keyboards/foxlab/key65/universal/rules.mk b/keyboards/foxlab/key65/universal/rules.mk
index e6b452286e..5d93138381 100644
--- a/keyboards/foxlab/key65/universal/rules.mk
+++ b/keyboards/foxlab/key65/universal/rules.mk
@@ -4,6 +4,9 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
diff --git a/keyboards/foxlab/time_re/hotswap/rules.mk b/keyboards/foxlab/time_re/hotswap/rules.mk
index cabadd6ef1..b03288f7ae 100644
--- a/keyboards/foxlab/time_re/hotswap/rules.mk
+++ b/keyboards/foxlab/time_re/hotswap/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# change yes to no to disable
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/foxlab/time_re/universal/rules.mk b/keyboards/foxlab/time_re/universal/rules.mk
index d40e8ed422..3c2afd0583 100644
--- a/keyboards/foxlab/time_re/universal/rules.mk
+++ b/keyboards/foxlab/time_re/universal/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# change yes to no to disable
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/ft/mars80/rules.mk b/keyboards/ft/mars80/rules.mk
index 3faff68b16..3cf7107cc9 100644
--- a/keyboards/ft/mars80/rules.mk
+++ b/keyboards/ft/mars80/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/georgi/rules.mk b/keyboards/georgi/rules.mk
index 0df6761059..a884d8b3b9 100644
--- a/keyboards/georgi/rules.mk
+++ b/keyboards/georgi/rules.mk
@@ -4,6 +4,9 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
+# Build Options
+# change yes to no to disable
+#
CUSTOM_MATRIX = yes
MOUSEKEY_ENABLE = no
STENO_ENABLE = yes
diff --git a/keyboards/gergo/rules.mk b/keyboards/gergo/rules.mk
index b5752ad934..0f877e2d4b 100644
--- a/keyboards/gergo/rules.mk
+++ b/keyboards/gergo/rules.mk
@@ -4,6 +4,9 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
+# Build Options
+# change yes to no to disable
+#
CUSTOM_MATRIX = yes
EXTRAKEY_ENABLE = yes
CONSOLE_ENABLE = yes
diff --git a/keyboards/gh60/revc/rules.mk b/keyboards/gh60/revc/rules.mk
index 9e65ae7386..06720ec5e4 100644
--- a/keyboards/gh60/revc/rules.mk
+++ b/keyboards/gh60/revc/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/gh60/satan/rules.mk b/keyboards/gh60/satan/rules.mk
index 69b91af460..14a7691e0f 100644
--- a/keyboards/gh60/satan/rules.mk
+++ b/keyboards/gh60/satan/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/gh80_3000/rules.mk b/keyboards/gh80_3000/rules.mk
index 8a903f6f15..fb984117ab 100644
--- a/keyboards/gh80_3000/rules.mk
+++ b/keyboards/gh80_3000/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/gray_studio/hb85/rules.mk b/keyboards/gray_studio/hb85/rules.mk
index 2dba9c3eb9..9a2e1da0de 100644
--- a/keyboards/gray_studio/hb85/rules.mk
+++ b/keyboards/gray_studio/hb85/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/hadron/ver2/rules.mk b/keyboards/hadron/ver2/rules.mk
index 1bbe0da38d..f7aeba6891 100644
--- a/keyboards/hadron/ver2/rules.mk
+++ b/keyboards/hadron/ver2/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = halfkay
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/hadron/ver3/rules.mk b/keyboards/hadron/ver3/rules.mk
index f35e688194..da70b2a9bf 100644
--- a/keyboards/hadron/ver3/rules.mk
+++ b/keyboards/hadron/ver3/rules.mk
@@ -6,7 +6,7 @@ BOARD = QMK_PROTON_C
BOOTLOADER = stm32-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BACKLIGHT_ENABLE = no
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
diff --git a/keyboards/handwired/2x5keypad/rules.mk b/keyboards/handwired/2x5keypad/rules.mk
index 5075d22f06..08870622a1 100644
--- a/keyboards/handwired/2x5keypad/rules.mk
+++ b/keyboards/handwired/2x5keypad/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = caterina
-
+# Build Options
+# change yes to no to disable
+#
AUDIO_ENABLE = no
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
diff --git a/keyboards/handwired/aek64/rules.mk b/keyboards/handwired/aek64/rules.mk
index 7df9eed9ae..03ca07fc44 100644
--- a/keyboards/handwired/aek64/rules.mk
+++ b/keyboards/handwired/aek64/rules.mk
@@ -5,7 +5,7 @@ MCU = at90usb1286
BOOTLOADER = halfkay
# Build Options
-# change to no to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/handwired/cans12er/rules.mk b/keyboards/handwired/cans12er/rules.mk
index 9eb57d728b..476cf49f27 100644
--- a/keyboards/handwired/cans12er/rules.mk
+++ b/keyboards/handwired/cans12er/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/handwired/ck4x4/rules.mk b/keyboards/handwired/ck4x4/rules.mk
index 0bbf7c40e8..b234297ed3 100644
--- a/keyboards/handwired/ck4x4/rules.mk
+++ b/keyboards/handwired/ck4x4/rules.mk
@@ -5,9 +5,8 @@ MCU = STM32F072
BOOTLOADER = stm32-dfu
# Build Options
-# comment out to disable the 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
diff --git a/keyboards/handwired/co60/rev6/rules.mk b/keyboards/handwired/co60/rev6/rules.mk
index 6157ddf99b..117fdd5e9d 100644
--- a/keyboards/handwired/co60/rev6/rules.mk
+++ b/keyboards/handwired/co60/rev6/rules.mk
@@ -6,7 +6,7 @@ BOARD = QMK_PROTON_C
BOOTLOADER = stm32-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BACKLIGHT_ENABLE = yes
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
diff --git a/keyboards/handwired/co60/rev7/rules.mk b/keyboards/handwired/co60/rev7/rules.mk
index 02de067fd7..eabe78800a 100644
--- a/keyboards/handwired/co60/rev7/rules.mk
+++ b/keyboards/handwired/co60/rev7/rules.mk
@@ -9,7 +9,7 @@ BOOTLOADER = stm32-dfu
WS2812_DRIVER = spi
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BACKLIGHT_ENABLE = yes
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
diff --git a/keyboards/handwired/dactyl/rules.mk b/keyboards/handwired/dactyl/rules.mk
index 9eba082a34..fdc8b2e5ef 100644
--- a/keyboards/handwired/dactyl/rules.mk
+++ b/keyboards/handwired/dactyl/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = halfkay
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
POINTING_DEVICE_ENABLE = no
diff --git a/keyboards/handwired/datahand/rules.mk b/keyboards/handwired/datahand/rules.mk
index e2ea798d8a..06bc1c5040 100644
--- a/keyboards/handwired/datahand/rules.mk
+++ b/keyboards/handwired/datahand/rules.mk
@@ -5,6 +5,8 @@ MCU = at90usb1286
BOOTLOADER = halfkay
# 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
diff --git a/keyboards/handwired/frenchdev/rules.mk b/keyboards/handwired/frenchdev/rules.mk
index d0b2144ceb..88a48968f1 100644
--- a/keyboards/handwired/frenchdev/rules.mk
+++ b/keyboards/handwired/frenchdev/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = halfkay
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/handwired/hexon38/rules.mk b/keyboards/handwired/hexon38/rules.mk
index ad39547a24..b092156024 100644
--- a/keyboards/handwired/hexon38/rules.mk
+++ b/keyboards/handwired/hexon38/rules.mk
@@ -4,15 +4,15 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = halfkay
-# Enabled build options:
+# 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 = yes # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
-
-# Disabled build options:
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no
RGBLIGHT_ENABLE = no
diff --git a/keyboards/handwired/jopr/rules.mk b/keyboards/handwired/jopr/rules.mk
index e741cb709b..6157d25454 100644
--- a/keyboards/handwired/jopr/rules.mk
+++ b/keyboards/handwired/jopr/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/handwired/k_numpad17/rules.mk b/keyboards/handwired/k_numpad17/rules.mk
index 909f99d066..4cb57769e9 100644
--- a/keyboards/handwired/k_numpad17/rules.mk
+++ b/keyboards/handwired/k_numpad17/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/handwired/ms_sculpt_mobile/rules.mk b/keyboards/handwired/ms_sculpt_mobile/rules.mk
index 6ff144dabd..72015d93d8 100644
--- a/keyboards/handwired/ms_sculpt_mobile/rules.mk
+++ b/keyboards/handwired/ms_sculpt_mobile/rules.mk
@@ -1,3 +1,4 @@
+# MCU name
ifdef ASTAR
MCU = atmega32u4
CFLAGS = -D ASTAR
@@ -12,6 +13,9 @@ else
BOOTLOADER = atmel-dfu
endif
+# 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
diff --git a/keyboards/handwired/myskeeb/rules.mk b/keyboards/handwired/myskeeb/rules.mk
index 907d30e5d7..d694be736f 100644
--- a/keyboards/handwired/myskeeb/rules.mk
+++ b/keyboards/handwired/myskeeb/rules.mk
@@ -6,6 +6,7 @@ BOOTLOADER = caterina
# 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
diff --git a/keyboards/handwired/obuwunkunubi/spaget/rules.mk b/keyboards/handwired/obuwunkunubi/spaget/rules.mk
index 55f8d7c830..9a469b22ec 100644
--- a/keyboards/handwired/obuwunkunubi/spaget/rules.mk
+++ b/keyboards/handwired/obuwunkunubi/spaget/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/handwired/postageboard/mini/rules.mk b/keyboards/handwired/postageboard/mini/rules.mk
index f21f4a30b8..354f194ca2 100644
--- a/keyboards/handwired/postageboard/mini/rules.mk
+++ b/keyboards/handwired/postageboard/mini/rules.mk
@@ -4,6 +4,9 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
+# 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
diff --git a/keyboards/handwired/postageboard/r1/rules.mk b/keyboards/handwired/postageboard/r1/rules.mk
index f21f4a30b8..354f194ca2 100644
--- a/keyboards/handwired/postageboard/r1/rules.mk
+++ b/keyboards/handwired/postageboard/r1/rules.mk
@@ -4,6 +4,9 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
+# 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
diff --git a/keyboards/handwired/pteron/rules.mk b/keyboards/handwired/pteron/rules.mk
index 3161e94dad..9f51ea20cf 100644
--- a/keyboards/handwired/pteron/rules.mk
+++ b/keyboards/handwired/pteron/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/handwired/retro_refit/rules.mk b/keyboards/handwired/retro_refit/rules.mk
index 166a113b2e..4d1b278f53 100644
--- a/keyboards/handwired/retro_refit/rules.mk
+++ b/keyboards/handwired/retro_refit/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = halfkay
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/handwired/rs60/rules.mk b/keyboards/handwired/rs60/rules.mk
index cb5c34c221..d14abe406b 100644
--- a/keyboards/handwired/rs60/rules.mk
+++ b/keyboards/handwired/rs60/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = qmk-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/handwired/space_oddity/rules.mk b/keyboards/handwired/space_oddity/rules.mk
index a11da96108..0b1ff1cd0a 100644
--- a/keyboards/handwired/space_oddity/rules.mk
+++ b/keyboards/handwired/space_oddity/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/handwired/steamvan/rev1/rules.mk b/keyboards/handwired/steamvan/rev1/rules.mk
index 6bc0b0ae7c..3d45b63d21 100644
--- a/keyboards/handwired/steamvan/rev1/rules.mk
+++ b/keyboards/handwired/steamvan/rev1/rules.mk
@@ -9,7 +9,7 @@ BOOTLOADER = stm32-dfu
WS2812_DRIVER = spi
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BACKLIGHT_ENABLE = yes
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
diff --git a/keyboards/handwired/terminus_mini/keymaps/default/rules.mk b/keyboards/handwired/terminus_mini/keymaps/default/rules.mk
index a74d805979..8fcd018bd5 100644
--- a/keyboards/handwired/terminus_mini/keymaps/default/rules.mk
+++ b/keyboards/handwired/terminus_mini/keymaps/default/rules.mk
@@ -1,7 +1,3 @@
-# QMK Build Options
-# change to "no" to disable the options, or define them in the rules.mk in
-# the appropriate keymap folder that will get included automatically
-#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
diff --git a/keyboards/handwired/trackpoint/rules.mk b/keyboards/handwired/trackpoint/rules.mk
index a4beb2d663..f471f00dfc 100644
--- a/keyboards/handwired/trackpoint/rules.mk
+++ b/keyboards/handwired/trackpoint/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = halfkay
-
+# 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
diff --git a/keyboards/handwired/tritium_numpad/rules.mk b/keyboards/handwired/tritium_numpad/rules.mk
index b3736f80e1..ae586aa093 100644
--- a/keyboards/handwired/tritium_numpad/rules.mk
+++ b/keyboards/handwired/tritium_numpad/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/handwired/wulkan/rules.mk b/keyboards/handwired/wulkan/rules.mk
index 33cba379e7..f60cc5ea80 100644
--- a/keyboards/handwired/wulkan/rules.mk
+++ b/keyboards/handwired/wulkan/rules.mk
@@ -6,7 +6,7 @@ BOARD = QMK_PROTON_C
BOOTLOADER = stm32-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BACKLIGHT_ENABLE = no
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
diff --git a/keyboards/hardlineworks/otd_plus/rules.mk b/keyboards/hardlineworks/otd_plus/rules.mk
index 02a7e36e45..476cf49f27 100644
--- a/keyboards/hardlineworks/otd_plus/rules.mk
+++ b/keyboards/hardlineworks/otd_plus/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# change yes to no to disable
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/hhkb/ansi/rules.mk b/keyboards/hhkb/ansi/rules.mk
index 1eed08104e..0b110d6561 100644
--- a/keyboards/hhkb/ansi/rules.mk
+++ b/keyboards/hhkb/ansi/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/hhkb/jp/rules.mk b/keyboards/hhkb/jp/rules.mk
index 4a42e974db..ae0710e028 100644
--- a/keyboards/hhkb/jp/rules.mk
+++ b/keyboards/hhkb/jp/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/honeycomb/rules.mk b/keyboards/honeycomb/rules.mk
index 48b73e817f..2b5eb0360c 100755
--- a/keyboards/honeycomb/rules.mk
+++ b/keyboards/honeycomb/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
#MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/hotdox/rules.mk b/keyboards/hotdox/rules.mk
index 0572e4504c..0860e9d475 100644
--- a/keyboards/hotdox/rules.mk
+++ b/keyboards/hotdox/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
CUSTOM_MATRIX = yes # Custom matrix file for the ErgoDone
UNICODE_ENABLE = yes # Unicode
diff --git a/keyboards/hs60/v2/ansi/rules.mk b/keyboards/hs60/v2/ansi/rules.mk
index 380abe628e..b7d4ce80a8 100644
--- a/keyboards/hs60/v2/ansi/rules.mk
+++ b/keyboards/hs60/v2/ansi/rules.mk
@@ -11,7 +11,7 @@ BOOTLOADER = stm32-dfu
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
diff --git a/keyboards/hs60/v2/hhkb/rules.mk b/keyboards/hs60/v2/hhkb/rules.mk
index 9590e314d4..8dedad03df 100644
--- a/keyboards/hs60/v2/hhkb/rules.mk
+++ b/keyboards/hs60/v2/hhkb/rules.mk
@@ -11,7 +11,7 @@ BOOTLOADER = stm32-dfu
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
diff --git a/keyboards/hs60/v2/iso/rules.mk b/keyboards/hs60/v2/iso/rules.mk
index 6c083deb59..399a93fcc7 100644
--- a/keyboards/hs60/v2/iso/rules.mk
+++ b/keyboards/hs60/v2/iso/rules.mk
@@ -11,7 +11,7 @@ BOOTLOADER = stm32-dfu
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
diff --git a/keyboards/hub16/rules.mk b/keyboards/hub16/rules.mk
index 7e17fa2a97..9b3be3a2c9 100755
--- a/keyboards/hub16/rules.mk
+++ b/keyboards/hub16/rules.mk
@@ -5,6 +5,8 @@ MCU = atmega32u4
BOOTLOADER = caterina
# 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
diff --git a/keyboards/idb/idb_60/rules.mk b/keyboards/idb/idb_60/rules.mk
index 61f74e46de..6862c48e49 100644
--- a/keyboards/idb/idb_60/rules.mk
+++ b/keyboards/idb/idb_60/rules.mk
@@ -5,7 +5,8 @@ MCU = atmega32u2
BOOTLOADER = atmel-dfu
# Build Options
-# Comment out to disable the 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
diff --git a/keyboards/jc65/v32a/rules.mk b/keyboards/jc65/v32a/rules.mk
index 694ad609a2..9686fd1aa4 100644
--- a/keyboards/jc65/v32a/rules.mk
+++ b/keyboards/jc65/v32a/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/jd40/rules.mk b/keyboards/jd40/rules.mk
index d1036b997b..59bbf0ca8b 100644
--- a/keyboards/jd40/rules.mk
+++ b/keyboards/jd40/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/jd45/rules.mk b/keyboards/jd45/rules.mk
index feaba38c5f..0e6f70f0c9 100644
--- a/keyboards/jd45/rules.mk
+++ b/keyboards/jd45/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/kabedon/kabedon78s/rules.mk b/keyboards/kabedon/kabedon78s/rules.mk
index 17dc500d6d..30854a59b9 100644
--- a/keyboards/kabedon/kabedon78s/rules.mk
+++ b/keyboards/kabedon/kabedon78s/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# change yes to no to disable.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/kabedon/kabedon980/rules.mk b/keyboards/kabedon/kabedon980/rules.mk
index 17dc500d6d..30854a59b9 100644
--- a/keyboards/kabedon/kabedon980/rules.mk
+++ b/keyboards/kabedon/kabedon980/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# change yes to no to disable.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/kapcave/gskt00/rules.mk b/keyboards/kapcave/gskt00/rules.mk
index 3832353861..7774ac0f87 100755
--- a/keyboards/kapcave/gskt00/rules.mk
+++ b/keyboards/kapcave/gskt00/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk
index 19805d77ef..399d60eda9 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk
@@ -5,6 +5,9 @@ BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
+# Build Options
+# change yes to no to disable
+#
BACKLIGHT_ENABLE = no
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/kbdfans/kbd75/rev1/rules.mk b/keyboards/kbdfans/kbd75/rev1/rules.mk
index bee94f0365..e5d5d2c9a2 100644
--- a/keyboards/kbdfans/kbd75/rev1/rules.mk
+++ b/keyboards/kbdfans/kbd75/rev1/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/kbdfans/kbd75/rev2/rules.mk b/keyboards/kbdfans/kbd75/rev2/rules.mk
index bee94f0365..e5d5d2c9a2 100644
--- a/keyboards/kbdfans/kbd75/rev2/rules.mk
+++ b/keyboards/kbdfans/kbd75/rev2/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/kbdfans/kbdpad/mk1/rules.mk b/keyboards/kbdfans/kbdpad/mk1/rules.mk
index 9912abbe9f..7c8b9e3670 100644
--- a/keyboards/kbdfans/kbdpad/mk1/rules.mk
+++ b/keyboards/kbdfans/kbdpad/mk1/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/kc60se/rules.mk b/keyboards/kc60se/rules.mk
index bc378083b7..54d3028ce0 100644
--- a/keyboards/kc60se/rules.mk
+++ b/keyboards/kc60se/rules.mk
@@ -6,6 +6,7 @@ BOOTLOADER = atmel-dfu
# Build Options
# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # default keymap does not map mouse
EXTRAKEY_ENABLE = yes # Audio control and System control
diff --git a/keyboards/keebio/chocopad/rules.mk b/keyboards/keebio/chocopad/rules.mk
index 0e47db9659..4a14c7977c 100644
--- a/keyboards/keebio/chocopad/rules.mk
+++ b/keyboards/keebio/chocopad/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/keebio/dilly/rules.mk b/keyboards/keebio/dilly/rules.mk
index 705db989ee..e4026f85cf 100644
--- a/keyboards/keebio/dilly/rules.mk
+++ b/keyboards/keebio/dilly/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/keebio/rorschach/rules.mk b/keyboards/keebio/rorschach/rules.mk
index 89c6bf4f9a..6e3d022b02 100644
--- a/keyboards/keebio/rorschach/rules.mk
+++ b/keyboards/keebio/rorschach/rules.mk
@@ -4,6 +4,9 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = caterina
+# 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
diff --git a/keyboards/keebwerk/nano_slider/rules.mk b/keyboards/keebwerk/nano_slider/rules.mk
index e9f4433e8f..5412232d0f 100644
--- a/keyboards/keebwerk/nano_slider/rules.mk
+++ b/keyboards/keebwerk/nano_slider/rules.mk
@@ -5,6 +5,8 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# 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
diff --git a/keyboards/kingly_keys/little_foot/rules.mk b/keyboards/kingly_keys/little_foot/rules.mk
index 654ad6a659..4792d1c794 100644
--- a/keyboards/kingly_keys/little_foot/rules.mk
+++ b/keyboards/kingly_keys/little_foot/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/kingly_keys/romac/rules.mk b/keyboards/kingly_keys/romac/rules.mk
index e253f64a8c..40d08b7731 100644
--- a/keyboards/kingly_keys/romac/rules.mk
+++ b/keyboards/kingly_keys/romac/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/kingly_keys/smd_milk/rules.mk b/keyboards/kingly_keys/smd_milk/rules.mk
index 698ad1eeac..469e098ba5 100644
--- a/keyboards/kingly_keys/smd_milk/rules.mk
+++ b/keyboards/kingly_keys/smd_milk/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u2
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/kprepublic/bm16s/rules.mk b/keyboards/kprepublic/bm16s/rules.mk
index 3a19104778..9f6dae5604 100755
--- a/keyboards/kprepublic/bm16s/rules.mk
+++ b/keyboards/kprepublic/bm16s/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/kprepublic/jj50/rules.mk b/keyboards/kprepublic/jj50/rules.mk
index ef99e19e4a..2e510c8bba 100644
--- a/keyboards/kprepublic/jj50/rules.mk
+++ b/keyboards/kprepublic/jj50/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
diff --git a/keyboards/ktec/ergodone/rules.mk b/keyboards/ktec/ergodone/rules.mk
index f4b982aaff..13e1044c98 100644
--- a/keyboards/ktec/ergodone/rules.mk
+++ b/keyboards/ktec/ergodone/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
CUSTOM_MATRIX = yes # Custom matrix file for the ErgoDone
UNICODE_ENABLE = yes # Unicode
diff --git a/keyboards/ktec/staryu/rules.mk b/keyboards/ktec/staryu/rules.mk
index 02d56f5a84..73b1a47953 100755
--- a/keyboards/ktec/staryu/rules.mk
+++ b/keyboards/ktec/staryu/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u2
BOOTLOADER = lufa-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/latinpad/rules.mk b/keyboards/latinpad/rules.mk
index 7e47faecda..1570b33db4 100644
--- a/keyboards/latinpad/rules.mk
+++ b/keyboards/latinpad/rules.mk
@@ -6,6 +6,7 @@ BOOTLOADER = caterina
# Build Options
# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
diff --git a/keyboards/lazydesigners/the50/rules.mk b/keyboards/lazydesigners/the50/rules.mk
index c5b1198dc0..c9f848a018 100644
--- a/keyboards/lazydesigners/the50/rules.mk
+++ b/keyboards/lazydesigners/the50/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/lazydesigners/the60/rev1/rules.mk b/keyboards/lazydesigners/the60/rev1/rules.mk
index 38a956154f..9ebd4620b9 100755
--- a/keyboards/lazydesigners/the60/rev1/rules.mk
+++ b/keyboards/lazydesigners/the60/rev1/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/le_chiffre/rules.mk b/keyboards/le_chiffre/rules.mk
index 4c1c0f0f1e..bc5775a151 100644
--- a/keyboards/le_chiffre/rules.mk
+++ b/keyboards/le_chiffre/rules.mk
@@ -4,6 +4,9 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
+# 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
diff --git a/keyboards/massdrop/alt/rules.mk b/keyboards/massdrop/alt/rules.mk
index 378f1474d9..83d4fc590b 100644
--- a/keyboards/massdrop/alt/rules.mk
+++ b/keyboards/massdrop/alt/rules.mk
@@ -6,7 +6,7 @@ ARM_ATSAM = SAMD51J18A
MCU = cortex-m4
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/massdrop/ctrl/rules.mk b/keyboards/massdrop/ctrl/rules.mk
index e3153c4df8..667642f83d 100644
--- a/keyboards/massdrop/ctrl/rules.mk
+++ b/keyboards/massdrop/ctrl/rules.mk
@@ -6,7 +6,7 @@ ARM_ATSAM = SAMD51J18A
MCU = cortex-m4
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/masterworks/classy_tkl/rev_a/rules.mk b/keyboards/masterworks/classy_tkl/rev_a/rules.mk
index 4a2755a93a..73ac281e0b 100644
--- a/keyboards/masterworks/classy_tkl/rev_a/rules.mk
+++ b/keyboards/masterworks/classy_tkl/rev_a/rules.mk
@@ -4,7 +4,6 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/matrix/m12og/rev2/rules.mk b/keyboards/matrix/m12og/rev2/rules.mk
index 6970f247fe..51da7491d3 100644
--- a/keyboards/matrix/m12og/rev2/rules.mk
+++ b/keyboards/matrix/m12og/rev2/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/matrix/m20add/rules.mk b/keyboards/matrix/m20add/rules.mk
index 14db9e835b..1ecbd9d308 100644
--- a/keyboards/matrix/m20add/rules.mk
+++ b/keyboards/matrix/m20add/rules.mk
@@ -11,7 +11,7 @@ MCU_LDSCRIPT = m20add_boot
BOARD = ST_NUCLEO64_F411RE
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/matrix/me/rules.mk b/keyboards/matrix/me/rules.mk
index f5ed70c4d4..3ff392a61f 100644
--- a/keyboards/matrix/me/rules.mk
+++ b/keyboards/matrix/me/rules.mk
@@ -2,7 +2,7 @@
MCU = atmega32u4
# Bootloader selection
-BOOTLOADER = atmel-dfu
+BOOTLOADER = atmel-dfu
# Build Options
# change yes to no to disable
diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk
index 96990db3b8..b9f642e8cd 100644
--- a/keyboards/matrix/noah/rules.mk
+++ b/keyboards/matrix/noah/rules.mk
@@ -11,7 +11,7 @@ MCU_LDSCRIPT = noah_boot
BOARD = ST_NUCLEO64_F411RE
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/mechlovin/infinity87/rev2/rules.mk b/keyboards/mechlovin/infinity87/rev2/rules.mk
index b648aadbaf..92823adea9 100644
--- a/keyboards/mechlovin/infinity87/rev2/rules.mk
+++ b/keyboards/mechlovin/infinity87/rev2/rules.mk
@@ -4,7 +4,6 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechmini/v1/rules.mk b/keyboards/mechmini/v1/rules.mk
index d77ba03993..6905e73c27 100644
--- a/keyboards/mechmini/v1/rules.mk
+++ b/keyboards/mechmini/v1/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = atmel-dfu
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/mechmini/v2/rules.mk b/keyboards/mechmini/v2/rules.mk
index 93b105dba8..4f6e666b62 100755
--- a/keyboards/mechmini/v2/rules.mk
+++ b/keyboards/mechmini/v2/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/mehkee96/rules.mk b/keyboards/mehkee96/rules.mk
index 171f3a5734..9e2ac24f88 100644
--- a/keyboards/mehkee96/rules.mk
+++ b/keyboards/mehkee96/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
BOOTLOADER = bootloadhid
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/melody96/rules.mk b/keyboards/melody96/rules.mk
index 768f0d332a..9ccce6abf4 100644
--- a/keyboards/melody96/rules.mk
+++ b/keyboards/melody96/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/mitosis/rules.mk b/keyboards/mitosis/rules.mk
index 485f02a09b..6c7aa30d88 100644
--- a/keyboards/mitosis/rules.mk
+++ b/keyboards/mitosis/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/mixi/rules.mk b/keyboards/mixi/rules.mk
index 46f1c92365..f0530f599c 100644
--- a/keyboards/mixi/rules.mk
+++ b/keyboards/mixi/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/montsinger/rebound/rev1/rules.mk b/keyboards/montsinger/rebound/rev1/rules.mk
index 9cfa397ac8..f914cd14cb 100644
--- a/keyboards/montsinger/rebound/rev1/rules.mk
+++ b/keyboards/montsinger/rebound/rev1/rules.mk
@@ -4,6 +4,9 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
+# 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
diff --git a/keyboards/montsinger/rebound/rev2/rules.mk b/keyboards/montsinger/rebound/rev2/rules.mk
index 9fc856afe5..211b7290b5 100644
--- a/keyboards/montsinger/rebound/rev2/rules.mk
+++ b/keyboards/montsinger/rebound/rev2/rules.mk
@@ -4,6 +4,9 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
+# 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
diff --git a/keyboards/montsinger/rebound/rev3/rules.mk b/keyboards/montsinger/rebound/rev3/rules.mk
index 9fc856afe5..211b7290b5 100644
--- a/keyboards/montsinger/rebound/rev3/rules.mk
+++ b/keyboards/montsinger/rebound/rev3/rules.mk
@@ -4,6 +4,9 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
+# 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
diff --git a/keyboards/montsinger/rebound/rev4/rules.mk b/keyboards/montsinger/rebound/rev4/rules.mk
index 69ced7cd17..e0e8339713 100644
--- a/keyboards/montsinger/rebound/rev4/rules.mk
+++ b/keyboards/montsinger/rebound/rev4/rules.mk
@@ -4,6 +4,9 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
+# 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
diff --git a/keyboards/montsinger/rewind/rules.mk b/keyboards/montsinger/rewind/rules.mk
index 0c37cdaabb..33d28b3a89 100644
--- a/keyboards/montsinger/rewind/rules.mk
+++ b/keyboards/montsinger/rewind/rules.mk
@@ -4,6 +4,9 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = caterina
+# 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
diff --git a/keyboards/mt40/rules.mk b/keyboards/mt40/rules.mk
index e4bdd73c2a..3024f40149 100644
--- a/keyboards/mt40/rules.mk
+++ b/keyboards/mt40/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
diff --git a/keyboards/mt980/rules.mk b/keyboards/mt980/rules.mk
index c353d2fd73..2ca5686493 100644
--- a/keyboards/mt980/rules.mk
+++ b/keyboards/mt980/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/nebula12/rules.mk b/keyboards/nebula12/rules.mk
index c261dfd383..961d5a4915 100755
--- a/keyboards/nebula12/rules.mk
+++ b/keyboards/nebula12/rules.mk
@@ -11,7 +11,7 @@ BOOTLOADER = stm32-dfu
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
diff --git a/keyboards/nebula68/rules.mk b/keyboards/nebula68/rules.mk
index aa33f21bbc..b7d3ca2005 100755
--- a/keyboards/nebula68/rules.mk
+++ b/keyboards/nebula68/rules.mk
@@ -11,7 +11,7 @@ BOOTLOADER = stm32-dfu
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
diff --git a/keyboards/nek_type_a/rules.mk b/keyboards/nek_type_a/rules.mk
index 7e15e2fadb..ea79c962da 100644
--- a/keyboards/nek_type_a/rules.mk
+++ b/keyboards/nek_type_a/rules.mk
@@ -7,6 +7,9 @@ F_CPU = 8000000
# Bootloader selection
BOOTLOADER = caterina
+# 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
diff --git a/keyboards/nk65/rules.mk b/keyboards/nk65/rules.mk
index d34f986fa6..d64ce8e1f6 100755
--- a/keyboards/nk65/rules.mk
+++ b/keyboards/nk65/rules.mk
@@ -11,7 +11,7 @@ BOOTLOADER = stm32-dfu
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
diff --git a/keyboards/novelpad/rules.mk b/keyboards/novelpad/rules.mk
index d986e5c27a..ecdb295257 100755
--- a/keyboards/novelpad/rules.mk
+++ b/keyboards/novelpad/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u2
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/oddforge/vea/rules.mk b/keyboards/oddforge/vea/rules.mk
index e466f73eae..4aed5ab586 100644
--- a/keyboards/oddforge/vea/rules.mk
+++ b/keyboards/oddforge/vea/rules.mk
@@ -5,6 +5,8 @@ MCU = atmega32a
BOOTLOADER = bootloadhid
# 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
diff --git a/keyboards/ok60/rules.mk b/keyboards/ok60/rules.mk
index 901399dbf2..7fab929d98 100644
--- a/keyboards/ok60/rules.mk
+++ b/keyboards/ok60/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/omnikey_bh/rules.mk b/keyboards/omnikey_bh/rules.mk
index beab8c84ac..65e353ad15 100644
--- a/keyboards/omnikey_bh/rules.mk
+++ b/keyboards/omnikey_bh/rules.mk
@@ -5,7 +5,7 @@ MCU = at90usb1286
BOOTLOADER = halfkay
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/omnikeyish/rules.mk b/keyboards/omnikeyish/rules.mk
index 4eb202b3b7..2a00a52c84 100644
--- a/keyboards/omnikeyish/rules.mk
+++ b/keyboards/omnikeyish/rules.mk
@@ -5,7 +5,7 @@ MCU = at90usb1286
BOOTLOADER = halfkay
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/opus/rules.mk b/keyboards/opus/rules.mk
index 4e36891dee..515ca5621f 100644
--- a/keyboards/opus/rules.mk
+++ b/keyboards/opus/rules.mk
@@ -4,7 +4,6 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = caterina
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/orange75/rules.mk b/keyboards/orange75/rules.mk
index 62215beecc..60293f1386 100644
--- a/keyboards/orange75/rules.mk
+++ b/keyboards/orange75/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/org60/rules.mk b/keyboards/org60/rules.mk
index 538c467944..2d3a48944b 100644
--- a/keyboards/org60/rules.mk
+++ b/keyboards/org60/rules.mk
@@ -5,6 +5,8 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
+# change yes to no to disable
+#
AUDIO_ENABLE = no # Audio output
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
diff --git a/keyboards/panc60/rules.mk b/keyboards/panc60/rules.mk
index 1c8a2d105d..691aa35917 100644
--- a/keyboards/panc60/rules.mk
+++ b/keyboards/panc60/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/pearl/rules.mk b/keyboards/pearl/rules.mk
index 2dba9c3eb9..9a2e1da0de 100644
--- a/keyboards/pearl/rules.mk
+++ b/keyboards/pearl/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/percent/canoe/rules.mk b/keyboards/percent/canoe/rules.mk
index fd4f660f2d..3b5f3dae4d 100644
--- a/keyboards/percent/canoe/rules.mk
+++ b/keyboards/percent/canoe/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/percent/skog/rules.mk b/keyboards/percent/skog/rules.mk
index 694ad609a2..9686fd1aa4 100644
--- a/keyboards/percent/skog/rules.mk
+++ b/keyboards/percent/skog/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/playkbtw/ca66/rules.mk b/keyboards/playkbtw/ca66/rules.mk
index 768f0d332a..9ccce6abf4 100644
--- a/keyboards/playkbtw/ca66/rules.mk
+++ b/keyboards/playkbtw/ca66/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/playkbtw/pk60/rules.mk b/keyboards/playkbtw/pk60/rules.mk
index 2871bf8493..f24db316c2 100644
--- a/keyboards/playkbtw/pk60/rules.mk
+++ b/keyboards/playkbtw/pk60/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/plut0nium/0x3e/rules.mk b/keyboards/plut0nium/0x3e/rules.mk
index 05a9294140..9cccfc4833 100644
--- a/keyboards/plut0nium/0x3e/rules.mk
+++ b/keyboards/plut0nium/0x3e/rules.mk
@@ -5,6 +5,8 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
diff --git a/keyboards/polycarbdiet/s20/rules.mk b/keyboards/polycarbdiet/s20/rules.mk
index 175829cf72..3cdf4babf9 100644
--- a/keyboards/polycarbdiet/s20/rules.mk
+++ b/keyboards/polycarbdiet/s20/rules.mk
@@ -5,7 +5,8 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# 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
diff --git a/keyboards/primekb/prime_r/rules.mk b/keyboards/primekb/prime_r/rules.mk
index 62215beecc..60293f1386 100644
--- a/keyboards/primekb/prime_r/rules.mk
+++ b/keyboards/primekb/prime_r/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/projectkb/signature87/rules.mk b/keyboards/projectkb/signature87/rules.mk
index fc85f3b3e3..3ea9f22486 100644
--- a/keyboards/projectkb/signature87/rules.mk
+++ b/keyboards/projectkb/signature87/rules.mk
@@ -5,7 +5,7 @@ MCU = STM32F072
BOOTLOADER = stm32-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/rainkeeb/rules.mk b/keyboards/rainkeeb/rules.mk
index c7e7f55543..a4b7fca0d1 100644
--- a/keyboards/rainkeeb/rules.mk
+++ b/keyboards/rainkeeb/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/rart/rartpad/rules.mk b/keyboards/rart/rartpad/rules.mk
index 309faf271d..80e5d192ce 100644
--- a/keyboards/rart/rartpad/rules.mk
+++ b/keyboards/rart/rartpad/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/redox_w/rules.mk b/keyboards/redox_w/rules.mk
index 689d3e02c9..a8bd3a027a 100644
--- a/keyboards/redox_w/rules.mk
+++ b/keyboards/redox_w/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/sck/gtm/rules.mk b/keyboards/sck/gtm/rules.mk
index fdabf03717..756963d95d 100644
--- a/keyboards/sck/gtm/rules.mk
+++ b/keyboards/sck/gtm/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u2
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/senselessclay/had60/rules.mk b/keyboards/senselessclay/had60/rules.mk
index 333bead113..6b9a97646d 100644
--- a/keyboards/senselessclay/had60/rules.mk
+++ b/keyboards/senselessclay/had60/rules.mk
@@ -5,6 +5,8 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
diff --git a/keyboards/sets3n/kk980/rules.mk b/keyboards/sets3n/kk980/rules.mk
index 773da20a83..85eec9079f 100644
--- a/keyboards/sets3n/kk980/rules.mk
+++ b/keyboards/sets3n/kk980/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# change yes to no to disable
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/signum/3_0/rules.mk b/keyboards/signum/3_0/rules.mk
index baae12ecca..d1eef7d82f 100644
--- a/keyboards/signum/3_0/rules.mk
+++ b/keyboards/signum/3_0/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# change yes to no to disable
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/singa/rules.mk b/keyboards/singa/rules.mk
index 3bff3ee31b..4dcdfe886a 100644
--- a/keyboards/singa/rules.mk
+++ b/keyboards/singa/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/sixkeyboard/rules.mk b/keyboards/sixkeyboard/rules.mk
index 618daa7142..3e1b51fa86 100644
--- a/keyboards/sixkeyboard/rules.mk
+++ b/keyboards/sixkeyboard/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega16u2
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/southpole/rules.mk b/keyboards/southpole/rules.mk
index 4667e9bc96..278ee36f23 100644
--- a/keyboards/southpole/rules.mk
+++ b/keyboards/southpole/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = halfkay
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/spaceman/2_milk/rules.mk b/keyboards/spaceman/2_milk/rules.mk
index fbffcef0f2..77b594bd81 100644
--- a/keyboards/spaceman/2_milk/rules.mk
+++ b/keyboards/spaceman/2_milk/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/spaceman/pancake/rev1/feather/rules.mk b/keyboards/spaceman/pancake/rev1/feather/rules.mk
index 5427472986..6530422734 100644
--- a/keyboards/spaceman/pancake/rev1/feather/rules.mk
+++ b/keyboards/spaceman/pancake/rev1/feather/rules.mk
@@ -8,7 +8,7 @@ F_CPU = 8000000
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/spaceman/pancake/rev1/promicro/rules.mk b/keyboards/spaceman/pancake/rev1/promicro/rules.mk
index 0d60059ae1..561b3da8fe 100644
--- a/keyboards/spaceman/pancake/rev1/promicro/rules.mk
+++ b/keyboards/spaceman/pancake/rev1/promicro/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/spaceman/yun65/rules.mk b/keyboards/spaceman/yun65/rules.mk
index 1d08a58905..d2c47c1529 100644
--- a/keyboards/spaceman/yun65/rules.mk
+++ b/keyboards/spaceman/yun65/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/splitish/rules.mk b/keyboards/splitish/rules.mk
index 546ca050dd..76fa2e63fb 100644
--- a/keyboards/splitish/rules.mk
+++ b/keyboards/splitish/rules.mk
@@ -4,6 +4,9 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = caterina
+# 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
diff --git a/keyboards/squiggle/rev1/rules.mk b/keyboards/squiggle/rev1/rules.mk
index 24eadaaeca..c5eccd2db9 100644
--- a/keyboards/squiggle/rev1/rules.mk
+++ b/keyboards/squiggle/rev1/rules.mk
@@ -4,6 +4,9 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = caterina
+# 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
diff --git a/keyboards/sx60/rules.mk b/keyboards/sx60/rules.mk
index 62a3dce40a..0848a4d73f 100755
--- a/keyboards/sx60/rules.mk
+++ b/keyboards/sx60/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/tanuki/rules.mk b/keyboards/tanuki/rules.mk
index a17e2ed845..453b0fb12f 100644
--- a/keyboards/tanuki/rules.mk
+++ b/keyboards/tanuki/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/tenki/rules.mk b/keyboards/tenki/rules.mk
index be195a168b..61e4c302ba 100644
--- a/keyboards/tenki/rules.mk
+++ b/keyboards/tenki/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/tetris/rules.mk b/keyboards/tetris/rules.mk
index 5fa8de2444..e68d632b65 100755
--- a/keyboards/tetris/rules.mk
+++ b/keyboards/tetris/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = qmk-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/tgr/910/rules.mk b/keyboards/tgr/910/rules.mk
index 2dba9c3eb9..9a2e1da0de 100644
--- a/keyboards/tgr/910/rules.mk
+++ b/keyboards/tgr/910/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/tgr/alice/rules.mk b/keyboards/tgr/alice/rules.mk
index 2a437c3c13..0d63df82e7 100644
--- a/keyboards/tgr/alice/rules.mk
+++ b/keyboards/tgr/alice/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/tgr/jane/v2/rules.mk b/keyboards/tgr/jane/v2/rules.mk
index 9d035a031a..853857ba7c 100644
--- a/keyboards/tgr/jane/v2/rules.mk
+++ b/keyboards/tgr/jane/v2/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/the_royal/liminal/rules.mk b/keyboards/the_royal/liminal/rules.mk
index ab20e90f76..88173a40c2 100644
--- a/keyboards/the_royal/liminal/rules.mk
+++ b/keyboards/the_royal/liminal/rules.mk
@@ -5,8 +5,8 @@ MCU = atmega32u2
BOOTLOADER = atmel-dfu
# Build Options
-# - change yes to no to disable
-
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
diff --git a/keyboards/thevankeyboards/bananasplit/rules.mk b/keyboards/thevankeyboards/bananasplit/rules.mk
index 44166ee7ed..36da451a6d 100644
--- a/keyboards/thevankeyboards/bananasplit/rules.mk
+++ b/keyboards/thevankeyboards/bananasplit/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/tkc/candybar/lefty/rules.mk b/keyboards/tkc/candybar/lefty/rules.mk
index 501b267a4c..52cb35c5a2 100644
--- a/keyboards/tkc/candybar/lefty/rules.mk
+++ b/keyboards/tkc/candybar/lefty/rules.mk
@@ -5,9 +5,8 @@ MCU = STM32F072
BOOTLOADER = stm32-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
-# LTO_ENABLE = yes
LTO_ENABLE = yes
BACKLIGHT_ENABLE = no
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
diff --git a/keyboards/tkc/candybar/righty/rules.mk b/keyboards/tkc/candybar/righty/rules.mk
index 501b267a4c..52cb35c5a2 100644
--- a/keyboards/tkc/candybar/righty/rules.mk
+++ b/keyboards/tkc/candybar/righty/rules.mk
@@ -5,9 +5,8 @@ MCU = STM32F072
BOOTLOADER = stm32-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
-# LTO_ENABLE = yes
LTO_ENABLE = yes
BACKLIGHT_ENABLE = no
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
diff --git a/keyboards/tkc/tkc1800/rules.mk b/keyboards/tkc/tkc1800/rules.mk
index db18bd7584..cf95bbd4b2 100644
--- a/keyboards/tkc/tkc1800/rules.mk
+++ b/keyboards/tkc/tkc1800/rules.mk
@@ -7,7 +7,6 @@ BOOTLOADER = qmk-dfu
# 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
diff --git a/keyboards/toad/rules.mk b/keyboards/toad/rules.mk
index 91b034d4cd..82694737e6 100644
--- a/keyboards/toad/rules.mk
+++ b/keyboards/toad/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/uk78/rules.mk b/keyboards/uk78/rules.mk
index 93ff840704..0cf8df9c19 100644
--- a/keyboards/uk78/rules.mk
+++ b/keyboards/uk78/rules.mk
@@ -5,7 +5,7 @@ MCU = at90usb1286
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/unikorn/rules.mk b/keyboards/unikorn/rules.mk
index 4c4a33355e..7bc9adda6b 100644
--- a/keyboards/unikorn/rules.mk
+++ b/keyboards/unikorn/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/walletburner/cajal/rules.mk b/keyboards/walletburner/cajal/rules.mk
index 512cfb60d3..e8057998c5 100644
--- a/keyboards/walletburner/cajal/rules.mk
+++ b/keyboards/walletburner/cajal/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/walletburner/neuron/rules.mk b/keyboards/walletburner/neuron/rules.mk
index 3ada3a08a0..8f9b670fd9 100644
--- a/keyboards/walletburner/neuron/rules.mk
+++ b/keyboards/walletburner/neuron/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/westfoxtrot/aanzee/rules.mk b/keyboards/westfoxtrot/aanzee/rules.mk
index 06d6064df4..afa3f6d63d 100644
--- a/keyboards/westfoxtrot/aanzee/rules.mk
+++ b/keyboards/westfoxtrot/aanzee/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/westfoxtrot/prophet/rules.mk b/keyboards/westfoxtrot/prophet/rules.mk
index f32f725546..7c8bb3669d 100644
--- a/keyboards/westfoxtrot/prophet/rules.mk
+++ b/keyboards/westfoxtrot/prophet/rules.mk
@@ -5,7 +5,7 @@ MCU = STM32F072
BOOTLOADER = stm32-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/winkeyless/bface/rules.mk b/keyboards/winkeyless/bface/rules.mk
index 3bff3ee31b..4dcdfe886a 100644
--- a/keyboards/winkeyless/bface/rules.mk
+++ b/keyboards/winkeyless/bface/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/winkeyless/bmini/rules.mk b/keyboards/winkeyless/bmini/rules.mk
index 694ad609a2..9686fd1aa4 100644
--- a/keyboards/winkeyless/bmini/rules.mk
+++ b/keyboards/winkeyless/bmini/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/winkeyless/bminiex/rules.mk b/keyboards/winkeyless/bminiex/rules.mk
index 5a51fc476e..dca760709c 100644
--- a/keyboards/winkeyless/bminiex/rules.mk
+++ b/keyboards/winkeyless/bminiex/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/wsk/houndstooth/rules.mk b/keyboards/wsk/houndstooth/rules.mk
index a384a4c497..1b7716f469 100644
--- a/keyboards/wsk/houndstooth/rules.mk
+++ b/keyboards/wsk/houndstooth/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/wsk/jerkin/rules.mk b/keyboards/wsk/jerkin/rules.mk
index 2f01902f3c..2ad4835ae6 100644
--- a/keyboards/wsk/jerkin/rules.mk
+++ b/keyboards/wsk/jerkin/rules.mk
@@ -4,9 +4,8 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = caterina
-
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/wsk/kodachi50/rules.mk b/keyboards/wsk/kodachi50/rules.mk
index 993893238b..82cf2b723b 100644
--- a/keyboards/wsk/kodachi50/rules.mk
+++ b/keyboards/wsk/kodachi50/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/wsk/pain27/rules.mk b/keyboards/wsk/pain27/rules.mk
index cfbadac10b..99bf6e4cc0 100644
--- a/keyboards/wsk/pain27/rules.mk
+++ b/keyboards/wsk/pain27/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/wsk/sl40/rules.mk b/keyboards/wsk/sl40/rules.mk
index 993893238b..82cf2b723b 100644
--- a/keyboards/wsk/sl40/rules.mk
+++ b/keyboards/wsk/sl40/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/wuque/ikki68/rules.mk b/keyboards/wuque/ikki68/rules.mk
index a1bec5d120..975e874e09 100644
--- a/keyboards/wuque/ikki68/rules.mk
+++ b/keyboards/wuque/ikki68/rules.mk
@@ -1,11 +1,9 @@
# MCU name
MCU = atmega32u4
-
# Bootloader selection
BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/xbows/woody/rules.mk b/keyboards/xbows/woody/rules.mk
index d5c951d915..6dcdb62058 100644
--- a/keyboards/xbows/woody/rules.mk
+++ b/keyboards/xbows/woody/rules.mk
@@ -3,6 +3,10 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
+
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
BACKLIGHT_ENABLE = no
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/xelus/kangaroo/rules.mk b/keyboards/xelus/kangaroo/rules.mk
index 58e7ca97fd..80826fae5f 100644
--- a/keyboards/xelus/kangaroo/rules.mk
+++ b/keyboards/xelus/kangaroo/rules.mk
@@ -5,9 +5,8 @@ MCU = STM32F072
BOOTLOADER = stm32-dfu
# Build Options
-# comment out to disable the 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
diff --git a/keyboards/xelus/trinityxttkl/rules.mk b/keyboards/xelus/trinityxttkl/rules.mk
index 5c5b9847c7..99fcb3cd13 100644
--- a/keyboards/xelus/trinityxttkl/rules.mk
+++ b/keyboards/xelus/trinityxttkl/rules.mk
@@ -8,9 +8,8 @@ BOOTLOADER = stm32-dfu
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
# Build Options
-# comment out to disable the 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
diff --git a/keyboards/xiudi/xd004/v1/rules.mk b/keyboards/xiudi/xd004/v1/rules.mk
index dbe8f8c8fc..2a885e1441 100644
--- a/keyboards/xiudi/xd004/v1/rules.mk
+++ b/keyboards/xiudi/xd004/v1/rules.mk
@@ -5,6 +5,8 @@ MCU = atmega16u2
BOOTLOADER = atmel-dfu
# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
diff --git a/keyboards/xiudi/xd60/rev2/rules.mk b/keyboards/xiudi/xd60/rev2/rules.mk
index 865f81eaa0..0479b79af5 100644
--- a/keyboards/xiudi/xd60/rev2/rules.mk
+++ b/keyboards/xiudi/xd60/rev2/rules.mk
@@ -5,6 +5,8 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# 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
diff --git a/keyboards/xiudi/xd60/rev3/rules.mk b/keyboards/xiudi/xd60/rev3/rules.mk
index 865f81eaa0..0479b79af5 100644
--- a/keyboards/xiudi/xd60/rev3/rules.mk
+++ b/keyboards/xiudi/xd60/rev3/rules.mk
@@ -5,6 +5,8 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# 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
diff --git a/keyboards/xiudi/xd68/rules.mk b/keyboards/xiudi/xd68/rules.mk
index 878cbff7ec..927741e979 100644
--- a/keyboards/xiudi/xd68/rules.mk
+++ b/keyboards/xiudi/xd68/rules.mk
@@ -4,7 +4,7 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
-# QMK Build Options
+# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
diff --git a/keyboards/xmmx/rules.mk b/keyboards/xmmx/rules.mk
index 91b034d4cd..82694737e6 100644
--- a/keyboards/xmmx/rules.mk
+++ b/keyboards/xmmx/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/yasui/rules.mk b/keyboards/yasui/rules.mk
index f88c0855c2..bc14e746aa 100644
--- a/keyboards/yasui/rules.mk
+++ b/keyboards/yasui/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/ymd75/rev1/rules.mk b/keyboards/ymd75/rev1/rules.mk
index 709d2202b7..816b0060c9 100644
--- a/keyboards/ymd75/rev1/rules.mk
+++ b/keyboards/ymd75/rev1/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/ymd75/rev2/rules.mk b/keyboards/ymd75/rev2/rules.mk
index 709d2202b7..816b0060c9 100644
--- a/keyboards/ymd75/rev2/rules.mk
+++ b/keyboards/ymd75/rev2/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/ymd96/rules.mk b/keyboards/ymd96/rules.mk
index 69db6d1a23..8dab58389a 100644
--- a/keyboards/ymd96/rules.mk
+++ b/keyboards/ymd96/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/ymdk/bface/rules.mk b/keyboards/ymdk/bface/rules.mk
index 3bff3ee31b..4dcdfe886a 100644
--- a/keyboards/ymdk/bface/rules.mk
+++ b/keyboards/ymdk/bface/rules.mk
@@ -4,7 +4,9 @@ MCU = atmega32a
# Bootloader selection
BOOTLOADER = bootloadhid
-# build options
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
diff --git a/keyboards/ymdk/ymd67/rules.mk b/keyboards/ymdk/ymd67/rules.mk
index ed474c2d90..d684f610e9 100644
--- a/keyboards/ymdk/ymd67/rules.mk
+++ b/keyboards/ymdk/ymd67/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
diff --git a/keyboards/z12/rules.mk b/keyboards/z12/rules.mk
index 166b2e4116..fe67be276f 100644
--- a/keyboards/z12/rules.mk
+++ b/keyboards/z12/rules.mk
@@ -5,6 +5,8 @@ MCU = atmega32u4
BOOTLOADER = caterina
# 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
diff --git a/keyboards/z150_bh/rules.mk b/keyboards/z150_bh/rules.mk
index beab8c84ac..65e353ad15 100644
--- a/keyboards/z150_bh/rules.mk
+++ b/keyboards/z150_bh/rules.mk
@@ -5,7 +5,7 @@ MCU = at90usb1286
BOOTLOADER = halfkay
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/zj68/rules.mk b/keyboards/zj68/rules.mk
index 99db76d700..1d5db073ca 100644
--- a/keyboards/zj68/rules.mk
+++ b/keyboards/zj68/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
diff --git a/keyboards/zlant/rules.mk b/keyboards/zlant/rules.mk
index 7c4641082a..5fb361e12e 100755
--- a/keyboards/zlant/rules.mk
+++ b/keyboards/zlant/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
BOOTLOADER = atmel-dfu
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys