107 files changed, 324 insertions, 1282 deletions
diff --git a/keyboards/kindakeyboards/conone65/config.h b/keyboards/kindakeyboards/conone65/config.h
deleted file mode 100644
index d3147b115a..0000000000
--- a/keyboards/kindakeyboards/conone65/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 Kindakeyboards
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kindakeyboards/conone65/keyboard.json b/keyboards/kindakeyboards/conone65/keyboard.json
index 0c44723f62..6786b6a3d5 100644
--- a/keyboards/kindakeyboards/conone65/keyboard.json
+++ b/keyboards/kindakeyboards/conone65/keyboard.json
@@ -16,6 +16,12 @@
        "mousekey": true,
        "nkro": false
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["B7", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F6", "F5", "F4", "F1", "F0", "D0"],
        "rows": ["D5", "D3", "E6", "D1", "D2"]
diff --git a/keyboards/kinesis/config.h b/keyboards/kinesis/config.h
index 52ea641d6e..e8381f8635 100644
--- a/keyboards/kinesis/config.h
+++ b/keyboards/kinesis/config.h
@@ -26,11 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_WHEEL_DELTA 1
 #define MOUSEKEY_WHEEL_TIME_TO_MAX 1
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/kinesis/info.json b/keyboards/kinesis/info.json
index 4454639ab0..49025977bd 100644
--- a/keyboards/kinesis/info.json
+++ b/keyboards/kinesis/info.json
@@ -1,4 +1,10 @@
 {
  "url": "",
-  "maintainer": "qmk"
+  "maintainer": "qmk",
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  }
 }
diff --git a/keyboards/kingly_keys/ave/config.h b/keyboards/kingly_keys/ave/config.h
deleted file mode 100644
index e43087b697..0000000000
--- a/keyboards/kingly_keys/ave/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
- /* 
- Copyright 2020 Garret Gartner
-  
- 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/>. 
- */ 
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kingly_keys/ave/ortho/keyboard.json b/keyboards/kingly_keys/ave/ortho/keyboard.json
index 8c91b27615..d277e68e47 100644
--- a/keyboards/kingly_keys/ave/ortho/keyboard.json
+++ b/keyboards/kingly_keys/ave/ortho/keyboard.json
@@ -18,6 +18,12 @@
    "nkro": false,
    "rgblight": true
  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "matrix_pins": {
    "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
    "rows": ["B3", "F4", "F7", "F6", "F5"]
diff --git a/keyboards/kingly_keys/ave/staggered/keyboard.json b/keyboards/kingly_keys/ave/staggered/keyboard.json
index 581e86c11b..3f5bf70ce8 100644
--- a/keyboards/kingly_keys/ave/staggered/keyboard.json
+++ b/keyboards/kingly_keys/ave/staggered/keyboard.json
@@ -18,6 +18,12 @@
    "nkro": false,
    "rgblight": true
  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "matrix_pins": {
    "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
    "rows": ["B3", "F4", "F7", "F6", "F5"]
diff --git a/keyboards/kingly_keys/little_foot/config.h b/keyboards/kingly_keys/little_foot/config.h
deleted file mode 100644
index a2c4815a20..0000000000
--- a/keyboards/kingly_keys/little_foot/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2019 Garret G. (TheRoyalSweatshirt)
- *
- * 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/>.
- */
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kingly_keys/little_foot/keyboard.json b/keyboards/kingly_keys/little_foot/keyboard.json
index 19e6a0f547..a511d48905 100644
--- a/keyboards/kingly_keys/little_foot/keyboard.json
+++ b/keyboards/kingly_keys/little_foot/keyboard.json
@@ -39,6 +39,12 @@
    "nkro": true,
    "rgblight": true
  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "matrix_pins": {
    "cols": ["F5", "F7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
    "rows": ["F6", "B6", "B2", "B3", "B1"]
diff --git a/keyboards/kingly_keys/romac/config.h b/keyboards/kingly_keys/romac/config.h
deleted file mode 100644
index 5f36081323..0000000000
--- a/keyboards/kingly_keys/romac/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kingly_keys/romac/keyboard.json b/keyboards/kingly_keys/romac/keyboard.json
index 4c5e929848..9927bdc25f 100644
--- a/keyboards/kingly_keys/romac/keyboard.json
+++ b/keyboards/kingly_keys/romac/keyboard.json
@@ -16,6 +16,12 @@
    "mousekey": true,
    "nkro": true
  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "matrix_pins": {
    "cols": ["F7", "B1", "B3"],
    "rows": ["D4", "C6", "D7", "E6"]
diff --git a/keyboards/kingly_keys/romac_plus/config.h b/keyboards/kingly_keys/romac_plus/config.h
deleted file mode 100644
index 5f36081323..0000000000
--- a/keyboards/kingly_keys/romac_plus/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kingly_keys/romac_plus/keyboard.json b/keyboards/kingly_keys/romac_plus/keyboard.json
index bc4ad616e1..8b6c43333d 100644
--- a/keyboards/kingly_keys/romac_plus/keyboard.json
+++ b/keyboards/kingly_keys/romac_plus/keyboard.json
@@ -19,6 +19,12 @@
    "oled": true,
    "rgblight": true
  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "matrix_pins": {
    "cols": ["F6", "F5", "F4"],
    "rows": ["C6", "D4", "D2", "D3"]
diff --git a/keyboards/kingly_keys/ropro/config.h b/keyboards/kingly_keys/ropro/config.h
deleted file mode 100644
index a11ec4dfb2..0000000000
--- a/keyboards/kingly_keys/ropro/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-/* Copyright 2019 Garret G. (TheRoyalSweatshirt)
- *
- * 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/>.#pragma once
- */
- /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
- /* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kingly_keys/ropro/keyboard.json b/keyboards/kingly_keys/ropro/keyboard.json
index ed0bba5366..fb22d06a7d 100644
--- a/keyboards/kingly_keys/ropro/keyboard.json
+++ b/keyboards/kingly_keys/ropro/keyboard.json
@@ -18,6 +18,12 @@
    "nkro": true,
    "rgblight": true
  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "matrix_pins": {
    "cols": ["F0", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B3", "B2", "B6", "D2", "C7"],
    "rows": ["F4", "F5", "F6", "F7", "B1", "F1", null]
diff --git a/keyboards/kingly_keys/smd_milk/config.h b/keyboards/kingly_keys/smd_milk/config.h
deleted file mode 100644
index 7bbb5b4e94..0000000000
--- a/keyboards/kingly_keys/smd_milk/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2019 Sebastian Williams
- *
- * 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/>.
- */
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kingly_keys/smd_milk/keyboard.json b/keyboards/kingly_keys/smd_milk/keyboard.json
index e510ea80b4..9f8a10a5bf 100644
--- a/keyboards/kingly_keys/smd_milk/keyboard.json
+++ b/keyboards/kingly_keys/smd_milk/keyboard.json
@@ -39,6 +39,12 @@
    "nkro": true,
    "rgblight": true
  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "matrix_pins": {
    "cols": ["D3"],
    "rows": ["C5", "D2"]
diff --git a/keyboards/kingly_keys/soap/config.h b/keyboards/kingly_keys/soap/config.h
deleted file mode 100644
index 847cfcd5be..0000000000
--- a/keyboards/kingly_keys/soap/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2019 Garret G. (TheRoyalSweatshirt)
- *
- * 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/>.#pragma once
- */
- /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
- /* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kingly_keys/soap/keyboard.json b/keyboards/kingly_keys/soap/keyboard.json
index b4f8fb9e86..615014ffbf 100644
--- a/keyboards/kingly_keys/soap/keyboard.json
+++ b/keyboards/kingly_keys/soap/keyboard.json
@@ -36,6 +36,12 @@
    "nkro": true,
    "rgblight": true
  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "matrix_pins": {
    "cols": ["F4", "F1", "F0", "D5"],
    "rows": ["C7", "C6"]
diff --git a/keyboards/kira/kira75/config.h b/keyboards/kira/kira75/config.h
deleted file mode 100644
index d876570c80..0000000000
--- a/keyboards/kira/kira75/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2018 MechMerlin
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kira/kira75/keyboard.json b/keyboards/kira/kira75/keyboard.json
index c48f2bf492..fb4c90a8b5 100644
--- a/keyboards/kira/kira75/keyboard.json
+++ b/keyboards/kira/kira75/keyboard.json
@@ -18,6 +18,12 @@
        "nkro": false,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F6", "F7", "C7", "C6", "B6", "B5", "B4", "F5", "F4", "F1", "F0", "E6", "B3", "B2", "B1", "B0"],
        "rows": ["D0", "D1", "D2", "D3", "D5", "D4"]
diff --git a/keyboards/kisakeyluxury/qtz/config.h b/keyboards/kisakeyluxury/qtz/config.h
deleted file mode 100644
index 7660e3d7e9..0000000000
--- a/keyboards/kisakeyluxury/qtz/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2023 kisakeyluxury
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kisakeyluxury/qtz/keyboard.json b/keyboards/kisakeyluxury/qtz/keyboard.json
index 3225336890..d215f57895 100644
--- a/keyboards/kisakeyluxury/qtz/keyboard.json
+++ b/keyboards/kisakeyluxury/qtz/keyboard.json
@@ -13,6 +13,12 @@
      "extrakey": true,
      "nkro": true
  },
+  "qmk": {
+      "locking": {
+          "enabled": true,
+          "resync": true
+      }
+  },
  "matrix_pins": {
    "cols": ["D0", "D1", "D2", "D3", "F7", "F6", "F5", "F4", "F1", "F0"],
    "rows": ["D5", "D4", "D6", "C6"]
diff --git a/keyboards/kiserdesigns/madeline/config.h b/keyboards/kiserdesigns/madeline/config.h
index 8522d7cd43..027e62e3c6 100644
--- a/keyboards/kiserdesigns/madeline/config.h
+++ b/keyboards/kiserdesigns/madeline/config.h
@@ -15,9 +15,6 @@
 */
 #pragma once
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/kiserdesigns/madeline/keyboard.json b/keyboards/kiserdesigns/madeline/keyboard.json
index 73d3f5ccff..8a1a988a6f 100644
--- a/keyboards/kiserdesigns/madeline/keyboard.json
+++ b/keyboards/kiserdesigns/madeline/keyboard.json
@@ -24,7 +24,11 @@
    },
    "processor": "RP2040",
    "qmk": {
-        "tap_keycode_delay": 10
+        "tap_keycode_delay": 10,
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
    },
    "url": "https://qmk.fm/keyboards",
    "usb": {
@@ -74,4 +78,4 @@
            ]
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/keyboards/kiwikeebs/macro/config.h b/keyboards/kiwikeebs/macro/config.h
deleted file mode 100644
index 2238a4171f..0000000000
--- a/keyboards/kiwikeebs/macro/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 KiwiKeebs
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kiwikeebs/macro/keyboard.json b/keyboards/kiwikeebs/macro/keyboard.json
index d8bc9f3925..faaebe88cf 100644
--- a/keyboards/kiwikeebs/macro/keyboard.json
+++ b/keyboards/kiwikeebs/macro/keyboard.json
@@ -17,6 +17,12 @@
        "mousekey": true,
        "nkro": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F7", "B1", "B3", "B2"],
        "rows": ["E6", "D7"]
diff --git a/keyboards/kiwikeebs/macro_v2/config.h b/keyboards/kiwikeebs/macro_v2/config.h
deleted file mode 100644
index 2238a4171f..0000000000
--- a/keyboards/kiwikeebs/macro_v2/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 KiwiKeebs
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kiwikeebs/macro_v2/keyboard.json b/keyboards/kiwikeebs/macro_v2/keyboard.json
index d9b693dd1a..3848457990 100644
--- a/keyboards/kiwikeebs/macro_v2/keyboard.json
+++ b/keyboards/kiwikeebs/macro_v2/keyboard.json
@@ -17,6 +17,12 @@
        "mousekey": true,
        "nkro": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["B6", "C6", "C7", "D4"],
        "rows": ["B5", "B4"]
diff --git a/keyboards/kiwikey/borderland/config.h b/keyboards/kiwikey/borderland/config.h
deleted file mode 100644
index bff2f881e8..0000000000
--- a/keyboards/kiwikey/borderland/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2021 KiwiKey (@KiwiKey)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kiwikey/borderland/keyboard.json b/keyboards/kiwikey/borderland/keyboard.json
index 247c6b304d..c4bf2eaba5 100644
--- a/keyboards/kiwikey/borderland/keyboard.json
+++ b/keyboards/kiwikey/borderland/keyboard.json
@@ -20,7 +20,11 @@
        ]
    },
    "qmk": {
-        "tap_keycode_delay": 10
+        "tap_keycode_delay": 10,
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
    },
    "rgblight": {
        "saturation_steps": 8,
diff --git a/keyboards/kiwikey/kawii9/config.h b/keyboards/kiwikey/kawii9/config.h
deleted file mode 100644
index bc1b5f6c88..0000000000
--- a/keyboards/kiwikey/kawii9/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 KiwiKey
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kiwikey/kawii9/keyboard.json b/keyboards/kiwikey/kawii9/keyboard.json
index 07b4cca097..bb11911cde 100644
--- a/keyboards/kiwikey/kawii9/keyboard.json
+++ b/keyboards/kiwikey/kawii9/keyboard.json
@@ -42,6 +42,12 @@
        "extrakey": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "layouts": {
        "LAYOUT_ortho_3x3": {
            "layout": [
diff --git a/keyboards/kiwikey/wanderland/config.h b/keyboards/kiwikey/wanderland/config.h
deleted file mode 100644
index 1a4dea1b38..0000000000
--- a/keyboards/kiwikey/wanderland/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 KiwiKey
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kiwikey/wanderland/keyboard.json b/keyboards/kiwikey/wanderland/keyboard.json
index b4d4d4f516..3dd7c668ac 100644
--- a/keyboards/kiwikey/wanderland/keyboard.json
+++ b/keyboards/kiwikey/wanderland/keyboard.json
@@ -18,6 +18,12 @@
        "nkro": false,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F5", "F6", "B4", "D7", "D6", "D5", "D2", "D3", "B0", "F0", "B1", "B2", "B3"],
        "rows": ["F4", "F1", "E6", "E2", "C7", "D4"]
diff --git a/keyboards/kkatano/bakeneko60/config.h b/keyboards/kkatano/bakeneko60/config.h
deleted file mode 100644
index 6aac1d9a5e..0000000000
--- a/keyboards/kkatano/bakeneko60/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Koichi Katano
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kkatano/bakeneko60/keyboard.json b/keyboards/kkatano/bakeneko60/keyboard.json
index a8d9e655a1..fee9b9d533 100644
--- a/keyboards/kkatano/bakeneko60/keyboard.json
+++ b/keyboards/kkatano/bakeneko60/keyboard.json
@@ -16,6 +16,12 @@
        "mousekey": true,
        "nkro": false
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
        "rows": ["E6", "B7", "F7", "F4", "F5"]
diff --git a/keyboards/kkatano/bakeneko65/rev2/config.h b/keyboards/kkatano/bakeneko65/rev2/config.h
deleted file mode 100644
index 6aac1d9a5e..0000000000
--- a/keyboards/kkatano/bakeneko65/rev2/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Koichi Katano
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kkatano/bakeneko65/rev2/keyboard.json b/keyboards/kkatano/bakeneko65/rev2/keyboard.json
index 92193e52db..93ac8a5e50 100644
--- a/keyboards/kkatano/bakeneko65/rev2/keyboard.json
+++ b/keyboards/kkatano/bakeneko65/rev2/keyboard.json
@@ -16,6 +16,12 @@
        "mousekey": true,
        "nkro": false
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
        "rows": ["E6", "B7", "F7", "F4", "F5"]
diff --git a/keyboards/kkatano/bakeneko65/rev3/config.h b/keyboards/kkatano/bakeneko65/rev3/config.h
deleted file mode 100644
index 6aac1d9a5e..0000000000
--- a/keyboards/kkatano/bakeneko65/rev3/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Koichi Katano
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kkatano/bakeneko65/rev3/keyboard.json b/keyboards/kkatano/bakeneko65/rev3/keyboard.json
index d0717c1893..3892da5d04 100644
--- a/keyboards/kkatano/bakeneko65/rev3/keyboard.json
+++ b/keyboards/kkatano/bakeneko65/rev3/keyboard.json
@@ -16,6 +16,12 @@
        "mousekey": true,
        "nkro": false
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
        "rows": ["E6", "B7", "F7", "F4", "F5"]
diff --git a/keyboards/kkatano/bakeneko80/config.h b/keyboards/kkatano/bakeneko80/config.h
deleted file mode 100644
index 6aac1d9a5e..0000000000
--- a/keyboards/kkatano/bakeneko80/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Koichi Katano
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kkatano/bakeneko80/keyboard.json b/keyboards/kkatano/bakeneko80/keyboard.json
index ee005086c3..06f7eeb4db 100644
--- a/keyboards/kkatano/bakeneko80/keyboard.json
+++ b/keyboards/kkatano/bakeneko80/keyboard.json
@@ -16,6 +16,12 @@
        "mousekey": true,
        "nkro": false
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
        "rows": ["E6", "B0", "B1", "B7", "D1", "D0"]
diff --git a/keyboards/kkatano/wallaby/config.h b/keyboards/kkatano/wallaby/config.h
deleted file mode 100644
index 6aac1d9a5e..0000000000
--- a/keyboards/kkatano/wallaby/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Koichi Katano
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kkatano/wallaby/keyboard.json b/keyboards/kkatano/wallaby/keyboard.json
index e7c76c46a0..ee475a54bc 100644
--- a/keyboards/kkatano/wallaby/keyboard.json
+++ b/keyboards/kkatano/wallaby/keyboard.json
@@ -16,6 +16,12 @@
        "mousekey": true,
        "nkro": false
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["D5", "C7", "C6", "D4", "D0", "E6", "F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D1", "D2", "D3"],
        "rows": ["B5", "B4", "B3", "B2", "B1", "B0"]
diff --git a/keyboards/kkatano/yurei/config.h b/keyboards/kkatano/yurei/config.h
deleted file mode 100644
index 6954b38182..0000000000
--- a/keyboards/kkatano/yurei/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Koichi Katano
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kkatano/yurei/keyboard.json b/keyboards/kkatano/yurei/keyboard.json
index 3249014846..7bf0895787 100644
--- a/keyboards/kkatano/yurei/keyboard.json
+++ b/keyboards/kkatano/yurei/keyboard.json
@@ -16,6 +16,12 @@
        "mousekey": true,
        "nkro": false
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["D5", "C7", "C6", "D4", "D0", "E6", "F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D1", "D2", "D3"],
        "rows": ["B5", "B4", "B3", "B2", "B1", "B0"]
diff --git a/keyboards/knops/mini/config.h b/keyboards/knops/mini/config.h
deleted file mode 100644
index 8b274e7f0f..0000000000
--- a/keyboards/knops/mini/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2017 Pawnerd
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/knops/mini/keyboard.json b/keyboards/knops/mini/keyboard.json
index 721e3d7b36..10b18faf8d 100644
--- a/keyboards/knops/mini/keyboard.json
+++ b/keyboards/knops/mini/keyboard.json
@@ -16,6 +16,12 @@
        "mousekey": true,
        "nkro": false
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F7", "F6", "F5", "F4", "F1", "F0"],
        "rows": ["D0"]
diff --git a/keyboards/kona_classic/config.h b/keyboards/kona_classic/config.h
deleted file mode 100644
index b9449c4714..0000000000
--- a/keyboards/kona_classic/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kona_classic/keyboard.json b/keyboards/kona_classic/keyboard.json
index 01388f363a..79bef89bb6 100644
--- a/keyboards/kona_classic/keyboard.json
+++ b/keyboards/kona_classic/keyboard.json
@@ -37,6 +37,12 @@
    "mousekey": true,
    "nkro": false
  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "matrix_pins": {
    "cols": ["F0", "F4", "B5", "B4", "D7", "D6", "B0", "B1", "B3", "D2", "B7", "D0", "D1", "D3", "C6", "C7"],
    "rows": ["F1", "F5", "F6", "F7", "B6"]
diff --git a/keyboards/kopibeng/mnk60_stm32/config.h b/keyboards/kopibeng/mnk60_stm32/config.h
deleted file mode 100644
index 625c24bde0..0000000000
--- a/keyboards/kopibeng/mnk60_stm32/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2023 Samuel Lu
- *
- * 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/>.
- */
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kopibeng/mnk60_stm32/keyboard.json b/keyboards/kopibeng/mnk60_stm32/keyboard.json
index be1f3cd409..e0853d543f 100644
--- a/keyboards/kopibeng/mnk60_stm32/keyboard.json
+++ b/keyboards/kopibeng/mnk60_stm32/keyboard.json
@@ -13,6 +13,12 @@
        "nkro": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "indicators": {
        "caps_lock": "A0"
    },
diff --git a/keyboards/kopibeng/mnk65/config.h b/keyboards/kopibeng/mnk65/config.h
deleted file mode 100644
index 62a2978f67..0000000000
--- a/keyboards/kopibeng/mnk65/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Samuel Lu
- *
- * 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/>.
- */
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kopibeng/mnk65/keyboard.json b/keyboards/kopibeng/mnk65/keyboard.json
index 24113c3ce5..3c6e04f116 100644
--- a/keyboards/kopibeng/mnk65/keyboard.json
+++ b/keyboards/kopibeng/mnk65/keyboard.json
@@ -16,6 +16,12 @@
        "mousekey": true,
        "nkro": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["B7", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "F5"],
        "rows": ["B3", "D0", "F6", "F4", "F1"]
diff --git a/keyboards/kopibeng/mnk65_stm32/config.h b/keyboards/kopibeng/mnk65_stm32/config.h
deleted file mode 100644
index 62a2978f67..0000000000
--- a/keyboards/kopibeng/mnk65_stm32/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Samuel Lu
- *
- * 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/>.
- */
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kopibeng/mnk65_stm32/keyboard.json b/keyboards/kopibeng/mnk65_stm32/keyboard.json
index f3c57063c9..c71394ba84 100644
--- a/keyboards/kopibeng/mnk65_stm32/keyboard.json
+++ b/keyboards/kopibeng/mnk65_stm32/keyboard.json
@@ -13,6 +13,12 @@
        "nkro": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "indicators": {
        "caps_lock": "A8"
    },
diff --git a/keyboards/kopibeng/mnk88/config.h b/keyboards/kopibeng/mnk88/config.h
deleted file mode 100644
index 62a2978f67..0000000000
--- a/keyboards/kopibeng/mnk88/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Samuel Lu
- *
- * 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/>.
- */
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kopibeng/mnk88/keyboard.json b/keyboards/kopibeng/mnk88/keyboard.json
index 8a63d6562b..29d2d70ba9 100644
--- a/keyboards/kopibeng/mnk88/keyboard.json
+++ b/keyboards/kopibeng/mnk88/keyboard.json
@@ -34,6 +34,12 @@
        "nkro": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["A2", "A1", "A0", "B11", "B10", "B2", "F1", "B1", "B0", "A7", "A6", "A5", "F0", "A4", "C15", "C14", "C13"],
        "rows": ["A8", "B15", "A9", "B12", "A3", "B14"]
diff --git a/keyboards/kopibeng/typ65/config.h b/keyboards/kopibeng/typ65/config.h
index 76cd3ae659..48c3abee25 100644
--- a/keyboards/kopibeng/typ65/config.h
+++ b/keyboards/kopibeng/typ65/config.h
@@ -19,8 +19,3 @@
 #define INDICATOR_0 B2
 #define INDICATOR_1 B7
 #define INDICATOR_2 B3
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kopibeng/typ65/keyboard.json b/keyboards/kopibeng/typ65/keyboard.json
index c2598cadcb..57a23da4ad 100644
--- a/keyboards/kopibeng/typ65/keyboard.json
+++ b/keyboards/kopibeng/typ65/keyboard.json
@@ -16,6 +16,12 @@
        "mousekey": true,
        "nkro": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F5", "F4", "F1", "F0", "E6"],
        "rows": ["D0", "D1", "D2", "F6", "B0"]
diff --git a/keyboards/kopibeng/xt60/config.h b/keyboards/kopibeng/xt60/config.h
deleted file mode 100644
index 62a2978f67..0000000000
--- a/keyboards/kopibeng/xt60/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Samuel Lu
- *
- * 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/>.
- */
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kopibeng/xt60/keyboard.json b/keyboards/kopibeng/xt60/keyboard.json
index 70b5a06ab4..2901c056dd 100644
--- a/keyboards/kopibeng/xt60/keyboard.json
+++ b/keyboards/kopibeng/xt60/keyboard.json
@@ -33,6 +33,12 @@
        "nkro": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["C7", "F5", "F1", "F0", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2", "D1"],
        "rows": ["F7", "F4", "D0", "B3", "B7"]
diff --git a/keyboards/kopibeng/xt60_singa/config.h b/keyboards/kopibeng/xt60_singa/config.h
deleted file mode 100644
index 62a2978f67..0000000000
--- a/keyboards/kopibeng/xt60_singa/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Samuel Lu
- *
- * 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/>.
- */
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kopibeng/xt60_singa/keyboard.json b/keyboards/kopibeng/xt60_singa/keyboard.json
index 844d9b7aca..688fa2f73a 100644
--- a/keyboards/kopibeng/xt60_singa/keyboard.json
+++ b/keyboards/kopibeng/xt60_singa/keyboard.json
@@ -33,6 +33,12 @@
        "nkro": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["C7", "F5", "F1", "F0", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2", "D1"],
        "rows": ["F7", "F4", "D0", "B3", "B7"]
diff --git a/keyboards/kopibeng/xt65/config.h b/keyboards/kopibeng/xt65/config.h
deleted file mode 100644
index 2ef1d22576..0000000000
--- a/keyboards/kopibeng/xt65/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 Samuel Lu
- *
- * 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/>.
- */
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kopibeng/xt65/keyboard.json b/keyboards/kopibeng/xt65/keyboard.json
index f5d53e0af4..c73ff703d5 100644
--- a/keyboards/kopibeng/xt65/keyboard.json
+++ b/keyboards/kopibeng/xt65/keyboard.json
@@ -18,6 +18,12 @@
        "nkro": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["D1", "D2", "D3", "B6", "C6", "C7", "F0", "F1", "F4", "F5", "F6", "F7", "B2", "B3", "B7"],
        "rows": ["B5", "B4", "D7", "D6", "D4"]
diff --git a/keyboards/kopibeng/xt8x/config.h b/keyboards/kopibeng/xt8x/config.h
index 5f12451e15..65961eb226 100644
--- a/keyboards/kopibeng/xt8x/config.h
+++ b/keyboards/kopibeng/xt8x/config.h
@@ -17,8 +17,3 @@
 #pragma once
 #define INDICATOR_PIN_0 B13
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kopibeng/xt8x/keyboard.json b/keyboards/kopibeng/xt8x/keyboard.json
index 379ca9ee67..7167cb1d07 100644
--- a/keyboards/kopibeng/xt8x/keyboard.json
+++ b/keyboards/kopibeng/xt8x/keyboard.json
@@ -17,6 +17,12 @@
        "nkro": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["A2", "A1", "A0", "B11", "B10", "B2", "F1", "B1", "B0", "A7", "A6", "A5", "F0", "A4", "C15", "C14", "C13"],
        "rows": ["A8", "B15", "A9", "B12", "A3", "B14"]
diff --git a/keyboards/kprepublic/bm16s/config.h b/keyboards/kprepublic/bm16s/config.h
deleted file mode 100755
index 5f36081323..0000000000
--- a/keyboards/kprepublic/bm16s/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kprepublic/bm16s/keyboard.json b/keyboards/kprepublic/bm16s/keyboard.json
index c1dce5d300..8c6ce05bb9 100644
--- a/keyboards/kprepublic/bm16s/keyboard.json
+++ b/keyboards/kprepublic/bm16s/keyboard.json
@@ -37,6 +37,12 @@
        "nkro": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
      "cols": ["F7", "F6", "D4", "D6"],
      "rows": ["D1", "D0", "D3", "D2"]
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/config.h b/keyboards/kprepublic/bm40hsrgb/rev1/config.h
deleted file mode 100755
index 0ddf783824..0000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 tominabox1
- *
- * 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/>.
- */
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keyboard.json b/keyboards/kprepublic/bm40hsrgb/rev1/keyboard.json
index 83da66a0a1..7bdeafbcad 100644
--- a/keyboards/kprepublic/bm40hsrgb/rev1/keyboard.json
+++ b/keyboards/kprepublic/bm40hsrgb/rev1/keyboard.json
@@ -73,6 +73,12 @@
        "nkro": false,
        "rgb_matrix": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["B6", "C6", "B4", "D7", "D4", "D6", "C7", "F6", "F5", "F4", "F1", "F0"],
        "rows": ["B3", "B2", "E6", "B5"]
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/config.h b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
deleted file mode 100644
index 944a3a8423..0000000000
--- a/keyboards/kprepublic/bm65hsrgb/rev1/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 bytesapart
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/keyboard.json b/keyboards/kprepublic/bm65hsrgb/rev1/keyboard.json
index fcc2101b01..dc63acfa41 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/keyboard.json
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/keyboard.json
@@ -26,6 +26,12 @@
        "nkro": true,
        "rgb_matrix": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
        "rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
deleted file mode 100644
index 458ef98569..0000000000
--- a/keyboards/kprepublic/bm68hsrgb/rev1/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 peepeetee
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keyboard.json b/keyboards/kprepublic/bm68hsrgb/rev1/keyboard.json
index ca68c78756..6e2d3a9208 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keyboard.json
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/keyboard.json
@@ -72,6 +72,12 @@
        "nkro": true,
        "rgb_matrix": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
        "rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm980hsrgb/config.h b/keyboards/kprepublic/bm980hsrgb/config.h
deleted file mode 100644
index 458ef98569..0000000000
--- a/keyboards/kprepublic/bm980hsrgb/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 peepeetee
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kprepublic/bm980hsrgb/keyboard.json b/keyboards/kprepublic/bm980hsrgb/keyboard.json
index 717a514fe8..8ee498b7b6 100644
--- a/keyboards/kprepublic/bm980hsrgb/keyboard.json
+++ b/keyboards/kprepublic/bm980hsrgb/keyboard.json
@@ -23,6 +23,12 @@
        "nkro": true,
        "rgb_matrix": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "E6", "F0", "F1", "F4", "F5", "D6"],
        "rows": ["D4", "B6", "B5", "B4", "F7", "F6", "D7"]
diff --git a/keyboards/kprepublic/cospad/config.h b/keyboards/kprepublic/cospad/config.h
deleted file mode 100644
index 5e90ea1c05..0000000000
--- a/keyboards/kprepublic/cospad/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kprepublic/cospad/keyboard.json b/keyboards/kprepublic/cospad/keyboard.json
index 233e258e1d..51a824b816 100644
--- a/keyboards/kprepublic/cospad/keyboard.json
+++ b/keyboards/kprepublic/cospad/keyboard.json
@@ -18,6 +18,12 @@
        "nkro": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F0", "F1", "E6", "C7"],
        "rows": ["D0", "D1", "D2", "D3", "D4", "D5"]
diff --git a/keyboards/ktec/daisy/config.h b/keyboards/ktec/daisy/config.h
deleted file mode 100644
index 5e90ea1c05..0000000000
--- a/keyboards/ktec/daisy/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/ktec/daisy/keyboard.json b/keyboards/ktec/daisy/keyboard.json
index 3d230b03f4..d0a24f5b0d 100644
--- a/keyboards/ktec/daisy/keyboard.json
+++ b/keyboards/ktec/daisy/keyboard.json
@@ -18,6 +18,12 @@
        "nkro": false,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6"],
        "rows": ["D2", "D3", "D5", "B7"]
diff --git a/keyboards/kumaokobo/kudox/columner/config.h b/keyboards/kumaokobo/kudox/columner/config.h
index 04bc8cb2d2..fc2549733e 100644
--- a/keyboards/kumaokobo/kudox/columner/config.h
+++ b/keyboards/kumaokobo/kudox/columner/config.h
@@ -16,11 +16,6 @@
 #pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/kumaokobo/kudox/columner/keyboard.json b/keyboards/kumaokobo/kudox/columner/keyboard.json
index 903d0d97a5..2fde419205 100644
--- a/keyboards/kumaokobo/kudox/columner/keyboard.json
+++ b/keyboards/kumaokobo/kudox/columner/keyboard.json
@@ -46,6 +46,12 @@
        "command": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
diff --git a/keyboards/kumaokobo/kudox/rev1/config.h b/keyboards/kumaokobo/kudox/rev1/config.h
index 666cb49b2e..1bf4f3c026 100644
--- a/keyboards/kumaokobo/kudox/rev1/config.h
+++ b/keyboards/kumaokobo/kudox/rev1/config.h
@@ -16,11 +16,6 @@
 #pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/kumaokobo/kudox/rev1/keyboard.json b/keyboards/kumaokobo/kudox/rev1/keyboard.json
index 2be4cefc56..ba4dbe7ae3 100644
--- a/keyboards/kumaokobo/kudox/rev1/keyboard.json
+++ b/keyboards/kumaokobo/kudox/rev1/keyboard.json
@@ -46,6 +46,12 @@
        "command": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
diff --git a/keyboards/kumaokobo/kudox/rev2/config.h b/keyboards/kumaokobo/kudox/rev2/config.h
index 666cb49b2e..1bf4f3c026 100644
--- a/keyboards/kumaokobo/kudox/rev2/config.h
+++ b/keyboards/kumaokobo/kudox/rev2/config.h
@@ -16,11 +16,6 @@
 #pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/kumaokobo/kudox/rev2/keyboard.json b/keyboards/kumaokobo/kudox/rev2/keyboard.json
index a5dad94322..a7423adf11 100644
--- a/keyboards/kumaokobo/kudox/rev2/keyboard.json
+++ b/keyboards/kumaokobo/kudox/rev2/keyboard.json
@@ -46,6 +46,12 @@
        "command": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
diff --git a/keyboards/kumaokobo/kudox/rev3/config.h b/keyboards/kumaokobo/kudox/rev3/config.h
index 04bc8cb2d2..fc2549733e 100644
--- a/keyboards/kumaokobo/kudox/rev3/config.h
+++ b/keyboards/kumaokobo/kudox/rev3/config.h
@@ -16,11 +16,6 @@
 #pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/kumaokobo/kudox/rev3/keyboard.json b/keyboards/kumaokobo/kudox/rev3/keyboard.json
index 1fe349a99e..25ead43505 100644
--- a/keyboards/kumaokobo/kudox/rev3/keyboard.json
+++ b/keyboards/kumaokobo/kudox/rev3/keyboard.json
@@ -46,6 +46,12 @@
        "command": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
diff --git a/keyboards/kumaokobo/kudox_full/rev1/config.h b/keyboards/kumaokobo/kudox_full/rev1/config.h
deleted file mode 100644
index f1dcbbcf3d..0000000000
--- a/keyboards/kumaokobo/kudox_full/rev1/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2021 Kumao Kobo (@kumaokobo)
-// SPDX-License-Identifier: GPL-2.0+
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-// #define NO_DEBUG
-/* disable print */
-// #define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kumaokobo/kudox_full/rev1/keyboard.json b/keyboards/kumaokobo/kudox_full/rev1/keyboard.json
index 046bc8e182..09d1cd152c 100644
--- a/keyboards/kumaokobo/kudox_full/rev1/keyboard.json
+++ b/keyboards/kumaokobo/kudox_full/rev1/keyboard.json
@@ -44,6 +44,12 @@
        "unicode": true,
        "oled": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "build": {
        "lto": true
    },
diff --git a/keyboards/kumaokobo/kudox_game/rev1/config.h b/keyboards/kumaokobo/kudox_game/rev1/config.h
index b0b9607f4b..0a8c5278dc 100644
--- a/keyboards/kumaokobo/kudox_game/rev1/config.h
+++ b/keyboards/kumaokobo/kudox_game/rev1/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/kumaokobo/kudox_game/rev1/keyboard.json b/keyboards/kumaokobo/kudox_game/rev1/keyboard.json
index 2163b89d97..975fbcd546 100644
--- a/keyboards/kumaokobo/kudox_game/rev1/keyboard.json
+++ b/keyboards/kumaokobo/kudox_game/rev1/keyboard.json
@@ -35,6 +35,12 @@
        "mousekey": true,
        "nkro": false
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
diff --git a/keyboards/kumaokobo/kudox_game/rev2/config.h b/keyboards/kumaokobo/kudox_game/rev2/config.h
index 37fde91599..f1572e18d5 100644
--- a/keyboards/kumaokobo/kudox_game/rev2/config.h
+++ b/keyboards/kumaokobo/kudox_game/rev2/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/kumaokobo/kudox_game/rev2/keyboard.json b/keyboards/kumaokobo/kudox_game/rev2/keyboard.json
index 554d03c76b..ac13e1b216 100644
--- a/keyboards/kumaokobo/kudox_game/rev2/keyboard.json
+++ b/keyboards/kumaokobo/kudox_game/rev2/keyboard.json
@@ -36,6 +36,12 @@
        "nkro": false,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
diff --git a/keyboards/kumaokobo/pico/65keys/config.h b/keyboards/kumaokobo/pico/65keys/config.h
index 04bc8cb2d2..fc2549733e 100644
--- a/keyboards/kumaokobo/pico/65keys/config.h
+++ b/keyboards/kumaokobo/pico/65keys/config.h
@@ -16,11 +16,6 @@
 #pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/kumaokobo/pico/65keys/keyboard.json b/keyboards/kumaokobo/pico/65keys/keyboard.json
index efcc96e1dc..00113a931f 100644
--- a/keyboards/kumaokobo/pico/65keys/keyboard.json
+++ b/keyboards/kumaokobo/pico/65keys/keyboard.json
@@ -46,6 +46,12 @@
        "command": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
diff --git a/keyboards/kumaokobo/pico/70keys/config.h b/keyboards/kumaokobo/pico/70keys/config.h
index 04bc8cb2d2..fc2549733e 100644
--- a/keyboards/kumaokobo/pico/70keys/config.h
+++ b/keyboards/kumaokobo/pico/70keys/config.h
@@ -16,11 +16,6 @@
 #pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/kumaokobo/pico/70keys/keyboard.json b/keyboards/kumaokobo/pico/70keys/keyboard.json
index 8fe91b84cc..a820c7eee3 100644
--- a/keyboards/kumaokobo/pico/70keys/keyboard.json
+++ b/keyboards/kumaokobo/pico/70keys/keyboard.json
@@ -46,6 +46,12 @@
        "command": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
diff --git a/keyboards/kv/revt/config.h b/keyboards/kv/revt/config.h
deleted file mode 100644
index c2fe5d4d75..0000000000
--- a/keyboards/kv/revt/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Hybrid65
- *
- * 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/>.
- */
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kv/revt/keyboard.json b/keyboards/kv/revt/keyboard.json
index 1c2ee5a84a..8553dcdd35 100644
--- a/keyboards/kv/revt/keyboard.json
+++ b/keyboards/kv/revt/keyboard.json
@@ -16,6 +16,12 @@
        "mousekey": true,
        "nkro": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": false
+        }
+    },
    "matrix_pins": {
        "cols": ["B7", "B6", "B5", "B4", "B3", "B2", "B14", "B1", "B15", "B0", "B9", "B10", "B11", "B12", "A14", "A13", "A4", "A5", "A7", "A8", "A15"],
        "rows": ["A6", "B13", "B8", "A0", "A1", "A2"]
diff --git a/keyboards/kwub/bloop/config.h b/keyboards/kwub/bloop/config.h
deleted file mode 100644
index 87dc81c24d..0000000000
--- a/keyboards/kwub/bloop/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 Kwabena Aduse-Poku (Kwub)
- *
- * 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/>.
- */
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kwub/bloop/keyboard.json b/keyboards/kwub/bloop/keyboard.json
index b482b571be..2889ef1598 100644
--- a/keyboards/kwub/bloop/keyboard.json
+++ b/keyboards/kwub/bloop/keyboard.json
@@ -16,6 +16,12 @@
        "mousekey": true,
        "nkro": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["B4", "B5", "B6", "F6", "F1", "F7", "F0", "B0", "B7", "D3", "D2", "D1", "D5", "D4", "D6"],
        "rows": ["F5", "F4", "C6", "C7", "D7"]
diff --git a/keyboards/ky01/config.h b/keyboards/ky01/config.h
deleted file mode 100644
index 224b56103a..0000000000
--- a/keyboards/ky01/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 KnoblesseOblige
-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/>.
-*/
-#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/ky01/keyboard.json b/keyboards/ky01/keyboard.json
index b9e4eeef70..f5657ac93f 100644
--- a/keyboards/ky01/keyboard.json
+++ b/keyboards/ky01/keyboard.json
@@ -16,6 +16,12 @@
        "mousekey": true,
        "nkro": false
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["B3", "B7", "D0", "D1", "D2", "D3", "D5", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6"],
        "rows": ["E6", "B5", "B4", "D7", "D4", "D6"]