Bocaj - Third Annual Refactor (Redux) (#10295)

* Reset everything to upstream, reapply Bocaj changes

* Bocaj - address PR comments

* Just in time changes

* Bocaj - Several adjustments after using the layout for a while

layouts/community/ergodox/bocaj/rules.mk

@@ -1,11 +1,14 @@
-AUTO_SHIFT_ENABLE = no
-COMMAND_ENABLE = no
-SWAP_HANDS_ENABLE = no
-TAP_DANCE_ENABLE = yes
-EXTRAKEY_ENABLE = no
-KEY_LOCK_ENABLE = yes
-LEADER_ENABLE = yes
+BOOTMAGIC_ENABLE   = yes
+TAP_DANCE_ENABLE   = no
+COMMAND_ENABLE     = no  # Commands for debug and configuration
+CONSOLE_ENABLE 	   = yes
+SPACE_CADET_ENABLE = no
+KEY_LOCK_ENABLE    = yes
+MOUSEKEY_ENABLE    = yes
+EXTRAKEY_ENABLE	   = yes
+LEADER_ENABLE	   = yes
 
-UNICODE_ENABLE    = yes
-UNICODEMAP_ENABLE = no
-UCIS_ENABLE = no
+UNICODE_ENABLE     = no
+UNICODEMAP_ENABLE  = no
+RGB_MATRIX_ENABLE  = no
+RGBLIGHT_ENABLE    = no