summaryrefslogtreecommitdiff
path: root/keyboards/keebio
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keebio')
-rw-r--r--keyboards/keebio/bamfk4/config.h2
-rw-r--r--keyboards/keebio/bamfk4/info.json1
-rw-r--r--keyboards/keebio/bdn9/rev2/config.h2
-rw-r--r--keyboards/keebio/bfo9000/keymaps/abstractkb/config.h5
-rw-r--r--keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/config.h5
-rw-r--r--keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h5
-rw-r--r--keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h5
-rw-r--r--keyboards/keebio/fourier/keymaps/default/config.h1
-rw-r--r--keyboards/keebio/fourier/keymaps/maxim/config.h5
-rw-r--r--keyboards/keebio/iris/keymaps/333fred/config.h1
-rw-r--r--keyboards/keebio/iris/keymaps/antonlindstrom/config.h5
-rw-r--r--keyboards/keebio/iris/keymaps/ave-63/config.h5
-rw-r--r--keyboards/keebio/iris/keymaps/bmoorey/config.h7
-rw-r--r--keyboards/keebio/iris/keymaps/boo/config.h3
-rw-r--r--keyboards/keebio/iris/keymaps/davidrambo/config.h5
-rw-r--r--keyboards/keebio/iris/keymaps/drashna/config.h6
-rw-r--r--keyboards/keebio/iris/keymaps/dvorak/config.h4
-rw-r--r--keyboards/keebio/iris/keymaps/edvorakjp/config.h4
-rw-r--r--keyboards/keebio/iris/keymaps/emp/config.h2
-rw-r--r--keyboards/keebio/iris/keymaps/gary/config.h5
-rw-r--r--keyboards/keebio/iris/keymaps/gsigler/config.h5
-rw-r--r--keyboards/keebio/iris/keymaps/hbbisenieks/config.h6
-rw-r--r--keyboards/keebio/iris/keymaps/impstyle/config.h3
-rw-r--r--keyboards/keebio/iris/keymaps/isolike/config.h5
-rw-r--r--keyboards/keebio/iris/keymaps/jasondunsmore/config.h1
-rw-r--r--keyboards/keebio/iris/keymaps/khord/config.h5
-rw-r--r--keyboards/keebio/iris/keymaps/krusli/config.h5
-rw-r--r--keyboards/keebio/iris/keymaps/mojitas/config.h5
-rw-r--r--keyboards/keebio/iris/keymaps/moonfall/config.h5
-rw-r--r--keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h3
-rw-r--r--keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h5
-rw-r--r--keyboards/keebio/iris/keymaps/omgvee/config.h5
-rw-r--r--keyboards/keebio/iris/keymaps/pvinis/config.h6
-rw-r--r--keyboards/keebio/iris/keymaps/rs/config.h5
-rw-r--r--keyboards/keebio/iris/keymaps/sethBarberee/config.h5
-rw-r--r--keyboards/keebio/iris/keymaps/vyolle/config.h4
-rw-r--r--keyboards/keebio/iris/keymaps/wanleg/config.h3
-rw-r--r--keyboards/keebio/iris/keymaps/xyverz/config.h29
-rw-r--r--keyboards/keebio/iris/rev6/config.h2
-rw-r--r--keyboards/keebio/iris/rev6a/config.h2
-rw-r--r--keyboards/keebio/iris/rev6b/config.h2
-rw-r--r--keyboards/keebio/iris/rev7/config.h2
-rw-r--r--keyboards/keebio/levinson/keymaps/drogglbecher/config.h5
-rw-r--r--keyboards/keebio/levinson/keymaps/issmirnov/config.h5
-rw-r--r--keyboards/keebio/levinson/keymaps/losinggeneration/config.h5
-rw-r--r--keyboards/keebio/levinson/keymaps/mmacdougall/config.h5
-rw-r--r--keyboards/keebio/levinson/keymaps/steno/config.h4
-rw-r--r--keyboards/keebio/levinson/keymaps/treadwell/config.h5
-rw-r--r--keyboards/keebio/levinson/keymaps/xtonhasvim/config.h2
-rw-r--r--keyboards/keebio/nyquist/keymaps/DivergeJM/README.md2
-rw-r--r--keyboards/keebio/nyquist/keymaps/DivergeJM/config.h2
-rw-r--r--keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c4
-rw-r--r--keyboards/keebio/nyquist/keymaps/bramver/config.h1
-rw-r--r--keyboards/keebio/nyquist/keymaps/danielhklein/config.h3
-rw-r--r--keyboards/keebio/nyquist/keymaps/jojiichan/config.h5
-rw-r--r--keyboards/keebio/nyquist/keymaps/kim-kim/config.h7
-rw-r--r--keyboards/keebio/nyquist/keymaps/losinggeneration/config.h5
-rw-r--r--keyboards/keebio/nyquist/keymaps/pitty/config.h5
-rw-r--r--keyboards/keebio/nyquist/keymaps/pjanx/keymap.c4
-rw-r--r--keyboards/keebio/nyquist/keymaps/shovelpaw/config.h5
-rw-r--r--keyboards/keebio/nyquist/keymaps/skug/config.h3
-rw-r--r--keyboards/keebio/nyquist/keymaps/yshrsmz/config.h5
-rw-r--r--keyboards/keebio/quefrency/keymaps/bcat/config.h7
-rw-r--r--keyboards/keebio/quefrency/keymaps/bfiedler/config.h5
-rw-r--r--keyboards/keebio/quefrency/keymaps/bjohnson/config.h5
-rw-r--r--keyboards/keebio/quefrency/keymaps/bramver/config.h1
-rw-r--r--keyboards/keebio/quefrency/keymaps/default60/config.h5
-rw-r--r--keyboards/keebio/quefrency/keymaps/default65/config.h4
-rw-r--r--keyboards/keebio/quefrency/keymaps/joestrong/config.h5
-rw-r--r--keyboards/keebio/quefrency/keymaps/jonavin/config.h5
-rw-r--r--keyboards/keebio/quefrency/keymaps/kingwangwong/config.h4
-rw-r--r--keyboards/keebio/quefrency/keymaps/rogthefrog/config.h5
-rw-r--r--keyboards/keebio/quefrency/keymaps/unausgeschlafen/config.h5
-rw-r--r--keyboards/keebio/quefrency/keymaps/yoryer/config.h5
-rw-r--r--keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h3
-rw-r--r--keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h3
-rw-r--r--keyboards/keebio/sinc/keymaps/sethBarberee/config.h5
-rw-r--r--keyboards/keebio/stick/config.h2
-rw-r--r--keyboards/keebio/viterbi/keymaps/drashna/config.h2
79 files changed, 27 insertions, 317 deletions
diff --git a/keyboards/keebio/bamfk4/config.h b/keyboards/keebio/bamfk4/config.h
index b18b94da10..afac3376a4 100644
--- a/keyboards/keebio/bamfk4/config.h
+++ b/keyboards/keebio/bamfk4/config.h
@@ -81,7 +81,7 @@
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-# define DRIVER_LED_TOTAL RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
//# endif
diff --git a/keyboards/keebio/bamfk4/info.json b/keyboards/keebio/bamfk4/info.json
index 1d04f4348b..0704d0e1d2 100644
--- a/keyboards/keebio/bamfk4/info.json
+++ b/keyboards/keebio/bamfk4/info.json
@@ -1,5 +1,6 @@
{
"keyboard_name": "BAMFK-4",
+ "manufacturer": "Keebio",
"url": "https://keeb.io",
"maintainer": "nooges",
"usb": {
diff --git a/keyboards/keebio/bdn9/rev2/config.h b/keyboards/keebio/bdn9/rev2/config.h
index e3d004fc27..3af4f76725 100644
--- a/keyboards/keebio/bdn9/rev2/config.h
+++ b/keyboards/keebio/bdn9/rev2/config.h
@@ -47,7 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_ANIMATIONS
// RGB Matrix
# ifdef RGB_MATRIX_ENABLE
-# define DRIVER_LED_TOTAL RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
# define RGB_MATRIX_KEYPRESSES
// RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/keebio/bfo9000/keymaps/abstractkb/config.h b/keyboards/keebio/bfo9000/keymaps/abstractkb/config.h
index 67c64fd8e8..c44c64603d 100644
--- a/keyboards/keebio/bfo9000/keymaps/abstractkb/config.h
+++ b/keyboards/keebio/bfo9000/keymaps/abstractkb/config.h
@@ -25,11 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_ANIMATIONS
#define RGBLIGHT_SLEEP
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/config.h b/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/config.h
index be57e385ef..786e107f9c 100644
--- a/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/config.h
+++ b/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/config.h
@@ -23,11 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h
index 344634063c..2e2f45ea1f 100644
--- a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h
+++ b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h
@@ -20,9 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-// #define USE_SERIAL
#define USE_I2C
/* Select hand configuration */
@@ -39,4 +36,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define RGBLED_NUM 12
// #define RGBLIGHT_HUE_STEP 8
// #define RGBLIGHT_SAT_STEP 8
-// #define RGBLIGHT_VAL_STEP 8 \ No newline at end of file
+// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h
index 344634063c..2e2f45ea1f 100644
--- a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h
+++ b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h
@@ -20,9 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-// #define USE_SERIAL
#define USE_I2C
/* Select hand configuration */
@@ -39,4 +36,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define RGBLED_NUM 12
// #define RGBLIGHT_HUE_STEP 8
// #define RGBLIGHT_SAT_STEP 8
-// #define RGBLIGHT_VAL_STEP 8 \ No newline at end of file
+// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/fourier/keymaps/default/config.h b/keyboards/keebio/fourier/keymaps/default/config.h
index 8cea392181..fa952ef4c3 100644
--- a/keyboards/keebio/fourier/keymaps/default/config.h
+++ b/keyboards/keebio/fourier/keymaps/default/config.h
@@ -20,5 +20,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
// #define USE_I2C
diff --git a/keyboards/keebio/fourier/keymaps/maxim/config.h b/keyboards/keebio/fourier/keymaps/maxim/config.h
index fb13b56cdc..446b011153 100644
--- a/keyboards/keebio/fourier/keymaps/maxim/config.h
+++ b/keyboards/keebio/fourier/keymaps/maxim/config.h
@@ -22,8 +22,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
diff --git a/keyboards/keebio/iris/keymaps/333fred/config.h b/keyboards/keebio/iris/keymaps/333fred/config.h
index 3c8ba4cb25..0c0250291c 100644
--- a/keyboards/keebio/iris/keymaps/333fred/config.h
+++ b/keyboards/keebio/iris/keymaps/333fred/config.h
@@ -22,7 +22,6 @@
#pragma once
-#define USE_SERIAL
#define EE_HANDS
#define NO_ACTION_MACRO
diff --git a/keyboards/keebio/iris/keymaps/antonlindstrom/config.h b/keyboards/keebio/iris/keymaps/antonlindstrom/config.h
index 0997e72512..36b3e42d7e 100644
--- a/keyboards/keebio/iris/keymaps/antonlindstrom/config.h
+++ b/keyboards/keebio/iris/keymaps/antonlindstrom/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
// #define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/ave-63/config.h b/keyboards/keebio/iris/keymaps/ave-63/config.h
index 381a494b75..0d0c4764bb 100644
--- a/keyboards/keebio/iris/keymaps/ave-63/config.h
+++ b/keyboards/keebio/iris/keymaps/ave-63/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
#define PREVENT_STUCK_MODIFIERS
#define TAPPING_TERM 150
diff --git a/keyboards/keebio/iris/keymaps/bmoorey/config.h b/keyboards/keebio/iris/keymaps/bmoorey/config.h
index 9f8a9afab8..8f173a128b 100644
--- a/keyboards/keebio/iris/keymaps/bmoorey/config.h
+++ b/keyboards/keebio/iris/keymaps/bmoorey/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_RIGHT
@@ -35,4 +30,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define NO_ACTION_TAPPING
-#define NO_ACTION_ONESHOT \ No newline at end of file
+#define NO_ACTION_ONESHOT
diff --git a/keyboards/keebio/iris/keymaps/boo/config.h b/keyboards/keebio/iris/keymaps/boo/config.h
index 6af7d40852..101fd6e8ce 100644
--- a/keyboards/keebio/iris/keymaps/boo/config.h
+++ b/keyboards/keebio/iris/keymaps/boo/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/davidrambo/config.h b/keyboards/keebio/iris/keymaps/davidrambo/config.h
index 0c4bf8c8f4..bfa48ce0ce 100644
--- a/keyboards/keebio/iris/keymaps/davidrambo/config.h
+++ b/keyboards/keebio/iris/keymaps/davidrambo/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define PERMISSIVE_HOLD
#define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/drashna/config.h b/keyboards/keebio/iris/keymaps/drashna/config.h
index cf67aa6984..0569f30744 100644
--- a/keyboards/keebio/iris/keymaps/drashna/config.h
+++ b/keyboards/keebio/iris/keymaps/drashna/config.h
@@ -51,11 +51,11 @@
#undef PRODUCT
#if defined(KEYBOARD_keebio_iris_rev2)
-# define PRODUCT Drashna Hacked Iris Rev 2
+# define PRODUCT "Drashna Hacked Iris Rev 2"
#elif defined(KEYBOARD_keebio_iris_rev3)
-# define PRODUCT Drashna Hacked Iris Rev 3
+# define PRODUCT "Drashna Hacked Iris Rev 3"
#elif defined(KEYBOARD_keebio_iris_rev4)
-# define PRODUCT Drashna Hacked Iris Rev 4
+# define PRODUCT "Drashna Hacked Iris Rev 4"
#endif
#define SHFT_LED1 6
diff --git a/keyboards/keebio/iris/keymaps/dvorak/config.h b/keyboards/keebio/iris/keymaps/dvorak/config.h
index d37d3c3123..4576a6d639 100644
--- a/keyboards/keebio/iris/keymaps/dvorak/config.h
+++ b/keyboards/keebio/iris/keymaps/dvorak/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/edvorakjp/config.h b/keyboards/keebio/iris/keymaps/edvorakjp/config.h
index f296e29769..864cedae98 100644
--- a/keyboards/keebio/iris/keymaps/edvorakjp/config.h
+++ b/keyboards/keebio/iris/keymaps/edvorakjp/config.h
@@ -1,9 +1,5 @@
#pragma once
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/emp/config.h b/keyboards/keebio/iris/keymaps/emp/config.h
index a08db4d170..9f1982935a 100644
--- a/keyboards/keebio/iris/keymaps/emp/config.h
+++ b/keyboards/keebio/iris/keymaps/emp/config.h
@@ -17,9 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
#undef USE_I2C
-#define USE_SERIAL
/* Select hand configuration */
#undef MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/gary/config.h b/keyboards/keebio/iris/keymaps/gary/config.h
index 186aee502c..e337f4403f 100644
--- a/keyboards/keebio/iris/keymaps/gary/config.h
+++ b/keyboards/keebio/iris/keymaps/gary/config.h
@@ -1,10 +1,5 @@
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/gsigler/config.h b/keyboards/keebio/iris/keymaps/gsigler/config.h
index e1793fb1b8..f568452d0a 100644
--- a/keyboards/keebio/iris/keymaps/gsigler/config.h
+++ b/keyboards/keebio/iris/keymaps/gsigler/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/hbbisenieks/config.h b/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
index bb3fe25085..20384f4582 100644
--- a/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
+++ b/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
@@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/impstyle/config.h b/keyboards/keebio/iris/keymaps/impstyle/config.h
index 6fc14133f8..68b45c217d 100644
--- a/keyboards/keebio/iris/keymaps/impstyle/config.h
+++ b/keyboards/keebio/iris/keymaps/impstyle/config.h
@@ -20,9 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* Use I2C or Serial, not both */
-
-//#define USE_SERIAL
#define USE_I2C
/* Select hand configuration */
diff --git a/keyboards/keebio/iris/keymaps/isolike/config.h b/keyboards/keebio/iris/keymaps/isolike/config.h
index 7986b50416..6d3194157e 100644
--- a/keyboards/keebio/iris/keymaps/isolike/config.h
+++ b/keyboards/keebio/iris/keymaps/isolike/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/jasondunsmore/config.h b/keyboards/keebio/iris/keymaps/jasondunsmore/config.h
index 8799e01c18..e6fa61d3dd 100644
--- a/keyboards/keebio/iris/keymaps/jasondunsmore/config.h
+++ b/keyboards/keebio/iris/keymaps/jasondunsmore/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define USE_SERIAL
#define EE_HANDS
#define TAPPING_TERM 150
#define TAPPING_TOGGLE 2
diff --git a/keyboards/keebio/iris/keymaps/khord/config.h b/keyboards/keebio/iris/keymaps/khord/config.h
index 9b44bca792..22e11c8798 100644
--- a/keyboards/keebio/iris/keymaps/khord/config.h
+++ b/keyboards/keebio/iris/keymaps/khord/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/krusli/config.h b/keyboards/keebio/iris/keymaps/krusli/config.h
index 72e35c4728..ec8bdffe88 100644
--- a/keyboards/keebio/iris/keymaps/krusli/config.h
+++ b/keyboards/keebio/iris/keymaps/krusli/config.h
@@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/mojitas/config.h b/keyboards/keebio/iris/keymaps/mojitas/config.h
index 24aecb9f84..d1c8bda27c 100644
--- a/keyboards/keebio/iris/keymaps/mojitas/config.h
+++ b/keyboards/keebio/iris/keymaps/mojitas/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/moonfall/config.h b/keyboards/keebio/iris/keymaps/moonfall/config.h
index 7986b50416..6d3194157e 100644
--- a/keyboards/keebio/iris/keymaps/moonfall/config.h
+++ b/keyboards/keebio/iris/keymaps/moonfall/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h b/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h
index 16c4302373..b78c52a460 100644
--- a/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h
+++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-//#define USE_SERIAL
#define USE_I2C
/* Select hand configuration */
diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h
index c1acce7c38..5e06cb3ac3 100644
--- a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h
+++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-//#define USE_SERIAL
#define USE_I2C
/* Select hand configuration */
@@ -28,4 +25,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define MASTER_RIGHT
#define EE_HANDS
-#undef RGBLED_NUM \ No newline at end of file
+#undef RGBLED_NUM
diff --git a/keyboards/keebio/iris/keymaps/omgvee/config.h b/keyboards/keebio/iris/keymaps/omgvee/config.h
index c5899f45f0..c47ec74287 100644
--- a/keyboards/keebio/iris/keymaps/omgvee/config.h
+++ b/keyboards/keebio/iris/keymaps/omgvee/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/pvinis/config.h b/keyboards/keebio/iris/keymaps/pvinis/config.h
index c2870eba0b..861c474e54 100644
--- a/keyboards/keebio/iris/keymaps/pvinis/config.h
+++ b/keyboards/keebio/iris/keymaps/pvinis/config.h
@@ -2,13 +2,9 @@
#ifdef PRODUCT
# undef PRODUCT
-# define PRODUCT Iris Keyboard - pvinis
+# define PRODUCT "Iris Keyboard - pvinis"
#endif
-// Use I2C or Serial, not both.
-#define USE_SERIAL
-// #define USE_I2C
-
// Select hand configuration.
// #define MASTER_LEFT
#define MASTER_RIGHT
diff --git a/keyboards/keebio/iris/keymaps/rs/config.h b/keyboards/keebio/iris/keymaps/rs/config.h
index 412862c872..8aed71e202 100644
--- a/keyboards/keebio/iris/keymaps/rs/config.h
+++ b/keyboards/keebio/iris/keymaps/rs/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/sethBarberee/config.h b/keyboards/keebio/iris/keymaps/sethBarberee/config.h
index bd2ec41210..61aa24ff01 100644
--- a/keyboards/keebio/iris/keymaps/sethBarberee/config.h
+++ b/keyboards/keebio/iris/keymaps/sethBarberee/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-//#define USE_I2C
-
/* Select hand configuration */
//#define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/vyolle/config.h b/keyboards/keebio/iris/keymaps/vyolle/config.h
index 1adbd65b5a..49ad181d9b 100644
--- a/keyboards/keebio/iris/keymaps/vyolle/config.h
+++ b/keyboards/keebio/iris/keymaps/vyolle/config.h
@@ -17,11 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
#define USE_I2C
-// #define USE_SERIAL
-
#define FORCE_NKRO //Cause it's suprisingly handy.
diff --git a/keyboards/keebio/iris/keymaps/wanleg/config.h b/keyboards/keebio/iris/keymaps/wanleg/config.h
index 9b90007688..6e774d9de7 100644
--- a/keyboards/keebio/iris/keymaps/wanleg/config.h
+++ b/keyboards/keebio/iris/keymaps/wanleg/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
#undef USE_I2C
/* Select hand configuration */
diff --git a/keyboards/keebio/iris/keymaps/xyverz/config.h b/keyboards/keebio/iris/keymaps/xyverz/config.h
index d3fc22ca76..f6eb967943 100644
--- a/keyboards/keebio/iris/keymaps/xyverz/config.h
+++ b/keyboards/keebio/iris/keymaps/xyverz/config.h
@@ -1,33 +1,12 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.com>
+#pragma once
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "config_common.h"
-
-#define USE_SERIAL
#define EE_HANDS
#undef PRODUCT
-#define PRODUCT Iris Keyboard
+#define PRODUCT "Iris Keyboard"
#undef MANUFACTURER
-#define MANUFACTURER Ian Sterling
+#define MANUFACTURER "Ian Sterling"
#undef RGBLED_NUM
#define RGBLIGHT_ANIMATIONS
@@ -35,5 +14,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-
-#endif
diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h
index 7bc8c4132b..2f6d18efcd 100644
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/config.h
@@ -113,7 +113,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-# define DRIVER_LED_TOTAL RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# define RGB_MATRIX_SPLIT { 34, 34 }
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h
index 08863797fb..632514e87e 100644
--- a/keyboards/keebio/iris/rev6a/config.h
+++ b/keyboards/keebio/iris/rev6a/config.h
@@ -113,7 +113,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-# define DRIVER_LED_TOTAL RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# define RGB_MATRIX_SPLIT { 34, 34 }
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h
index 08863797fb..632514e87e 100644
--- a/keyboards/keebio/iris/rev6b/config.h
+++ b/keyboards/keebio/iris/rev6b/config.h
@@ -113,7 +113,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-# define DRIVER_LED_TOTAL RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# define RGB_MATRIX_SPLIT { 34, 34 }
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h
index 005f78e8a9..ee55576d8c 100644
--- a/keyboards/keebio/iris/rev7/config.h
+++ b/keyboards/keebio/iris/rev7/config.h
@@ -113,7 +113,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-# define DRIVER_LED_TOTAL RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# define RGB_MATRIX_SPLIT { 34, 34 }
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keebio/levinson/keymaps/drogglbecher/config.h b/keyboards/keebio/levinson/keymaps/drogglbecher/config.h
index ef96ff00b1..1beb80a649 100644
--- a/keyboards/keebio/levinson/keymaps/drogglbecher/config.h
+++ b/keyboards/keebio/levinson/keymaps/drogglbecher/config.h
@@ -3,11 +3,6 @@
#include "config_common.h"
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-/* #define USE_I2C */
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/levinson/keymaps/issmirnov/config.h b/keyboards/keebio/levinson/keymaps/issmirnov/config.h
index 2f0fbaf33c..6f6f362a8f 100644
--- a/keyboards/keebio/levinson/keymaps/issmirnov/config.h
+++ b/keyboards/keebio/levinson/keymaps/issmirnov/config.h
@@ -1,10 +1,5 @@
#pragma once
-// Use serial comms for split keyboard
-// DO NOT enable USE_IDC - board will not respond.
-#define USE_SERIAL
-//#define USE_I2C
-
#ifdef RGBLIGHT_ENABLE
// Enable animations. +5500 bytes
#define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/keebio/levinson/keymaps/losinggeneration/config.h b/keyboards/keebio/levinson/keymaps/losinggeneration/config.h
index 13023939eb..41bfb4651f 100644
--- a/keyboards/keebio/levinson/keymaps/losinggeneration/config.h
+++ b/keyboards/keebio/levinson/keymaps/losinggeneration/config.h
@@ -18,11 +18,6 @@ long with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-/* #define USE_I2C */
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/levinson/keymaps/mmacdougall/config.h b/keyboards/keebio/levinson/keymaps/mmacdougall/config.h
index 63dd5bc88f..e3012bbe06 100644
--- a/keyboards/keebio/levinson/keymaps/mmacdougall/config.h
+++ b/keyboards/keebio/levinson/keymaps/mmacdougall/config.h
@@ -1,10 +1,5 @@
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/levinson/keymaps/steno/config.h b/keyboards/keebio/levinson/keymaps/steno/config.h
index 9cbc148e42..630cc6238f 100644
--- a/keyboards/keebio/levinson/keymaps/steno/config.h
+++ b/keyboards/keebio/levinson/keymaps/steno/config.h
@@ -17,11 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
#define USE_I2C
-// #define USE_SERIAL
-
#define FORCE_NKRO //For Steno.
diff --git a/keyboards/keebio/levinson/keymaps/treadwell/config.h b/keyboards/keebio/levinson/keymaps/treadwell/config.h
index 69783937b2..47f85f6dc3 100644
--- a/keyboards/keebio/levinson/keymaps/treadwell/config.h
+++ b/keyboards/keebio/levinson/keymaps/treadwell/config.h
@@ -3,11 +3,6 @@
#include "config_common.h"
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/levinson/keymaps/xtonhasvim/config.h b/keyboards/keebio/levinson/keymaps/xtonhasvim/config.h
index aaf1b7f049..53847db93a 100644
--- a/keyboards/keebio/levinson/keymaps/xtonhasvim/config.h
+++ b/keyboards/keebio/levinson/keymaps/xtonhasvim/config.h
@@ -1,7 +1,5 @@
#pragma once
-#define USE_SERIAL
-
// #define MUSIC_MASK (keycode != KC_NO)
/*
diff --git a/keyboards/keebio/nyquist/keymaps/DivergeJM/README.md b/keyboards/keebio/nyquist/keymaps/DivergeJM/README.md
index 198e3ef887..86d764818b 100644
--- a/keyboards/keebio/nyquist/keymaps/DivergeJM/README.md
+++ b/keyboards/keebio/nyquist/keymaps/DivergeJM/README.md
@@ -173,7 +173,7 @@ The *MOUSE* layer contains keys replicating functions found on the mouse.
,-----------------------------------------. ,----------------------------------------.
| | | | | |RESET | | | | | | | |
|------+------+------+------+------+------| |-----+------+------+------+------+------|
-| | | | | | | | |TermOn|TermOf| | | Del |
+| | | | | | | | | | | | | Del |
|------+------+------+------+------+------| |-----+------+------+------+------+------|
| | | | | | | | |Qwerty|Colemk|Dvorak| | |
|------+------+------+------+------+------| |-----+------+------+------+------+------|
diff --git a/keyboards/keebio/nyquist/keymaps/DivergeJM/config.h b/keyboards/keebio/nyquist/keymaps/DivergeJM/config.h
index 776834111d..43696b046c 100644
--- a/keyboards/keebio/nyquist/keymaps/DivergeJM/config.h
+++ b/keyboards/keebio/nyquist/keymaps/DivergeJM/config.h
@@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TERM 150 //reduce time required to register a held key
-#define USE_SERIAL
-
// #define MASTER_LEFT
// #define MASTER_RIGHT
#define EE_HANDS
diff --git a/keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c b/keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c
index 8e8743766b..5cf639775e 100644
--- a/keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c
@@ -208,7 +208,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* ,-----------------------------------------. ,----------------------------------------.
* | | | | | |QK_BOOT | | | | | | | |
* |------+------+------+------+------+------| |-----+------+------+------+------+------|
- * | | | | | | | | |TermOn|TermOf| | | Del |
+ * | | | | | | | | | | | | | Del |
* |------+------+------+------+------+------| |-----+------+------+------+------+------|
* | | | | | | | | |Qwerty|Colemk|Dvorak| | |
* |------+------+------+------+------+------| |-----+------+------+------+------+------|
@@ -220,7 +220,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ADJUST] = LAYOUT(
_______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, \
- _______, _______, _______, _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
_______, _______, _______, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
diff --git a/keyboards/keebio/nyquist/keymaps/bramver/config.h b/keyboards/keebio/nyquist/keymaps/bramver/config.h
index c908386e28..468e59af07 100644
--- a/keyboards/keebio/nyquist/keymaps/bramver/config.h
+++ b/keyboards/keebio/nyquist/keymaps/bramver/config.h
@@ -16,7 +16,6 @@
#pragma once
-#define USE_SERIAL
#define MASTER_LEFT
#define TAPPING_TERM 200
diff --git a/keyboards/keebio/nyquist/keymaps/danielhklein/config.h b/keyboards/keebio/nyquist/keymaps/danielhklein/config.h
index 398b285b89..74499ede71 100644
--- a/keyboards/keebio/nyquist/keymaps/danielhklein/config.h
+++ b/keyboards/keebio/nyquist/keymaps/danielhklein/config.h
@@ -16,8 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#define TAPPING_TERM 150
-#define USE_SERIAL
+#define TAPPING_TERM 150
#define EE_HANDS
#ifdef SUBPROJECT_rev1
diff --git a/keyboards/keebio/nyquist/keymaps/jojiichan/config.h b/keyboards/keebio/nyquist/keymaps/jojiichan/config.h
index 39a3df26bf..544b7b7371 100644
--- a/keyboards/keebio/nyquist/keymaps/jojiichan/config.h
+++ b/keyboards/keebio/nyquist/keymaps/jojiichan/config.h
@@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../../config.h"
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/nyquist/keymaps/kim-kim/config.h b/keyboards/keebio/nyquist/keymaps/kim-kim/config.h
index a6246262e5..f3d8ae0a40 100644
--- a/keyboards/keebio/nyquist/keymaps/kim-kim/config.h
+++ b/keyboards/keebio/nyquist/keymaps/kim-kim/config.h
@@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
@@ -38,4 +33,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/keebio/nyquist/keymaps/losinggeneration/config.h b/keyboards/keebio/nyquist/keymaps/losinggeneration/config.h
index 56cacd843e..38d1939580 100644
--- a/keyboards/keebio/nyquist/keymaps/losinggeneration/config.h
+++ b/keyboards/keebio/nyquist/keymaps/losinggeneration/config.h
@@ -18,11 +18,6 @@ long with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-/* #define USE_I2C */
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/nyquist/keymaps/pitty/config.h b/keyboards/keebio/nyquist/keymaps/pitty/config.h
index efc75b22c7..b393e6a5f6 100644
--- a/keyboards/keebio/nyquist/keymaps/pitty/config.h
+++ b/keyboards/keebio/nyquist/keymaps/pitty/config.h
@@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../../config.h"
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c b/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c
index 96cf700bb8..176e53988c 100644
--- a/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | |MUSmod|Aud on|Audoff|AGnorm|AGswap| | | | | |
* |------+------+------+------+------+------+------+------+------+------+------+------|
- * | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf| | | |
+ * | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | | | | |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | M1 | M2 | M3 | | | | | <- | vv | ^^ | -> |
* `-----------------------------------------------------------------------------------'
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ADJUST] = LAYOUT_ortho_4x12(
_______, QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
_______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
- _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, TERM_ON, TERM_OFF, _______, _______, _______,
+ _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
KC_MS_BTN1, KC_MS_BTN2, KC_MS_BTN3, _______, _______, _______, _______, _______, KC_MS_LEFT, KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT
)
diff --git a/keyboards/keebio/nyquist/keymaps/shovelpaw/config.h b/keyboards/keebio/nyquist/keymaps/shovelpaw/config.h
index d0adbfe0c8..72e0e422d6 100644
--- a/keyboards/keebio/nyquist/keymaps/shovelpaw/config.h
+++ b/keyboards/keebio/nyquist/keymaps/shovelpaw/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/keyboards/keebio/nyquist/keymaps/skug/config.h b/keyboards/keebio/nyquist/keymaps/skug/config.h
index c366863294..532cdafa97 100644
--- a/keyboards/keebio/nyquist/keymaps/skug/config.h
+++ b/keyboards/keebio/nyquist/keymaps/skug/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-// #define USE_SERIAL
#define USE_I2C
/* Select hand configuration */
diff --git a/keyboards/keebio/nyquist/keymaps/yshrsmz/config.h b/keyboards/keebio/nyquist/keymaps/yshrsmz/config.h
index 5cbe3b7010..aafb73fa05 100644
--- a/keyboards/keebio/nyquist/keymaps/yshrsmz/config.h
+++ b/keyboards/keebio/nyquist/keymaps/yshrsmz/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* auto shift config */
#define AUTO_SHIFT_TIMEOUT 140
diff --git a/keyboards/keebio/quefrency/keymaps/bcat/config.h b/keyboards/keebio/quefrency/keymaps/bcat/config.h
index 69771d36ba..32510e9031 100644
--- a/keyboards/keebio/quefrency/keymaps/bcat/config.h
+++ b/keyboards/keebio/quefrency/keymaps/bcat/config.h
@@ -16,13 +16,6 @@
#pragma once
-/* Quefrency lacks I2C resistors on the right PCB, so the right half doesn't
- * work independently. (Presumably the floating I2C lines cause a problem.)
- * Using serial seems sufficiently fast in practice and allows both halves to be
- * used independently.
- */
-#define USE_SERIAL
-
/* Use an extra LED on the right side since it's wider on the 65% PCB. */
#undef RGBLED_NUM
#define RGBLED_NUM 17
diff --git a/keyboards/keebio/quefrency/keymaps/bfiedler/config.h b/keyboards/keebio/quefrency/keymaps/bfiedler/config.h
index e7d5ba9ca8..8a35b6f197 100644
--- a/keyboards/keebio/quefrency/keymaps/bfiedler/config.h
+++ b/keyboards/keebio/quefrency/keymaps/bfiedler/config.h
@@ -22,11 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
// https://docs.qmk.fm/#/tap_hold?id=tap-hold-configuration-options
#define TAPPING_TERM 120
//#define PERMISSIVE_HOLD
diff --git a/keyboards/keebio/quefrency/keymaps/bjohnson/config.h b/keyboards/keebio/quefrency/keymaps/bjohnson/config.h
index 37c6d6672d..82ace2ef68 100644
--- a/keyboards/keebio/quefrency/keymaps/bjohnson/config.h
+++ b/keyboards/keebio/quefrency/keymaps/bjohnson/config.h
@@ -21,11 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
#define TAPPING_TERM 500
#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/keebio/quefrency/keymaps/bramver/config.h b/keyboards/keebio/quefrency/keymaps/bramver/config.h
index c908386e28..468e59af07 100644
--- a/keyboards/keebio/quefrency/keymaps/bramver/config.h
+++ b/keyboards/keebio/quefrency/keymaps/bramver/config.h
@@ -16,7 +16,6 @@
#pragma once
-#define USE_SERIAL
#define MASTER_LEFT
#define TAPPING_TERM 200
diff --git a/keyboards/keebio/quefrency/keymaps/default60/config.h b/keyboards/keebio/quefrency/keymaps/default60/config.h
index f9efe78c5b..497e05b540 100644
--- a/keyboards/keebio/quefrency/keymaps/default60/config.h
+++ b/keyboards/keebio/quefrency/keymaps/default60/config.h
@@ -20,8 +20,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
diff --git a/keyboards/keebio/quefrency/keymaps/default65/config.h b/keyboards/keebio/quefrency/keymaps/default65/config.h
index f9efe78c5b..9aae0fdfc2 100644
--- a/keyboards/keebio/quefrency/keymaps/default65/config.h
+++ b/keyboards/keebio/quefrency/keymaps/default65/config.h
@@ -21,7 +21,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
diff --git a/keyboards/keebio/quefrency/keymaps/joestrong/config.h b/keyboards/keebio/quefrency/keymaps/joestrong/config.h
index f9efe78c5b..497e05b540 100644
--- a/keyboards/keebio/quefrency/keymaps/joestrong/config.h
+++ b/keyboards/keebio/quefrency/keymaps/joestrong/config.h
@@ -20,8 +20,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
diff --git a/keyboards/keebio/quefrency/keymaps/jonavin/config.h b/keyboards/keebio/quefrency/keymaps/jonavin/config.h
index b7883424bc..495638123a 100644
--- a/keyboards/keebio/quefrency/keymaps/jonavin/config.h
+++ b/keyboards/keebio/quefrency/keymaps/jonavin/config.h
@@ -22,11 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
#define TAPPING_TOGGLE 2
// TT set to two taps
diff --git a/keyboards/keebio/quefrency/keymaps/kingwangwong/config.h b/keyboards/keebio/quefrency/keymaps/kingwangwong/config.h
index bf632842e9..f636c95454 100644
--- a/keyboards/keebio/quefrency/keymaps/kingwangwong/config.h
+++ b/keyboards/keebio/quefrency/keymaps/kingwangwong/config.h
@@ -21,10 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-//#define USE_I2C
#define USB_MAX_POWER_CONSUMPTION 50
diff --git a/keyboards/keebio/quefrency/keymaps/rogthefrog/config.h b/keyboards/keebio/quefrency/keymaps/rogthefrog/config.h
index 2332c4f523..0eefd14dfe 100644
--- a/keyboards/keebio/quefrency/keymaps/rogthefrog/config.h
+++ b/keyboards/keebio/quefrency/keymaps/rogthefrog/config.h
@@ -21,8 +21,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
diff --git a/keyboards/keebio/quefrency/keymaps/unausgeschlafen/config.h b/keyboards/keebio/quefrency/keymaps/unausgeschlafen/config.h
index f9efe78c5b..497e05b540 100644
--- a/keyboards/keebio/quefrency/keymaps/unausgeschlafen/config.h
+++ b/keyboards/keebio/quefrency/keymaps/unausgeschlafen/config.h
@@ -20,8 +20,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
diff --git a/keyboards/keebio/quefrency/keymaps/yoryer/config.h b/keyboards/keebio/quefrency/keymaps/yoryer/config.h
index f9efe78c5b..497e05b540 100644
--- a/keyboards/keebio/quefrency/keymaps/yoryer/config.h
+++ b/keyboards/keebio/quefrency/keymaps/yoryer/config.h
@@ -20,8 +20,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
index ed948a4b3b..0915bbba18 100644
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
+++ b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
@@ -1,8 +1,5 @@
#pragma once
-/* Use I2C or Serial, not both */
-
-// #define USE_SERIAL
#define USE_I2C
/* Select hand configuration */
diff --git a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h
index 2048232c9c..3b95b3c4d7 100644
--- a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h
+++ b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h
@@ -1,8 +1,5 @@
#pragma once
-/* Use I2C or Serial, not both */
-
-// #define USE_SERIAL
#define USE_I2C
/* Select hand configuration */
diff --git a/keyboards/keebio/sinc/keymaps/sethBarberee/config.h b/keyboards/keebio/sinc/keymaps/sethBarberee/config.h
index 2d66aefc3e..343567273d 100644
--- a/keyboards/keebio/sinc/keymaps/sethBarberee/config.h
+++ b/keyboards/keebio/sinc/keymaps/sethBarberee/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-//
-//#define USE_SERIAL
-//#define USE_I2C
-
//#ifdef RGBLIGHT_ENABLE
//# ifdef NORMAL_MODE
//# undef NORMAL_MODE
diff --git a/keyboards/keebio/stick/config.h b/keyboards/keebio/stick/config.h
index 8166510921..8539a6d49d 100644
--- a/keyboards/keebio/stick/config.h
+++ b/keyboards/keebio/stick/config.h
@@ -44,7 +44,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_ANIMATIONS
// RGB Matrix
# ifdef RGB_MATRIX_ENABLE
-# define DRIVER_LED_TOTAL RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT RGBLED_NUM
// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/keebio/viterbi/keymaps/drashna/config.h b/keyboards/keebio/viterbi/keymaps/drashna/config.h
index 2decb3b3e9..cd640ec8d5 100644
--- a/keyboards/keebio/viterbi/keymaps/drashna/config.h
+++ b/keyboards/keebio/viterbi/keymaps/drashna/config.h
@@ -31,7 +31,7 @@
#endif // RGBLIGHT_ENABLE
#undef PRODUCT
-#define PRODUCT Drashnas Viterbi Macro Pad
+#define PRODUCT "Drashnas Viterbi Macro Pad"
#ifdef AUDIO_ENABLE
# define AUDIO_PIN C6