From 9dbee3e23d28e5f61384bbb5650505a572022341 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 16 Mar 2023 20:18:33 +1100
Subject: Remove useless "ifdef KEYBOARD_*" (#20078)

Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 keyboards/keychron/q5/ansi/ansi.c                 |  2 +-
 keyboards/keychron/q5/ansi/ansi.h                 | 19 ---------------
 keyboards/keychron/q5/ansi_encoder/ansi_encoder.c |  2 +-
 keyboards/keychron/q5/ansi_encoder/ansi_encoder.h | 19 ---------------
 keyboards/keychron/q5/iso/iso.c                   |  2 +-
 keyboards/keychron/q5/iso/iso.h                   | 19 ---------------
 keyboards/keychron/q5/iso_encoder/iso_encoder.c   |  2 +-
 keyboards/keychron/q5/iso_encoder/iso_encoder.h   | 19 ---------------
 keyboards/keychron/q5/q5.c                        |  2 +-
 keyboards/keychron/q5/q5.h                        | 29 -----------------------
 10 files changed, 5 insertions(+), 110 deletions(-)
 delete mode 100644 keyboards/keychron/q5/ansi/ansi.h
 delete mode 100644 keyboards/keychron/q5/ansi_encoder/ansi_encoder.h
 delete mode 100644 keyboards/keychron/q5/iso/iso.h
 delete mode 100644 keyboards/keychron/q5/iso_encoder/iso_encoder.h
 delete mode 100644 keyboards/keychron/q5/q5.h

(limited to 'keyboards/keychron/q5')

diff --git a/keyboards/keychron/q5/ansi/ansi.c b/keyboards/keychron/q5/ansi/ansi.c
index 6aeb46c07d..dda563cd79 100644
--- a/keyboards/keychron/q5/ansi/ansi.c
+++ b/keyboards/keychron/q5/ansi/ansi.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ansi.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q5/ansi/ansi.h b/keyboards/keychron/q5/ansi/ansi.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q5/ansi/ansi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
index 43c27433b2..4d3cc0f036 100644
--- a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ansi_encoder.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q5/iso/iso.c b/keyboards/keychron/q5/iso/iso.c
index b57474f535..65924abd76 100644
--- a/keyboards/keychron/q5/iso/iso.c
+++ b/keyboards/keychron/q5/iso/iso.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "iso.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q5/iso/iso.h b/keyboards/keychron/q5/iso/iso.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q5/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q5/iso_encoder/iso_encoder.c b/keyboards/keychron/q5/iso_encoder/iso_encoder.c
index 8ae11bc36b..22ba9e2d4e 100644
--- a/keyboards/keychron/q5/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q5/iso_encoder/iso_encoder.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "iso_encoder.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q5/iso_encoder/iso_encoder.h b/keyboards/keychron/q5/iso_encoder/iso_encoder.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q5/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q5/q5.c b/keyboards/keychron/q5/q5.c
index 4130dcebe3..7a1cabcd1a 100644
--- a/keyboards/keychron/q5/q5.c
+++ b/keyboards/keychron/q5/q5.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "q5.h"
+#include "quantum.h"
 
 const matrix_row_t matrix_mask[] = {
     0b111111111111111111,
diff --git a/keyboards/keychron/q5/q5.h b/keyboards/keychron/q5/q5.h
deleted file mode 100644
index 70ccc8dcfa..0000000000
--- a/keyboards/keychron/q5/q5.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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
-
-#include "quantum.h"
-
-#if   defined(KEYBOARD_keychron_q5_ansi)
-#    include "ansi.h"
-#elif defined(KEYBOARD_keychron_q5_ansi_encoder)
-#    include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q5_iso)
-#    include "iso.h"
-#elif defined(KEYBOARD_keychron_q5_iso_encoder)
-#    include "iso_encoder.h"
-#endif
-- 
cgit v1.2.3


From 522048725f6b076bdad1251243c65dd2acf6595d Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 8 Apr 2023 18:08:08 +1000
Subject: Move `RGB_MATRIX_DRIVER` to data driven (#20350)

---
 keyboards/keychron/q5/ansi/info.json         | 3 +++
 keyboards/keychron/q5/ansi/rules.mk          | 1 -
 keyboards/keychron/q5/ansi_encoder/info.json | 3 +++
 keyboards/keychron/q5/ansi_encoder/rules.mk  | 1 -
 keyboards/keychron/q5/iso/info.json          | 3 +++
 keyboards/keychron/q5/iso/rules.mk           | 1 -
 keyboards/keychron/q5/iso_encoder/info.json  | 3 +++
 keyboards/keychron/q5/iso_encoder/rules.mk   | 1 -
 8 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'keyboards/keychron/q5')

diff --git a/keyboards/keychron/q5/ansi/info.json b/keyboards/keychron/q5/ansi/info.json
index 4e77f23b7c..8f3396500f 100644
--- a/keyboards/keychron/q5/ansi/info.json
+++ b/keyboards/keychron/q5/ansi/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0150",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q5/ansi/rules.mk b/keyboards/keychron/q5/ansi/rules.mk
index 311ca648e1..f2dba218bf 100644
--- a/keyboards/keychron/q5/ansi/rules.mk
+++ b/keyboards/keychron/q5/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q5/ansi_encoder/info.json b/keyboards/keychron/q5/ansi_encoder/info.json
index 7bd6f179c6..86c3b2d39b 100644
--- a/keyboards/keychron/q5/ansi_encoder/info.json
+++ b/keyboards/keychron/q5/ansi_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0151",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/q5/ansi_encoder/rules.mk b/keyboards/keychron/q5/ansi_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/q5/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q5/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q5/iso/info.json b/keyboards/keychron/q5/iso/info.json
index 20eebe22b0..dc7a2f5f2b 100644
--- a/keyboards/keychron/q5/iso/info.json
+++ b/keyboards/keychron/q5/iso/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0152",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q5/iso/rules.mk b/keyboards/keychron/q5/iso/rules.mk
index 311ca648e1..f2dba218bf 100644
--- a/keyboards/keychron/q5/iso/rules.mk
+++ b/keyboards/keychron/q5/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q5/iso_encoder/info.json b/keyboards/keychron/q5/iso_encoder/info.json
index 81cd72036f..26e27edd5e 100644
--- a/keyboards/keychron/q5/iso_encoder/info.json
+++ b/keyboards/keychron/q5/iso_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0153",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/q5/iso_encoder/rules.mk b/keyboards/keychron/q5/iso_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/q5/iso_encoder/rules.mk
+++ b/keyboards/keychron/q5/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
-- 
cgit v1.2.3


From c9f619124d41637ece157570703423c3890cb6c2 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sun, 16 Apr 2023 01:18:44 +1000
Subject: Encodermap direction define. (#20454)

---
 keyboards/keychron/q5/ansi_encoder/keymaps/default/keymap.c  | 2 +-
 keyboards/keychron/q5/ansi_encoder/keymaps/keychron/keymap.c | 2 +-
 keyboards/keychron/q5/ansi_encoder/keymaps/via/keymap.c      | 2 +-
 keyboards/keychron/q5/iso_encoder/keymaps/default/keymap.c   | 2 +-
 keyboards/keychron/q5/iso_encoder/keymaps/keychron/keymap.c  | 2 +-
 keyboards/keychron/q5/iso_encoder/keymaps/via/keymap.c       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'keyboards/keychron/q5')

diff --git a/keyboards/keychron/q5/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q5/ansi_encoder/keymaps/default/keymap.c
index c897aecf73..c9079b53ff 100644
--- a/keyboards/keychron/q5/ansi_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q5/ansi_encoder/keymaps/default/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][1][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
     [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/keychron/q5/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q5/ansi_encoder/keymaps/keychron/keymap.c
index d516c2da4b..62446674fe 100644
--- a/keyboards/keychron/q5/ansi_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q5/ansi_encoder/keymaps/keychron/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][1][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
     [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/keychron/q5/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q5/ansi_encoder/keymaps/via/keymap.c
index c897aecf73..c9079b53ff 100644
--- a/keyboards/keychron/q5/ansi_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q5/ansi_encoder/keymaps/via/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][1][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
     [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/keychron/q5/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q5/iso_encoder/keymaps/default/keymap.c
index a570031a0b..e1f3d93212 100644
--- a/keyboards/keychron/q5/iso_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q5/iso_encoder/keymaps/default/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][1][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
     [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/keychron/q5/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q5/iso_encoder/keymaps/keychron/keymap.c
index 85efa63759..95dbb282c2 100644
--- a/keyboards/keychron/q5/iso_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q5/iso_encoder/keymaps/keychron/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][1][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
     [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/keychron/q5/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q5/iso_encoder/keymaps/via/keymap.c
index 324f24e90e..9446d04839 100644
--- a/keyboards/keychron/q5/iso_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q5/iso_encoder/keymaps/via/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][1][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
     [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-- 
cgit v1.2.3


From 79aa31994698c9050141714f77c0177edbcd9488 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 2 May 2023 08:25:15 +1000
Subject: `info.json` whitespace cleanups (#20651)

---
 keyboards/keychron/q5/ansi/info.json         | 94 ++++++++++++++--------------
 keyboards/keychron/q5/ansi_encoder/info.json | 90 +++++++++++++-------------
 keyboards/keychron/q5/iso/info.json          | 94 ++++++++++++++--------------
 keyboards/keychron/q5/iso_encoder/info.json  | 90 +++++++++++++-------------
 4 files changed, 184 insertions(+), 184 deletions(-)

(limited to 'keyboards/keychron/q5')

diff --git a/keyboards/keychron/q5/ansi/info.json b/keyboards/keychron/q5/ansi/info.json
index 8f3396500f..555034fb80 100644
--- a/keyboards/keychron/q5/ansi/info.json
+++ b/keyboards/keychron/q5/ansi/info.json
@@ -16,16 +16,16 @@
     "layouts": {
         "LAYOUT_ansi_100": {
             "layout": [
-                {"matrix":[0,  0], "x":0, "y":0},
-                {"matrix":[0,  1], "x":1, "y":0},
-                {"matrix":[0,  2], "x":2, "y":0},
-                {"matrix":[0,  3], "x":3, "y":0},
-                {"matrix":[0,  4], "x":4, "y":0},
-                {"matrix":[0,  5], "x":5, "y":0},
-                {"matrix":[0,  6], "x":6, "y":0},
-                {"matrix":[0,  7], "x":7, "y":0},
-                {"matrix":[0,  8], "x":8, "y":0},
-                {"matrix":[0,  9], "x":9, "y":0},
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1, "y":0},
+                {"matrix":[0, 2], "x":2, "y":0},
+                {"matrix":[0, 3], "x":3, "y":0},
+                {"matrix":[0, 4], "x":4, "y":0},
+                {"matrix":[0, 5], "x":5, "y":0},
+                {"matrix":[0, 6], "x":6, "y":0},
+                {"matrix":[0, 7], "x":7, "y":0},
+                {"matrix":[0, 8], "x":8, "y":0},
+                {"matrix":[0, 9], "x":9, "y":0},
                 {"matrix":[0, 10], "x":10, "y":0},
                 {"matrix":[0, 11], "x":11, "y":0},
                 {"matrix":[0, 12], "x":12, "y":0},
@@ -46,14 +46,14 @@
                 {"matrix":[1, 7], "x":7, "y":1.25},
                 {"matrix":[1, 8], "x":8, "y":1.25},
                 {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,15], "x":15.5, "y":1.25},
-                {"matrix":[1,16], "x":16.5, "y":1.25},
-                {"matrix":[1,17], "x":17.5, "y":1.25},
-                {"matrix":[3,14], "x":18.5, "y":1.25},
+                {"matrix":[1, 10], "x":10, "y":1.25},
+                {"matrix":[1, 11], "x":11, "y":1.25},
+                {"matrix":[1, 12], "x":12, "y":1.25},
+                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1, 15], "x":15.5, "y":1.25},
+                {"matrix":[1, 16], "x":16.5, "y":1.25},
+                {"matrix":[1, 17], "x":17.5, "y":1.25},
+                {"matrix":[3, 14], "x":18.5, "y":1.25},
 
                 {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
                 {"matrix":[2, 1], "x":1.5, "y":2.25},
@@ -65,13 +65,13 @@
                 {"matrix":[2, 7], "x":7.5, "y":2.25},
                 {"matrix":[2, 8], "x":8.5, "y":2.25},
                 {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,15], "x":15.5, "y":2.25},
-                {"matrix":[2,16], "x":16.5, "y":2.25},
-                {"matrix":[2,17], "x":17.5, "y":2.25},
+                {"matrix":[2, 10], "x":10.5, "y":2.25},
+                {"matrix":[2, 11], "x":11.5, "y":2.25},
+                {"matrix":[2, 12], "x":12.5, "y":2.25},
+                {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2, 15], "x":15.5, "y":2.25},
+                {"matrix":[2, 16], "x":16.5, "y":2.25},
+                {"matrix":[2, 17], "x":17.5, "y":2.25},
 
                 {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
                 {"matrix":[3, 1], "x":1.75, "y":3.25},
@@ -83,13 +83,13 @@
                 {"matrix":[3, 7], "x":7.75, "y":3.25},
                 {"matrix":[3, 8], "x":8.75, "y":3.25},
                 {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3,15], "x":15.5, "y":3.25},
-                {"matrix":[3,16], "x":16.5, "y":3.25},
-                {"matrix":[3,17], "x":17.5, "y":3.25},
-                {"matrix":[2,14], "x":18.5, "y":2.25, "h":2},
+                {"matrix":[3, 10], "x":10.75, "y":3.25},
+                {"matrix":[3, 11], "x":11.75, "y":3.25},
+                {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25},
+                {"matrix":[3, 15], "x":15.5, "y":3.25},
+                {"matrix":[3, 16], "x":16.5, "y":3.25},
+                {"matrix":[3, 17], "x":17.5, "y":3.25},
+                {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2},
 
                 {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
                 {"matrix":[4, 2], "x":2.25, "y":4.25},
@@ -100,26 +100,26 @@
                 {"matrix":[4, 7], "x":7.25, "y":4.25},
                 {"matrix":[4, 8], "x":8.25, "y":4.25},
                 {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4,14], "x":14.25, "y":4.5},
-                {"matrix":[4,15], "x":15.5, "y":4.25},
-                {"matrix":[4,16], "x":16.5, "y":4.25},
-                {"matrix":[4,17], "x":17.5, "y":4.25},
+                {"matrix":[4, 10], "x":10.25, "y":4.25},
+                {"matrix":[4, 11], "x":11.25, "y":4.25},
+                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix":[4, 14], "x":14.25, "y":4.5},
+                {"matrix":[4, 15], "x":15.5, "y":4.25},
+                {"matrix":[4, 16], "x":16.5, "y":4.25},
+                {"matrix":[4, 17], "x":17.5, "y":4.25},
 
                 {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
                 {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
                 {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
                 {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25},
-                {"matrix":[5,11], "x":11, "y":5.25},
-                {"matrix":[5,12], "x":12, "y":5.25},
-                {"matrix":[5,13], "x":13.25, "y":5.5},
-                {"matrix":[5,14], "x":14.25, "y":5.5},
-                {"matrix":[5,15], "x":15.25, "y":5.5},
-                {"matrix":[5,16], "x":16.5, "y":5.25},
-                {"matrix":[5,17], "x":17.5, "y":5.25},
+                {"matrix":[5, 10], "x":10, "y":5.25},
+                {"matrix":[5, 11], "x":11, "y":5.25},
+                {"matrix":[5, 12], "x":12, "y":5.25},
+                {"matrix":[5, 13], "x":13.25, "y":5.5},
+                {"matrix":[5, 14], "x":14.25, "y":5.5},
+                {"matrix":[5, 15], "x":15.25, "y":5.5},
+                {"matrix":[5, 16], "x":16.5, "y":5.25},
+                {"matrix":[5, 17], "x":17.5, "y":5.25},
                 {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
             ]
         }
diff --git a/keyboards/keychron/q5/ansi_encoder/info.json b/keyboards/keychron/q5/ansi_encoder/info.json
index 86c3b2d39b..2c828726c7 100644
--- a/keyboards/keychron/q5/ansi_encoder/info.json
+++ b/keyboards/keychron/q5/ansi_encoder/info.json
@@ -21,14 +21,14 @@
     "layouts": {
         "LAYOUT_ansi_98": {
             "layout": [
-                {"matrix":[0,  0], "x":0, "y":0},
-                {"matrix":[0,  2], "x":2, "y":0},
-                {"matrix":[0,  3], "x":3, "y":0},
-                {"matrix":[0,  4], "x":4, "y":0},
-                {"matrix":[0,  5], "x":5, "y":0},
-                {"matrix":[0,  7], "x":6.5, "y":0},
-                {"matrix":[0,  8], "x":7.5, "y":0},
-                {"matrix":[0,  9], "x":8.5, "y":0},
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 2], "x":2, "y":0},
+                {"matrix":[0, 3], "x":3, "y":0},
+                {"matrix":[0, 4], "x":4, "y":0},
+                {"matrix":[0, 5], "x":5, "y":0},
+                {"matrix":[0, 7], "x":6.5, "y":0},
+                {"matrix":[0, 8], "x":7.5, "y":0},
+                {"matrix":[0, 9], "x":8.5, "y":0},
                 {"matrix":[0, 10], "x":9.5, "y":0},
                 {"matrix":[0, 11], "x":11, "y":0},
                 {"matrix":[0, 12], "x":12, "y":0},
@@ -49,14 +49,14 @@
                 {"matrix":[1, 7], "x":7, "y":1.25},
                 {"matrix":[1, 8], "x":8, "y":1.25},
                 {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,15], "x":15.5, "y":1.25},
-                {"matrix":[1,16], "x":16.5, "y":1.25},
-                {"matrix":[1,17], "x":17.5, "y":1.25},
-                {"matrix":[3,14], "x":18.5, "y":1.25},
+                {"matrix":[1, 10], "x":10, "y":1.25},
+                {"matrix":[1, 11], "x":11, "y":1.25},
+                {"matrix":[1, 12], "x":12, "y":1.25},
+                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1, 15], "x":15.5, "y":1.25},
+                {"matrix":[1, 16], "x":16.5, "y":1.25},
+                {"matrix":[1, 17], "x":17.5, "y":1.25},
+                {"matrix":[3, 14], "x":18.5, "y":1.25},
 
                 {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
                 {"matrix":[2, 1], "x":1.5, "y":2.25},
@@ -68,13 +68,13 @@
                 {"matrix":[2, 7], "x":7.5, "y":2.25},
                 {"matrix":[2, 8], "x":8.5, "y":2.25},
                 {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,15], "x":15.5, "y":2.25},
-                {"matrix":[2,16], "x":16.5, "y":2.25},
-                {"matrix":[2,17], "x":17.5, "y":2.25},
+                {"matrix":[2, 10], "x":10.5, "y":2.25},
+                {"matrix":[2, 11], "x":11.5, "y":2.25},
+                {"matrix":[2, 12], "x":12.5, "y":2.25},
+                {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2, 15], "x":15.5, "y":2.25},
+                {"matrix":[2, 16], "x":16.5, "y":2.25},
+                {"matrix":[2, 17], "x":17.5, "y":2.25},
 
                 {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
                 {"matrix":[3, 1], "x":1.75, "y":3.25},
@@ -86,13 +86,13 @@
                 {"matrix":[3, 7], "x":7.75, "y":3.25},
                 {"matrix":[3, 8], "x":8.75, "y":3.25},
                 {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3,15], "x":15.5, "y":3.25},
-                {"matrix":[3,16], "x":16.5, "y":3.25},
-                {"matrix":[3,17], "x":17.5, "y":3.25},
-                {"matrix":[2,14], "x":18.5, "y":2.25, "h":2},
+                {"matrix":[3, 10], "x":10.75, "y":3.25},
+                {"matrix":[3, 11], "x":11.75, "y":3.25},
+                {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25},
+                {"matrix":[3, 15], "x":15.5, "y":3.25},
+                {"matrix":[3, 16], "x":16.5, "y":3.25},
+                {"matrix":[3, 17], "x":17.5, "y":3.25},
+                {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2},
 
                 {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
                 {"matrix":[4, 2], "x":2.25, "y":4.25},
@@ -103,26 +103,26 @@
                 {"matrix":[4, 7], "x":7.25, "y":4.25},
                 {"matrix":[4, 8], "x":8.25, "y":4.25},
                 {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4,14], "x":14.25, "y":4.5},
-                {"matrix":[4,15], "x":15.5, "y":4.25},
-                {"matrix":[4,16], "x":16.5, "y":4.25},
-                {"matrix":[4,17], "x":17.5, "y":4.25},
+                {"matrix":[4, 10], "x":10.25, "y":4.25},
+                {"matrix":[4, 11], "x":11.25, "y":4.25},
+                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix":[4, 14], "x":14.25, "y":4.5},
+                {"matrix":[4, 15], "x":15.5, "y":4.25},
+                {"matrix":[4, 16], "x":16.5, "y":4.25},
+                {"matrix":[4, 17], "x":17.5, "y":4.25},
 
                 {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
                 {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
                 {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
                 {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25},
-                {"matrix":[5,11], "x":11, "y":5.25},
-                {"matrix":[5,12], "x":12, "y":5.25},
-                {"matrix":[5,13], "x":13.25, "y":5.5},
-                {"matrix":[5,14], "x":14.25, "y":5.5},
-                {"matrix":[5,15], "x":15.25, "y":5.5},
-                {"matrix":[5,16], "x":16.5, "y":5.25},
-                {"matrix":[5,17], "x":17.5, "y":5.25},
+                {"matrix":[5, 10], "x":10, "y":5.25},
+                {"matrix":[5, 11], "x":11, "y":5.25},
+                {"matrix":[5, 12], "x":12, "y":5.25},
+                {"matrix":[5, 13], "x":13.25, "y":5.5},
+                {"matrix":[5, 14], "x":14.25, "y":5.5},
+                {"matrix":[5, 15], "x":15.25, "y":5.5},
+                {"matrix":[5, 16], "x":16.5, "y":5.25},
+                {"matrix":[5, 17], "x":17.5, "y":5.25},
                 {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
             ]
         }
diff --git a/keyboards/keychron/q5/iso/info.json b/keyboards/keychron/q5/iso/info.json
index dc7a2f5f2b..125cc33736 100644
--- a/keyboards/keychron/q5/iso/info.json
+++ b/keyboards/keychron/q5/iso/info.json
@@ -16,16 +16,16 @@
     "layouts": {
         "LAYOUT_iso_101": {
             "layout": [
-                {"matrix":[0,  0], "x":0, "y":0},
-                {"matrix":[0,  1], "x":1, "y":0},
-                {"matrix":[0,  2], "x":2, "y":0},
-                {"matrix":[0,  3], "x":3, "y":0},
-                {"matrix":[0,  4], "x":4, "y":0},
-                {"matrix":[0,  5], "x":5, "y":0},
-                {"matrix":[0,  6], "x":6, "y":0},
-                {"matrix":[0,  7], "x":7, "y":0},
-                {"matrix":[0,  8], "x":8, "y":0},
-                {"matrix":[0,  9], "x":9, "y":0},
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1, "y":0},
+                {"matrix":[0, 2], "x":2, "y":0},
+                {"matrix":[0, 3], "x":3, "y":0},
+                {"matrix":[0, 4], "x":4, "y":0},
+                {"matrix":[0, 5], "x":5, "y":0},
+                {"matrix":[0, 6], "x":6, "y":0},
+                {"matrix":[0, 7], "x":7, "y":0},
+                {"matrix":[0, 8], "x":8, "y":0},
+                {"matrix":[0, 9], "x":9, "y":0},
                 {"matrix":[0, 10], "x":10, "y":0},
                 {"matrix":[0, 11], "x":11, "y":0},
                 {"matrix":[0, 12], "x":12, "y":0},
@@ -46,14 +46,14 @@
                 {"matrix":[1, 7], "x":7, "y":1.25},
                 {"matrix":[1, 8], "x":8, "y":1.25},
                 {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,15], "x":15.5, "y":1.25},
-                {"matrix":[1,16], "x":16.5, "y":1.25},
-                {"matrix":[1,17], "x":17.5, "y":1.25},
-                {"matrix":[3,14], "x":18.5, "y":1.25},
+                {"matrix":[1, 10], "x":10, "y":1.25},
+                {"matrix":[1, 11], "x":11, "y":1.25},
+                {"matrix":[1, 12], "x":12, "y":1.25},
+                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1, 15], "x":15.5, "y":1.25},
+                {"matrix":[1, 16], "x":16.5, "y":1.25},
+                {"matrix":[1, 17], "x":17.5, "y":1.25},
+                {"matrix":[3, 14], "x":18.5, "y":1.25},
 
                 {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
                 {"matrix":[2, 1], "x":1.5, "y":2.25},
@@ -65,12 +65,12 @@
                 {"matrix":[2, 7], "x":7.5, "y":2.25},
                 {"matrix":[2, 8], "x":8.5, "y":2.25},
                 {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,15], "x":15.5, "y":2.25},
-                {"matrix":[2,16], "x":16.5, "y":2.25},
-                {"matrix":[2,17], "x":17.5, "y":2.25},
+                {"matrix":[2, 10], "x":10.5, "y":2.25},
+                {"matrix":[2, 11], "x":11.5, "y":2.25},
+                {"matrix":[2, 12], "x":12.5, "y":2.25},
+                {"matrix":[2, 15], "x":15.5, "y":2.25},
+                {"matrix":[2, 16], "x":16.5, "y":2.25},
+                {"matrix":[2, 17], "x":17.5, "y":2.25},
 
                 {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
                 {"matrix":[3, 1], "x":1.75, "y":3.25},
@@ -82,14 +82,14 @@
                 {"matrix":[3, 7], "x":7.75, "y":3.25},
                 {"matrix":[3, 8], "x":8.75, "y":3.25},
                 {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25},
-                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3,15], "x":15.5, "y":3.25},
-                {"matrix":[3,16], "x":16.5, "y":3.25},
-                {"matrix":[3,17], "x":17.5, "y":3.25},
-                {"matrix":[2,14], "x":18.5, "y":2.25, "h":2},
+                {"matrix":[3, 10], "x":10.75, "y":3.25},
+                {"matrix":[3, 11], "x":11.75, "y":3.25},
+                {"matrix":[3, 13], "x":12.75, "y":3.25},
+                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[3, 15], "x":15.5, "y":3.25},
+                {"matrix":[3, 16], "x":16.5, "y":3.25},
+                {"matrix":[3, 17], "x":17.5, "y":3.25},
+                {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2},
 
                 {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
                 {"matrix":[4, 1], "x":1.25, "y":4.25},
@@ -101,26 +101,26 @@
                 {"matrix":[4, 7], "x":7.25, "y":4.25},
                 {"matrix":[4, 8], "x":8.25, "y":4.25},
                 {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4,14], "x":14.25, "y":4.5},
-                {"matrix":[4,15], "x":15.5, "y":4.25},
-                {"matrix":[4,16], "x":16.5, "y":4.25},
-                {"matrix":[4,17], "x":17.5, "y":4.25},
+                {"matrix":[4, 10], "x":10.25, "y":4.25},
+                {"matrix":[4, 11], "x":11.25, "y":4.25},
+                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix":[4, 14], "x":14.25, "y":4.5},
+                {"matrix":[4, 15], "x":15.5, "y":4.25},
+                {"matrix":[4, 16], "x":16.5, "y":4.25},
+                {"matrix":[4, 17], "x":17.5, "y":4.25},
 
                 {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
                 {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
                 {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
                 {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25},
-                {"matrix":[5,11], "x":11, "y":5.25},
-                {"matrix":[5,12], "x":12, "y":5.25},
-                {"matrix":[5,13], "x":13.25, "y":5.5},
-                {"matrix":[5,14], "x":14.25, "y":5.5},
-                {"matrix":[5,15], "x":15.25, "y":5.5},
-                {"matrix":[5,16], "x":16.5, "y":5.25},
-                {"matrix":[5,17], "x":17.5, "y":5.25},
+                {"matrix":[5, 10], "x":10, "y":5.25},
+                {"matrix":[5, 11], "x":11, "y":5.25},
+                {"matrix":[5, 12], "x":12, "y":5.25},
+                {"matrix":[5, 13], "x":13.25, "y":5.5},
+                {"matrix":[5, 14], "x":14.25, "y":5.5},
+                {"matrix":[5, 15], "x":15.25, "y":5.5},
+                {"matrix":[5, 16], "x":16.5, "y":5.25},
+                {"matrix":[5, 17], "x":17.5, "y":5.25},
                 {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
             ]
         }
diff --git a/keyboards/keychron/q5/iso_encoder/info.json b/keyboards/keychron/q5/iso_encoder/info.json
index 26e27edd5e..4a5e1521cf 100644
--- a/keyboards/keychron/q5/iso_encoder/info.json
+++ b/keyboards/keychron/q5/iso_encoder/info.json
@@ -21,14 +21,14 @@
     "layouts": {
         "LAYOUT_iso_99": {
             "layout": [
-                {"matrix":[0,  0], "x":0, "y":0},
-                {"matrix":[0,  2], "x":2, "y":0},
-                {"matrix":[0,  3], "x":3, "y":0},
-                {"matrix":[0,  4], "x":4, "y":0},
-                {"matrix":[0,  5], "x":5, "y":0},
-                {"matrix":[0,  7], "x":6.5, "y":0},
-                {"matrix":[0,  8], "x":7.5, "y":0},
-                {"matrix":[0,  9], "x":8.5, "y":0},
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 2], "x":2, "y":0},
+                {"matrix":[0, 3], "x":3, "y":0},
+                {"matrix":[0, 4], "x":4, "y":0},
+                {"matrix":[0, 5], "x":5, "y":0},
+                {"matrix":[0, 7], "x":6.5, "y":0},
+                {"matrix":[0, 8], "x":7.5, "y":0},
+                {"matrix":[0, 9], "x":8.5, "y":0},
                 {"matrix":[0, 10], "x":9.5, "y":0},
                 {"matrix":[0, 11], "x":11, "y":0},
                 {"matrix":[0, 12], "x":12, "y":0},
@@ -49,14 +49,14 @@
                 {"matrix":[1, 7], "x":7, "y":1.25},
                 {"matrix":[1, 8], "x":8, "y":1.25},
                 {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,15], "x":15.5, "y":1.25},
-                {"matrix":[1,16], "x":16.5, "y":1.25},
-                {"matrix":[1,17], "x":17.5, "y":1.25},
-                {"matrix":[3,14], "x":18.5, "y":1.25},
+                {"matrix":[1, 10], "x":10, "y":1.25},
+                {"matrix":[1, 11], "x":11, "y":1.25},
+                {"matrix":[1, 12], "x":12, "y":1.25},
+                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1, 15], "x":15.5, "y":1.25},
+                {"matrix":[1, 16], "x":16.5, "y":1.25},
+                {"matrix":[1, 17], "x":17.5, "y":1.25},
+                {"matrix":[3, 14], "x":18.5, "y":1.25},
 
                 {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
                 {"matrix":[2, 1], "x":1.5, "y":2.25},
@@ -68,12 +68,12 @@
                 {"matrix":[2, 7], "x":7.5, "y":2.25},
                 {"matrix":[2, 8], "x":8.5, "y":2.25},
                 {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,15], "x":15.5, "y":2.25},
-                {"matrix":[2,16], "x":16.5, "y":2.25},
-                {"matrix":[2,17], "x":17.5, "y":2.25},
+                {"matrix":[2, 10], "x":10.5, "y":2.25},
+                {"matrix":[2, 11], "x":11.5, "y":2.25},
+                {"matrix":[2, 12], "x":12.5, "y":2.25},
+                {"matrix":[2, 15], "x":15.5, "y":2.25},
+                {"matrix":[2, 16], "x":16.5, "y":2.25},
+                {"matrix":[2, 17], "x":17.5, "y":2.25},
 
                 {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
                 {"matrix":[3, 1], "x":1.75, "y":3.25},
@@ -85,14 +85,14 @@
                 {"matrix":[3, 7], "x":7.75, "y":3.25},
                 {"matrix":[3, 8], "x":8.75, "y":3.25},
                 {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25},
-                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3,15], "x":15.5, "y":3.25},
-                {"matrix":[3,16], "x":16.5, "y":3.25},
-                {"matrix":[3,17], "x":17.5, "y":3.25},
-                {"matrix":[2,14], "x":18.5, "y":2.25, "h":2},
+                {"matrix":[3, 10], "x":10.75, "y":3.25},
+                {"matrix":[3, 11], "x":11.75, "y":3.25},
+                {"matrix":[3, 13], "x":12.75, "y":3.25},
+                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[3, 15], "x":15.5, "y":3.25},
+                {"matrix":[3, 16], "x":16.5, "y":3.25},
+                {"matrix":[3, 17], "x":17.5, "y":3.25},
+                {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2},
 
                 {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
                 {"matrix":[4, 1], "x":1.25, "y":4.25},
@@ -104,26 +104,26 @@
                 {"matrix":[4, 7], "x":7.25, "y":4.25},
                 {"matrix":[4, 8], "x":8.25, "y":4.25},
                 {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4,14], "x":14.25, "y":4.5},
-                {"matrix":[4,15], "x":15.5, "y":4.25},
-                {"matrix":[4,16], "x":16.5, "y":4.25},
-                {"matrix":[4,17], "x":17.5, "y":4.25},
+                {"matrix":[4, 10], "x":10.25, "y":4.25},
+                {"matrix":[4, 11], "x":11.25, "y":4.25},
+                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix":[4, 14], "x":14.25, "y":4.5},
+                {"matrix":[4, 15], "x":15.5, "y":4.25},
+                {"matrix":[4, 16], "x":16.5, "y":4.25},
+                {"matrix":[4, 17], "x":17.5, "y":4.25},
 
                 {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
                 {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
                 {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
                 {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25},
-                {"matrix":[5,11], "x":11, "y":5.25},
-                {"matrix":[5,12], "x":12, "y":5.25},
-                {"matrix":[5,13], "x":13.25, "y":5.5},
-                {"matrix":[5,14], "x":14.25, "y":5.5},
-                {"matrix":[5,15], "x":15.25, "y":5.5},
-                {"matrix":[5,16], "x":16.5, "y":5.25},
-                {"matrix":[5,17], "x":17.5, "y":5.25},
+                {"matrix":[5, 10], "x":10, "y":5.25},
+                {"matrix":[5, 11], "x":11, "y":5.25},
+                {"matrix":[5, 12], "x":12, "y":5.25},
+                {"matrix":[5, 13], "x":13.25, "y":5.5},
+                {"matrix":[5, 14], "x":14.25, "y":5.5},
+                {"matrix":[5, 15], "x":15.25, "y":5.5},
+                {"matrix":[5, 16], "x":16.5, "y":5.25},
+                {"matrix":[5, 17], "x":17.5, "y":5.25},
                 {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
             ]
         }
-- 
cgit v1.2.3


From a5e46d80822797cd2e0dc2a2b81c4ccce9e167f4 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 3 May 2023 12:19:34 +1000
Subject: More `info.json` whitespace cleanups (#20665)

---
 keyboards/keychron/q5/ansi/info.json         | 200 +++++++++++++-------------
 keyboards/keychron/q5/ansi_encoder/info.json | 196 +++++++++++++-------------
 keyboards/keychron/q5/iso/info.json          | 202 +++++++++++++--------------
 keyboards/keychron/q5/iso_encoder/info.json  | 198 +++++++++++++-------------
 4 files changed, 398 insertions(+), 398 deletions(-)

(limited to 'keyboards/keychron/q5')

diff --git a/keyboards/keychron/q5/ansi/info.json b/keyboards/keychron/q5/ansi/info.json
index 555034fb80..7be2a38367 100644
--- a/keyboards/keychron/q5/ansi/info.json
+++ b/keyboards/keychron/q5/ansi/info.json
@@ -16,111 +16,111 @@
     "layouts": {
         "LAYOUT_ansi_100": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0, 10], "x":10, "y":0},
-                {"matrix":[0, 11], "x":11, "y":0},
-                {"matrix":[0, 12], "x":12, "y":0},
-                {"matrix":[0, 13], "x":13, "y":0},
-                {"matrix":[0, 14], "x":14, "y":0},
-                {"matrix":[0, 15], "x":15.5, "y":0},
-                {"matrix":[0, 16], "x":16.5, "y":0},
-                {"matrix":[0, 17], "x":17.5, "y":0},
-                {"matrix":[3, 12], "x":18.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "x": 17.5, "y": 0},
+                {"matrix": [3, 12], "x": 18.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":15.5, "y":1.25},
-                {"matrix":[1, 16], "x":16.5, "y":1.25},
-                {"matrix":[1, 17], "x":17.5, "y":1.25},
-                {"matrix":[3, 14], "x":18.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2, 15], "x":15.5, "y":2.25},
-                {"matrix":[2, 16], "x":16.5, "y":2.25},
-                {"matrix":[2, 17], "x":17.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3, 15], "x":15.5, "y":3.25},
-                {"matrix":[3, 16], "x":16.5, "y":3.25},
-                {"matrix":[3, 17], "x":17.5, "y":3.25},
-                {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 14], "x":14.25, "y":4.5},
-                {"matrix":[4, 15], "x":15.5, "y":4.25},
-                {"matrix":[4, 16], "x":16.5, "y":4.25},
-                {"matrix":[4, 17], "x":17.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25},
-                {"matrix":[5, 11], "x":11, "y":5.25},
-                {"matrix":[5, 12], "x":12, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.5},
-                {"matrix":[5, 14], "x":14.25, "y":5.5},
-                {"matrix":[5, 15], "x":15.25, "y":5.5},
-                {"matrix":[5, 16], "x":16.5, "y":5.25},
-                {"matrix":[5, 17], "x":17.5, "y":5.25},
-                {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/q5/ansi_encoder/info.json b/keyboards/keychron/q5/ansi_encoder/info.json
index 2c828726c7..a1a12f17ed 100644
--- a/keyboards/keychron/q5/ansi_encoder/info.json
+++ b/keyboards/keychron/q5/ansi_encoder/info.json
@@ -21,109 +21,109 @@
     "layouts": {
         "LAYOUT_ansi_98": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 7], "x":6.5, "y":0},
-                {"matrix":[0, 8], "x":7.5, "y":0},
-                {"matrix":[0, 9], "x":8.5, "y":0},
-                {"matrix":[0, 10], "x":9.5, "y":0},
-                {"matrix":[0, 11], "x":11, "y":0},
-                {"matrix":[0, 12], "x":12, "y":0},
-                {"matrix":[0, 13], "x":13, "y":0},
-                {"matrix":[0, 14], "x":14, "y":0},
-                {"matrix":[0, 15], "x":15.25, "y":0},
-                {"matrix":[0, 16], "x":16.25, "y":0},
-                {"matrix":[0, 17], "x":17.25, "y":0},
-                {"matrix":[3, 12], "x":18.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+                {"matrix": [3, 12], "x": 18.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":15.5, "y":1.25},
-                {"matrix":[1, 16], "x":16.5, "y":1.25},
-                {"matrix":[1, 17], "x":17.5, "y":1.25},
-                {"matrix":[3, 14], "x":18.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2, 15], "x":15.5, "y":2.25},
-                {"matrix":[2, 16], "x":16.5, "y":2.25},
-                {"matrix":[2, 17], "x":17.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3, 15], "x":15.5, "y":3.25},
-                {"matrix":[3, 16], "x":16.5, "y":3.25},
-                {"matrix":[3, 17], "x":17.5, "y":3.25},
-                {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 14], "x":14.25, "y":4.5},
-                {"matrix":[4, 15], "x":15.5, "y":4.25},
-                {"matrix":[4, 16], "x":16.5, "y":4.25},
-                {"matrix":[4, 17], "x":17.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25},
-                {"matrix":[5, 11], "x":11, "y":5.25},
-                {"matrix":[5, 12], "x":12, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.5},
-                {"matrix":[5, 14], "x":14.25, "y":5.5},
-                {"matrix":[5, 15], "x":15.25, "y":5.5},
-                {"matrix":[5, 16], "x":16.5, "y":5.25},
-                {"matrix":[5, 17], "x":17.5, "y":5.25},
-                {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/q5/iso/info.json b/keyboards/keychron/q5/iso/info.json
index 125cc33736..786fa4a67e 100644
--- a/keyboards/keychron/q5/iso/info.json
+++ b/keyboards/keychron/q5/iso/info.json
@@ -16,112 +16,112 @@
     "layouts": {
         "LAYOUT_iso_101": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0, 10], "x":10, "y":0},
-                {"matrix":[0, 11], "x":11, "y":0},
-                {"matrix":[0, 12], "x":12, "y":0},
-                {"matrix":[0, 13], "x":13, "y":0},
-                {"matrix":[0, 14], "x":14, "y":0},
-                {"matrix":[0, 15], "x":15.5, "y":0},
-                {"matrix":[0, 16], "x":16.5, "y":0},
-                {"matrix":[0, 17], "x":17.5, "y":0},
-                {"matrix":[3, 12], "x":18.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "x": 17.5, "y": 0},
+                {"matrix": [3, 12], "x": 18.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":15.5, "y":1.25},
-                {"matrix":[1, 16], "x":16.5, "y":1.25},
-                {"matrix":[1, 17], "x":17.5, "y":1.25},
-                {"matrix":[3, 14], "x":18.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 15], "x":15.5, "y":2.25},
-                {"matrix":[2, 16], "x":16.5, "y":2.25},
-                {"matrix":[2, 17], "x":17.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3, 15], "x":15.5, "y":3.25},
-                {"matrix":[3, 16], "x":16.5, "y":3.25},
-                {"matrix":[3, 17], "x":17.5, "y":3.25},
-                {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 14], "x":14.25, "y":4.5},
-                {"matrix":[4, 15], "x":15.5, "y":4.25},
-                {"matrix":[4, 16], "x":16.5, "y":4.25},
-                {"matrix":[4, 17], "x":17.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25},
-                {"matrix":[5, 11], "x":11, "y":5.25},
-                {"matrix":[5, 12], "x":12, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.5},
-                {"matrix":[5, 14], "x":14.25, "y":5.5},
-                {"matrix":[5, 15], "x":15.25, "y":5.5},
-                {"matrix":[5, 16], "x":16.5, "y":5.25},
-                {"matrix":[5, 17], "x":17.5, "y":5.25},
-                {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/q5/iso_encoder/info.json b/keyboards/keychron/q5/iso_encoder/info.json
index 4a5e1521cf..650af582af 100644
--- a/keyboards/keychron/q5/iso_encoder/info.json
+++ b/keyboards/keychron/q5/iso_encoder/info.json
@@ -21,110 +21,110 @@
     "layouts": {
         "LAYOUT_iso_99": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 7], "x":6.5, "y":0},
-                {"matrix":[0, 8], "x":7.5, "y":0},
-                {"matrix":[0, 9], "x":8.5, "y":0},
-                {"matrix":[0, 10], "x":9.5, "y":0},
-                {"matrix":[0, 11], "x":11, "y":0},
-                {"matrix":[0, 12], "x":12, "y":0},
-                {"matrix":[0, 13], "x":13, "y":0},
-                {"matrix":[0, 14], "x":14, "y":0},
-                {"matrix":[0, 15], "x":15.25, "y":0},
-                {"matrix":[0, 16], "x":16.25, "y":0},
-                {"matrix":[0, 17], "x":17.25, "y":0},
-                {"matrix":[3, 12], "x":18.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+                {"matrix": [3, 12], "x": 18.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":15.5, "y":1.25},
-                {"matrix":[1, 16], "x":16.5, "y":1.25},
-                {"matrix":[1, 17], "x":17.5, "y":1.25},
-                {"matrix":[3, 14], "x":18.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 15], "x":15.5, "y":2.25},
-                {"matrix":[2, 16], "x":16.5, "y":2.25},
-                {"matrix":[2, 17], "x":17.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3, 15], "x":15.5, "y":3.25},
-                {"matrix":[3, 16], "x":16.5, "y":3.25},
-                {"matrix":[3, 17], "x":17.5, "y":3.25},
-                {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 14], "x":14.25, "y":4.5},
-                {"matrix":[4, 15], "x":15.5, "y":4.25},
-                {"matrix":[4, 16], "x":16.5, "y":4.25},
-                {"matrix":[4, 17], "x":17.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25},
-                {"matrix":[5, 11], "x":11, "y":5.25},
-                {"matrix":[5, 12], "x":12, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.5},
-                {"matrix":[5, 14], "x":14.25, "y":5.5},
-                {"matrix":[5, 15], "x":15.25, "y":5.5},
-                {"matrix":[5, 16], "x":16.5, "y":5.25},
-                {"matrix":[5, 17], "x":17.5, "y":5.25},
-                {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
             ]
         }
     }
-- 
cgit v1.2.3