Migrate recently introduced sync items (#22305)

57 files changed, 195 insertions, 111 deletions

diff --git a/keyboards/ai03/orbit/config.h b/keyboards/ai03/orbit/config.h
index f4157a1729..53a057875f 100644
--- a/keyboards/ai03/orbit/config.h
+++ b/keyboards/ai03/orbit/config.h
@@ -19,9 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SELECT_SOFT_SERIAL_SPEED 1
 
-#define SPLIT_LED_STATE_ENABLE
-#define SPLIT_LAYER_STATE_ENABLE
-
 #define SPLIT_HAND_PIN D5
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/ai03/orbit/info.json b/keyboards/ai03/orbit/info.json
index 4c5cd1ee51..d7ff0b786c 100644
--- a/keyboards/ai03/orbit/info.json
+++ b/keyboards/ai03/orbit/info.json
@@ -23,6 +23,12 @@
                 "cols": ["D4", "D6", "F1", "F0", "F4", "F5", "C6"],
                 "rows": ["B6", "B5", "B4", "D7", "E6"]
             }
+        },
+        "transport":{
+            "sync" :{
+                "indicators": true,
+                "layer_state": true
+            }
         }
     },
     "processor": "atmega32u4",
diff --git a/keyboards/boardsource/unicorne/config.h b/keyboards/boardsource/unicorne/config.h
index d0d466bb54..5843a0c847 100644
--- a/keyboards/boardsource/unicorne/config.h
+++ b/keyboards/boardsource/unicorne/config.h
@@ -8,8 +8,6 @@
 
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 
-#define SPLIT_LAYER_STATE_ENABLE
-
 #define I2C_DRIVER I2CD1
 #define I2C1_SDA_PIN GP22
 #define I2C1_SCL_PIN GP23
diff --git a/keyboards/boardsource/unicorne/info.json b/keyboards/boardsource/unicorne/info.json
index aeeb348125..4184c870fe 100644
--- a/keyboards/boardsource/unicorne/info.json
+++ b/keyboards/boardsource/unicorne/info.json
@@ -20,7 +20,12 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "GP0"
+        "soft_serial_pin": "GP0",
+        "transport": {
+            "sync": {
+                "layer_state": true
+            }
+        }
     },
     "usb": {
         "device_version": "1.0.0",
diff --git a/keyboards/buzzard/rev1/config.h b/keyboards/buzzard/rev1/config.h
index f29441fac8..36313a1c6a 100644
--- a/keyboards/buzzard/rev1/config.h
+++ b/keyboards/buzzard/rev1/config.h
@@ -10,7 +10,6 @@
 
 #ifdef OLED_ENABLE
 #define OLED_DISPLAY_128X32
-#define SPLIT_OLED_ENABLE
 #endif
 
 #ifdef PS2_DRIVER_INTERRUPT
diff --git a/keyboards/buzzard/rev1/info.json b/keyboards/buzzard/rev1/info.json
index d0fa9603f7..0e7d246ae3 100644
--- a/keyboards/buzzard/rev1/info.json
+++ b/keyboards/buzzard/rev1/info.json
@@ -14,7 +14,12 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "transport": {
+            "sync": {
+                "oled": true
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/clickety_split/leeloo/rev2/info.json b/keyboards/clickety_split/leeloo/rev2/info.json
index 7fc4792f21..6db77714a4 100644
--- a/keyboards/clickety_split/leeloo/rev2/info.json
+++ b/keyboards/clickety_split/leeloo/rev2/info.json
@@ -8,7 +8,9 @@
     },
     "split": {
         "transport": {
-            "sync_matrix_state": true
+            "sync" :{
+                "matrix_state": true
+            }
         }
     },
     "rgblight": {
diff --git a/keyboards/clickety_split/leeloo/rev3/info.json b/keyboards/clickety_split/leeloo/rev3/info.json
index 9e6727a9e6..2c92f5226e 100644
--- a/keyboards/clickety_split/leeloo/rev3/info.json
+++ b/keyboards/clickety_split/leeloo/rev3/info.json
@@ -7,9 +7,11 @@
         "rgb_matrix": true
     },
     "split": {
-        "transport": {
-            "sync_matrix_state": true
+      "transport": {
+        "sync" :{
+          "matrix_state": true
         }
+      }
     },
     "rgblight": {
       "led_count": 58,
diff --git a/keyboards/controllerworks/mini36/config.h b/keyboards/controllerworks/mini36/config.h
index 3a094c2fd1..4a0c48b1b0 100644
--- a/keyboards/controllerworks/mini36/config.h
+++ b/keyboards/controllerworks/mini36/config.h
@@ -22,11 +22,6 @@
 #define RGB_MATRIX_SPLIT \
         { 24, 24 }
 
-#define SPLIT_TRANSPORT_MIRROR
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_LED_STATE_ENABLE
-#define SPLIT_MODS_ENABLE
-
 #define I2C_DRIVER I2CD0
 #define I2C1_SCL_PIN GP25
 #define I2C1_SDA_PIN GP24
diff --git a/keyboards/controllerworks/mini36/info.json b/keyboards/controllerworks/mini36/info.json
index 534dee94f1..3a49b210ac 100644
--- a/keyboards/controllerworks/mini36/info.json
+++ b/keyboards/controllerworks/mini36/info.json
@@ -41,7 +41,13 @@
         },
         "soft_serial_pin": "GP1",
         "transport": {
-            "protocol": "serial"
+            "protocol": "serial",
+            "sync": {
+                "indicators": true,
+                "layer_state": true,
+                "matrix_state": true,
+                "modifiers": true
+            }
         }
     },
     "features": {
diff --git a/keyboards/controllerworks/mini42/config.h b/keyboards/controllerworks/mini42/config.h
index e7fc529592..20b6bbac8d 100644
--- a/keyboards/controllerworks/mini42/config.h
+++ b/keyboards/controllerworks/mini42/config.h
@@ -20,11 +20,6 @@
 #define WS2812_PIO_USE_PIO1
 #define RGB_MATRIX_LED_COUNT 54
 
-#define SPLIT_TRANSPORT_MIRROR
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_LED_STATE_ENABLE
-#define SPLIT_MODS_ENABLE
-
 #undef I2C_DRIVER
 #define I2C_DRIVER I2CD0
 #undef I2C1_SCL_PIN
diff --git a/keyboards/controllerworks/mini42/info.json b/keyboards/controllerworks/mini42/info.json
index ae70408a9f..c8c436c08f 100644
--- a/keyboards/controllerworks/mini42/info.json
+++ b/keyboards/controllerworks/mini42/info.json
@@ -42,7 +42,13 @@
         },
         "soft_serial_pin": "GP1",
         "transport": {
-            "protocol": "serial"
+            "protocol": "serial",
+            "sync": {
+                "indicators": true,
+                "layer_state": true,
+                "matrix_state": true,
+                "modifiers": true
+            }
         }
     },
     "features": {
diff --git a/keyboards/handwired/tsubasa/config.h b/keyboards/handwired/tsubasa/config.h
index 52b64de9f6..a2cd2dafe6 100644
--- a/keyboards/handwired/tsubasa/config.h
+++ b/keyboards/handwired/tsubasa/config.h
@@ -17,6 +17,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 #define MASTER_RIGHT
-
-#define SPLIT_WPM_ENABLE
-#define SPLIT_LAYER_STATE_ENABLE
diff --git a/keyboards/handwired/tsubasa/info.json b/keyboards/handwired/tsubasa/info.json
index 245afe30cc..62c418c995 100644
--- a/keyboards/handwired/tsubasa/info.json
+++ b/keyboards/handwired/tsubasa/info.json
@@ -38,6 +38,12 @@
                     {"pin_a": "F4", "pin_b": "F5"}
                 ]
             }
+        },
+        "transport": {
+            "sync": {
+                "layer_state": true,
+                "wpm": true
+            }
         }
     },
     "layouts": {
diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h
index 212d0e1e38..7ab494522a 100644
--- a/keyboards/helix/rev2/config.h
+++ b/keyboards/helix/rev2/config.h
@@ -21,9 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define QUICK_TAP_TERM 0
 
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_LED_STATE_ENABLE
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/helix/rev2/info.json b/keyboards/helix/rev2/info.json
index 0056ba90b1..aac3cc9dbb 100644
--- a/keyboards/helix/rev2/info.json
+++ b/keyboards/helix/rev2/info.json
@@ -14,7 +14,13 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "layer_state": true
+            }
+        }
     },
     "tapping": {
         "term": 100
diff --git a/keyboards/hotdox76v2/config.h b/keyboards/hotdox76v2/config.h
index f469aa475f..3d80775073 100644
--- a/keyboards/hotdox76v2/config.h
+++ b/keyboards/hotdox76v2/config.h
@@ -30,11 +30,6 @@
 #define RGB_MATRIX_CENTER \
     { 112, 32 }
 
-#define SPLIT_TRANSPORT_MIRROR
-#define SPLIT_MODS_ENABLE
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_LED_STATE_ENABLE
-#define SPLIT_OLED_ENABLE
 #define SPLIT_TRANSACTION_IDS_KB KEYBOARD_CURRENT_ALPA_SYNC
 
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/hotdox76v2/info.json b/keyboards/hotdox76v2/info.json
index c66bd5eb8a..a42bdb3a79 100644
--- a/keyboards/hotdox76v2/info.json
+++ b/keyboards/hotdox76v2/info.json
@@ -27,7 +27,16 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "layer_state": true,
+                "matrix_state": true,
+                "modifiers": true,
+                "oled": true
+            }
+        }
     },
     "ws2812": {
         "pin": "D3"
diff --git a/keyboards/jorne/rev1/config.h b/keyboards/jorne/rev1/config.h
index 623aaf149c..3b854d3afc 100644
--- a/keyboards/jorne/rev1/config.h
+++ b/keyboards/jorne/rev1/config.h
@@ -7,5 +7,3 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_LED_STATE_ENABLE
diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json
index 1b1f156fa5..f76b9c0e7d 100644
--- a/keyboards/jorne/rev1/info.json
+++ b/keyboards/jorne/rev1/info.json
@@ -14,7 +14,13 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "layer_state": true
+            }
+        }
     },
     "rgblight": {
         "led_count": 56,
diff --git a/keyboards/kapl/rev1/config.h b/keyboards/kapl/rev1/config.h
index c5c9ada22b..db7eaaee49 100644
--- a/keyboards/kapl/rev1/config.h
+++ b/keyboards/kapl/rev1/config.h
@@ -8,7 +8,6 @@
 #define RGB_MATRIX_LED_COUNT 88
 #define RGB_MATRIX_SPLIT { 44, 44 }
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-#define SPLIT_TRANSPORT_MIRROR
 
 #ifdef RGB_MATRIX_ENABLE
 // EFFECTS
@@ -41,6 +40,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_LED_STATE_ENABLE
diff --git a/keyboards/kapl/rev1/info.json b/keyboards/kapl/rev1/info.json
index 5ef44ccaaa..b649c055ac 100644
--- a/keyboards/kapl/rev1/info.json
+++ b/keyboards/kapl/rev1/info.json
@@ -36,7 +36,14 @@
   },
   "diode_direction": "COL2ROW",
   "split": {
-    "soft_serial_pin": "D2"
+    "soft_serial_pin": "D2",
+    "transport": {
+      "sync": {
+          "indicators": true,
+          "layer_state": true,
+          "matrix_state": true
+      }
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
diff --git a/keyboards/keebio/iris/rev8/info.json b/keyboards/keebio/iris/rev8/info.json
index 7d75640801..998cde201d 100644
--- a/keyboards/keebio/iris/rev8/info.json
+++ b/keyboards/keebio/iris/rev8/info.json
@@ -31,7 +31,9 @@
             }
         },
         "transport": {
-            "sync_matrix_state": true
+            "sync" :{
+                "matrix_state": true
+            }
         }
     },
     "processor": "RP2040",
diff --git a/keyboards/keebio/nyquist/rev4/info.json b/keyboards/keebio/nyquist/rev4/info.json
index d18af71952..043bb02f01 100644
--- a/keyboards/keebio/nyquist/rev4/info.json
+++ b/keyboards/keebio/nyquist/rev4/info.json
@@ -28,7 +28,9 @@
             }
         },
         "transport": {
-            "sync_matrix_state": true
+            "sync" :{
+                "matrix_state": true
+            }
         }
     },
     "matrix_pins": {
diff --git a/keyboards/keebio/sinc/rev1/config.h b/keyboards/keebio/sinc/rev1/config.h
index 8894354d43..2d2c772422 100644
--- a/keyboards/keebio/sinc/rev1/config.h
+++ b/keyboards/keebio/sinc/rev1/config.h
@@ -23,8 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Synchronize Caps Lock LED across halves */
-#define SPLIT_LED_STATE_ENABLE
 
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
diff --git a/keyboards/keebio/sinc/rev1/info.json b/keyboards/keebio/sinc/rev1/info.json
index 5ddb54ee60..0829cae6e7 100644
--- a/keyboards/keebio/sinc/rev1/info.json
+++ b/keyboards/keebio/sinc/rev1/info.json
@@ -18,7 +18,10 @@
         "enabled": true,
         "soft_serial_pin": "D0",
         "transport": {
-            "protocol": "serial"
+            "protocol": "serial",
+            "sync" :{
+                "indicators": true
+            }
         },
         "encoder": {
             "right": {
diff --git a/keyboards/keebio/sinc/rev2/config.h b/keyboards/keebio/sinc/rev2/config.h
index 8894354d43..2d2c772422 100644
--- a/keyboards/keebio/sinc/rev2/config.h
+++ b/keyboards/keebio/sinc/rev2/config.h
@@ -23,8 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Synchronize Caps Lock LED across halves */
-#define SPLIT_LED_STATE_ENABLE
 
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
diff --git a/keyboards/keebio/sinc/rev2/info.json b/keyboards/keebio/sinc/rev2/info.json
index 0c86727abe..5b74d17b1a 100644
--- a/keyboards/keebio/sinc/rev2/info.json
+++ b/keyboards/keebio/sinc/rev2/info.json
@@ -18,7 +18,10 @@
         "enabled": true,
         "soft_serial_pin": "D0",
         "transport": {
-            "protocol": "serial"
+            "protocol": "serial",
+            "sync" :{
+                "indicators": true
+            }
         },
         "encoder": {
             "right": {
diff --git a/keyboards/keychron/q11/info.json b/keyboards/keychron/q11/info.json
index 7a56725324..f240c70801 100755
--- a/keyboards/keychron/q11/info.json
+++ b/keyboards/keychron/q11/info.json
@@ -44,7 +44,9 @@
         },
         "transport": {
             "protocol": "serial_usart",
-            "sync_matrix_state": true
+            "sync" :{
+                "matrix_state": true
+            }
         },
         "bootmagic": {
             "matrix": [6, 7]
diff --git a/keyboards/lime/rev1/config.h b/keyboards/lime/rev1/config.h
index ef4f99076d..ec2c061372 100644
--- a/keyboards/lime/rev1/config.h
+++ b/keyboards/lime/rev1/config.h
@@ -24,8 +24,3 @@
 #endif
 
 #define SPLIT_USB_DETECT
-
-#ifdef WPM_ENABLE
-#    define SPLIT_WPM_ENABLE
-#endif
-
diff --git a/keyboards/lime/rev1/info.json b/keyboards/lime/rev1/info.json
index 13caf33841..19ac7dfda2 100644
--- a/keyboards/lime/rev1/info.json
+++ b/keyboards/lime/rev1/info.json
@@ -26,6 +26,11 @@
                     {"pin_a": "F4", "pin_b": "F5", "resolution": 2}
                 ]
             }
+        },
+        "transport": {
+            "sync": {
+                "wpm": true
+            }
         }
     },
     "tapping": {
diff --git a/keyboards/mechwild/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h
index 219a4ec7b0..d62d7b49f0 100644
--- a/keyboards/mechwild/mokulua/mirrored/config.h
+++ b/keyboards/mechwild/mokulua/mirrored/config.h
@@ -7,10 +7,6 @@
 
 #define MASTER_LEFT
 //#define MASTER_RIGHT
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_LED_STATE_ENABLE
-#define SPLIT_MODS_ENABLE
-#define SPLIT_OLED_ENABLE
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json
index 5221238784..7289147e6b 100644
--- a/keyboards/mechwild/mokulua/mirrored/info.json
+++ b/keyboards/mechwild/mokulua/mirrored/info.json
@@ -22,7 +22,15 @@
         "tap_keycode_delay": 10
     },
     "split": {
-        "soft_serial_pin": "D3"
+        "soft_serial_pin": "D3",
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "layer_state": true,
+                "modifiers": true,
+                "oled": true
+            }
+        }
     },
     "rgblight": {
         "saturation_steps": 8,
diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/standard/config.h
index f13e1e582a..953e53c236 100644
--- a/keyboards/mechwild/mokulua/standard/config.h
+++ b/keyboards/mechwild/mokulua/standard/config.h
@@ -7,10 +7,6 @@
 
 #define MASTER_LEFT
 //#define MASTER_RIGHT
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_LED_STATE_ENABLE
-#define SPLIT_MODS_ENABLE
-#define SPLIT_OLED_ENABLE
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json
index 05ca6775df..da82447980 100644
--- a/keyboards/mechwild/mokulua/standard/info.json
+++ b/keyboards/mechwild/mokulua/standard/info.json
@@ -22,7 +22,15 @@
         "tap_keycode_delay": 10
     },
     "split": {
-        "soft_serial_pin": "D3"
+        "soft_serial_pin": "D3",
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "layer_state": true,
+                "modifiers": true,
+                "oled": true
+            }
+        }
     },
     "rgblight": {
         "saturation_steps": 8,
diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h
index b351e66d2c..90ea0bd56c 100644
--- a/keyboards/mlego/m60_split/rev1/config.h
+++ b/keyboards/mlego/m60_split/rev1/config.h
@@ -15,10 +15,6 @@
  */
 #pragma once
 
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_LED_STATE_ENABLE
-
-
 #define SPLIT_HAND_PIN B9
 #define SERIAL_USART_TX_PIN B6
 #define SERIAL_USART_SPEED 921600
diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json
index 3d66633ac9..89744c8b86 100644
--- a/keyboards/mlego/m60_split/rev1/info.json
+++ b/keyboards/mlego/m60_split/rev1/info.json
@@ -47,6 +47,12 @@
                 "cols": ["B0", "A3", "A2", "A1", "B7", "B5"],
                 "rows": ["B1", "A4", "A5", "A6", "A7"]
             }
+        },
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "layer_state": true
+            }
         }
     },
     "processor": "STM32F401",
diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h
index bf60a6966c..82ea1b37e3 100644
--- a/keyboards/mlego/m60_split/rev2/config.h
+++ b/keyboards/mlego/m60_split/rev2/config.h
@@ -15,10 +15,6 @@
  */
 #pragma once
 
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_LED_STATE_ENABLE
-
-
 #define SPLIT_HAND_PIN B9
 #define SERIAL_USART_TX_PIN B6
 
diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json
index 1ba28e0a52..4ba6442443 100644
--- a/keyboards/mlego/m60_split/rev2/info.json
+++ b/keyboards/mlego/m60_split/rev2/info.json
@@ -46,6 +46,12 @@
                 "cols": ["B0", "A3", "A2", "A1", "B7", "B5"],
                 "rows": ["B1", "A4", "A5", "A6", "A7"]
             }
+        },
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "layer_state": true
+            }
         }
     },
     "processor": "STM32F411",
diff --git a/keyboards/nullbitsco/snap/config.h b/keyboards/nullbitsco/snap/config.h
index d9fe16e285..9559a34352 100644
--- a/keyboards/nullbitsco/snap/config.h
+++ b/keyboards/nullbitsco/snap/config.h
@@ -59,6 +59,3 @@
 
 /* Optional speaker pin */
 #define AUDIO_PIN B6
-
-/* Optional split transactions */
-#define SPLIT_OLED_ENABLE
diff --git a/keyboards/nullbitsco/snap/info.json b/keyboards/nullbitsco/snap/info.json
index f235fce511..65cd463708 100644
--- a/keyboards/nullbitsco/snap/info.json
+++ b/keyboards/nullbitsco/snap/info.json
@@ -37,6 +37,11 @@
                     {"pin_a": "B4", "pin_b": "B5"}
                 ]
             }
+        },
+        "transport": {
+            "sync": {
+                "oled": true
+            }
         }
     },
     "ws2812": {
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index baf495b534..87a7fe1319 100644
--- a/keyboards/rgbkb/mun/config.h
+++ b/keyboards/rgbkb/mun/config.h
@@ -41,9 +41,6 @@
 #endif
 
 /* Split Transport Features */
-#define SPLIT_TRANSPORT_MIRROR
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_LED_STATE_ENABLE
 #define SPLIT_TRANSACTION_IDS_KB TOUCH_ENCODER_SYNC, RGB_MENU_SYNC
 
 #define RGB_MATRIX_LED_COUNT 98
diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json
index 91b60e76c3..96d1a18e81 100644
--- a/keyboards/rgbkb/mun/rev1/info.json
+++ b/keyboards/rgbkb/mun/rev1/info.json
@@ -52,7 +52,14 @@
         "tap_keycode_delay": 5
     },
     "split": {
-        "soft_serial_pin": "A9"
+        "soft_serial_pin": "A9",
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "layer_state": true,
+                "matrix_state": true
+            }
+        }
     },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h
index 575e5bcd95..4ce1c60343 100644
--- a/keyboards/rgbkb/sol3/config.h
+++ b/keyboards/rgbkb/sol3/config.h
@@ -41,9 +41,6 @@
 #endif
 
 /* Split Transport Features */
-#define SPLIT_TRANSPORT_MIRROR
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_LED_STATE_ENABLE
 #define SPLIT_TRANSACTION_IDS_KB TOUCH_ENCODER_SYNC, RGB_MENU_SYNC
 
 /* LED Turbo DIP Switch */
diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json
index 7d3db933a8..19e5719cd6 100644
--- a/keyboards/rgbkb/sol3/rev1/info.json
+++ b/keyboards/rgbkb/sol3/rev1/info.json
@@ -65,6 +65,13 @@
                 "cols": ["B9", "B8", "B4", "A6", "A3", "B10", "B12", "B11"],
                 "rows": ["B15", "B14", "A8", "A13", "A7", null]
             }
+        },
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "layer_state": true,
+                "matrix_state": true
+            }
         }
     },
     "qmk": {
diff --git a/keyboards/sofle/keyhive/config.h b/keyboards/sofle/keyhive/config.h
index 1e90cbab48..cda0be789e 100755
--- a/keyboards/sofle/keyhive/config.h
+++ b/keyboards/sofle/keyhive/config.h
@@ -21,7 +21,3 @@
 // OLED settings
 #define OLED_TIMEOUT    80000
 #define OLED_BRIGHTNESS 90
-
-#define SPLIT_WPM_ENABLE
-#define SPLIT_OLED_ENABLE
-#define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/sofle/keyhive/info.json b/keyboards/sofle/keyhive/info.json
index 1f7ae8b209..ae7c4a1935 100644
--- a/keyboards/sofle/keyhive/info.json
+++ b/keyboards/sofle/keyhive/info.json
@@ -41,6 +41,13 @@
                 "cols": ["F6", "F7", "B1", "B3", "B2", "B6", null],
                 "rows": ["C6", "D7", "E6", "B4", "B5"]
             }
+        },
+        "transport": {
+            "sync": {
+                "matrix_state": true,
+                "oled": true,
+                "wpm": true
+            }
         }
     },
     "qmk": {
diff --git a/keyboards/spleeb/config.h b/keyboards/spleeb/config.h
index 8a6fb13c4e..64a1fb09ba 100644
--- a/keyboards/spleeb/config.h
+++ b/keyboards/spleeb/config.h
@@ -7,10 +7,6 @@
 // the touch sensor to be on the master side
 #define MASTER_RIGHT
 
-// Sync later, led, and mod state for use on OLED on slave side
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_LED_STATE_ENABLE
-#define SPLIT_MODS_ENABLE
 // Transport dpi and enc mode for display on oled
 #define SPLIT_TRANSACTION_IDS_KB RPC_ID_KB_CONFIG_SYNC
 
diff --git a/keyboards/spleeb/info.json b/keyboards/spleeb/info.json
index e03faa7c3e..7b92316de2 100644
--- a/keyboards/spleeb/info.json
+++ b/keyboards/spleeb/info.json
@@ -36,6 +36,13 @@
                     {"pin_a": "GP21", "pin_b": "GP4"}
                 ]
             }
+        },
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "layer_state": true,
+                "modifiers": true
+            }
         }
     },
     "url": "https://github.com/chrishoage/spleeb",
diff --git a/keyboards/stront/config.h b/keyboards/stront/config.h
index 4c88e411ac..13c76a80e2 100644
--- a/keyboards/stront/config.h
+++ b/keyboards/stront/config.h
@@ -13,8 +13,6 @@
 
 /* any side can be master by default, enable split sync to support it */
 #define EE_HANDS
-#define SPLIT_LED_STATE_ENABLE
-#define SPLIT_MODS_ENABLE
 #define SPLIT_POINTING_ENABLE
 
 /* SPI config for display/touchpad */
diff --git a/keyboards/stront/info.json b/keyboards/stront/info.json
index cd418aa246..40be364688 100644
--- a/keyboards/stront/info.json
+++ b/keyboards/stront/info.json
@@ -61,7 +61,13 @@
         "rows": ["GP28", "GP27", "GP26", "GP15"]
     },
     "split": {
-        "enabled": true
+        "enabled": true,
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "modifiers": true
+            }
+        }
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/tweetydabird/lotus58/config.h b/keyboards/tweetydabird/lotus58/config.h
index de32af4284..4175568d40 100644
--- a/keyboards/tweetydabird/lotus58/config.h
+++ b/keyboards/tweetydabird/lotus58/config.h
@@ -7,6 +7,3 @@
 #define RGBLIGHT_DEFAULT_VAL 87
 
 #define SPLIT_HAND_PIN B5
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_LED_STATE_ENABLE
-#define SPLIT_OLED_ENABLE
diff --git a/keyboards/tweetydabird/lotus58/info.json b/keyboards/tweetydabird/lotus58/info.json
index a222dec8de..4e41fcc7bd 100644
--- a/keyboards/tweetydabird/lotus58/info.json
+++ b/keyboards/tweetydabird/lotus58/info.json
@@ -56,8 +56,13 @@
         "soft_serial_pin": "D2",
         "transport": {
             "protocol": "serial",
-            "sync_matrix_state": true,
-            "sync_modifiers": true
+            "sync": {
+                "indicators": true,
+                "layer_state": true,
+                "matrix_state": true,
+                "modifiers": true,
+                "oled": true
+            }
         },
         "usb_detect": {
             "enabled": true
diff --git a/keyboards/tzarc/djinn/config.h b/keyboards/tzarc/djinn/config.h
index af98f887db..74bb00edc2 100644
--- a/keyboards/tzarc/djinn/config.h
+++ b/keyboards/tzarc/djinn/config.h
@@ -11,12 +11,6 @@
 
 // Split configuration
 #define SPLIT_TRANSACTION_IDS_KB RPC_ID_SYNC_STATE_KB
-#define SPLIT_TRANSPORT_MIRROR
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_LED_STATE_ENABLE
-#define SPLIT_MODS_ENABLE
-#define SPLIT_WPM_ENABLE
-#define SPLIT_ACTIVITY_ENABLE
 
 // SPI Configuration
 #define SPI_DRIVER SPID3
diff --git a/keyboards/tzarc/djinn/info.json b/keyboards/tzarc/djinn/info.json
index 8f47f35027..1546369307 100644
--- a/keyboards/tzarc/djinn/info.json
+++ b/keyboards/tzarc/djinn/info.json
@@ -52,6 +52,16 @@
           {"pin_a": "C15", "pin_b": "C14", "resolution": 2}
         ]
       }
+    },
+    "transport": {
+      "sync": {
+          "activity": true,
+          "indicators": true,
+          "layer_state": true,
+          "matrix_state": true,
+          "modifiers": true,
+          "wpm": true
+      }
     }
   },
   "encoder": {
diff --git a/keyboards/waterfowl/config.h b/keyboards/waterfowl/config.h
index 2ddc7228d4..bba96732cb 100644
--- a/keyboards/waterfowl/config.h
+++ b/keyboards/waterfowl/config.h
@@ -17,6 +17,5 @@
 #pragma once
 
 #define OLED_DISPLAY_128X64
-#define SPLIT_MODS_ENABLE
-#define SPLIT_WPM_ENABLE
+
 #define SPLIT_USB_DETECT
diff --git a/keyboards/waterfowl/info.json b/keyboards/waterfowl/info.json
index ff8af90fb3..159773a1c9 100644
--- a/keyboards/waterfowl/info.json
+++ b/keyboards/waterfowl/info.json
@@ -20,7 +20,13 @@
         ]
     },
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "transport": {
+            "sync": {
+                "modifiers": true,
+                "wpm": true
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",