diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7687fc6e..1375a6ae 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,5 +1,10 @@
 fail_fast: false
 repos:
+  - repo: https://github.com/Lucas-C/pre-commit-hooks
+    rev: v1.5.1
+    hooks:
+      - id: remove-tabs
+        exclude: "vendor-prefixes\\.txt$"
   - repo: https://github.com/pocc/pre-commit-hooks
     rev: v1.3.5
     hooks:
diff --git a/app/Kconfig b/app/Kconfig
index ccc5f42d..25a99b55 100644
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -8,167 +8,167 @@ menu "ZMK"
 menu "Basic Keyboard Setup"
 
 config ZMK_KEYBOARD_NAME
-	string "Keyboard Name"
+    string "Keyboard Name"
 
 config USB_DEVICE_PRODUCT
-	default ZMK_KEYBOARD_NAME
+    default ZMK_KEYBOARD_NAME
 
 config BT_DEVICE_NAME
-	default ZMK_KEYBOARD_NAME
+    default ZMK_KEYBOARD_NAME
 
 config USB_DEVICE_VID
-	default 0x1D50
+    default 0x1D50
 
 config USB_DEVICE_PID
-	default 0x615E
+    default 0x615E
 
 config USB_DEVICE_MANUFACTURER
-	default "ZMK Project"
+    default "ZMK Project"
 
 config BT_DIS_PNP_VID
-	default 0x1D50
+    default 0x1D50
 
 config BT_DIS_PNP_PID
-	default 0x615E
+    default 0x615E
 
 config BT_DIS_MODEL
-	default ZMK_KEYBOARD_NAME
+    default ZMK_KEYBOARD_NAME
 
 config BT_DIS_MANUF
-	default "ZMK Project"
+    default "ZMK Project"
 
 menu "HID"
 
 choice ZMK_HID_REPORT_TYPE
-	prompt "HID Report Type"
+    prompt "HID Report Type"
 
 config ZMK_HID_REPORT_TYPE_HKRO
-	bool "#-Key Roll Over (HKRO) HID Report"
-	help
-	  Enable # key roll over for HID report. This selection is "boot keyboard" compatible
-	  but limits the total number of possible keys to report as held to #.
+    bool "#-Key Roll Over (HKRO) HID Report"
+    help
+      Enable # key roll over for HID report. This selection is "boot keyboard" compatible
+      but limits the total number of possible keys to report as held to #.
 
 config ZMK_HID_REPORT_TYPE_NKRO
-	bool "Full N-Key Roll Over (NKRO) HID Report"
-	help
-	  Enable full N-Key Roll Over for HID output. This selection will prevent the keyboard
-	  from working with some BIOS/UEFI versions that only support "boot keyboard" support.
-	  This option also prevents using some infrequently used higher range HID usages.
+    bool "Full N-Key Roll Over (NKRO) HID Report"
+    help
+      Enable full N-Key Roll Over for HID output. This selection will prevent the keyboard
+      from working with some BIOS/UEFI versions that only support "boot keyboard" support.
+      This option also prevents using some infrequently used higher range HID usages.
 
 endchoice
 
 if ZMK_HID_REPORT_TYPE_HKRO
 
 config ZMK_HID_KEYBOARD_REPORT_SIZE
-	int "# Keyboard Keys Reportable"
-	default 6
+    int "# Keyboard Keys Reportable"
+    default 6
 
 endif
 
 config ZMK_HID_CONSUMER_REPORT_SIZE
-	int "# Consumer Keys Reportable"
-	default 6
+    int "# Consumer Keys Reportable"
+    default 6
 
 
 choice ZMK_HID_CONSUMER_REPORT_USAGES
-	prompt "HID Report Type"
+    prompt "HID Report Type"
 
 config ZMK_HID_CONSUMER_REPORT_USAGES_FULL
-	bool "Full Consumer HID Usage Support"
-	help
-	  Enable full Consumer usage ID values to be sent to hosts. Allows for less
-	  frequently used usages, but has compatibability issues with some host OSes.
+    bool "Full Consumer HID Usage Support"
+    help
+      Enable full Consumer usage ID values to be sent to hosts. Allows for less
+      frequently used usages, but has compatibability issues with some host OSes.
 
 config ZMK_HID_CONSUMER_REPORT_USAGES_BASIC
-	bool "Basic Consumer HID Usage Support"
-	help
-	  Enable Consumer usage ID values up to "Playback Speed - Slow" to be sent to
-	  hosts. Allows for broader compatibability with more host OSes.
+    bool "Basic Consumer HID Usage Support"
+    help
+      Enable Consumer usage ID values up to "Playback Speed - Slow" to be sent to
+      hosts. Allows for broader compatibability with more host OSes.
 
 endchoice
 
 menu "Output Types"
 
 config ZMK_USB
-	bool "USB"
-	select USB
-	select USB_DEVICE_STACK
-	select USB_DEVICE_HID
+    bool "USB"
+    select USB
+    select USB_DEVICE_STACK
+    select USB_DEVICE_HID
 
 if ZMK_USB
 
 config USB_NUMOF_EP_WRITE_RETRIES
-	default 10
+    default 10
 
 config USB_HID_POLL_INTERVAL_MS
-	default 1
+    default 1
 
 #ZMK_USB
 endif
 
 menuconfig ZMK_BLE
-	bool "BLE (HID over GATT)"
-	select BT
-	select BT_SMP
-	select BT_SMP_SC_PAIR_ONLY
-	select BT_SMP_APP_PAIRING_ACCEPT
-	select BT_PERIPHERAL
-	select BT_DIS
-	select BT_BAS
-	select BT_SETTINGS
-	select SETTINGS
+    bool "BLE (HID over GATT)"
+    select BT
+    select BT_SMP
+    select BT_SMP_SC_PAIR_ONLY
+    select BT_SMP_APP_PAIRING_ACCEPT
+    select BT_PERIPHERAL
+    select BT_DIS
+    select BT_BAS
+    select BT_SETTINGS
+    select SETTINGS
 
 if ZMK_BLE
 
 config SYSTEM_WORKQUEUE_STACK_SIZE
-	default 4096 if SOC_RP2040
-	default 2048
+    default 4096 if SOC_RP2040
+    default 2048
 
 config ZMK_BLE_THREAD_STACK_SIZE
-	int "BLE notify thread stack size"
-	default 512
+    int "BLE notify thread stack size"
+    default 512
 
 config ZMK_BLE_THREAD_PRIORITY
-	int "BLE notify thread priority"
-	default 5
+    int "BLE notify thread priority"
+    default 5
 
 config ZMK_BLE_KEYBOARD_REPORT_QUEUE_SIZE
-	int "Max number of keyboard HID reports to queue for sending over BLE"
-	default 20
+    int "Max number of keyboard HID reports to queue for sending over BLE"
+    default 20
 
 config ZMK_BLE_CONSUMER_REPORT_QUEUE_SIZE
-	int "Max number of consumer HID reports to queue for sending over BLE"
-	default 5
+    int "Max number of consumer HID reports to queue for sending over BLE"
+    default 5
 
 config ZMK_BLE_CLEAR_BONDS_ON_START
-	bool "Configuration that clears all bond information from the keyboard on startup."
-	default n
+    bool "Configuration that clears all bond information from the keyboard on startup."
+    default n
 
 # HID GATT notifications sent this way are *not* picked up by Linux, and possibly others.
 config BT_GATT_NOTIFY_MULTIPLE
-	default n
+    default n
 
 config BT_GATT_AUTO_SEC_REQ
-	default n
+    default n
 
 config BT_DEVICE_APPEARANCE
-	default 961
+    default 961
 
 config ZMK_BLE_PASSKEY_ENTRY
-	bool "Experimental: Requiring typing passkey from host to pair BLE connection"
-	default n
+    bool "Experimental: Requiring typing passkey from host to pair BLE connection"
+    default n
 
 config BT_PERIPHERAL_PREF_MIN_INT
-	default 6
+    default 6
 
 config BT_PERIPHERAL_PREF_MAX_INT
-	default 12
+    default 12
 
 config BT_PERIPHERAL_PREF_LATENCY
-	default 30
+    default 30
 
 config BT_PERIPHERAL_PREF_TIMEOUT
-	default 400
+    default 400
 
 #ZMK_BLE
 endif
@@ -189,108 +189,108 @@ menu "Display/LED Options"
 rsource "src/display/Kconfig"
 
 menuconfig ZMK_RGB_UNDERGLOW
-	bool "RGB Adressable LED Underglow"
-	select LED_STRIP
+    bool "RGB Adressable LED Underglow"
+    select LED_STRIP
 
 if ZMK_RGB_UNDERGLOW
 
 # This default value cuts down on tons of excess .conf files, if you're using GPIO, manually disable this
 config SPI
-	default y
+    default y
 
 config ZMK_RGB_UNDERGLOW_EXT_POWER
-	bool "RGB underglow toggling also controls external power"
-	default y
+    bool "RGB underglow toggling also controls external power"
+    default y
 
 config ZMK_RGB_UNDERGLOW_BRT_MIN
-	int "RGB underglow minimum brightness in percent"
-	range 0 100
-	default 0
+    int "RGB underglow minimum brightness in percent"
+    range 0 100
+    default 0
 
 config ZMK_RGB_UNDERGLOW_BRT_MAX
-	int "RGB underglow maximum brightness in percent"
-	range ZMK_RGB_UNDERGLOW_BRT_MIN 100
-	default 100
+    int "RGB underglow maximum brightness in percent"
+    range ZMK_RGB_UNDERGLOW_BRT_MIN 100
+    default 100
 
 config ZMK_RGB_UNDERGLOW_HUE_STEP
-	int "RGB underglow hue step in degrees"
-	range 0 359
-	default 10
+    int "RGB underglow hue step in degrees"
+    range 0 359
+    default 10
 
 config ZMK_RGB_UNDERGLOW_SAT_STEP
-	int "RGB underglow saturation step in percent"
-	range 0 100
-	default 10
+    int "RGB underglow saturation step in percent"
+    range 0 100
+    default 10
 
 config ZMK_RGB_UNDERGLOW_BRT_STEP
-	int "RGB underglow brightness step in percent"
-	range 0 100
-	default 10
+    int "RGB underglow brightness step in percent"
+    range 0 100
+    default 10
 
 config ZMK_RGB_UNDERGLOW_HUE_START
-	int "RGB underglow start hue value in degrees"
-	range 0 359
-	default 0
+    int "RGB underglow start hue value in degrees"
+    range 0 359
+    default 0
 
 config ZMK_RGB_UNDERGLOW_SAT_START
-	int "RGB underglow start saturations value in percent"
-	range 0 100
-	default 100
+    int "RGB underglow start saturations value in percent"
+    range 0 100
+    default 100
 
 config ZMK_RGB_UNDERGLOW_BRT_START
-	int "RGB underglow start brightness value in percent"
-	range ZMK_RGB_UNDERGLOW_BRT_MIN ZMK_RGB_UNDERGLOW_BRT_MAX
-	default ZMK_RGB_UNDERGLOW_BRT_MAX
+    int "RGB underglow start brightness value in percent"
+    range ZMK_RGB_UNDERGLOW_BRT_MIN ZMK_RGB_UNDERGLOW_BRT_MAX
+    default ZMK_RGB_UNDERGLOW_BRT_MAX
 
 config ZMK_RGB_UNDERGLOW_SPD_START
-	int "RGB underglow start animation speed value"
-	range 1 5
-	default 3
+    int "RGB underglow start animation speed value"
+    range 1 5
+    default 3
 
 config ZMK_RGB_UNDERGLOW_EFF_START
-	int "RGB underglow start effect int value related to the effect enum list"
-	range 0 3
-	default 0
+    int "RGB underglow start effect int value related to the effect enum list"
+    range 0 3
+    default 0
 
 config ZMK_RGB_UNDERGLOW_ON_START
-	bool "RGB underglow starts on by default"
-	default y
+    bool "RGB underglow starts on by default"
+    default y
 
 config ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE
-	bool "Turn off RGB underglow when keyboard goes into idle state"
+    bool "Turn off RGB underglow when keyboard goes into idle state"
 
 config ZMK_RGB_UNDERGLOW_AUTO_OFF_USB
-	bool "Turn off RGB underglow when USB is disconnected"
-	depends on USB_DEVICE_STACK
+    bool "Turn off RGB underglow when USB is disconnected"
+    depends on USB_DEVICE_STACK
 
 #ZMK_RGB_UNDERGLOW
 endif
 
 menuconfig ZMK_BACKLIGHT
-	bool "LED backlight"
-	select LED
+    bool "LED backlight"
+    select LED
 
 if ZMK_BACKLIGHT
 
 config ZMK_BACKLIGHT_BRT_STEP
-	int "Brightness step in percent"
-	range 1 100
-	default 20
+    int "Brightness step in percent"
+    range 1 100
+    default 20
 
 config ZMK_BACKLIGHT_BRT_START
-	int "Default brightness in percent"
-	range 1 100
-	default 40
+    int "Default brightness in percent"
+    range 1 100
+    default 40
 
 config ZMK_BACKLIGHT_ON_START
-	bool "Default backlight state"
-	default y
+    bool "Default backlight state"
+    default y
 
 config ZMK_BACKLIGHT_AUTO_OFF_IDLE
-	bool "Turn off backlight when keyboard goes into idle state"
+    bool "Turn off backlight when keyboard goes into idle state"
 
 config ZMK_BACKLIGHT_AUTO_OFF_USB
-	bool "Turn off backlight when USB is disconnected"
+    bool "Turn off backlight when USB is disconnected"
 
 #ZMK_BACKLIGHT
 endif
@@ -301,28 +301,28 @@ endmenu
 menu "Power Management"
 
 config ZMK_IDLE_TIMEOUT
-	int "Milliseconds of inactivity before entering idle state (OLED shutoff, etc)"
-	default 30000
+    int "Milliseconds of inactivity before entering idle state (OLED shutoff, etc)"
+    default 30000
 
 config ZMK_SLEEP
-	bool "Enable deep sleep support"
-	imply USB
+    bool "Enable deep sleep support"
+    imply USB
 
 if ZMK_SLEEP
 
 config PM_DEVICE
-	default y
+    default y
 
 config ZMK_IDLE_SLEEP_TIMEOUT
-	int "Milliseconds of inactivity before entering deep sleep"
-	default 900000
+    int "Milliseconds of inactivity before entering deep sleep"
+    default 900000
 
 #ZMK_SLEEP
 endif
 
 config ZMK_EXT_POWER
-	bool "Enable support to control external power output"
-	default y
+    bool "Enable support to control external power output"
+    default y
 
 #Power Management
 endmenu
@@ -330,16 +330,16 @@ endmenu
 menu "Combo options"
 
 config ZMK_COMBO_MAX_PRESSED_COMBOS
-	int "Maximum number of currently pressed combos"
-	default 4
+    int "Maximum number of currently pressed combos"
+    default 4
 
 config ZMK_COMBO_MAX_COMBOS_PER_KEY
-	int "Maximum number of combos per key"
-	default 5
+    int "Maximum number of combos per key"
+    default 5
 
 config ZMK_COMBO_MAX_KEYS_PER_COMBO
-	int "Maximum number of keys per combo"
-	default 4
+    int "Maximum number of keys per combo"
+    default 4
 
 #Combo options
 endmenu
@@ -347,18 +347,18 @@ endmenu
 menu "Behavior Options"
 
 config ZMK_BEHAVIORS_QUEUE_SIZE
-	int "Maximum number of behaviors to allow queueing from a macro or other complex behavior"
-	default 64
+    int "Maximum number of behaviors to allow queueing from a macro or other complex behavior"
+    default 64
 
 rsource "Kconfig.behaviors"
 
 config ZMK_MACRO_DEFAULT_WAIT_MS
-	int "Default time to wait (in milliseconds) before triggering the next behavior in macros"
-	default 15
+    int "Default time to wait (in milliseconds) before triggering the next behavior in macros"
+    default 15
 
 config ZMK_MACRO_DEFAULT_TAP_MS
-	int "Default time to wait (in milliseconds) between the press and release events of a tapped behavior in macros"
-	default 30
+    int "Default time to wait (in milliseconds) between the press and release events of a tapped behavior in macros"
+    default 30
 
 endmenu
 
@@ -369,8 +369,8 @@ menu "Initialization Priorities"
 if USB_DEVICE_STACK
 
 config ZMK_USB_INIT_PRIORITY
-	int "USB Init Priority"
-	default 50
+    int "USB Init Priority"
+    default 50
 
 #USB
 endif
@@ -378,8 +378,8 @@ endif
 if ZMK_BLE || ZMK_SPLIT_BLE
 
 config ZMK_BLE_INIT_PRIORITY
-	int "BLE Init Priority"
-	default 50
+    int "BLE Init Priority"
+    default 50
 
 #ZMK_BLE || ZMK_SPLIT_BLE
 endif
@@ -390,8 +390,8 @@ endmenu
 menu "KSCAN Settings"
 
 config ZMK_KSCAN_EVENT_QUEUE_SIZE
-	int "Size of the event queue for KSCAN events to buffer events"
-	default 4
+    int "Size of the event queue for KSCAN events to buffer events"
+    default 4
 
 #KSCAN Settings
 endmenu
@@ -399,63 +399,63 @@ endmenu
 menu "Logging"
 
 config ZMK_LOGGING_MINIMAL
-	bool "Suppress all ZMK debug log messages"
-	default false
+    bool "Suppress all ZMK debug log messages"
+    default false
 
 if !ZMK_LOGGING_MINIMAL
 
 config ZMK_LOG_LEVEL
-	default 4
+    default 4
 
 endif
 
 config ZMK_USB_LOGGING
-	bool "Enable USB CDC ACM logging to help debug"
-	select LOG
-	select USB
-	select USB_DEVICE_STACK
-	select USB_CDC_ACM
-	select SERIAL
-	select CONSOLE
-	select UART_INTERRUPT_DRIVEN
-	select UART_LINE_CTRL
-	select UART_CONSOLE
-	select USB_UART_CONSOLE
+    bool "Enable USB CDC ACM logging to help debug"
+    select LOG
+    select USB
+    select USB_DEVICE_STACK
+    select USB_CDC_ACM
+    select SERIAL
+    select CONSOLE
+    select UART_INTERRUPT_DRIVEN
+    select UART_LINE_CTRL
+    select UART_CONSOLE
+    select USB_UART_CONSOLE
 
 if ZMK_USB_LOGGING
 
 choice USB_CDC_ACM_LOG_LEVEL_CHOICE
-	default USB_CDC_ACM_LOG_LEVEL_OFF
+    default USB_CDC_ACM_LOG_LEVEL_OFF
 endchoice
 
 choice USB_DRIVER_LOG_LEVEL_CHOICE
-	default USB_DRIVER_LOG_LEVEL_OFF
+    default USB_DRIVER_LOG_LEVEL_OFF
 endchoice
 
 # We do this to avoid log loop where logging to USB generates more log messages.
 
 config USB_CDC_ACM_RINGBUF_SIZE
-	default 1024
+    default 1024
 
 config LOG_PROCESS_THREAD_STARTUP_DELAY_MS
-	default 1000
+    default 1000
 
 #ZMK_USB_LOGGING
 endif
 
 config ZMK_RTT_LOGGING
-	bool "Enable RTT logging to help debug"
-	select LOG
-	select DEBUG
-	select ASSERT
-	select USE_SEGGER_RTT
-	select CONSOLE
-	select RTT_CONSOLE
+    bool "Enable RTT logging to help debug"
+    select LOG
+    select DEBUG
+    select ASSERT
+    select USE_SEGGER_RTT
+    select CONSOLE
+    select RTT_CONSOLE
 
 if ZMK_RTT_LOGGING
 
 config SEGGER_RTT_BUFFER_SIZE_UP
-	default 8192
+    default 8192
 
 #ZMK_RTT_LOGGING
 endif
@@ -463,10 +463,10 @@ endif
 if ZMK_USB_LOGGING || ZMK_RTT_LOGGING
 
 config LOG_BUFFER_SIZE
-	default 8192
+    default 8192
 
 config LOG_PROCESS_THREAD_SLEEP_MS
-	default 100
+    default 100
 
 #ZMK_USB_LOGGING || ZMK_RTT_LOGGING
 endif
@@ -477,16 +477,16 @@ endmenu
 if SETTINGS
 
 config ZMK_SETTINGS_SAVE_DEBOUNCE
-	int "Milliseconds to debounce settings saves"
-	default 60000
+    int "Milliseconds to debounce settings saves"
+    default 60000
 
 #SETTINGS
 endif
 
 config ZMK_BATTERY_REPORT_INTERVAL
-	depends on ZMK_BLE
-	int "Battery level report interval in seconds"
-	default 60
+    depends on ZMK_BLE
+    int "Battery level report interval in seconds"
+    default 60
 
 #Advanced
 endmenu
@@ -495,26 +495,26 @@ endmenu
 endmenu
 
 config HEAP_MEM_POOL_SIZE
-	default 8192
+    default 8192
 
 config KERNEL_BIN_NAME
-	default "zmk"
+    default "zmk"
 
 config REBOOT
-	default y
+    default y
 
 config USB_DEVICE_STACK
-	default y if HAS_HW_NRF_USBD
+    default y if HAS_HW_NRF_USBD
 
 config ZMK_WPM
-	bool "Calculate WPM"
-	default n
+    bool "Calculate WPM"
+    default n
 
 config SENSOR
-	default y
+    default y
 
 choice CBPRINTF_IMPLEMENTATION
-	default CBPRINTF_NANO
+    default CBPRINTF_NANO
 
 endchoice
 
diff --git a/app/boards/arm/bdn9/Kconfig.board b/app/boards/arm/bdn9/Kconfig.board
index a67e9a51..76a204cc 100644
--- a/app/boards/arm/bdn9/Kconfig.board
+++ b/app/boards/arm/bdn9/Kconfig.board
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_BDN9
-	bool "BDN9 rev2"
-	depends on SOC_STM32F072XB
+    bool "BDN9 rev2"
+    depends on SOC_STM32F072XB
diff --git a/app/boards/arm/bdn9/Kconfig.defconfig b/app/boards/arm/bdn9/Kconfig.defconfig
index 17695185..d1c82811 100644
--- a/app/boards/arm/bdn9/Kconfig.defconfig
+++ b/app/boards/arm/bdn9/Kconfig.defconfig
@@ -6,16 +6,16 @@
 if BOARD_BDN9
 
 config BOARD
-	default "bdn9_rev2"
+    default "bdn9_rev2"
 
 config ZMK_KEYBOARD_NAME
-	default "BDN9 Rev2"
+    default "BDN9 Rev2"
 
 config ZMK_USB
-	default y
+    default y
 
 config ZMK_RGB_UNDERGLOW
-	select SPI
-	select WS2812_STRIP
+    select SPI
+    select WS2812_STRIP
 
 endif # BOARD_BDN9
diff --git a/app/boards/arm/bdn9/bdn9_rev2.dts b/app/boards/arm/bdn9/bdn9_rev2.dts
index e75893d6..d2d1c65c 100644
--- a/app/boards/arm/bdn9/bdn9_rev2.dts
+++ b/app/boards/arm/bdn9/bdn9_rev2.dts
@@ -10,134 +10,134 @@
 #include <dt-bindings/led/led.h>
 
 / {
-	model = "Keeb.io BDN9 rev2";
-	compatible = "keebio,bdn9", "st,stm32f072";
+    model = "Keeb.io BDN9 rev2";
+    compatible = "keebio,bdn9", "st,stm32f072";
 
-	chosen {
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &cdc_acm_uart;
-		zmk,kscan = &kscan;
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zephyr,sram = &sram0;
+        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
+        zmk,kscan = &kscan;
+        zmk,underglow = &led_strip;
+    };
 
-	kscan: kscan {
-		compatible = "zmk,kscan-gpio-direct";
-		label = "KSCAN";
+    kscan: kscan {
+        compatible = "zmk,kscan-gpio-direct";
+        label = "KSCAN";
 
-		input-gpios
-			= <&gpiob 12 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&gpiob 5  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&gpiob 6  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&gpiob 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&gpiob 4  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&gpiob 7  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&gpioa 3  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&gpiof 1  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&gpiof 0  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			;
-	};
+        input-gpios
+            = <&gpiob 12 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&gpiob 5  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&gpiob 6  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&gpiob 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&gpiob 4  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&gpiob 7  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&gpioa 3  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&gpiof 1  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&gpiof 0  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            ;
+    };
 
-	left_encoder: encoder_left {
-		compatible = "alps,ec11";
-		label = "LEFT_ENCODER";
-		a-gpios = <&gpioa 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		b-gpios = <&gpioa 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		resolution = <4>;
-		status = "disabled";
-	};
-	mid_encoder: encoder_mid {
-		compatible = "alps,ec11";
-		label = "MID_ENCODER";
-		a-gpios = <&gpioa 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		b-gpios = <&gpioa 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		resolution = <4>;
-		status = "disabled";
-	};
-	right_encoder: encoder_right {
-		compatible = "alps,ec11";
-		label = "RIGHT_ENCODER";
-		a-gpios = <&gpioa 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		b-gpios = <&gpiob 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		resolution = <4>;
-		status = "disabled";
-	};
+    left_encoder: encoder_left {
+        compatible = "alps,ec11";
+        label = "LEFT_ENCODER";
+        a-gpios = <&gpioa 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        b-gpios = <&gpioa 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        resolution = <4>;
+        status = "disabled";
+    };
+    mid_encoder: encoder_mid {
+        compatible = "alps,ec11";
+        label = "MID_ENCODER";
+        a-gpios = <&gpioa 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        b-gpios = <&gpioa 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        resolution = <4>;
+        status = "disabled";
+    };
+    right_encoder: encoder_right {
+        compatible = "alps,ec11";
+        label = "RIGHT_ENCODER";
+        a-gpios = <&gpioa 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        b-gpios = <&gpiob 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        resolution = <4>;
+        status = "disabled";
+    };
 
-	sensors: sensors {
-		compatible = "zmk,keymap-sensors";
-		status = "disabled";
-		sensors = <>;
-	};
+    sensors: sensors {
+        compatible = "zmk,keymap-sensors";
+        status = "disabled";
+        sensors = <>;
+    };
 };
 
 &spi2 {
-	status = "okay";
-	pinctrl-0 = <&spi2_sck_pb13 &spi2_mosi_pb15>;
-	pinctrl-names = "default";
+    status = "okay";
+    pinctrl-0 = <&spi2_sck_pb13 &spi2_mosi_pb15>;
+    pinctrl-names = "default";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <9>;
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <9>;
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 &clk_hsi {
-	status = "okay";
+    status = "okay";
 };
 
 &pll {
-	status = "okay";
-	prediv = <1>;
-	mul = <6>;
-	clocks = <&clk_hsi>;
+    status = "okay";
+    prediv = <1>;
+    mul = <6>;
+    clocks = <&clk_hsi>;
 };
 
 &rcc {
-	clocks = <&pll>;
-	clock-frequency = <DT_FREQ_M(48)>;
-	ahb-prescaler = <1>;
-	apb1-prescaler = <1>;
+    clocks = <&pll>;
+    clock-frequency = <DT_FREQ_M(48)>;
+    ahb-prescaler = <1>;
+    apb1-prescaler = <1>;
 };
 
 &usb {
-	status = "okay";
-	pinctrl-0 = <&usb_dm_pa11 &usb_dp_pa12>;
-	pinctrl-names = "default";
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    status = "okay";
+    pinctrl-0 = <&usb_dm_pa11 &usb_dp_pa12>;
+    pinctrl-names = "default";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
 &rtc {
-	status = "okay";
+    status = "okay";
 };
 
 &flash0 {
-	/*
-	 * For more information, see:
-	 * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
-	 */
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
+    /*
+     * For more information, see:
+     * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
+     */
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
 
-		/* Set 6Kb of storage at the end of the 128Kb of flash */
-		storage_partition: partition@1e800 {
-			label = "storage";
-			reg = <0x0001e800 0x00001800>;
-		};
-	};
+        /* Set 6Kb of storage at the end of the 128Kb of flash */
+        storage_partition: partition@1e800 {
+            label = "storage";
+            reg = <0x0001e800 0x00001800>;
+        };
+    };
 };
diff --git a/app/boards/arm/bdn9/bdn9_rev2.keymap b/app/boards/arm/bdn9/bdn9_rev2.keymap
index 50c273c7..1e2c192d 100644
--- a/app/boards/arm/bdn9/bdn9_rev2.keymap
+++ b/app/boards/arm/bdn9/bdn9_rev2.keymap
@@ -9,8 +9,8 @@
 
 /* Uncomment and keep whatever encoders are on your BDN9
 &sensors {
-	status = "okay";
-	sensors = <&left_encoder &mid_encoder &right_encoder>;
+    status = "okay";
+    sensors = <&left_encoder &mid_encoder &right_encoder>;
 };
 */
 
@@ -20,19 +20,19 @@
 // &right_encoder { status = "okay"; };
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
-			bindings = <
-				&kp HOME  &kp K_PP &kp END
-				&kp PG_UP &kp UP   &kp PG_DN
-				&kp LEFT  &kp DOWN &kp RIGHT
-			>;
-			/* Uncomment and add necessary bindings. This examples is for one encoder
-			sensor-bindings = <&inc_dec_kp PG_UP PG_DN>;
-			*/
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp HOME  &kp K_PP &kp END
+                &kp PG_UP &kp UP   &kp PG_DN
+                &kp LEFT  &kp DOWN &kp RIGHT
+            >;
+            /* Uncomment and add necessary bindings. This examples is for one encoder
+            sensor-bindings = <&inc_dec_kp PG_UP PG_DN>;
+            */
+        };
+    };
 };
 
diff --git a/app/boards/arm/bluemicro840/Kconfig b/app/boards/arm/bluemicro840/Kconfig
index 0e6743d3..ca060885 100644
--- a/app/boards/arm/bluemicro840/Kconfig
+++ b/app/boards/arm/bluemicro840/Kconfig
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_ENABLE_DCDC
-	bool "Enable DCDC mode"
-	select SOC_DCDC_NRF52X
-	default y
-	depends on BOARD_BLUEMICRO840_V1
+    bool "Enable DCDC mode"
+    select SOC_DCDC_NRF52X
+    default y
+    depends on BOARD_BLUEMICRO840_V1
 
diff --git a/app/boards/arm/bluemicro840/Kconfig.board b/app/boards/arm/bluemicro840/Kconfig.board
index bc271af3..e2794015 100644
--- a/app/boards/arm/bluemicro840/Kconfig.board
+++ b/app/boards/arm/bluemicro840/Kconfig.board
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_BLUEMICRO840_V1
-	bool "BlueMicro840_V1"
-	depends on SOC_NRF52840_QIAA
+    bool "BlueMicro840_V1"
+    depends on SOC_NRF52840_QIAA
diff --git a/app/boards/arm/bluemicro840/Kconfig.defconfig b/app/boards/arm/bluemicro840/Kconfig.defconfig
index 5d911ec6..732805ae 100644
--- a/app/boards/arm/bluemicro840/Kconfig.defconfig
+++ b/app/boards/arm/bluemicro840/Kconfig.defconfig
@@ -6,22 +6,22 @@
 if BOARD_BLUEMICRO840_V1
 
 config BOARD
-	default "bluemicro840_v1"
+    default "bluemicro840_v1"
 
 if USB_DEVICE_STACK
 
 config USB_NRFX
-	default y
+    default y
 
 endif # USB_DEVICE_STACK
 
 config BT_CTLR
-	default BT
+    default BT
 
 config ZMK_BLE
-	default y
+    default y
 
 config ZMK_USB
-	default y
+    default y
 
 endif # BOARD_BLUEMICRO840_V1
diff --git a/app/boards/arm/bluemicro840/arduino_pro_micro_pins.dtsi b/app/boards/arm/bluemicro840/arduino_pro_micro_pins.dtsi
index 53514d64..cdb8fcdd 100644
--- a/app/boards/arm/bluemicro840/arduino_pro_micro_pins.dtsi
+++ b/app/boards/arm/bluemicro840/arduino_pro_micro_pins.dtsi
@@ -5,50 +5,50 @@
  */
 
 / {
-	pro_micro: connector {
-		compatible = "arduino-pro-micro";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map
-			= <0 0 &gpio0 8 0>		/* D0	D2 */
-			, <1 0 &gpio0 6 0>		/* D1 	D3*/
-			, <2 0 &gpio0 15 0>		/* D2 	D1*/
-			, <3 0 &gpio0 17 0>		/* D3 	D0*/
-			, <4 0 &gpio0 20 0>		/* D4/A6 	D4*/
-			, <5 0 &gpio0 13 0>		/* D5 	C6*/
-			, <6 0 &gpio0 24 0>		/* D6/A7 	D7*/
-			, <7 0 &gpio0 9 0>		/* D7 	E6*/
-			, <8 0 &gpio0 10 0>		/* D8/A8 	B4*/
-			, <9 0 &gpio1 6 0>		/* D9/A9 	B5*/
-			, <10 0 &gpio1 11 0>		/* D10/A10 	B6*/
-			, <16 0 &gpio0 28 0>	/* D16 	B2*/
-			, <14 0 &gpio0 3 0>	/* D14 	B3*/
-			, <15 0 &gpio1 13 0>	/* D15 	B1*/
-			, <18 0 &gpio0 2 0>	/* D18/A0 	F7*/
-			, <19 0 &gpio0 29 0>	/* D19/A1 	F6*/
-			, <20 0 &gpio0 26 0>	/* D20/A2 	F5*/
-			, <21 0 &gpio0 30 0>	/* D21/A3 	F4*/
-			;
-	};
+    pro_micro: connector {
+        compatible = "arduino-pro-micro";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map
+            = <0 0 &gpio0 8 0>      /* D0   D2 */
+            , <1 0 &gpio0 6 0>      /* D1   D3*/
+            , <2 0 &gpio0 15 0>     /* D2   D1*/
+            , <3 0 &gpio0 17 0>     /* D3   D0*/
+            , <4 0 &gpio0 20 0>     /* D4/A6    D4*/
+            , <5 0 &gpio0 13 0>     /* D5   C6*/
+            , <6 0 &gpio0 24 0>     /* D6/A7    D7*/
+            , <7 0 &gpio0 9 0>      /* D7   E6*/
+            , <8 0 &gpio0 10 0>     /* D8/A8    B4*/
+            , <9 0 &gpio1 6 0>      /* D9/A9    B5*/
+            , <10 0 &gpio1 11 0>        /* D10/A10  B6*/
+            , <16 0 &gpio0 28 0>    /* D16  B2*/
+            , <14 0 &gpio0 3 0> /* D14  B3*/
+            , <15 0 &gpio1 13 0>    /* D15  B1*/
+            , <18 0 &gpio0 2 0> /* D18/A0   F7*/
+            , <19 0 &gpio0 29 0>    /* D19/A1   F6*/
+            , <20 0 &gpio0 26 0>    /* D20/A2   F5*/
+            , <21 0 &gpio0 30 0>    /* D21/A3   F4*/
+            ;
+    };
 
-	pro_micro_a: connector_a {
-		compatible = "arduino-pro-micro";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map
-			= <0 0 &gpio0 2 0>	/* D18/A0 	F7*/
-			, <1 0 &gpio0 29 0>	/* D19/A1 	F6*/
-			, <2 0 &gpio0 26 0>	/* D20/A2 	F5*/
-			, <3 0 &gpio0 30 0>	/* D21/A3 	F4*/
-			, <6 0 &gpio0 20 0>	/* D4/A6 	D4*/
-			, <7 0 &gpio0 24 0>	/* D6/A7 	D7*/
-			, <8 0 &gpio0 10 0>	/* D8/A8 	B4*/
-			, <9 0 &gpio1 6 0>	/* D9/A9 	B5*/
-			, <10 0 &gpio1 11 0>	/* D10/A10 	B6*/
-			;
-	};
+    pro_micro_a: connector_a {
+        compatible = "arduino-pro-micro";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map
+            = <0 0 &gpio0 2 0>  /* D18/A0   F7*/
+            , <1 0 &gpio0 29 0> /* D19/A1   F6*/
+            , <2 0 &gpio0 26 0> /* D20/A2   F5*/
+            , <3 0 &gpio0 30 0> /* D21/A3   F4*/
+            , <6 0 &gpio0 20 0> /* D4/A6    D4*/
+            , <7 0 &gpio0 24 0> /* D6/A7    D7*/
+            , <8 0 &gpio0 10 0> /* D8/A8    B4*/
+            , <9 0 &gpio1 6 0>  /* D9/A9    B5*/
+            , <10 0 &gpio1 11 0>    /* D10/A10  B6*/
+            ;
+    };
 };
 
 pro_micro_d: &pro_micro {};
diff --git a/app/boards/arm/bluemicro840/bluemicro840_v1-pinctrl.dtsi b/app/boards/arm/bluemicro840/bluemicro840_v1-pinctrl.dtsi
index 18b90f21..15c48509 100644
--- a/app/boards/arm/bluemicro840/bluemicro840_v1-pinctrl.dtsi
+++ b/app/boards/arm/bluemicro840/bluemicro840_v1-pinctrl.dtsi
@@ -4,36 +4,36 @@
  */
 
 &pinctrl {
-	uart0_default: uart0_default {
-		group1 {
-			psels = <NRF_PSEL(UART_RX, 0, 8)>;
-			bias-pull-up;
-		};
-		group2 {
-			psels = <NRF_PSEL(UART_TX, 0, 6)>;
-		};
-	};
+    uart0_default: uart0_default {
+        group1 {
+            psels = <NRF_PSEL(UART_RX, 0, 8)>;
+            bias-pull-up;
+        };
+        group2 {
+            psels = <NRF_PSEL(UART_TX, 0, 6)>;
+        };
+    };
 
-	uart0_sleep: uart0_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_RX, 0, 8)>,
-				<NRF_PSEL(UART_TX, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    uart0_sleep: uart0_sleep {
+        group1 {
+            psels = <NRF_PSEL(UART_RX, 0, 8)>,
+                <NRF_PSEL(UART_TX, 0, 6)>;
+            low-power-enable;
+        };
+    };
 
-	i2c0_default: i2c0_default {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
-				<NRF_PSEL(TWIM_SCL, 0, 20)>;
-		};
-	};
+    i2c0_default: i2c0_default {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
+                <NRF_PSEL(TWIM_SCL, 0, 20)>;
+        };
+    };
 
-	i2c0_sleep: i2c0_sleep {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
-				<NRF_PSEL(TWIM_SCL, 0, 20)>;
-			low-power-enable;
-		};
-	};
+    i2c0_sleep: i2c0_sleep {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
+                <NRF_PSEL(TWIM_SCL, 0, 20)>;
+            low-power-enable;
+        };
+    };
 };
diff --git a/app/boards/arm/bluemicro840/bluemicro840_v1.dts b/app/boards/arm/bluemicro840/bluemicro840_v1.dts
index c636ca31..f1952601 100644
--- a/app/boards/arm/bluemicro840/bluemicro840_v1.dts
+++ b/app/boards/arm/bluemicro840/bluemicro840_v1.dts
@@ -10,117 +10,117 @@
 #include "bluemicro840_v1-pinctrl.dtsi"
 
 / {
-	model = "BlueMicro840_V1";
-	compatible = "bluemicro840,v1";
+    model = "BlueMicro840_V1";
+    compatible = "bluemicro840,v1";
 
-	chosen {
-		zephyr,code-partition = &code_partition;
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &cdc_acm_uart;
-		zmk,battery = &vbatt;
-	};
+    chosen {
+        zephyr,code-partition = &code_partition;
+        zephyr,sram = &sram0;
+        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
+        zmk,battery = &vbatt;
+    };
 
-	leds {
-		compatible = "gpio-leds";
-		blue_led: led_0 {
-			gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
-			label = "Blue LED";
-		};
-	};
+    leds {
+        compatible = "gpio-leds";
+        blue_led: led_0 {
+            gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
+        };
+    };
 
-	ext-power {
-		compatible = "zmk,ext-power-generic";
-		label = "EXT_POWER";
-		init-delay-ms = <20>;
-		control-gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
-	};
+    ext-power {
+        compatible = "zmk,ext-power-generic";
+        label = "EXT_POWER";
+        init-delay-ms = <20>;
+        control-gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+    };
 
-	vbatt: vbatt {
-		compatible = "zmk,battery-voltage-divider";
-		label = "BATTERY";
-		io-channels = <&adc 7>;
-		output-ohms = <2000000>;
-		full-ohms = <(2000000 + 806000)>;
-	};
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        label = "BATTERY";
+        io-channels = <&adc 7>;
+        output-ohms = <2000000>;
+        full-ohms = <(2000000 + 806000)>;
+    };
 
 };
 
 &adc {
-	status = "okay";
+    status = "okay";
 };
 
 &gpiote {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio0 {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio1 {
-	status = "okay";
+    status = "okay";
 };
 
 &i2c0 {
-	compatible = "nordic,nrf-twim";
-	pinctrl-0 = <&i2c0_default>;
-	pinctrl-1 = <&i2c0_sleep>;
-	pinctrl-names = "default", "sleep";
+    compatible = "nordic,nrf-twim";
+    pinctrl-0 = <&i2c0_default>;
+    pinctrl-1 = <&i2c0_sleep>;
+    pinctrl-names = "default", "sleep";
 };
 
 &uart0 {
-	compatible = "nordic,nrf-uarte";
-	pinctrl-0 = <&uart0_default>;
-	pinctrl-1 = <&uart0_sleep>;
-	pinctrl-names = "default", "sleep";
+    compatible = "nordic,nrf-uarte";
+    pinctrl-0 = <&uart0_default>;
+    pinctrl-1 = <&uart0_sleep>;
+    pinctrl-names = "default", "sleep";
 };
 
 &usbd {
-	status = "okay";
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
 
 &flash0 {
-	/*
-	 * For more information, see:
-	 * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
-	 */
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
+    /*
+     * For more information, see:
+     * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
+     */
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
 
-		sd_partition: partition@0 {
-			label = "softdevice";
-			reg = <0x00000000 0x00026000>;
-		};
-		code_partition: partition@26000 {
-			label = "code_partition";
-			reg = <0x00026000 0x000c6000>;
-		};
+        sd_partition: partition@0 {
+            label = "softdevice";
+            reg = <0x00000000 0x00026000>;
+        };
+        code_partition: partition@26000 {
+            label = "code_partition";
+            reg = <0x00026000 0x000c6000>;
+        };
 
-		/*
-		 * The flash starting at 0x000ec000 and ending at
-		 * 0x000f3fff is reserved for use by the application.
-		 */
+        /*
+         * The flash starting at 0x000ec000 and ending at
+         * 0x000f3fff is reserved for use by the application.
+         */
 
-		/*
-		 * Storage partition will be used by FCB/LittleFS/NVS
-		 * if enabled.
-		 */
-		storage_partition: partition@ec000 {
-			label = "storage";
-			reg = <0x000ec000 0x00008000>;
-		};
+        /*
+         * Storage partition will be used by FCB/LittleFS/NVS
+         * if enabled.
+         */
+        storage_partition: partition@ec000 {
+            label = "storage";
+            reg = <0x000ec000 0x00008000>;
+        };
 
-		boot_partition: partition@f4000 {
-			label = "adafruit_boot";
-			reg = <0x000f4000 0x0000c000>;
-		};
-	};
+        boot_partition: partition@f4000 {
+            label = "adafruit_boot";
+            reg = <0x000f4000 0x0000c000>;
+        };
+    };
 };
diff --git a/app/boards/arm/bt60/Kconfig b/app/boards/arm/bt60/Kconfig
index 359e237d..d57a6b7e 100644
--- a/app/boards/arm/bt60/Kconfig
+++ b/app/boards/arm/bt60/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_ENABLE_DCDC
-	bool "Enable DCDC mode"
-	select SOC_DCDC_NRF52X
-	default y
-	depends on (BOARD_BT60_V1_HS || BOARD_BT60_V1)
+    bool "Enable DCDC mode"
+    select SOC_DCDC_NRF52X
+    default y
+    depends on (BOARD_BT60_V1_HS || BOARD_BT60_V1)
diff --git a/app/boards/arm/bt60/Kconfig.board b/app/boards/arm/bt60/Kconfig.board
index 0f0a9c6e..24c0a8b5 100644
--- a/app/boards/arm/bt60/Kconfig.board
+++ b/app/boards/arm/bt60/Kconfig.board
@@ -4,9 +4,9 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_BT60_V1
-	bool "bt60"
-	depends on SOC_NRF52840_QIAA
+    bool "bt60"
+    depends on SOC_NRF52840_QIAA
 
 config BOARD_BT60_V1_HS
-	bool "bt60 hotswap"
-	depends on SOC_NRF52840_QIAA
+    bool "bt60 hotswap"
+    depends on SOC_NRF52840_QIAA
diff --git a/app/boards/arm/bt60/Kconfig.defconfig b/app/boards/arm/bt60/Kconfig.defconfig
index bad1e7cd..e7cf1a48 100644
--- a/app/boards/arm/bt60/Kconfig.defconfig
+++ b/app/boards/arm/bt60/Kconfig.defconfig
@@ -4,28 +4,28 @@
 if BOARD_BT60_V1_HS || BOARD_BT60_V1
 
 config BOARD
-	default "bt60"
+    default "bt60"
 
 if USB
 
 config USB_NRFX
-	default y
+    default y
 
 config USB_DEVICE_STACK
-	default y
+    default y
 
 endif # USB
 
 config BT_CTLR
-	default BT
+    default BT
 
 config ZMK_BLE
-	default y
+    default y
 
 config ZMK_USB
-	default y
+    default y
 
 config ZMK_KEYBOARD_NAME
-	default "BT60"
+    default "BT60"
 
 endif # BOARD_BT60
diff --git a/app/boards/arm/bt60/bt60.dtsi b/app/boards/arm/bt60/bt60.dtsi
index 3858ba46..6e4900af 100644
--- a/app/boards/arm/bt60/bt60.dtsi
+++ b/app/boards/arm/bt60/bt60.dtsi
@@ -9,126 +9,126 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	model = "BT60";
-	compatible = "polarityworks,bt60";
+    model = "BT60";
+    compatible = "polarityworks,bt60";
 
-	chosen {
-		zephyr,code-partition = &code_partition;
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &cdc_acm_uart;
-		zmk,battery = &vbatt;
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zephyr,code-partition = &code_partition;
+        zephyr,sram = &sram0;
+        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
+        zmk,battery = &vbatt;
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	sensors {
-		compatible = "zmk,keymap-sensors";
-		sensors = <&left_encoder>;
-	};
+    sensors {
+        compatible = "zmk,keymap-sensors";
+        sensors = <&left_encoder>;
+    };
 
 
 
-	left_encoder: encoder_left {
-		compatible = "alps,ec11";
-		label = "LEFT_ENCODER";
-		a-gpios = <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		b-gpios = <&gpio1 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		resolution = <4>;
-		status = "okay";
-	};
+    left_encoder: encoder_left {
+        compatible = "alps,ec11";
+        label = "LEFT_ENCODER";
+        a-gpios = <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        b-gpios = <&gpio1 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        resolution = <4>;
+        status = "okay";
+    };
 
 
-	leds {
-		compatible = "gpio-leds";
-		blue_led: led_0 {
-			gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
-			label = "Blue LED";
-		};
-	};
+    leds {
+        compatible = "gpio-leds";
+        blue_led: led_0 {
+            gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
+        };
+    };
 
-	vbatt: vbatt {
-		compatible = "zmk,battery-voltage-divider";
-		label = "BATTERY";
-		io-channels = <&adc 2>;
-		output-ohms = <2000000>;
-		full-ohms = <(2000000 + 806000)>;
-	};
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        label = "BATTERY";
+        io-channels = <&adc 2>;
+        output-ohms = <2000000>;
+        full-ohms = <(2000000 + 806000)>;
+    };
 };
 
 &adc {
-	status = "okay";
+    status = "okay";
 };
 
 &gpiote {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio0 {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio1 {
-	status = "okay";
+    status = "okay";
 };
 
 &i2c0 {
-	compatible = "nordic,nrf-twi";
-	sda-pin = <17>;
-	scl-pin = <20>;
+    compatible = "nordic,nrf-twi";
+    sda-pin = <17>;
+    scl-pin = <20>;
 };
 
 &uart0 {
-	compatible = "nordic,nrf-uarte";
-	tx-pin = <6>;
-	rx-pin = <8>;
+    compatible = "nordic,nrf-uarte";
+    tx-pin = <6>;
+    rx-pin = <8>;
 };
 
 &usbd {
-	status = "okay";
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
 
 &flash0 {
-	/*
-	 * For more information, see:
-	 * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
-	 */
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
+    /*
+     * For more information, see:
+     * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
+     */
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
 
-		sd_partition: partition@0 {
-			label = "softdevice";
-			reg = <0x00000000 0x00026000>;
-		};
-		code_partition: partition@26000 {
-			label = "code_partition";
-			reg = <0x00026000 0x000c6000>;
-		};
+        sd_partition: partition@0 {
+            label = "softdevice";
+            reg = <0x00000000 0x00026000>;
+        };
+        code_partition: partition@26000 {
+            label = "code_partition";
+            reg = <0x00026000 0x000c6000>;
+        };
 
-		/*
-		 * The flash starting at 0x000ec000 and ending at
-		 * 0x000f3fff is reserved for use by the application.
-		 */
+        /*
+         * The flash starting at 0x000ec000 and ending at
+         * 0x000f3fff is reserved for use by the application.
+         */
 
-		/*
-		 * Storage partition will be used by FCB/LittleFS/NVS
-		 * if enabled.
-		 */
-		storage_partition: partition@ec000 {
-			label = "storage";
-			reg = <0x000ec000 0x00008000>;
-		};
+        /*
+         * Storage partition will be used by FCB/LittleFS/NVS
+         * if enabled.
+         */
+        storage_partition: partition@ec000 {
+            label = "storage";
+            reg = <0x000ec000 0x00008000>;
+        };
 
-		boot_partition: partition@f4000 {
-			label = "adafruit_boot";
-			reg = <0x000f4000 0x0000c000>;
-		};
-	};
+        boot_partition: partition@f4000 {
+            label = "adafruit_boot";
+            reg = <0x000f4000 0x0000c000>;
+        };
+    };
 };
diff --git a/app/boards/arm/bt60/bt60_v1.dts b/app/boards/arm/bt60/bt60_v1.dts
index 8b2f0cb4..0cfe184a 100644
--- a/app/boards/arm/bt60/bt60_v1.dts
+++ b/app/boards/arm/bt60/bt60_v1.dts
@@ -9,105 +9,105 @@
 
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &ansi_transform;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &ansi_transform;
+    };
 
-	ansi_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <15>;
-		rows = <5>;
-		map = <
-			RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13)
-			RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)   RC(1,13)
-			RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)          RC(2,13)
-			RC(3,0)       RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10)  RC(3,11)               RC(3,12)
-			RC(4,0)   RC(4,1)   RC(4,2)                      RC(4,6)                     RC(4,10)   RC(4,11)    RC(4,12)     RC(4,13) RC(4,14)
-		>;
-	};
+    ansi_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <15>;
+        rows = <5>;
+        map = <
+            RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13)
+            RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)   RC(1,13)
+            RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)          RC(2,13)
+            RC(3,0)       RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10)  RC(3,11)               RC(3,12)
+            RC(4,0)   RC(4,1)   RC(4,2)                      RC(4,6)                     RC(4,10)   RC(4,11)    RC(4,12)     RC(4,13) RC(4,14)
+        >;
+    };
 
-	hhkb_transform: keymap_transform_1 {
-		compatible = "zmk,matrix-transform";
-		columns = <15>;
-		rows = <5>;
-		map = <
-			RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13) RC(0,14)
-			RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)   RC(1,13)
-			RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)          RC(2,13)
-			RC(3,0)   RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10)       RC(3,11)     RC(3,12) RC(3,14)
-			RC(4,0)   RC(4,1)   RC(4,2)                          RC(4,6)                  RC(4,10)  RC(4,11)   RC(4,12)    RC(4,13)
-		>;
-	};
+    hhkb_transform: keymap_transform_1 {
+        compatible = "zmk,matrix-transform";
+        columns = <15>;
+        rows = <5>;
+        map = <
+            RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13) RC(0,14)
+            RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)   RC(1,13)
+            RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)          RC(2,13)
+            RC(3,0)   RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10)       RC(3,11)     RC(3,12) RC(3,14)
+            RC(4,0)   RC(4,1)   RC(4,2)                          RC(4,6)                  RC(4,10)  RC(4,11)   RC(4,12)    RC(4,13)
+        >;
+    };
 
-	iso_transform: keymap_transform_2 {
-		compatible = "zmk,matrix-transform";
-		columns = <15>;
-		rows = <5>;
-		map = <
-			RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13)
-			RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)
-			RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13)
-			RC(3,0)  RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10)       RC(3,11)       RC(3,12)
-			RC(4,0)   RC(4,1)   RC(4,2)                          RC(4,6)                  RC(4,10)  RC(4,11)   RC(4,12)    RC(4,13)
-		>;
-	};
+    iso_transform: keymap_transform_2 {
+        compatible = "zmk,matrix-transform";
+        columns = <15>;
+        rows = <5>;
+        map = <
+            RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13)
+            RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)
+            RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13)
+            RC(3,0)  RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10)       RC(3,11)       RC(3,12)
+            RC(4,0)   RC(4,1)   RC(4,2)                          RC(4,6)                  RC(4,10)  RC(4,11)   RC(4,12)    RC(4,13)
+        >;
+    };
 
-	all_1u_transform: keymap_transform_3 {
-		compatible = "zmk,matrix-transform";
-		columns = <15>;
-		rows = <5>;
-		map = <
-			RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13)
-			RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)   RC(1,13)
-			RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)          RC(2,13)
-			RC(3,0)   RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10)  RC(3,11) RC(3,12) RC(3,13) RC(3,14)
-			RC(4,0)   RC(4,1)   RC(4,2)                      RC(4,6)                   RC(4,10) RC(4,11) RC(4,12) RC(4,13) RC(4,14)
-		>;
-	};
+    all_1u_transform: keymap_transform_3 {
+        compatible = "zmk,matrix-transform";
+        columns = <15>;
+        rows = <5>;
+        map = <
+            RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13)
+            RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)   RC(1,13)
+            RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)          RC(2,13)
+            RC(3,0)   RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10)  RC(3,11) RC(3,12) RC(3,13) RC(3,14)
+            RC(4,0)   RC(4,1)   RC(4,2)                      RC(4,6)                   RC(4,10) RC(4,11) RC(4,12) RC(4,13) RC(4,14)
+        >;
+    };
 
-	split_transform: keymap_transform_4 {
-		compatible = "zmk,matrix-transform";
-		columns = <15>;
-		rows = <5>;
-		map = <
-			RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13) RC(0,14)
-			RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)   RC(1,13)
-			RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)          RC(2,13)
-			RC(3,0)   RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10)       RC(3,11)     RC(3,12) RC(3,14)
-			RC(4,0)   RC(4,1)   RC(4,2)                          RC(4,6)                  RC(4,10)  RC(4,11)   RC(4,12)    RC(4,13)
-		>;
-	};
+    split_transform: keymap_transform_4 {
+        compatible = "zmk,matrix-transform";
+        columns = <15>;
+        rows = <5>;
+        map = <
+            RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13) RC(0,14)
+            RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)   RC(1,13)
+            RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)          RC(2,13)
+            RC(3,0)   RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10)       RC(3,11)     RC(3,12) RC(3,14)
+            RC(4,0)   RC(4,1)   RC(4,2)                          RC(4,6)                  RC(4,10)  RC(4,11)   RC(4,12)    RC(4,13)
+        >;
+    };
 
-	kscan0: kscan_0 {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
-		diode-direction = "col2row";
+    kscan0: kscan_0 {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
+        diode-direction = "col2row";
 
-		col-gpios
-			= <&gpio1 13 GPIO_ACTIVE_HIGH>
-			, <&gpio1 10 GPIO_ACTIVE_HIGH>
-			, <&gpio1 11 GPIO_ACTIVE_HIGH>
-			, <&gpio1 15 GPIO_ACTIVE_HIGH>
-			, <&gpio0 3 GPIO_ACTIVE_HIGH>
-			, <&gpio0 2 GPIO_ACTIVE_HIGH>
-			, <&gpio0 28 GPIO_ACTIVE_HIGH>
-			, <&gpio0 29 GPIO_ACTIVE_HIGH>
-			, <&gpio0 30 GPIO_ACTIVE_HIGH>
-			, <&gpio0 31 GPIO_ACTIVE_HIGH>
-			, <&gpio0 5 GPIO_ACTIVE_HIGH>
-			, <&gpio0 7 GPIO_ACTIVE_HIGH>
-			, <&gpio1 9 GPIO_ACTIVE_HIGH>
-			, <&gpio0 12 GPIO_ACTIVE_HIGH>
-			, <&gpio0 23 GPIO_ACTIVE_HIGH>
-			;
+        col-gpios
+            = <&gpio1 13 GPIO_ACTIVE_HIGH>
+            , <&gpio1 10 GPIO_ACTIVE_HIGH>
+            , <&gpio1 11 GPIO_ACTIVE_HIGH>
+            , <&gpio1 15 GPIO_ACTIVE_HIGH>
+            , <&gpio0 3 GPIO_ACTIVE_HIGH>
+            , <&gpio0 2 GPIO_ACTIVE_HIGH>
+            , <&gpio0 28 GPIO_ACTIVE_HIGH>
+            , <&gpio0 29 GPIO_ACTIVE_HIGH>
+            , <&gpio0 30 GPIO_ACTIVE_HIGH>
+            , <&gpio0 31 GPIO_ACTIVE_HIGH>
+            , <&gpio0 5 GPIO_ACTIVE_HIGH>
+            , <&gpio0 7 GPIO_ACTIVE_HIGH>
+            , <&gpio1 9 GPIO_ACTIVE_HIGH>
+            , <&gpio0 12 GPIO_ACTIVE_HIGH>
+            , <&gpio0 23 GPIO_ACTIVE_HIGH>
+            ;
 
-		row-gpios
-			= <&gpio1 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio0 22 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio0 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio0 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio1 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
-	};
+        row-gpios
+            = <&gpio1 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 22 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio1 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
+    };
 };
diff --git a/app/boards/arm/bt60/bt60_v1.keymap b/app/boards/arm/bt60/bt60_v1.keymap
index b42f3f3d..25ae269d 100644
--- a/app/boards/arm/bt60/bt60_v1.keymap
+++ b/app/boards/arm/bt60/bt60_v1.keymap
@@ -11,170 +11,170 @@
 
 
 / {
-	chosen {
-	#ifdef ANSI
-		zmk,matrix_transform = &ansi_transform;
-	#elif defined(HHKB)
-		zmk,matrix_transform = &hhkb_transform;
-	#elif defined(ISO)
-		zmk,matrix_transform = &iso_transform;
-	#elif defined(ALL_1U)
-		zmk,matrix_transform = &all_1u_transform;
-	#else
-		zmk,matrix_transform = &split_transform;
-	#endif
-	};
+    chosen {
+    #ifdef ANSI
+        zmk,matrix_transform = &ansi_transform;
+    #elif defined(HHKB)
+        zmk,matrix_transform = &hhkb_transform;
+    #elif defined(ISO)
+        zmk,matrix_transform = &iso_transform;
+    #elif defined(ALL_1U)
+        zmk,matrix_transform = &all_1u_transform;
+    #else
+        zmk,matrix_transform = &split_transform;
+    #endif
+    };
 
 
-	keymap {
-		compatible = "zmk,keymap";
-		#ifdef ANSI
-		default_layer {
-				// ------------------------------------------------------------------------------------------
-				// | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   |
-				// |  TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   |    |
-				// |  CAPS  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    ENTER    |
-				// |  SHIFT    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   |      SHIFT     |
-				// |  CTL  |  WIN  |  ALT  |            SPACE              | ALT | 1    |  MENU    |  CTRL  |
-				// ------------------------------------------------------------------------------------------
-			bindings = <
-				&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp  N8   &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC
-				&kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp  I    &kp  O  &kp  P   &kp LBKT &kp RBKT  &kp BSLH
-				&kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp  K    &kp  L  &kp SEMI &kp SQT           &kp RET
-				&kp LSHFT  &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH             &kp RSHFT
-				&kp LCTRL &kp LGUI &kp LALT            &kp SPACE                          &kp RALT  &mo 1 &kp K_CMENU &kp RCTRL &bt BT_CLR
-			>;
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
-		};
-		raise {
-				// ------------------------------------------------------------------------------------------
-				// |GRAVE| F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |   DEL   |
-				// | TAB  |  Q  | UP  |  E  |  R  |  T  |  Y  |  U  | INS |  O  |PSCRN|SLCK |PSEBRK| RESET |
-				// | CAPS  |LEFT |DOWN |RIGHT|  F  |  G  |  H  |  J  |  K  |  L  |HOME |PGUP |  BOOTLOADER |
-				// |   PREV  |VOLUP |VOLDN|MUTE |  V  |  B  |  N  |  M  |  ,  | END | PGDN |      NEXT     |
-				// |  CTL  |  WIN  |  ALT  |            SPACE               | ALT | 1    |  MENU  | BT_CLR |
-				// ------------------------------------------------------------------------------------------
-			bindings = <
-				&kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp  F8   &kp  F9 &kp  F10  &kp F11 &kp F12   &kp DEL
-				&trans &trans &kp UP &trans &trans &trans &trans &trans &kp INS &trans &kp PSCRN &kp SLCK &kp PAUSE_BREAK &sys_reset
-				&trans    &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &kp HOME  &kp PG_UP   &bootloader
-				&kp C_PREV &kp C_VOL_DN &kp C_VOL_UP &kp C_MUTE &trans &trans &trans &trans &trans &kp END &kp PG_DN  &kp C_NEXT
-				&bt BT_PRV &bt BT_NXT  &trans              &trans                            &trans   &trans   &trans &bt BT_CLR &trans
-			>;
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
-		};
-		#elif defined(HHKB)
-		default_layer {
-				// ------------------------------------------------------------------------------------------
-				// | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  | `  |
-				// | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  BSPC   |
-				// | CTRL  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |      ENTER   |
-				// |  SHIFT    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   | SHIFT |   1    |
-				// |  CAPS  |  ALT  |  WIN |                     SPACE               |   WIN   | ALT | CTRL |
-				// ------------------------------------------------------------------------------------------
-			bindings = <
-				&kp ESC       &kp N1          &kp N2          &kp N3        &kp N4    &kp N5    &kp N6    &kp N7    &kp  N8      &kp  N9     &kp  N0       &kp MINUS     &kp EQUAL          &kp BSLH    &kp GRAVE
-				&kp TAB       &kp Q           &kp W           &kp E         &kp R     &kp T     &kp Y     &kp U     &kp  I       &kp  O      &kp  P        &kp LBKT      &kp RBKT           &kp BSPC
-				&kp LCTRL     &kp A           &kp S           &kp D         &kp F     &kp G     &kp H     &kp J     &kp  K       &kp  L      &kp SEMI      &kp SQT       &kp RET
-				&kp LSHFT     &kp Z           &kp X           &kp C         &kp V     &kp B     &kp N     &kp M     &kp COMMA    &kp DOT     &kp FSLH      &kp RSHFT     &mo 1
-				&kp LCTRL     &kp LALT        &kp LGUI                                                    &kp SPACE                                        &kp RGUI      &kp RALT           &kp RCTRL
-			>;
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
-		};
-		raise {
-			bindings = <
-				&trans        &kp F1          &kp F2          &kp F3        &kp F4    &kp F5    &kp F6    &kp F7    &kp F8       &kp F9      &kp F10       &kp F11       &kp F12            &kp INS      &kp DEL
-				&kp CLCK      &bt BT_PRV      &bt BT_NXT      &bt BT_CLR    &trans    &trans    &trans    &trans    &trans       &trans      &trans        &kp UP        &trans             &sys_reset
-				&trans        &kp C_VOL_DN    &kp C_VOL_UP    &kp C_MUTE    &trans    &trans    &trans    &trans    &trans       &trans      &kp LEFT      &kp RIGHT     &trans
-				&trans        &trans          &trans          &trans        &trans    &trans    &trans    &trans    &trans       &trans      &kp DOWN      &trans        &trans
-				&trans        &trans          &trans                                                      &bootloader                                      &trans        &trans             &trans
-			>;
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
-		};
-		#elif defined(ISO)
-		default_layer {
-				// ------------------------------------------------------------------------------------------
-				// | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   |
-				// | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |         |
-				// | CAPS  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |  #   | ENTER |
-				// |  SHIFT | |  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   |     SHIFT    |
-				// |  CTL  |  WIN  |  ALT  |                     SPACE        |   ALT   |  1  | MENU | CTRL |
-				// ------------------------------------------------------------------------------------------
-			bindings = <
-				&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp  N8   &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC
-				&kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp  I    &kp  O  &kp  P   &kp LBKT &kp RBKT
-				&kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp  K    &kp  L  &kp SEMI &kp SQT  &kp NON_US_HASH  &kp RET
-				&kp LSHFT &kp NON_US_BSLH &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH             &kp RSHFT
-				&kp LCTRL &kp LGUI &kp LALT            &kp SPACE                          &kp RALT  &mo 1 &kp K_CMENU &kp RCTRL
-			>;
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
-		};
-		raise {
-			bindings = <
-				&kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp  F8   &kp  F9 &kp  F10  &kp F11 &kp F12   &kp DEL
-				&sys_reset &trans &kp UP &trans &trans &trans &trans &trans &kp INS &trans &kp PSCRN &kp SLCK &kp PAUSE_BREAK
-				&trans    &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &kp HOME  &kp PG_UP  &trans &bootloader
-				&kp C_PREV &kp C_VOL_DN &kp C_VOL_UP &kp C_MUTE &trans &trans &trans &trans &trans &trans &kp END &kp PG_DN  &kp C_NEXT
-				&bt BT_PRV &bt BT_NXT  &trans              &trans                            &trans   &trans   &trans &bt BT_CLR
-			>;
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
-		};
-		#elif defined(ALL_1U)
-		default_layer {
-				// ------------------------------------------------------------------------------------------
-				// | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   |
-				// | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   "|"   |
-				// | CAPS  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |     ENTER    |
-				// |  SHIFT    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   | SHFT | UP | 1  |
-				// |  CTL  |  WIN  |  ALT  |            SPACE              | ALT | CTRL | LEFT | DOWN | RIGHT |
-				// ------------------------------------------------------------------------------------------
-			bindings = <
-				&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp  N8   &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC
-				&kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp  I    &kp  O  &kp  P   &kp LBKT &kp RBKT  &kp BSLH
-				&kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp  K    &kp  L  &kp SEMI &kp SQT           &kp RET
-				&kp LSHFT  &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH    &kp RSHFT &kp UP   &mo 1
-				&kp LCTRL &kp LGUI &kp LALT            &kp SPACE                          &kp RALT  &kp RCTRL &kp LEFT &kp DOWN &kp RIGHT
-			>;
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
-		};
-		raise {
-			bindings = <
-				&kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp  F8   &kp  F9 &kp  F10  &kp F11 &kp F12   &kp F1
-				&trans &trans &kp UP &trans &trans &trans &trans &trans &kp INS &trans &kp PSCRN &kp SLCK &kp PAUSE_BREAK &sys_reset
-				&trans    &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &kp HOME  &kp PG_UP   &bootloader
-				&kp C_PREV &kp C_VOL_DN &kp C_VOL_UP &kp C_MUTE &trans &trans &trans &trans &trans &trans &trans &kp END &kp PG_DN  &kp C_NEXT
-				&bt BT_PRV &bt BT_NXT  &trans              &trans                            &trans  &trans &trans   &trans &bt BT_CLR
-			>;
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
-		};
-		#else
-		default_layer {
-				// ------------------------------------------------------------------------------------------
-				// | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |BKSP| DEL |
-				// | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \    |
-				// | CAPS  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |     ENTER    |
-				// |  SHIFT    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   |   SHIFT  |  1  |
-				// |  CTL  |  WIN  |  ALT  |                     SPACE               |   ALT   |  1  | CTRL |
-				// ------------------------------------------------------------------------------------------
-			bindings = <
-				&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp  N8   &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC &kp DEL
-				&kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp  I    &kp  O  &kp  P   &kp LBKT &kp RBKT  &kp BSLH
-				&kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp  K    &kp  L  &kp SEMI &kp SQT           &kp RET
-				&kp LSHFT  &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH    &kp RSHFT    &mo 1
-				&kp LCTRL &kp LGUI &kp LALT            &kp SPACE                          &kp RALT &kp RGUI &kp C_MENU &kp RCTRL
-			>;
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
-		};
-		raise {
-			bindings = <
-				&kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp  F8   &kp  F9 &kp  F10  &kp F11 &kp F12   &kp DEL &trans
-				&trans &trans &kp UP &trans &trans &trans &trans &trans &kp INS &trans &kp PSCRN &kp SLCK &kp PAUSE_BREAK &sys_reset
-				&trans    &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &kp HOME  &kp PG_UP   &bootloader
-				&kp C_PREV &kp C_VOL_DN &kp C_VOL_UP &kp C_MUTE &trans &trans &trans &trans &trans &kp END &kp PG_DN  &kp C_NEXT &trans
-				&bt BT_PRV &bt BT_NXT  &trans                       &trans                            &trans  &trans &trans &bt BT_CLR
-			>;
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
-		};
-		#endif
-	};
+    keymap {
+        compatible = "zmk,keymap";
+        #ifdef ANSI
+        default_layer {
+                // ------------------------------------------------------------------------------------------
+                // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   |
+                // |  TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   |    |
+                // |  CAPS  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    ENTER    |
+                // |  SHIFT    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   |      SHIFT     |
+                // |  CTL  |  WIN  |  ALT  |            SPACE              | ALT | 1    |  MENU    |  CTRL  |
+                // ------------------------------------------------------------------------------------------
+            bindings = <
+                &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp  N8   &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC
+                &kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp  I    &kp  O  &kp  P   &kp LBKT &kp RBKT  &kp BSLH
+                &kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp  K    &kp  L  &kp SEMI &kp SQT           &kp RET
+                &kp LSHFT  &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH             &kp RSHFT
+                &kp LCTRL &kp LGUI &kp LALT            &kp SPACE                          &kp RALT  &mo 1 &kp K_CMENU &kp RCTRL &bt BT_CLR
+            >;
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
+        raise {
+                // ------------------------------------------------------------------------------------------
+                // |GRAVE| F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |   DEL   |
+                // | TAB  |  Q  | UP  |  E  |  R  |  T  |  Y  |  U  | INS |  O  |PSCRN|SLCK |PSEBRK| RESET |
+                // | CAPS  |LEFT |DOWN |RIGHT|  F  |  G  |  H  |  J  |  K  |  L  |HOME |PGUP |  BOOTLOADER |
+                // |   PREV  |VOLUP |VOLDN|MUTE |  V  |  B  |  N  |  M  |  ,  | END | PGDN |      NEXT     |
+                // |  CTL  |  WIN  |  ALT  |            SPACE               | ALT | 1    |  MENU  | BT_CLR |
+                // ------------------------------------------------------------------------------------------
+            bindings = <
+                &kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp  F8   &kp  F9 &kp  F10  &kp F11 &kp F12   &kp DEL
+                &trans &trans &kp UP &trans &trans &trans &trans &trans &kp INS &trans &kp PSCRN &kp SLCK &kp PAUSE_BREAK &sys_reset
+                &trans    &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &kp HOME  &kp PG_UP   &bootloader
+                &kp C_PREV &kp C_VOL_DN &kp C_VOL_UP &kp C_MUTE &trans &trans &trans &trans &trans &kp END &kp PG_DN  &kp C_NEXT
+                &bt BT_PRV &bt BT_NXT  &trans              &trans                            &trans   &trans   &trans &bt BT_CLR &trans
+            >;
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
+        #elif defined(HHKB)
+        default_layer {
+                // ------------------------------------------------------------------------------------------
+                // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  | `  |
+                // | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  BSPC   |
+                // | CTRL  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |      ENTER   |
+                // |  SHIFT    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   | SHIFT |   1    |
+                // |  CAPS  |  ALT  |  WIN |                     SPACE               |   WIN   | ALT | CTRL |
+                // ------------------------------------------------------------------------------------------
+            bindings = <
+                &kp ESC       &kp N1          &kp N2          &kp N3        &kp N4    &kp N5    &kp N6    &kp N7    &kp  N8      &kp  N9     &kp  N0       &kp MINUS     &kp EQUAL          &kp BSLH    &kp GRAVE
+                &kp TAB       &kp Q           &kp W           &kp E         &kp R     &kp T     &kp Y     &kp U     &kp  I       &kp  O      &kp  P        &kp LBKT      &kp RBKT           &kp BSPC
+                &kp LCTRL     &kp A           &kp S           &kp D         &kp F     &kp G     &kp H     &kp J     &kp  K       &kp  L      &kp SEMI      &kp SQT       &kp RET
+                &kp LSHFT     &kp Z           &kp X           &kp C         &kp V     &kp B     &kp N     &kp M     &kp COMMA    &kp DOT     &kp FSLH      &kp RSHFT     &mo 1
+                &kp LCTRL     &kp LALT        &kp LGUI                                                    &kp SPACE                                        &kp RGUI      &kp RALT           &kp RCTRL
+            >;
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
+        raise {
+            bindings = <
+                &trans        &kp F1          &kp F2          &kp F3        &kp F4    &kp F5    &kp F6    &kp F7    &kp F8       &kp F9      &kp F10       &kp F11       &kp F12            &kp INS      &kp DEL
+                &kp CLCK      &bt BT_PRV      &bt BT_NXT      &bt BT_CLR    &trans    &trans    &trans    &trans    &trans       &trans      &trans        &kp UP        &trans             &sys_reset
+                &trans        &kp C_VOL_DN    &kp C_VOL_UP    &kp C_MUTE    &trans    &trans    &trans    &trans    &trans       &trans      &kp LEFT      &kp RIGHT     &trans
+                &trans        &trans          &trans          &trans        &trans    &trans    &trans    &trans    &trans       &trans      &kp DOWN      &trans        &trans
+                &trans        &trans          &trans                                                      &bootloader                                      &trans        &trans             &trans
+            >;
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
+        #elif defined(ISO)
+        default_layer {
+                // ------------------------------------------------------------------------------------------
+                // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   |
+                // | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |         |
+                // | CAPS  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |  #   | ENTER |
+                // |  SHIFT | |  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   |     SHIFT    |
+                // |  CTL  |  WIN  |  ALT  |                     SPACE        |   ALT   |  1  | MENU | CTRL |
+                // ------------------------------------------------------------------------------------------
+            bindings = <
+                &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp  N8   &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC
+                &kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp  I    &kp  O  &kp  P   &kp LBKT &kp RBKT
+                &kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp  K    &kp  L  &kp SEMI &kp SQT  &kp NON_US_HASH  &kp RET
+                &kp LSHFT &kp NON_US_BSLH &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH             &kp RSHFT
+                &kp LCTRL &kp LGUI &kp LALT            &kp SPACE                          &kp RALT  &mo 1 &kp K_CMENU &kp RCTRL
+            >;
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
+        raise {
+            bindings = <
+                &kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp  F8   &kp  F9 &kp  F10  &kp F11 &kp F12   &kp DEL
+                &sys_reset &trans &kp UP &trans &trans &trans &trans &trans &kp INS &trans &kp PSCRN &kp SLCK &kp PAUSE_BREAK
+                &trans    &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &kp HOME  &kp PG_UP  &trans &bootloader
+                &kp C_PREV &kp C_VOL_DN &kp C_VOL_UP &kp C_MUTE &trans &trans &trans &trans &trans &trans &kp END &kp PG_DN  &kp C_NEXT
+                &bt BT_PRV &bt BT_NXT  &trans              &trans                            &trans   &trans   &trans &bt BT_CLR
+            >;
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
+        #elif defined(ALL_1U)
+        default_layer {
+                // ------------------------------------------------------------------------------------------
+                // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   |
+                // | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   "|"   |
+                // | CAPS  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |     ENTER    |
+                // |  SHIFT    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   | SHFT | UP | 1  |
+                // |  CTL  |  WIN  |  ALT  |            SPACE              | ALT | CTRL | LEFT | DOWN | RIGHT |
+                // ------------------------------------------------------------------------------------------
+            bindings = <
+                &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp  N8   &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC
+                &kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp  I    &kp  O  &kp  P   &kp LBKT &kp RBKT  &kp BSLH
+                &kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp  K    &kp  L  &kp SEMI &kp SQT           &kp RET
+                &kp LSHFT  &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH    &kp RSHFT &kp UP   &mo 1
+                &kp LCTRL &kp LGUI &kp LALT            &kp SPACE                          &kp RALT  &kp RCTRL &kp LEFT &kp DOWN &kp RIGHT
+            >;
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
+        raise {
+            bindings = <
+                &kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp  F8   &kp  F9 &kp  F10  &kp F11 &kp F12   &kp F1
+                &trans &trans &kp UP &trans &trans &trans &trans &trans &kp INS &trans &kp PSCRN &kp SLCK &kp PAUSE_BREAK &sys_reset
+                &trans    &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &kp HOME  &kp PG_UP   &bootloader
+                &kp C_PREV &kp C_VOL_DN &kp C_VOL_UP &kp C_MUTE &trans &trans &trans &trans &trans &trans &trans &kp END &kp PG_DN  &kp C_NEXT
+                &bt BT_PRV &bt BT_NXT  &trans              &trans                            &trans  &trans &trans   &trans &bt BT_CLR
+            >;
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
+        #else
+        default_layer {
+                // ------------------------------------------------------------------------------------------
+                // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |BKSP| DEL |
+                // | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \    |
+                // | CAPS  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |     ENTER    |
+                // |  SHIFT    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   |   SHIFT  |  1  |
+                // |  CTL  |  WIN  |  ALT  |                     SPACE               |   ALT   |  1  | CTRL |
+                // ------------------------------------------------------------------------------------------
+            bindings = <
+                &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp  N8   &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC &kp DEL
+                &kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp  I    &kp  O  &kp  P   &kp LBKT &kp RBKT  &kp BSLH
+                &kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp  K    &kp  L  &kp SEMI &kp SQT           &kp RET
+                &kp LSHFT  &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH    &kp RSHFT    &mo 1
+                &kp LCTRL &kp LGUI &kp LALT            &kp SPACE                          &kp RALT &kp RGUI &kp C_MENU &kp RCTRL
+            >;
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
+        raise {
+            bindings = <
+                &kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp  F8   &kp  F9 &kp  F10  &kp F11 &kp F12   &kp DEL &trans
+                &trans &trans &kp UP &trans &trans &trans &trans &trans &kp INS &trans &kp PSCRN &kp SLCK &kp PAUSE_BREAK &sys_reset
+                &trans    &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &kp HOME  &kp PG_UP   &bootloader
+                &kp C_PREV &kp C_VOL_DN &kp C_VOL_UP &kp C_MUTE &trans &trans &trans &trans &trans &kp END &kp PG_DN  &kp C_NEXT &trans
+                &bt BT_PRV &bt BT_NXT  &trans                       &trans                            &trans  &trans &trans &bt BT_CLR
+            >;
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
+        #endif
+    };
 };
diff --git a/app/boards/arm/bt60/bt60_v1_hs.dts b/app/boards/arm/bt60/bt60_v1_hs.dts
index 0e686fd9..b24dee1e 100644
--- a/app/boards/arm/bt60/bt60_v1_hs.dts
+++ b/app/boards/arm/bt60/bt60_v1_hs.dts
@@ -9,53 +9,53 @@
 
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <15>;
-		rows = <5>;
-		map = <
-			RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13) RC(2,13)
-			RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)   RC(1,13)
-			RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)          RC(2,12)
-			RC(3,0)       RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9)  RC(3,10)               RC(3,11)
-			RC(4,0)   RC(4,1)   RC(4,2)                      RC(4,5)                     RC(4,8)   RC(4,9)    RC(4,10)     RC(4,11)
-		>;
-	};
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <15>;
+        rows = <5>;
+        map = <
+            RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13) RC(2,13)
+            RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)   RC(1,13)
+            RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)          RC(2,12)
+            RC(3,0)       RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9)  RC(3,10)               RC(3,11)
+            RC(4,0)   RC(4,1)   RC(4,2)                      RC(4,5)                     RC(4,8)   RC(4,9)    RC(4,10)     RC(4,11)
+        >;
+    };
 
 
-	kscan0: kscan_0 {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
-		diode-direction = "col2row";
+    kscan0: kscan_0 {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
+        diode-direction = "col2row";
 
-		col-gpios
-			= <&gpio1 11 GPIO_ACTIVE_HIGH>
-			, <&gpio1 10 GPIO_ACTIVE_HIGH>
-			, <&gpio1 13 GPIO_ACTIVE_HIGH>
-			, <&gpio1 15 GPIO_ACTIVE_HIGH>
-			, <&gpio0 3 GPIO_ACTIVE_HIGH>
-			, <&gpio0 2 GPIO_ACTIVE_HIGH>
-			, <&gpio0 28 GPIO_ACTIVE_HIGH>
-			, <&gpio0 29 GPIO_ACTIVE_HIGH>
-			, <&gpio0 30 GPIO_ACTIVE_HIGH>
-			, <&gpio0 31 GPIO_ACTIVE_HIGH>
-			, <&gpio0 5 GPIO_ACTIVE_HIGH>
-			, <&gpio0 7 GPIO_ACTIVE_HIGH>
-			, <&gpio1 9 GPIO_ACTIVE_HIGH>
-			, <&gpio0 12 GPIO_ACTIVE_HIGH>
-			;
+        col-gpios
+            = <&gpio1 11 GPIO_ACTIVE_HIGH>
+            , <&gpio1 10 GPIO_ACTIVE_HIGH>
+            , <&gpio1 13 GPIO_ACTIVE_HIGH>
+            , <&gpio1 15 GPIO_ACTIVE_HIGH>
+            , <&gpio0 3 GPIO_ACTIVE_HIGH>
+            , <&gpio0 2 GPIO_ACTIVE_HIGH>
+            , <&gpio0 28 GPIO_ACTIVE_HIGH>
+            , <&gpio0 29 GPIO_ACTIVE_HIGH>
+            , <&gpio0 30 GPIO_ACTIVE_HIGH>
+            , <&gpio0 31 GPIO_ACTIVE_HIGH>
+            , <&gpio0 5 GPIO_ACTIVE_HIGH>
+            , <&gpio0 7 GPIO_ACTIVE_HIGH>
+            , <&gpio1 9 GPIO_ACTIVE_HIGH>
+            , <&gpio0 12 GPIO_ACTIVE_HIGH>
+            ;
 
-		row-gpios
-			= <&gpio1 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio0 22 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio0 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio0 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio0 23 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
-	};
+        row-gpios
+            = <&gpio1 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 22 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 23 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
+    };
 };
diff --git a/app/boards/arm/bt60/bt60_v1_hs.keymap b/app/boards/arm/bt60/bt60_v1_hs.keymap
index 167460c6..6c26756e 100644
--- a/app/boards/arm/bt60/bt60_v1_hs.keymap
+++ b/app/boards/arm/bt60/bt60_v1_hs.keymap
@@ -3,35 +3,35 @@
 #include <dt-bindings/zmk/bt.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
-				// ------------------------------------------------------------------------------------------
-				// | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   | DEL
-				// | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   |    |
-				// | CAPS  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |     ENTER    |
-				// |  SHIFT    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   |      SHIFT     |
-				// |  CTL  |  WIN  |  ALT  |            SPACE               | ALT | 1    |  MENU    |  CTRL    |
-				// ------------------------------------------------------------------------------------------
-			bindings = <
-				&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp  N8   &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC &bt BT_CLR
-				&kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp  I    &kp  O  &kp  P   &kp LBKT &kp RBKT  &kp BSLH
-				&kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp  K    &kp  L  &kp SEMI &kp SQT           &kp RET
-				&kp LSHFT  &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH             &kp RSHFT
-				&kp LCTRL &kp LGUI &kp LALT            &kp SPACE                          &kp RALT  &mo 1 &kp K_CMENU &kp RCTRL
-			>;
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
-		};
-		raise {
-			bindings = <
-				&kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp  F8   &kp  F9 &kp  F10  &kp F11 &kp F12   &kp DEL &trans
-				&trans &trans &kp UP &trans &trans &trans &trans &trans &kp INS &trans &kp PSCRN &kp SLCK &kp PAUSE_BREAK &sys_reset
-				&trans    &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &kp HOME  &kp PG_UP   &bootloader
-				&kp C_PREV &kp C_VOL_DN &kp C_VOL_UP &kp C_MUTE &trans &trans &trans &trans &trans &kp END &kp PG_DN  &kp C_NEXT
-				&bt BT_PRV &bt BT_NXT  &trans              &trans                            &trans   &trans   &trans &bt BT_CLR
-			>;
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
-		};
-	};
+        default_layer {
+                // ------------------------------------------------------------------------------------------
+                // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   | DEL
+                // | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   |    |
+                // | CAPS  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |     ENTER    |
+                // |  SHIFT    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   |      SHIFT     |
+                // |  CTL  |  WIN  |  ALT  |            SPACE               | ALT | 1    |  MENU    |  CTRL    |
+                // ------------------------------------------------------------------------------------------
+            bindings = <
+                &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp  N8   &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC &bt BT_CLR
+                &kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp  I    &kp  O  &kp  P   &kp LBKT &kp RBKT  &kp BSLH
+                &kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp  K    &kp  L  &kp SEMI &kp SQT           &kp RET
+                &kp LSHFT  &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH             &kp RSHFT
+                &kp LCTRL &kp LGUI &kp LALT            &kp SPACE                          &kp RALT  &mo 1 &kp K_CMENU &kp RCTRL
+            >;
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
+        raise {
+            bindings = <
+                &kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp  F8   &kp  F9 &kp  F10  &kp F11 &kp F12   &kp DEL &trans
+                &trans &trans &kp UP &trans &trans &trans &trans &trans &kp INS &trans &kp PSCRN &kp SLCK &kp PAUSE_BREAK &sys_reset
+                &trans    &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &kp HOME  &kp PG_UP   &bootloader
+                &kp C_PREV &kp C_VOL_DN &kp C_VOL_UP &kp C_MUTE &trans &trans &trans &trans &trans &kp END &kp PG_DN  &kp C_NEXT
+                &bt BT_PRV &bt BT_NXT  &trans              &trans                            &trans   &trans   &trans &bt BT_CLR
+            >;
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
+    };
 };
diff --git a/app/boards/arm/corneish_zen/Kconfig.board b/app/boards/arm/corneish_zen/Kconfig.board
index 33baa110..ca82e330 100644
--- a/app/boards/arm/corneish_zen/Kconfig.board
+++ b/app/boards/arm/corneish_zen/Kconfig.board
@@ -4,9 +4,9 @@
 #
 
 config BOARD_CORNEISH_ZEN_V2_LEFT
-	bool "corneish zen left v2"
-	depends on SOC_NRF52840_QIAA
+    bool "corneish zen left v2"
+    depends on SOC_NRF52840_QIAA
 
 config BOARD_CORNEISH_ZEN_V2_RIGHT
-	bool "corneish zen right v2"
-	depends on SOC_NRF52840_QIAA
\ No newline at end of file
+    bool "corneish zen right v2"
+    depends on SOC_NRF52840_QIAA
\ No newline at end of file
diff --git a/app/boards/arm/corneish_zen/Kconfig.defconfig b/app/boards/arm/corneish_zen/Kconfig.defconfig
index 33ce1256..a161230c 100644
--- a/app/boards/arm/corneish_zen/Kconfig.defconfig
+++ b/app/boards/arm/corneish_zen/Kconfig.defconfig
@@ -6,10 +6,10 @@
 if BOARD_CORNEISH_ZEN_V2_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Corne-ish Zen"
+    default "Corne-ish Zen"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif # BOARD_CORNEISH_ZEN_V2_LEFT
 
@@ -17,65 +17,65 @@ endif # BOARD_CORNEISH_ZEN_V2_LEFT
 if BOARD_CORNEISH_ZEN_V2_LEFT || BOARD_CORNEISH_ZEN_V2_RIGHT
 
 config BOARD
-	default "corneish_zen"
+    default "corneish_zen"
 
 config ZMK_SPLIT
-	default y
+    default y
 
 config BT_CTLR
-	default BT
+    default BT
 
 config ZMK_BLE
-	default y
+    default y
 
 config ZMK_USB
-	default y
+    default y
 
 if USB
 
 config USB_NRFX
-	default y
+    default y
 
 config USB_DEVICE_STACK
-	default y
+    default y
 
 endif # USB
 
 config ZMK_DISPLAY
-	select LV_USE_CONT
-	select LV_FONT_MONTSERRAT_26
-	select LV_FONT_MONTSERRAT_20
-	select LV_FONT_MONTSERRAT_16
-	select LV_USE_LABEL
-	select LV_USE_IMG
+    select LV_USE_CONT
+    select LV_FONT_MONTSERRAT_26
+    select LV_FONT_MONTSERRAT_20
+    select LV_FONT_MONTSERRAT_16
+    select LV_USE_LABEL
+    select LV_USE_IMG
 
 choice ZMK_DISPLAY_STATUS_SCREEN
-	default ZMK_DISPLAY_STATUS_SCREEN_CUSTOM
+    default ZMK_DISPLAY_STATUS_SCREEN_CUSTOM
 endchoice
 
 if ZMK_DISPLAY
 
 config SPI
-	default y
+    default y
 
 config IL0323
-	default y
+    default y
 
 config ZMK_DISPLAY_BLANK_ON_IDLE
-	default n
+    default n
 
 endif # ZMK_DISPLAY
 
 menuconfig CUSTOM_WIDGET_BATTERY_STATUS
-	bool "custom battery status widget"
+    bool "custom battery status widget"
 
 menuconfig CUSTOM_WIDGET_OUTPUT_STATUS
-	bool "custom output status widget"
+    bool "custom output status widget"
 
 menuconfig CUSTOM_WIDGET_LAYER_STATUS
-	bool "custom layer status widget"
+    bool "custom layer status widget"
 
 menuconfig CUSTOM_WIDGET_PERIPHERAL_STATUS
-	bool "custom peripheral status widget"
+    bool "custom peripheral status widget"
 
 endif # BOARD_CORNEISH_ZEN_V2_LEFT || BOARD_CORNEISH_ZEN_V2_RIGHT
diff --git a/app/boards/arm/corneish_zen/corneish_zen.dtsi b/app/boards/arm/corneish_zen/corneish_zen.dtsi
index f203c9f8..10be54cc 100644
--- a/app/boards/arm/corneish_zen/corneish_zen.dtsi
+++ b/app/boards/arm/corneish_zen/corneish_zen.dtsi
@@ -11,116 +11,116 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	model = "corneish_zen_v2";
-	compatible = "corneish_zen_v2";
+    model = "corneish_zen_v2";
+    compatible = "corneish_zen_v2";
 
-	chosen {
-		zephyr,code-partition = &code_partition;
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zmk,kscan = &kscan0;
-		zmk,display = &epd;
-		zmk,battery = &vbatt;
-		zephyr,console = &cdc_acm_uart;
-	};
+    chosen {
+        zephyr,code-partition = &code_partition;
+        zephyr,sram = &sram0;
+        zephyr,flash = &flash0;
+        zmk,kscan = &kscan0;
+        zmk,display = &epd;
+        zmk,battery = &vbatt;
+        zephyr,console = &cdc_acm_uart;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <12>;
-		rows = <4>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <12>;
+        rows = <4>;
 
-			// | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |   | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  |
-			// | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |   | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |
-			// | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |
-			//                      | SW19 | SW20 | SW21 |   | SW21 | SW20 | SW19 |
-					map = <
-			RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)  RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11)
-			RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)  RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11)
-			RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)
-									RC(3,3) RC(3,4) RC(3,5)  RC(3,6) RC(3,7) RC(3,8)
-		>;
-	};
+            // | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |   | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  |
+            // | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |   | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |
+            // | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |
+            //                      | SW19 | SW20 | SW21 |   | SW21 | SW20 | SW19 |
+                    map = <
+            RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)  RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11)
+            RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)  RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11)
+            RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)
+                                    RC(3,3) RC(3,4) RC(3,5)  RC(3,6) RC(3,7) RC(3,8)
+        >;
+    };
 
-	five_column_transform: keymap_transform_1 {
-		compatible = "zmk,matrix-transform";
-		columns = <10>;
-		rows = <4>;
+    five_column_transform: keymap_transform_1 {
+        compatible = "zmk,matrix-transform";
+        columns = <10>;
+        rows = <4>;
 
-			// | SW2  | SW3  | SW4  | SW5  | SW6  |   | SW6  | SW5  | SW4  | SW3  | SW2  |
-			// | SW8  | SW9  | SW10 | SW11 | SW12 |   | SW12 | SW11 | SW10 | SW9  | SW8  |
-			// | SW14 | SW15 | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 | SW15 | SW14 |
-			//               | SW19 | SW20 | SW21 |   | SW21 | SW20 | SW19 |
-					map = <
-			RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)  RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10)
-			RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)  RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10)
-			RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10)
-							RC(3,3) RC(3,4) RC(3,5)  RC(3,6) RC(3,7) RC(3,8)
-		>;
-	};
+            // | SW2  | SW3  | SW4  | SW5  | SW6  |   | SW6  | SW5  | SW4  | SW3  | SW2  |
+            // | SW8  | SW9  | SW10 | SW11 | SW12 |   | SW12 | SW11 | SW10 | SW9  | SW8  |
+            // | SW14 | SW15 | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 | SW15 | SW14 |
+            //               | SW19 | SW20 | SW21 |   | SW21 | SW20 | SW19 |
+                    map = <
+            RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)  RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10)
+            RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)  RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10)
+            RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10)
+                            RC(3,3) RC(3,4) RC(3,5)  RC(3,6) RC(3,7) RC(3,8)
+        >;
+    };
 
 };
 
 
 &adc {
-	status = "okay";
+    status = "okay";
 };
 
 &gpiote {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio0 {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio1 {
-	status = "okay";
+    status = "okay";
 };
 
 &usbd {
-	status = "okay";
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
 &flash0 {
-	/*
-	 * For more information, see:
-	 * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
-	 */
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
+    /*
+     * For more information, see:
+     * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
+     */
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
 
-		sd_partition: partition@0 {
-			label = "softdevice";
-			reg = <0x00000000 0x00026000>;
-		};
-		code_partition: partition@26000 {
-			label = "code_partition";
-			reg = <0x00026000 0x000c6000>;
-		};
+        sd_partition: partition@0 {
+            label = "softdevice";
+            reg = <0x00000000 0x00026000>;
+        };
+        code_partition: partition@26000 {
+            label = "code_partition";
+            reg = <0x00026000 0x000c6000>;
+        };
 
-		/*
-		 * The flash starting at 0x000ec000 and ending at
-		 * 0x000f3fff is reserved for use by the application.
-		 */
+        /*
+         * The flash starting at 0x000ec000 and ending at
+         * 0x000f3fff is reserved for use by the application.
+         */
 
-		/*
-		 * Storage partition will be used by FCB/LittleFS/NVS
-		 * if enabled.
-		 */
-		storage_partition: partition@ec000 {
-			label = "storage";
-			reg = <0x000ec000 0x00008000>;
-		};
+        /*
+         * Storage partition will be used by FCB/LittleFS/NVS
+         * if enabled.
+         */
+        storage_partition: partition@ec000 {
+            label = "storage";
+            reg = <0x000ec000 0x00008000>;
+        };
 
-		boot_partition: partition@f4000 {
-			label = "adafruit_boot";
-			reg = <0x000f4000 0x0000c000>;
-		};
-	};
+        boot_partition: partition@f4000 {
+            label = "adafruit_boot";
+            reg = <0x000f4000 0x0000c000>;
+        };
+    };
 };
\ No newline at end of file
diff --git a/app/boards/arm/corneish_zen/corneish_zen.keymap b/app/boards/arm/corneish_zen/corneish_zen.keymap
index 72d0b8f1..2b9eeb14 100644
--- a/app/boards/arm/corneish_zen/corneish_zen.keymap
+++ b/app/boards/arm/corneish_zen/corneish_zen.keymap
@@ -45,7 +45,7 @@
    &kp TAB    &kp N1       &kp N2       &kp N3       &kp N4       &kp N5         &kp N6   &kp N7   &kp N8 &kp N9    &kp N0 &kp BSPC
    &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4   &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &trans
    &kp LSHFT  &trans       &trans       &trans       &trans       &trans         &trans   &trans   &trans &trans    &trans &trans
-                          	        &kp LGUI     &trans       &kp SPACE      &kp RET  &trans   &kp RALT
+                                    &kp LGUI     &trans       &kp SPACE      &kp RET  &trans   &kp RALT
                         >;
                 };
 
@@ -60,7 +60,7 @@
    &kp  TAB  &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT   &kp CARET &kp AMPS  &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp BSPC
    &kp LCTRL &trans   &trans &trans   &trans   &trans      &kp MINUS &kp EQUAL &kp LBKT        &kp RBKT &kp BSLH &kp GRAVE
    &kp LSHFT &trans   &trans &trans   &trans   &trans      &kp UNDER &kp PLUS  &kp LBRC        &kp RBRC &kp PIPE &kp TILDE
-                    	     &kp LGUI &trans   &kp SPACE   &kp RET   &trans    &kp RALT
+                             &kp LGUI &trans   &kp SPACE   &kp RET   &trans    &kp RALT
                         >;
                 };
         };
diff --git a/app/boards/arm/corneish_zen/corneish_zen_v2_left.dts b/app/boards/arm/corneish_zen/corneish_zen_v2_left.dts
index 65092dc5..9f3dd73a 100644
--- a/app/boards/arm/corneish_zen/corneish_zen_v2_left.dts
+++ b/app/boards/arm/corneish_zen/corneish_zen_v2_left.dts
@@ -8,90 +8,90 @@
 #include "corneish_zen.dtsi"
 
 /{
-	chosen {
-		zephyr,display = &epd;
-		zmk,battery = &vbatt;
-	};
+    chosen {
+        zephyr,display = &epd;
+        zmk,battery = &vbatt;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&gpio0 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio0 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio0 31 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio0 30 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
+        diode-direction = "col2row";
+        row-gpios
+            = <&gpio0 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 31 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 30 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
 
-		col-gpios
-			= <&gpio0 21 GPIO_ACTIVE_HIGH>
-			, <&gpio0 23 GPIO_ACTIVE_HIGH>
-			, <&gpio0 12 GPIO_ACTIVE_HIGH>
-			, <&gpio1  9 GPIO_ACTIVE_HIGH>
-			, <&gpio0  7 GPIO_ACTIVE_HIGH>
-			, <&gpio0  5 GPIO_ACTIVE_HIGH>
-			;
-	};
+        col-gpios
+            = <&gpio0 21 GPIO_ACTIVE_HIGH>
+            , <&gpio0 23 GPIO_ACTIVE_HIGH>
+            , <&gpio0 12 GPIO_ACTIVE_HIGH>
+            , <&gpio1  9 GPIO_ACTIVE_HIGH>
+            , <&gpio0  7 GPIO_ACTIVE_HIGH>
+            , <&gpio0  5 GPIO_ACTIVE_HIGH>
+            ;
+    };
 
-	leds {
-		compatible = "gpio-leds";
-		blue_led: led_0 {
-			gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
-			label = "Blue LED";
-		};
-	};
+    leds {
+        compatible = "gpio-leds";
+        blue_led: led_0 {
+            gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
+        };
+    };
 
-	vbatt: vbatt {
-		compatible = "zmk,battery-voltage-divider";
-		label = "BATTERY";
-		io-channels = <&adc 0>;
-		output-ohms = <1960000>;
-		full-ohms = <(1960000 + 810000)>;
-	};
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        label = "BATTERY";
+        io-channels = <&adc 0>;
+        output-ohms = <1960000>;
+        full-ohms = <(1960000 + 810000)>;
+    };
 
 };
 
 &pinctrl {
-	spi0_default: spi0_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 27)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 8)>,
-				<NRF_PSEL(SPIM_MISO, 0, 22)>;
-		};
-	};
+    spi0_default: spi0_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 27)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 8)>,
+                <NRF_PSEL(SPIM_MISO, 0, 22)>;
+        };
+    };
 
-	spi0_sleep: spi0_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 27)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 8)>,
-				<NRF_PSEL(SPIM_MISO, 0, 22)>;
-			low-power-enable;
-		};
-	};
+    spi0_sleep: spi0_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 27)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 8)>,
+                <NRF_PSEL(SPIM_MISO, 0, 22)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi0  {
-	status = "okay";
-	compatible = "nordic,nrf-spim";
-	pinctrl-0 = <&spi0_default>;
-	pinctrl-1 = <&spi0_sleep>;
-	pinctrl-names = "default", "sleep";
-	cs-gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
+    status = "okay";
+    compatible = "nordic,nrf-spim";
+    pinctrl-0 = <&spi0_default>;
+    pinctrl-1 = <&spi0_sleep>;
+    pinctrl-names = "default", "sleep";
+    cs-gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
 
-	epd: il0323@0 {
-		compatible = "gooddisplay,il0323";
-		reg =  <0>;
-		label = "DISPLAY";
-		width = <80>;
-		height = <128>;
-		spi-max-frequency = <4000000>;
-		dc-gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
-		busy-gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
-		reset-gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
-		pwr = [03 00 26 26];
-		cdi = <0xd2>;
-		tcon = <0x22>;
-	};
+    epd: il0323@0 {
+        compatible = "gooddisplay,il0323";
+        reg =  <0>;
+        label = "DISPLAY";
+        width = <80>;
+        height = <128>;
+        spi-max-frequency = <4000000>;
+        dc-gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+        busy-gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
+        reset-gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
+        pwr = [03 00 26 26];
+        cdi = <0xd2>;
+        tcon = <0x22>;
+    };
 };
diff --git a/app/boards/arm/corneish_zen/corneish_zen_v2_right.dts b/app/boards/arm/corneish_zen/corneish_zen_v2_right.dts
index 980c9900..3cb7556f 100644
--- a/app/boards/arm/corneish_zen/corneish_zen_v2_right.dts
+++ b/app/boards/arm/corneish_zen/corneish_zen_v2_right.dts
@@ -8,98 +8,98 @@
 #include "corneish_zen.dtsi"
 
 /{
-	chosen {
-		zephyr,display = &epd;
-		zmk,battery = &vbatt;
-	};
+    chosen {
+        zephyr,display = &epd;
+        zmk,battery = &vbatt;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&gpio0 22 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio1  0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio1  3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio1  1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
+        diode-direction = "col2row";
+        row-gpios
+            = <&gpio0 22 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio1  0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio1  3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio1  1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
 
-		col-gpios
-			= <&gpio0 19 GPIO_ACTIVE_HIGH>
-			, <&gpio0 21 GPIO_ACTIVE_HIGH>
-			, <&gpio0 23 GPIO_ACTIVE_HIGH>
-			, <&gpio0 12 GPIO_ACTIVE_HIGH>
-			, <&gpio1  9 GPIO_ACTIVE_HIGH>
-			, <&gpio0  7 GPIO_ACTIVE_HIGH>
-			;
+        col-gpios
+            = <&gpio0 19 GPIO_ACTIVE_HIGH>
+            , <&gpio0 21 GPIO_ACTIVE_HIGH>
+            , <&gpio0 23 GPIO_ACTIVE_HIGH>
+            , <&gpio0 12 GPIO_ACTIVE_HIGH>
+            , <&gpio1  9 GPIO_ACTIVE_HIGH>
+            , <&gpio0  7 GPIO_ACTIVE_HIGH>
+            ;
 
-	};
+    };
 
-	leds {
-			compatible = "gpio-leds";
-			blue_led: led_0 {
-				gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>;
-				label = "Blue LED";
-			};
-		};
+    leds {
+            compatible = "gpio-leds";
+            blue_led: led_0 {
+                gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>;
+                label = "Blue LED";
+            };
+        };
 
-	vbatt: vbatt {
-		compatible = "zmk,battery-voltage-divider";
-		label = "BATTERY";
-		io-channels = <&adc 0>;
-		output-ohms = <1960000>;
-		full-ohms = <(1960000 + 810000)>;
-	};
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        label = "BATTERY";
+        io-channels = <&adc 0>;
+        output-ohms = <1960000>;
+        full-ohms = <(1960000 + 810000)>;
+    };
 };
 
 &default_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 &five_column_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &pinctrl {
-	spi0_default: spi0_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 24)>,
-				<NRF_PSEL(SPIM_MISO, 0, 27)>;
-		};
-	};
+    spi0_default: spi0_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 24)>,
+                <NRF_PSEL(SPIM_MISO, 0, 27)>;
+        };
+    };
 
-	spi0_sleep: spi0_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 24)>,
-				<NRF_PSEL(SPIM_MISO, 0, 27)>;
-			low-power-enable;
-		};
-	};
+    spi0_sleep: spi0_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 24)>,
+                <NRF_PSEL(SPIM_MISO, 0, 27)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi0 {
-	status = "okay";
-	compatible = "nordic,nrf-spim";
-	pinctrl-0 = <&spi0_default>;
-	pinctrl-1 = <&spi0_sleep>;
-	pinctrl-names = "default", "sleep";
-	cs-gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
+    status = "okay";
+    compatible = "nordic,nrf-spim";
+    pinctrl-0 = <&spi0_default>;
+    pinctrl-1 = <&spi0_sleep>;
+    pinctrl-names = "default", "sleep";
+    cs-gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
 
-	epd: il0323@0 {
-		compatible = "gooddisplay,il0323";
-		reg =  <0>;
-		label = "DISPLAY";
-		width = <80>;
-		height = <128>;
-		spi-max-frequency = <4000000>;
-		dc-gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
-		busy-gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
-		reset-gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
-		pwr = [03 00 26 26];
-		//softstart = [17 17 17 17];
-		cdi = <0xd2>;
-		tcon = <0x22>;
-	};
+    epd: il0323@0 {
+        compatible = "gooddisplay,il0323";
+        reg =  <0>;
+        label = "DISPLAY";
+        width = <80>;
+        height = <128>;
+        spi-max-frequency = <4000000>;
+        dc-gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
+        busy-gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+        reset-gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
+        pwr = [03 00 26 26];
+        //softstart = [17 17 17 17];
+        cdi = <0xd2>;
+        tcon = <0x22>;
+    };
 };
diff --git a/app/boards/arm/dz60rgb/Kconfig.board b/app/boards/arm/dz60rgb/Kconfig.board
index ec8dad68..ba09e2dd 100644
--- a/app/boards/arm/dz60rgb/Kconfig.board
+++ b/app/boards/arm/dz60rgb/Kconfig.board
@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_DZ60RGB_REV1
-	bool "DZ60RGB Keyboard"
-	depends on SOC_STM32F303XC
+    bool "DZ60RGB Keyboard"
+    depends on SOC_STM32F303XC
diff --git a/app/boards/arm/dz60rgb/Kconfig.defconfig b/app/boards/arm/dz60rgb/Kconfig.defconfig
index 779d3123..2e30e3d0 100644
--- a/app/boards/arm/dz60rgb/Kconfig.defconfig
+++ b/app/boards/arm/dz60rgb/Kconfig.defconfig
@@ -6,9 +6,9 @@
 if BOARD_DZ60RGB_REV1
 
 config ZMK_KEYBOARD_NAME
-	default "DZ60RGB Rev 1"
+    default "DZ60RGB Rev 1"
 
 config ZMK_USB
-	default y
+    default y
 
 endif # BOARD_DZ60RGB_REV1
diff --git a/app/boards/arm/dz60rgb/dz60rgb_rev1.dts b/app/boards/arm/dz60rgb/dz60rgb_rev1.dts
index e2730d21..14be837d 100644
--- a/app/boards/arm/dz60rgb/dz60rgb_rev1.dts
+++ b/app/boards/arm/dz60rgb/dz60rgb_rev1.dts
@@ -10,84 +10,84 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	model = "DZ60RGB, Rev 1";
-	compatible = "dz60rgb,rev1", "st,stm32f303";
+    model = "DZ60RGB, Rev 1";
+    compatible = "dz60rgb,rev1", "st,stm32f303";
 
-	chosen {
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &cdc_acm_uart;
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zephyr,sram = &sram0;
+        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <14>;
-		rows = <5>;
-		map = <
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <14>;
+        rows = <5>;
+        map = <
 RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13)
 RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)   RC(1,13)
 RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)          RC(2,13)
 RC(3,0)       RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9)    RC(3,10)     RC(3,11) RC(3,13)
 RC(4,0)   RC(4,1)   RC(4,2)                      RC(4,5)                     RC(4,8) RC(4,9) RC(4,10) RC(4,11) RC(4,13)
-		>;
-	};
+        >;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&gpioa 9  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpiob 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpiob 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpiob 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpiob 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
-		col-gpios
-			= <&gpioa 6  GPIO_ACTIVE_HIGH>
-			, <&gpioa 7  GPIO_ACTIVE_HIGH>
-			, <&gpiob 0  GPIO_ACTIVE_HIGH>
-			, <&gpiob 13 GPIO_ACTIVE_HIGH>
-			, <&gpiob 15 GPIO_ACTIVE_HIGH>
-			, <&gpioa 8  GPIO_ACTIVE_HIGH>
-			, <&gpioa 15 GPIO_ACTIVE_HIGH>
-			, <&gpiob 3  GPIO_ACTIVE_HIGH>
-			, <&gpiob 4  GPIO_ACTIVE_HIGH>
-			, <&gpiob 5  GPIO_ACTIVE_HIGH>
-			, <&gpiob 8  GPIO_ACTIVE_HIGH>
-			, <&gpiob 9  GPIO_ACTIVE_HIGH>
-			, <&gpioc 13 GPIO_ACTIVE_HIGH>
-			, <&gpioc 14 GPIO_ACTIVE_HIGH>
-			;
-	};
+        diode-direction = "col2row";
+        row-gpios
+            = <&gpioa 9  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpiob 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpiob 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpiob 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpiob 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
+        col-gpios
+            = <&gpioa 6  GPIO_ACTIVE_HIGH>
+            , <&gpioa 7  GPIO_ACTIVE_HIGH>
+            , <&gpiob 0  GPIO_ACTIVE_HIGH>
+            , <&gpiob 13 GPIO_ACTIVE_HIGH>
+            , <&gpiob 15 GPIO_ACTIVE_HIGH>
+            , <&gpioa 8  GPIO_ACTIVE_HIGH>
+            , <&gpioa 15 GPIO_ACTIVE_HIGH>
+            , <&gpiob 3  GPIO_ACTIVE_HIGH>
+            , <&gpiob 4  GPIO_ACTIVE_HIGH>
+            , <&gpiob 5  GPIO_ACTIVE_HIGH>
+            , <&gpiob 8  GPIO_ACTIVE_HIGH>
+            , <&gpiob 9  GPIO_ACTIVE_HIGH>
+            , <&gpioc 13 GPIO_ACTIVE_HIGH>
+            , <&gpioc 14 GPIO_ACTIVE_HIGH>
+            ;
+    };
 
 };
 
 &usb {
-	status = "okay";
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
 &flash0 {
-	/*
-	 * For more information, see:
-	 * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
-	 */
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
+    /*
+     * For more information, see:
+     * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
+     */
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
 
-		/* Set 6Kb of storage at the end of the 256Kb of flash */
-		storage_partition: partition@3e800 {
-			label = "storage";
-			reg = <0x0003e800 0x00001800>;
-		};
-	};
+        /* Set 6Kb of storage at the end of the 256Kb of flash */
+        storage_partition: partition@3e800 {
+            label = "storage";
+            reg = <0x0003e800 0x00001800>;
+        };
+    };
 };
diff --git a/app/boards/arm/dz60rgb/dz60rgb_rev1.keymap b/app/boards/arm/dz60rgb/dz60rgb_rev1.keymap
index f95fce0e..e8cc6a7a 100644
--- a/app/boards/arm/dz60rgb/dz60rgb_rev1.keymap
+++ b/app/boards/arm/dz60rgb/dz60rgb_rev1.keymap
@@ -2,10 +2,10 @@
 #include <dt-bindings/zmk/keys.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
+        default_layer {
 // ------------------------------------------------------------------------------------------
 // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   |
 // | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   "|"   |
@@ -13,13 +13,13 @@
 // |  SHIFT  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  SHIFT(/)  |  ^  | DEL |
 // |  CTL  |  WIN  |  ALT  |            SPACE               | ALT | MO(1) |  <- |  v  | ->  |
 // ------------------------------------------------------------------------------------------
-			bindings = <
-	&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp  N8   &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC
-	&kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp  I    &kp  O  &kp  P   &kp LBKT &kp RBKT  &kp BSLH
-	&kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp  K    &kp  L  &kp SEMI &kp SQT           &kp RET
-	&kp LSHFT  &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &mt RSHFT FSLH   &kp  UP  &kp DEL
-	&kp LCTRL &kp LGUI &kp LALT            &kp SPACE                     &kp RALT &mo  1  &kp LEFT &kp DOWN &kp RIGHT
-			>;
-		};
-	};
+            bindings = <
+    &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp  N8   &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC
+    &kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp  I    &kp  O  &kp  P   &kp LBKT &kp RBKT  &kp BSLH
+    &kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp  K    &kp  L  &kp SEMI &kp SQT           &kp RET
+    &kp LSHFT  &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &mt RSHFT FSLH   &kp  UP  &kp DEL
+    &kp LCTRL &kp LGUI &kp LALT            &kp SPACE                     &kp RALT &mo  1  &kp LEFT &kp DOWN &kp RIGHT
+            >;
+        };
+    };
 };
\ No newline at end of file
diff --git a/app/boards/arm/ferris/Kconfig.board b/app/boards/arm/ferris/Kconfig.board
index ad96271a..70ee895d 100644
--- a/app/boards/arm/ferris/Kconfig.board
+++ b/app/boards/arm/ferris/Kconfig.board
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_FERRIS
-	bool "Ferris rev 0.2"
-	depends on SOC_STM32F072XB
+    bool "Ferris rev 0.2"
+    depends on SOC_STM32F072XB
diff --git a/app/boards/arm/ferris/Kconfig.defconfig b/app/boards/arm/ferris/Kconfig.defconfig
index c59cb902..7cf43bcb 100644
--- a/app/boards/arm/ferris/Kconfig.defconfig
+++ b/app/boards/arm/ferris/Kconfig.defconfig
@@ -6,15 +6,15 @@
 if BOARD_FERRIS
 
 config BOARD
-	default "ferris_rev02"
+    default "ferris_rev02"
 
 config ZMK_KEYBOARD_NAME
-	default "Ferris rev 0.2"
+    default "Ferris rev 0.2"
 
 config ZMK_USB
-	default y
+    default y
 
 config ZMK_KSCAN_MATRIX_POLLING
-	default y
+    default y
 
 endif # BOARD_FERRIS
diff --git a/app/boards/arm/ferris/ferris_rev02.dts b/app/boards/arm/ferris/ferris_rev02.dts
index 55055e9a..618a5591 100644
--- a/app/boards/arm/ferris/ferris_rev02.dts
+++ b/app/boards/arm/ferris/ferris_rev02.dts
@@ -11,153 +11,153 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	model = "Ferris rev0.2";
-	compatible = "ferris,rev02", "st,stm32f072";
+    model = "Ferris rev0.2";
+    compatible = "ferris,rev02", "st,stm32f072";
 
-	chosen {
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &cdc_acm_uart;
-		zmk,kscan = &kscan;
-		zmk,matrix_transform = &transform;
-		/* TODO: Enable once we support the IC for underglow
-		zmk,underglow = &led_strip;
-		 */
-	};
+    chosen {
+        zephyr,sram = &sram0;
+        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
+        zmk,kscan = &kscan;
+        zmk,matrix_transform = &transform;
+        /* TODO: Enable once we support the IC for underglow
+        zmk,underglow = &led_strip;
+         */
+    };
 
-	transform: transform {
-		compatible = "zmk,matrix-transform";
-		rows = <4>;
-		columns = <10>;
+    transform: transform {
+        compatible = "zmk,matrix-transform";
+        rows = <4>;
+        columns = <10>;
 
-		map = <
-		RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4)     RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9)
-		RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4)     RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9)
-		RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4)     RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
-		RC(3,3)  RC(3,4)     RC(3,5) RC(3,6)
-		>;
-	};
+        map = <
+        RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4)     RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9)
+        RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4)     RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9)
+        RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4)     RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
+        RC(3,3)  RC(3,4)     RC(3,5) RC(3,6)
+        >;
+    };
 
-	kscan: kscan {
-		compatible = "zmk,kscan-composite";
-		label = "KSCAN";
-		rows = <4>;
-		columns = <10>;
+    kscan: kscan {
+        compatible = "zmk,kscan-composite";
+        label = "KSCAN";
+        rows = <4>;
+        columns = <10>;
 
-		left {
-			kscan = <&kscan_left>;
-		};
+        left {
+            kscan = <&kscan_left>;
+        };
 
-		right {
-			kscan = <&kscan_right>;
-			column-offset = <5>;
-		};
-	};
+        right {
+            kscan = <&kscan_right>;
+            column-offset = <5>;
+        };
+    };
 
-	kscan_left: kscan_left {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN_LEFT";
+    kscan_left: kscan_left {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN_LEFT";
 
-		diode-direction = "col2row";
+        diode-direction = "col2row";
 
-		col-gpios
-		= <&gpiob 8 (GPIO_ACTIVE_HIGH)>
-		, <&gpiob 4 (GPIO_ACTIVE_HIGH)>
-		, <&gpiob 3 (GPIO_ACTIVE_HIGH)>
-		, <&gpioa 15 (GPIO_ACTIVE_HIGH)>
-		, <&gpioa 14 (GPIO_ACTIVE_HIGH)>
-		;
-		row-gpios
-		= <&gpiob 7  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&gpiob 6  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&gpiob 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&gpioa 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		;
-	};
+        col-gpios
+        = <&gpiob 8 (GPIO_ACTIVE_HIGH)>
+        , <&gpiob 4 (GPIO_ACTIVE_HIGH)>
+        , <&gpiob 3 (GPIO_ACTIVE_HIGH)>
+        , <&gpioa 15 (GPIO_ACTIVE_HIGH)>
+        , <&gpioa 14 (GPIO_ACTIVE_HIGH)>
+        ;
+        row-gpios
+        = <&gpiob 7  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&gpiob 6  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&gpiob 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&gpioa 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        ;
+    };
 
-	kscan_right: kscan_right {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN_RIGHT";
+    kscan_right: kscan_right {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN_RIGHT";
 
-		diode-direction = "row2col";
+        diode-direction = "row2col";
 
-		col-gpios
-		= <&right_io 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&right_io 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&right_io 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&right_io 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&right_io 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		;
-		row-gpios
-		= <&right_io 8  (GPIO_ACTIVE_LOW)>
-		, <&right_io 9  (GPIO_ACTIVE_LOW)>
-		, <&right_io 10 (GPIO_ACTIVE_LOW)>
-		, <&right_io 11 (GPIO_ACTIVE_LOW)>
-		;
-	};
+        col-gpios
+        = <&right_io 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&right_io 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&right_io 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&right_io 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&right_io 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        ;
+        row-gpios
+        = <&right_io 8  (GPIO_ACTIVE_LOW)>
+        , <&right_io 9  (GPIO_ACTIVE_LOW)>
+        , <&right_io 10 (GPIO_ACTIVE_LOW)>
+        , <&right_io 11 (GPIO_ACTIVE_LOW)>
+        ;
+    };
 };
 
 &i2c2 {
-	pinctrl-0 = <&i2c2_scl_pb10 &i2c2_sda_pb11>;
-	pinctrl-names = "default";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
+    pinctrl-0 = <&i2c2_scl_pb10 &i2c2_sda_pb11>;
+    pinctrl-names = "default";
+    status = "okay";
+    clock-frequency = <I2C_BITRATE_FAST>;
 
-	right_io: mcp23017@20 {
-		compatible = "microchip,mcp230xx";
-		status = "okay";
-		gpio-controller;
-		reg = <0x20>;
-		#gpio-cells = <2>;
-		ngpios = <16>;
-	};
+    right_io: mcp23017@20 {
+        compatible = "microchip,mcp230xx";
+        status = "okay";
+        gpio-controller;
+        reg = <0x20>;
+        #gpio-cells = <2>;
+        ngpios = <16>;
+    };
 };
 
 &usb {
-	status = "okay";
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
 &clk_hsi {
-	status = "okay";
+    status = "okay";
 };
 
 &pll {
-	prediv = <1>;
-	mul = <6>;
-	clocks = <&clk_hsi>;
-	status = "okay";
+    prediv = <1>;
+    mul = <6>;
+    clocks = <&clk_hsi>;
+    status = "okay";
 };
 
 &rcc {
-	clocks = <&pll>;
-	clock-frequency = <DT_FREQ_M(48)>;
-	ahb-prescaler = <1>;
-	apb1-prescaler = <1>;
+    clocks = <&pll>;
+    clock-frequency = <DT_FREQ_M(48)>;
+    ahb-prescaler = <1>;
+    apb1-prescaler = <1>;
 };
 
 
 &rtc {
-	status = "okay";
+    status = "okay";
 };
 
 &flash0 {
-	/*
-	 * For more information, see:
-	 * http: //docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
-	 */
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
+    /*
+     * For more information, see:
+     * http: //docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
+     */
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
 
-		/* Set 6Kb of storage at the end of the 128Kb of flash */
-		storage_partition: partition@3e800 {
-			label = "storage";
-			reg = <0x0001e800 0x00001800>;
-		};
-	};
+        /* Set 6Kb of storage at the end of the 128Kb of flash */
+        storage_partition: partition@3e800 {
+            label = "storage";
+            reg = <0x0001e800 0x00001800>;
+        };
+    };
 };
diff --git a/app/boards/arm/mikoto/Kconfig b/app/boards/arm/mikoto/Kconfig
index 646d119c..71ec9411 100644
--- a/app/boards/arm/mikoto/Kconfig
+++ b/app/boards/arm/mikoto/Kconfig
@@ -1,12 +1,12 @@
 config BOARD_ENABLE_DCDC
-	bool "Enable DCDC mode"
-	select SOC_DCDC_NRF52X
-	default y
-	depends on (BOARD_MIKOTO_520)
+    bool "Enable DCDC mode"
+    select SOC_DCDC_NRF52X
+    default y
+    depends on (BOARD_MIKOTO_520)
 
 choice BOARD_MIKOTO_CHARGER_CURRENT
     prompt "Charge current to supply to attached batteries"
-	depends on (BOARD_MIKOTO_520)
+    depends on (BOARD_MIKOTO_520)
 
 config BOARD_MIKOTO_CHARGER_CURRENT_40MA
     bool "40mA charge current, for battery capacity 40mAh or higher"
diff --git a/app/boards/arm/mikoto/Kconfig.board b/app/boards/arm/mikoto/Kconfig.board
index 067c2fbe..a872fa1f 100644
--- a/app/boards/arm/mikoto/Kconfig.board
+++ b/app/boards/arm/mikoto/Kconfig.board
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_MIKOTO_520
-	bool "mikoto_520"
-	depends on SOC_NRF52840_QIAA
+    bool "mikoto_520"
+    depends on SOC_NRF52840_QIAA
diff --git a/app/boards/arm/mikoto/Kconfig.defconfig b/app/boards/arm/mikoto/Kconfig.defconfig
index 6aafc613..8c7746db 100644
--- a/app/boards/arm/mikoto/Kconfig.defconfig
+++ b/app/boards/arm/mikoto/Kconfig.defconfig
@@ -6,29 +6,29 @@
 if BOARD_MIKOTO_520
 
 config BOARD
-	default "mikoto"
+    default "mikoto"
 
 if USB
 
 config USB_NRFX
-	default y
+    default y
 
 config USB_DEVICE_STACK
-	default y
+    default y
 
 endif # USB
 
 config BT_CTLR
-	default BT
+    default BT
 
 config ZMK_BLE
-	default y
+    default y
 
 config ZMK_USB
-	default y
+    default y
 
 config PINMUX
-	default y
+    default y
 
 choice BOARD_MIKOTO_CHARGER_CURRENT
     default BOARD_MIKOTO_CHARGER_CURRENT_100MA
diff --git a/app/boards/arm/mikoto/arduino_pro_micro_pins.dtsi b/app/boards/arm/mikoto/arduino_pro_micro_pins.dtsi
index 7c5cd12f..ed6097ec 100644
--- a/app/boards/arm/mikoto/arduino_pro_micro_pins.dtsi
+++ b/app/boards/arm/mikoto/arduino_pro_micro_pins.dtsi
@@ -6,50 +6,50 @@
 
 
 / {
-	pro_micro: connector {
-		compatible = "arduino-pro-micro";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map
-			= <0 0 &gpio0 4 0>		/* D0 */
-			, <1 0 &gpio0 8 0>		/* D1 */
-			, <2 0 &gpio0 17 0>		/* D2 */
-			, <3 0 &gpio0 20 0>		/* D3 */
-			, <4 0 &gpio0 22 0>		/* D4/A6 */
-			, <5 0 &gpio0 24 0>		/* D5 */
-			, <6 0 &gpio1 0 0>		/* D6/A7 */
-			, <7 0 &gpio1 2 0>		/* D7 */
-			, <8 0 &gpio1 4 0>		/* D8/A8 */
-			, <9 0 &gpio1 6 0>		/* D9/A9 */
-			, <10 0 &gpio0 9 0>	/* D10/A10 */
-			, <16 0 &gpio0 10 0>	/* D16 */
-			, <14 0 &gpio1 13 0>	/* D14 */
-			, <15 0 &gpio0 2 0>	/* D15 */
-			, <18 0 &gpio0 29 0>	/* D18/A0 */
-			, <19 0 &gpio0 31 0>	/* D19/A1 */
-			, <20 0 &gpio0 25 0>	/* D20/A2 */
-			, <21 0 &gpio0 11 0>	/* D21/A3 */
-			;
-	};
+    pro_micro: connector {
+        compatible = "arduino-pro-micro";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map
+            = <0 0 &gpio0 4 0>      /* D0 */
+            , <1 0 &gpio0 8 0>      /* D1 */
+            , <2 0 &gpio0 17 0>     /* D2 */
+            , <3 0 &gpio0 20 0>     /* D3 */
+            , <4 0 &gpio0 22 0>     /* D4/A6 */
+            , <5 0 &gpio0 24 0>     /* D5 */
+            , <6 0 &gpio1 0 0>      /* D6/A7 */
+            , <7 0 &gpio1 2 0>      /* D7 */
+            , <8 0 &gpio1 4 0>      /* D8/A8 */
+            , <9 0 &gpio1 6 0>      /* D9/A9 */
+            , <10 0 &gpio0 9 0> /* D10/A10 */
+            , <16 0 &gpio0 10 0>    /* D16 */
+            , <14 0 &gpio1 13 0>    /* D14 */
+            , <15 0 &gpio0 2 0> /* D15 */
+            , <18 0 &gpio0 29 0>    /* D18/A0 */
+            , <19 0 &gpio0 31 0>    /* D19/A1 */
+            , <20 0 &gpio0 25 0>    /* D20/A2 */
+            , <21 0 &gpio0 11 0>    /* D21/A3 */
+            ;
+    };
 
-	pro_micro_a: connector_a {
-		compatible = "arduino-pro-micro";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map
-			= <0 0 &gpio0 29 0>	/* D18/A0 */
-			, <1 0 &gpio0 31 0>	/* D19/A1 */
-			, <2 0 &gpio0 25 0>	/* D20/A2 */
-			, <3 0 &gpio0 11 0>	/* D21/A3 */
-			, <6 0 &gpio0 22 0>	/* D4/A6 */
-			, <7 0 &gpio1 0 0>	/* D6/A7 */
-			, <8 0 &gpio1 4 0>	/* D8/A8 */
-			, <9 0 &gpio1 6 0>	/* D9/A9 */
-			, <10 0 &gpio0 9 0>	/* D10/A10 */
-			;
-	};
+    pro_micro_a: connector_a {
+        compatible = "arduino-pro-micro";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map
+            = <0 0 &gpio0 29 0> /* D18/A0 */
+            , <1 0 &gpio0 31 0> /* D19/A1 */
+            , <2 0 &gpio0 25 0> /* D20/A2 */
+            , <3 0 &gpio0 11 0> /* D21/A3 */
+            , <6 0 &gpio0 22 0> /* D4/A6 */
+            , <7 0 &gpio1 0 0>  /* D6/A7 */
+            , <8 0 &gpio1 4 0>  /* D8/A8 */
+            , <9 0 &gpio1 6 0>  /* D9/A9 */
+            , <10 0 &gpio0 9 0> /* D10/A10 */
+            ;
+    };
 };
 
 
diff --git a/app/boards/arm/mikoto/mikoto_520-pinctrl.dtsi b/app/boards/arm/mikoto/mikoto_520-pinctrl.dtsi
index 4a8ff82c..df43c407 100644
--- a/app/boards/arm/mikoto/mikoto_520-pinctrl.dtsi
+++ b/app/boards/arm/mikoto/mikoto_520-pinctrl.dtsi
@@ -4,36 +4,36 @@
  */
 
 &pinctrl {
-	uart0_default: uart0_default {
-		group1 {
-			psels = <NRF_PSEL(UART_RX, 0, 4)>;
-			bias-pull-up;
-		};
-		group2 {
-			psels = <NRF_PSEL(UART_TX, 0, 8)>;
-		};
-	};
+    uart0_default: uart0_default {
+        group1 {
+            psels = <NRF_PSEL(UART_RX, 0, 4)>;
+            bias-pull-up;
+        };
+        group2 {
+            psels = <NRF_PSEL(UART_TX, 0, 8)>;
+        };
+    };
 
-	uart0_sleep: uart0_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_RX, 0, 4)>,
-				<NRF_PSEL(UART_TX, 0, 8)>;
-			low-power-enable;
-		};
-	};
+    uart0_sleep: uart0_sleep {
+        group1 {
+            psels = <NRF_PSEL(UART_RX, 0, 4)>,
+                <NRF_PSEL(UART_TX, 0, 8)>;
+            low-power-enable;
+        };
+    };
 
-	i2c0_default: i2c0_default {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
-				<NRF_PSEL(TWIM_SCL, 0, 20)>;
-		};
-	};
+    i2c0_default: i2c0_default {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
+                <NRF_PSEL(TWIM_SCL, 0, 20)>;
+        };
+    };
 
-	i2c0_sleep: i2c0_sleep {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
-				<NRF_PSEL(TWIM_SCL, 0, 20)>;
-			low-power-enable;
-		};
-	};
+    i2c0_sleep: i2c0_sleep {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
+                <NRF_PSEL(TWIM_SCL, 0, 20)>;
+            low-power-enable;
+        };
+    };
 };
diff --git a/app/boards/arm/mikoto/mikoto_520.dts b/app/boards/arm/mikoto/mikoto_520.dts
index 3fff0835..f8007033 100644
--- a/app/boards/arm/mikoto/mikoto_520.dts
+++ b/app/boards/arm/mikoto/mikoto_520.dts
@@ -10,117 +10,117 @@
 #include "mikoto_520-pinctrl.dtsi"
 
 / {
-	model = "mikoto";
-	compatible = "zhiayang,mikoto";
+    model = "mikoto";
+    compatible = "zhiayang,mikoto";
 
-	chosen {
-		zephyr,code-partition = &code_partition;
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &cdc_acm_uart;
-		zmk,battery = &vbatt;
-	};
+    chosen {
+        zephyr,code-partition = &code_partition;
+        zephyr,sram = &sram0;
+        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
+        zmk,battery = &vbatt;
+    };
 
-	leds {
-		compatible = "gpio-leds";
-		blue_led: led_0 {
-			gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
-			label = "Blue LED";
-		};
-	};
+    leds {
+        compatible = "gpio-leds";
+        blue_led: led_0 {
+            gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
+        };
+    };
 
-	ext-power {
-		compatible = "zmk,ext-power-generic";
-		label = "EXT_POWER";
-		control-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
-		init-delay-ms = <50>;
-	};
+    ext-power {
+        compatible = "zmk,ext-power-generic";
+        label = "EXT_POWER";
+        control-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
+        init-delay-ms = <50>;
+    };
 
-	vbatt: vbatt {
-		compatible = "zmk,battery-voltage-divider";
-		label = "BATTERY";
-		io-channels = <&adc 1>;
-		output-ohms = <10000000>;
-		full-ohms = <(10000000 + 4000000)>;
-	};
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        label = "BATTERY";
+        io-channels = <&adc 1>;
+        output-ohms = <10000000>;
+        full-ohms = <(10000000 + 4000000)>;
+    };
 };
 
 &adc {
-	status = "okay";
+    status = "okay";
 };
 
 &gpiote {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio0 {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio1 {
-	status = "okay";
+    status = "okay";
 };
 
 &i2c0 {
-	compatible = "nordic,nrf-twi";
-	pinctrl-0 = <&i2c0_default>;
-	pinctrl-1 = <&i2c0_sleep>;
-	pinctrl-names = "default", "sleep";
+    compatible = "nordic,nrf-twi";
+    pinctrl-0 = <&i2c0_default>;
+    pinctrl-1 = <&i2c0_sleep>;
+    pinctrl-names = "default", "sleep";
 };
 
 &uart0 {
-	compatible = "nordic,nrf-uarte";
-	current-speed = <115200>;
-	pinctrl-0 = <&uart0_default>;
-	pinctrl-1 = <&uart0_sleep>;
-	pinctrl-names = "default", "sleep";
+    compatible = "nordic,nrf-uarte";
+    current-speed = <115200>;
+    pinctrl-0 = <&uart0_default>;
+    pinctrl-1 = <&uart0_sleep>;
+    pinctrl-names = "default", "sleep";
 };
 
 &usbd {
-	status = "okay";
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
 
 &flash0 {
-	/*
-	 * For more information, see:
-	 * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
-	 */
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
+    /*
+     * For more information, see:
+     * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
+     */
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
 
-		sd_partition: partition@0 {
-			label = "softdevice";
-			reg = <0x00000000 0x00026000>;
-		};
-		code_partition: partition@26000 {
-			label = "code_partition";
-			reg = <0x00026000 0x000c6000>;
-		};
+        sd_partition: partition@0 {
+            label = "softdevice";
+            reg = <0x00000000 0x00026000>;
+        };
+        code_partition: partition@26000 {
+            label = "code_partition";
+            reg = <0x00026000 0x000c6000>;
+        };
 
-		/*
-		 * The flash starting at 0x000ec000 and ending at
-		 * 0x000f3fff is reserved for use by the application.
-		 */
+        /*
+         * The flash starting at 0x000ec000 and ending at
+         * 0x000f3fff is reserved for use by the application.
+         */
 
-		/*
-		 * Storage partition will be used by FCB/LittleFS/NVS
-		 * if enabled.
-		 */
-		storage_partition: partition@ec000 {
-			label = "storage";
-			reg = <0x000ec000 0x00008000>;
-		};
+        /*
+         * Storage partition will be used by FCB/LittleFS/NVS
+         * if enabled.
+         */
+        storage_partition: partition@ec000 {
+            label = "storage";
+            reg = <0x000ec000 0x00008000>;
+        };
 
-		boot_partition: partition@f4000 {
-			label = "adafruit_boot";
-			reg = <0x000f4000 0x0000c000>;
-		};
-	};
+        boot_partition: partition@f4000 {
+            label = "adafruit_boot";
+            reg = <0x000f4000 0x0000c000>;
+        };
+    };
 };
diff --git a/app/boards/arm/nice60/Kconfig b/app/boards/arm/nice60/Kconfig
index db7cf398..dfca4f1b 100644
--- a/app/boards/arm/nice60/Kconfig
+++ b/app/boards/arm/nice60/Kconfig
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_ENABLE_DCDC
-	bool "Enable DCDC mode"
-	select SOC_DCDC_NRF52X
-	default y
-	depends on BOARD_NICE60
+    bool "Enable DCDC mode"
+    select SOC_DCDC_NRF52X
+    default y
+    depends on BOARD_NICE60
diff --git a/app/boards/arm/nice60/Kconfig.board b/app/boards/arm/nice60/Kconfig.board
index 778f79eb..88db9ee8 100644
--- a/app/boards/arm/nice60/Kconfig.board
+++ b/app/boards/arm/nice60/Kconfig.board
@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_NICE60
-	bool "nice!60"
-	depends on SOC_NRF52840_QIAA
+    bool "nice!60"
+    depends on SOC_NRF52840_QIAA
diff --git a/app/boards/arm/nice60/Kconfig.defconfig b/app/boards/arm/nice60/Kconfig.defconfig
index 39cf1540..f3347df9 100644
--- a/app/boards/arm/nice60/Kconfig.defconfig
+++ b/app/boards/arm/nice60/Kconfig.defconfig
@@ -4,22 +4,22 @@
 if BOARD_NICE60
 
 config ZMK_KEYBOARD_NAME
-	default "nice!60"
+    default "nice!60"
 
 if USB_DEVICE_STACK
 
 config USB_NRFX
-	default y
+    default y
 
 endif # USB_DEVICE_STACK
 
 config BT_CTLR
-	default BT
+    default BT
 
 config ZMK_BLE
-	default y
+    default y
 
 config ZMK_USB
-	default y
+    default y
 
 endif # BOARD_NICE60
diff --git a/app/boards/arm/nice60/nice60-pinctrl.dtsi b/app/boards/arm/nice60/nice60-pinctrl.dtsi
index ace80f10..9b0e198d 100644
--- a/app/boards/arm/nice60/nice60-pinctrl.dtsi
+++ b/app/boards/arm/nice60/nice60-pinctrl.dtsi
@@ -4,9 +4,9 @@
  */
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 27)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 27)>;
+        };
+    };
 };
diff --git a/app/boards/arm/nice60/nice60.dts b/app/boards/arm/nice60/nice60.dts
index fdc65d6b..651dd555 100644
--- a/app/boards/arm/nice60/nice60.dts
+++ b/app/boards/arm/nice60/nice60.dts
@@ -13,170 +13,170 @@
 #include "nice60-pinctrl.dtsi"
 
 / {
-	model = "nice!60";
-	compatible = "nice,60";
+    model = "nice!60";
+    compatible = "nice,60";
 
-	chosen {
-		zephyr,code-partition = &code_partition;
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &cdc_acm_uart;
-		zmk,battery = &vbatt;
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zephyr,code-partition = &code_partition;
+        zephyr,sram = &sram0;
+        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
+        zmk,battery = &vbatt;
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+        zmk,underglow = &led_strip;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <14>;
-		rows = <5>;
-		map = <
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <14>;
+        rows = <5>;
+        map = <
 RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13)
 RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)   RC(1,13)
 RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)          RC(2,13)
 RC(3,0)       RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9)    RC(3,10)              RC(3,13)
 RC(4,0)   RC(4,1)   RC(4,2)                      RC(4,5)                       RC(4,9)   RC(4,10)   RC(4,11)   RC(4,13)
-		>;
-	};
+        >;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&gpio1 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio1 13 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio1 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio1 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio1 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
-		col-gpios
-			= <&gpio1 15 GPIO_ACTIVE_HIGH>
-			, <&gpio0 29 GPIO_ACTIVE_HIGH>
-			, <&gpio0 31 GPIO_ACTIVE_HIGH>
-			, <&gpio0 30 GPIO_ACTIVE_HIGH>
-			, <&gpio0 28 GPIO_ACTIVE_HIGH>
-			, <&gpio0 2  GPIO_ACTIVE_HIGH>
-			, <&gpio0 3  GPIO_ACTIVE_HIGH>
-			, <&gpio1 3  GPIO_ACTIVE_HIGH>
-			, <&gpio1 7  GPIO_ACTIVE_HIGH>
-			, <&gpio1 4  GPIO_ACTIVE_HIGH>
-			, <&gpio1 6  GPIO_ACTIVE_HIGH>
-			, <&gpio1 5  GPIO_ACTIVE_HIGH>
-			, <&gpio1 1  GPIO_ACTIVE_HIGH>
-			, <&gpio1 2  GPIO_ACTIVE_HIGH>
-			;
-	};
+        diode-direction = "col2row";
+        row-gpios
+            = <&gpio1 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio1 13 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio1 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio1 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio1 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
+        col-gpios
+            = <&gpio1 15 GPIO_ACTIVE_HIGH>
+            , <&gpio0 29 GPIO_ACTIVE_HIGH>
+            , <&gpio0 31 GPIO_ACTIVE_HIGH>
+            , <&gpio0 30 GPIO_ACTIVE_HIGH>
+            , <&gpio0 28 GPIO_ACTIVE_HIGH>
+            , <&gpio0 2  GPIO_ACTIVE_HIGH>
+            , <&gpio0 3  GPIO_ACTIVE_HIGH>
+            , <&gpio1 3  GPIO_ACTIVE_HIGH>
+            , <&gpio1 7  GPIO_ACTIVE_HIGH>
+            , <&gpio1 4  GPIO_ACTIVE_HIGH>
+            , <&gpio1 6  GPIO_ACTIVE_HIGH>
+            , <&gpio1 5  GPIO_ACTIVE_HIGH>
+            , <&gpio1 1  GPIO_ACTIVE_HIGH>
+            , <&gpio1 2  GPIO_ACTIVE_HIGH>
+            ;
+    };
 
-	leds {
-		compatible = "gpio-leds";
-		blue_led: led_0 {
-			gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>;
-			label = "Blue LED";
-		};
-	};
+    leds {
+        compatible = "gpio-leds";
+        blue_led: led_0 {
+            gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
+        };
+    };
 
-	ext-power {
-		compatible = "zmk,ext-power-generic";
-		label = "EXT_POWER";
-		control-gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
-	};
+    ext-power {
+        compatible = "zmk,ext-power-generic";
+        label = "EXT_POWER";
+        control-gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+    };
 
-	vbatt: vbatt {
-		compatible = "zmk,battery-voltage-divider";
-		label = "BATTERY";
-		io-channels = <&adc 2>;
-		output-ohms = <2000000>;
-		full-ohms = <(2000000 + 806000)>;
-	};
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        label = "BATTERY";
+        io-channels = <&adc 2>;
+        output-ohms = <2000000>;
+        full-ohms = <(2000000 + 806000)>;
+    };
 };
 
 &adc {
-	status = "okay";
+    status = "okay";
 };
 
 &gpiote {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio0 {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio1 {
-	status = "okay";
+    status = "okay";
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
+    compatible = "nordic,nrf-spim";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-names = "default";
-	status = "okay";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-names = "default";
+    status = "okay";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <12>; /* LED strip length */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        /* WS2812 */
+        chain-length = <12>; /* LED strip length */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 &usbd {
-	status = "okay";
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
 &flash0 {
-	/*
-	 * For more information, see:
-	 * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
-	 */
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
+    /*
+     * For more information, see:
+     * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
+     */
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
 
-		sd_partition: partition@0 {
-			label = "mbr";
-			reg = <0x00000000 0x00001000>;
-		};
+        sd_partition: partition@0 {
+            label = "mbr";
+            reg = <0x00000000 0x00001000>;
+        };
 
-		code_partition: partition@1000 {
-			label = "code_partition";
-			reg = <0x00001000 0x000d3000>;
-		};
+        code_partition: partition@1000 {
+            label = "code_partition";
+            reg = <0x00001000 0x000d3000>;
+        };
 
-		/*
-		 * The flash starting at 0x000d4000 and ending at
-		 * 0x000f3fff is reserved for use by the application.
-		 */
+        /*
+         * The flash starting at 0x000d4000 and ending at
+         * 0x000f3fff is reserved for use by the application.
+         */
 
-		/*
-		 * Storage partition will be used by FCB/LittleFS/NVS
-		 * if enabled.
-		 */
-		storage_partition: partition@d4000 {
-			label = "storage";
-			reg = <0x000d4000 0x00020000>;
-		};
+        /*
+         * Storage partition will be used by FCB/LittleFS/NVS
+         * if enabled.
+         */
+        storage_partition: partition@d4000 {
+            label = "storage";
+            reg = <0x000d4000 0x00020000>;
+        };
 
-		boot_partition: partition@f4000 {
-			label = "adafruit_boot";
-			reg = <0x000f4000 0x0000c000>;
-		};
-	};
+        boot_partition: partition@f4000 {
+            label = "adafruit_boot";
+            reg = <0x000f4000 0x0000c000>;
+        };
+    };
 };
diff --git a/app/boards/arm/nice60/nice60.keymap b/app/boards/arm/nice60/nice60.keymap
index edfec32e..3a357163 100644
--- a/app/boards/arm/nice60/nice60.keymap
+++ b/app/boards/arm/nice60/nice60.keymap
@@ -10,10 +10,10 @@
 #include <dt-bindings/zmk/bt.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
+        default_layer {
 // ------------------------------------------------------------------------------------------
 // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   |
 // | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   "|"   |
@@ -21,16 +21,16 @@
 // |  SHIFT  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |      SHIFT       |
 // |  CTL  |  WIN  |  ALT  |            SPACE              |  ALT  |  WIN  |  MO(1) |  CTL  |
 // ------------------------------------------------------------------------------------------
-			bindings = <
-	&gresc  &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS &kp EQUAL  &kp BSPC
-	&kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp I  &kp O  &kp P  &kp LBKT  &kp RBKT  &kp BSLH
-	&kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp K  &kp L  &kp SEMI &kp SQT           &kp RET
-	&kp LSHFT   &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH           &kp RSHFT
-	&kp LCTRL &kp LGUI &kp LALT             &kp SPACE                     &kp RALT  &kp RGUI  &mo 1   &kp RCTRL
-			>;
-		};
+            bindings = <
+    &gresc  &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS &kp EQUAL  &kp BSPC
+    &kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp I  &kp O  &kp P  &kp LBKT  &kp RBKT  &kp BSLH
+    &kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp K  &kp L  &kp SEMI &kp SQT           &kp RET
+    &kp LSHFT   &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH           &kp RSHFT
+    &kp LCTRL &kp LGUI &kp LALT             &kp SPACE                     &kp RALT  &kp RGUI  &mo 1   &kp RCTRL
+            >;
+        };
 
-		rgb_layer {
+        rgb_layer {
 // ------------------------------------------------------------------------------------------------
 // | BT CLR | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10  | F11 | F12 | EFFECT REV |
 // |  BT 1   |   |  UP |   | HUEUP | SATUP | BRIUP | SPDUP |   |     |    |     |     |           |
@@ -38,13 +38,13 @@
 // |    BT 3     |     |      |      |     |     |     |     |     |     |     |                  |
 // |   BT 4  |      |      |             TOG RGB                | PRT SCR |       |       |  DEL  |
 // ------------------------------------------------------------------------------------------------
-			bindings = <
-	&bt BT_CLR   &kp F1    &kp F2    &kp F3  &kp F4           &kp F5          &kp F6          &kp F7          &kp F8   &kp F9   &kp F10  &kp F11 &kp F12  &rgb_ug RGB_EFR
-	&bt BT_SEL 0  &trans    &kp UP    &trans  &rgb_ug RGB_HUI  &rgb_ug RGB_SAI &rgb_ug RGB_BRI &rgb_ug RGB_SPI  &trans   &trans   &trans   &trans  &trans          &trans
-	&bt BT_SEL 1   &kp LEFT  &kp DOWN  &kp RIGHT &rgb_ug RGB_HUD &rgb_ug RGB_SAD &rgb_ug RGB_BRD &rgb_ug RGB_SPD &trans   &trans   &trans   &trans        &rgb_ug RGB_EFF
-	&bt BT_SEL 2    &trans    &trans    &trans   &trans          &trans          &trans          &trans          &trans   &trans   &trans                          &trans
-	&bt BT_SEL 3  &trans   &trans                            &rgb_ug RGB_TOG                                      &kp PSCRN      &trans      &trans               &kp DEL
-			>;
-		};
-	};
+            bindings = <
+    &bt BT_CLR   &kp F1    &kp F2    &kp F3  &kp F4           &kp F5          &kp F6          &kp F7          &kp F8   &kp F9   &kp F10  &kp F11 &kp F12  &rgb_ug RGB_EFR
+    &bt BT_SEL 0  &trans    &kp UP    &trans  &rgb_ug RGB_HUI  &rgb_ug RGB_SAI &rgb_ug RGB_BRI &rgb_ug RGB_SPI  &trans   &trans   &trans   &trans  &trans          &trans
+    &bt BT_SEL 1   &kp LEFT  &kp DOWN  &kp RIGHT &rgb_ug RGB_HUD &rgb_ug RGB_SAD &rgb_ug RGB_BRD &rgb_ug RGB_SPD &trans   &trans   &trans   &trans        &rgb_ug RGB_EFF
+    &bt BT_SEL 2    &trans    &trans    &trans   &trans          &trans          &trans          &trans          &trans   &trans   &trans                          &trans
+    &bt BT_SEL 3  &trans   &trans                            &rgb_ug RGB_TOG                                      &kp PSCRN      &trans      &trans               &kp DEL
+            >;
+        };
+    };
 };
diff --git a/app/boards/arm/nice_nano/Kconfig b/app/boards/arm/nice_nano/Kconfig
index 0c9fbc79..ac6828a4 100644
--- a/app/boards/arm/nice_nano/Kconfig
+++ b/app/boards/arm/nice_nano/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_ENABLE_DCDC
-	bool "Enable DCDC mode"
-	select SOC_DCDC_NRF52X
-	default y
-	depends on (BOARD_NICE_NANO || BOARD_NICE_NANO_V2)
+    bool "Enable DCDC mode"
+    select SOC_DCDC_NRF52X
+    default y
+    depends on (BOARD_NICE_NANO || BOARD_NICE_NANO_V2)
diff --git a/app/boards/arm/nice_nano/Kconfig.board b/app/boards/arm/nice_nano/Kconfig.board
index 4a80b448..8dd16512 100644
--- a/app/boards/arm/nice_nano/Kconfig.board
+++ b/app/boards/arm/nice_nano/Kconfig.board
@@ -4,10 +4,10 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_NICE_NANO
-	bool "nice!nano"
-	depends on SOC_NRF52840_QIAA
+    bool "nice!nano"
+    depends on SOC_NRF52840_QIAA
 
 config BOARD_NICE_NANO_V2
-	bool "nice!nano v2"
-	depends on SOC_NRF52840_QIAA
+    bool "nice!nano v2"
+    depends on SOC_NRF52840_QIAA
 
diff --git a/app/boards/arm/nice_nano/Kconfig.defconfig b/app/boards/arm/nice_nano/Kconfig.defconfig
index ad3fefef..ada59dd9 100644
--- a/app/boards/arm/nice_nano/Kconfig.defconfig
+++ b/app/boards/arm/nice_nano/Kconfig.defconfig
@@ -4,22 +4,22 @@
 if BOARD_NICE_NANO || BOARD_NICE_NANO_V2
 
 config BOARD
-	default "nice_nano"
+    default "nice_nano"
 
 if USB_DEVICE_STACK
 
 config USB_NRFX
-	default y
+    default y
 
 endif # USB_DEVICE_STACK
 
 config BT_CTLR
-	default BT
+    default BT
 
 config ZMK_BLE
-	default y
+    default y
 
 config ZMK_USB
-	default y
+    default y
 
 endif # BOARD_NICE_NANO || BOARD_NICE_NANO_V2
diff --git a/app/boards/arm/nice_nano/arduino_pro_micro_pins.dtsi b/app/boards/arm/nice_nano/arduino_pro_micro_pins.dtsi
index b972451b..f1b569c0 100644
--- a/app/boards/arm/nice_nano/arduino_pro_micro_pins.dtsi
+++ b/app/boards/arm/nice_nano/arduino_pro_micro_pins.dtsi
@@ -5,50 +5,50 @@
  */
 
 / {
-	pro_micro: connector {
-		compatible = "arduino-pro-micro";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map
-			= <0 0 &gpio0 8 0>		/* D0 */
-			, <1 0 &gpio0 6 0>		/* D1 */
-			, <2 0 &gpio0 17 0>		/* D2 */
-			, <3 0 &gpio0 20 0>		/* D3 */
-			, <4 0 &gpio0 22 0>		/* D4/A6 */
-			, <5 0 &gpio0 24 0>		/* D5 */
-			, <6 0 &gpio1 0 0>		/* D6/A7 */
-			, <7 0 &gpio0 11 0>		/* D7 */
-			, <8 0 &gpio1 4 0>		/* D8/A8 */
-			, <9 0 &gpio1 6 0>		/* D9/A9 */
-			, <10 0 &gpio0 9 0>		/* D10/A10 */
-			, <16 0 &gpio0 10 0>	/* D16 */
-			, <14 0 &gpio1 11 0>	/* D14 */
-			, <15 0 &gpio1 13 0>	/* D15 */
-			, <18 0 &gpio1 15 0>	/* D18/A0 */
-			, <19 0 &gpio0 2 0>	/* D19/A1 */
-			, <20 0 &gpio0 29 0>	/* D20/A2 */
-			, <21 0 &gpio0 31 0>	/* D21/A3 */
-			;
-	};
+    pro_micro: connector {
+        compatible = "arduino-pro-micro";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map
+            = <0 0 &gpio0 8 0>      /* D0 */
+            , <1 0 &gpio0 6 0>      /* D1 */
+            , <2 0 &gpio0 17 0>     /* D2 */
+            , <3 0 &gpio0 20 0>     /* D3 */
+            , <4 0 &gpio0 22 0>     /* D4/A6 */
+            , <5 0 &gpio0 24 0>     /* D5 */
+            , <6 0 &gpio1 0 0>      /* D6/A7 */
+            , <7 0 &gpio0 11 0>     /* D7 */
+            , <8 0 &gpio1 4 0>      /* D8/A8 */
+            , <9 0 &gpio1 6 0>      /* D9/A9 */
+            , <10 0 &gpio0 9 0>     /* D10/A10 */
+            , <16 0 &gpio0 10 0>    /* D16 */
+            , <14 0 &gpio1 11 0>    /* D14 */
+            , <15 0 &gpio1 13 0>    /* D15 */
+            , <18 0 &gpio1 15 0>    /* D18/A0 */
+            , <19 0 &gpio0 2 0> /* D19/A1 */
+            , <20 0 &gpio0 29 0>    /* D20/A2 */
+            , <21 0 &gpio0 31 0>    /* D21/A3 */
+            ;
+    };
 
-	pro_micro_a: connector_a {
-		compatible = "arduino-pro-micro";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map
-			= <0 0 &gpio1 15 0>	/* D18/A0 */
-			, <1 0 &gpio0 2 0>	/* D19/A1 */
-			, <2 0 &gpio0 29 0>	/* D20/A2 */
-			, <3 0 &gpio0 31 0>	/* D21/A3 */
-			, <6 0 &gpio0 22 0>	/* D4/A6 */
-			, <7 0 &gpio1 0 0>	/* D6/A7 */
-			, <8 0 &gpio1 4 0>	/* D8/A8 */
-			, <9 0 &gpio1 6 0>	/* D9/A9 */
-			, <10 0 &gpio0 9 0>	/* D10/A10 */
-			;
-	};
+    pro_micro_a: connector_a {
+        compatible = "arduino-pro-micro";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map
+            = <0 0 &gpio1 15 0> /* D18/A0 */
+            , <1 0 &gpio0 2 0>  /* D19/A1 */
+            , <2 0 &gpio0 29 0> /* D20/A2 */
+            , <3 0 &gpio0 31 0> /* D21/A3 */
+            , <6 0 &gpio0 22 0> /* D4/A6 */
+            , <7 0 &gpio1 0 0>  /* D6/A7 */
+            , <8 0 &gpio1 4 0>  /* D8/A8 */
+            , <9 0 &gpio1 6 0>  /* D9/A9 */
+            , <10 0 &gpio0 9 0> /* D10/A10 */
+            ;
+    };
 };
 
 pro_micro_d: &pro_micro {};
diff --git a/app/boards/arm/nice_nano/nice_nano-pinctrl.dtsi b/app/boards/arm/nice_nano/nice_nano-pinctrl.dtsi
index 18b90f21..15c48509 100644
--- a/app/boards/arm/nice_nano/nice_nano-pinctrl.dtsi
+++ b/app/boards/arm/nice_nano/nice_nano-pinctrl.dtsi
@@ -4,36 +4,36 @@
  */
 
 &pinctrl {
-	uart0_default: uart0_default {
-		group1 {
-			psels = <NRF_PSEL(UART_RX, 0, 8)>;
-			bias-pull-up;
-		};
-		group2 {
-			psels = <NRF_PSEL(UART_TX, 0, 6)>;
-		};
-	};
+    uart0_default: uart0_default {
+        group1 {
+            psels = <NRF_PSEL(UART_RX, 0, 8)>;
+            bias-pull-up;
+        };
+        group2 {
+            psels = <NRF_PSEL(UART_TX, 0, 6)>;
+        };
+    };
 
-	uart0_sleep: uart0_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_RX, 0, 8)>,
-				<NRF_PSEL(UART_TX, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    uart0_sleep: uart0_sleep {
+        group1 {
+            psels = <NRF_PSEL(UART_RX, 0, 8)>,
+                <NRF_PSEL(UART_TX, 0, 6)>;
+            low-power-enable;
+        };
+    };
 
-	i2c0_default: i2c0_default {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
-				<NRF_PSEL(TWIM_SCL, 0, 20)>;
-		};
-	};
+    i2c0_default: i2c0_default {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
+                <NRF_PSEL(TWIM_SCL, 0, 20)>;
+        };
+    };
 
-	i2c0_sleep: i2c0_sleep {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
-				<NRF_PSEL(TWIM_SCL, 0, 20)>;
-			low-power-enable;
-		};
-	};
+    i2c0_sleep: i2c0_sleep {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
+                <NRF_PSEL(TWIM_SCL, 0, 20)>;
+            low-power-enable;
+        };
+    };
 };
diff --git a/app/boards/arm/nice_nano/nice_nano.dts b/app/boards/arm/nice_nano/nice_nano.dts
index e29df205..4ee0df7f 100644
--- a/app/boards/arm/nice_nano/nice_nano.dts
+++ b/app/boards/arm/nice_nano/nice_nano.dts
@@ -8,21 +8,21 @@
 #include "nice_nano.dtsi"
 
 / {
-	chosen {
-		zmk,battery = &vbatt;
-	};
+    chosen {
+        zmk,battery = &vbatt;
+    };
 
-	ext-power {
-		compatible = "zmk,ext-power-generic";
-		label = "EXT_POWER";
-		control-gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
-	};
+    ext-power {
+        compatible = "zmk,ext-power-generic";
+        label = "EXT_POWER";
+        control-gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+    };
 
-	vbatt: vbatt {
-		compatible = "zmk,battery-voltage-divider";
-		label = "BATTERY";
-		io-channels = <&adc 2>;
-		output-ohms = <2000000>;
-		full-ohms = <(2000000 + 806000)>;
-	};
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        label = "BATTERY";
+        io-channels = <&adc 2>;
+        output-ohms = <2000000>;
+        full-ohms = <(2000000 + 806000)>;
+    };
 };
diff --git a/app/boards/arm/nice_nano/nice_nano.dtsi b/app/boards/arm/nice_nano/nice_nano.dtsi
index ad5ef278..0c0a3823 100644
--- a/app/boards/arm/nice_nano/nice_nano.dtsi
+++ b/app/boards/arm/nice_nano/nice_nano.dtsi
@@ -9,101 +9,101 @@
 #include "arduino_pro_micro_pins.dtsi"
 
 / {
-	model = "nice!nano";
-	compatible = "nice,nano";
+    model = "nice!nano";
+    compatible = "nice,nano";
 
-	chosen {
-		zephyr,code-partition = &code_partition;
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &cdc_acm_uart;
-	};
+    chosen {
+        zephyr,code-partition = &code_partition;
+        zephyr,sram = &sram0;
+        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
+    };
 
-	leds {
-		compatible = "gpio-leds";
-		blue_led: led_0 {
-			gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
-			label = "Blue LED";
-		};
-	};
+    leds {
+        compatible = "gpio-leds";
+        blue_led: led_0 {
+            gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
+        };
+    };
 };
 
 &adc {
-	status = "okay";
+    status = "okay";
 };
 
 &gpiote {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio0 {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio1 {
-	status = "okay";
+    status = "okay";
 };
 
 &i2c0 {
-	compatible = "nordic,nrf-twi";
-	pinctrl-0 = <&i2c0_default>;
-	pinctrl-1 = <&i2c0_sleep>;
-	pinctrl-names = "default", "sleep";
+    compatible = "nordic,nrf-twi";
+    pinctrl-0 = <&i2c0_default>;
+    pinctrl-1 = <&i2c0_sleep>;
+    pinctrl-names = "default", "sleep";
 };
 
 &uart0 {
-	compatible = "nordic,nrf-uarte";
-	current-speed = <115200>;
-	pinctrl-0 = <&uart0_default>;
-	pinctrl-1 = <&uart0_sleep>;
-	pinctrl-names = "default", "sleep";
+    compatible = "nordic,nrf-uarte";
+    current-speed = <115200>;
+    pinctrl-0 = <&uart0_default>;
+    pinctrl-1 = <&uart0_sleep>;
+    pinctrl-names = "default", "sleep";
 };
 
 &usbd {
-	status = "okay";
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
 
 &flash0 {
-	/*
-	 * For more information, see:
-	 * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
-	 */
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
+    /*
+     * For more information, see:
+     * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
+     */
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
 
-		sd_partition: partition@0 {
-			label = "softdevice";
-			reg = <0x00000000 0x00026000>;
-		};
-		code_partition: partition@26000 {
-			label = "code_partition";
-			reg = <0x00026000 0x000c6000>;
-		};
+        sd_partition: partition@0 {
+            label = "softdevice";
+            reg = <0x00000000 0x00026000>;
+        };
+        code_partition: partition@26000 {
+            label = "code_partition";
+            reg = <0x00026000 0x000c6000>;
+        };
 
-		/*
-		 * The flash starting at 0x000ec000 and ending at
-		 * 0x000f3fff is reserved for use by the application.
-		 */
+        /*
+         * The flash starting at 0x000ec000 and ending at
+         * 0x000f3fff is reserved for use by the application.
+         */
 
-		/*
-		 * Storage partition will be used by FCB/LittleFS/NVS
-		 * if enabled.
-		 */
-		storage_partition: partition@ec000 {
-			label = "storage";
-			reg = <0x000ec000 0x00008000>;
-		};
+        /*
+         * Storage partition will be used by FCB/LittleFS/NVS
+         * if enabled.
+         */
+        storage_partition: partition@ec000 {
+            label = "storage";
+            reg = <0x000ec000 0x00008000>;
+        };
 
-		boot_partition: partition@f4000 {
-			label = "adafruit_boot";
-			reg = <0x000f4000 0x0000c000>;
-		};
-	};
+        boot_partition: partition@f4000 {
+            label = "adafruit_boot";
+            reg = <0x000f4000 0x0000c000>;
+        };
+    };
 };
diff --git a/app/boards/arm/nice_nano/nice_nano_v2.dts b/app/boards/arm/nice_nano/nice_nano_v2.dts
index ed2b35f4..b2fbcc81 100644
--- a/app/boards/arm/nice_nano/nice_nano_v2.dts
+++ b/app/boards/arm/nice_nano/nice_nano_v2.dts
@@ -8,19 +8,19 @@
 #include "nice_nano.dtsi"
 
 / {
-	chosen {
-		zmk,battery = &vbatt;
-	};
+    chosen {
+        zmk,battery = &vbatt;
+    };
 
-	ext-power {
-		compatible = "zmk,ext-power-generic";
-		label = "EXT_POWER";
-		control-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
-		init-delay-ms = <50>;
-	};
+    ext-power {
+        compatible = "zmk,ext-power-generic";
+        label = "EXT_POWER";
+        control-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
+        init-delay-ms = <50>;
+    };
 
-	vbatt: vbatt {
-		compatible = "zmk,battery-nrf-vddh";
-		label = "BATTERY";
-	};
+    vbatt: vbatt {
+        compatible = "zmk,battery-nrf-vddh";
+        label = "BATTERY";
+    };
 };
diff --git a/app/boards/arm/nrf52840_m2/Kconfig b/app/boards/arm/nrf52840_m2/Kconfig
index c7edeb8d..c9cb6523 100644
--- a/app/boards/arm/nrf52840_m2/Kconfig
+++ b/app/boards/arm/nrf52840_m2/Kconfig
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_ENABLE_DCDC
-	bool "Enable DCDC mode"
-	select SOC_DCDC_NRF52X
-	default y
-	depends on BOARD_NRF52840_M2
+    bool "Enable DCDC mode"
+    select SOC_DCDC_NRF52X
+    default y
+    depends on BOARD_NRF52840_M2
diff --git a/app/boards/arm/nrf52840_m2/Kconfig.board b/app/boards/arm/nrf52840_m2/Kconfig.board
index 49901039..b2927ff2 100644
--- a/app/boards/arm/nrf52840_m2/Kconfig.board
+++ b/app/boards/arm/nrf52840_m2/Kconfig.board
@@ -4,6 +4,6 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_NRF52840_M2
-	bool "nrf52480_m2"
-	depends on SOC_NRF52840_QIAA
+    bool "nrf52480_m2"
+    depends on SOC_NRF52840_QIAA
 
diff --git a/app/boards/arm/nrf52840_m2/Kconfig.defconfig b/app/boards/arm/nrf52840_m2/Kconfig.defconfig
index 4e1679ba..50a049bb 100644
--- a/app/boards/arm/nrf52840_m2/Kconfig.defconfig
+++ b/app/boards/arm/nrf52840_m2/Kconfig.defconfig
@@ -4,22 +4,22 @@
 if BOARD_NRF52840_M2
 
 config BOARD
-	default "nrf52480_m2"
+    default "nrf52480_m2"
 
 if USB_DEVICE_STACK
 
 config USB_NRFX
-	default y
+    default y
 
 endif # USB_DEVICE_STACK
 
 config BT_CTLR
-	default BT
+    default BT
 
 config ZMK_BLE
-	default y
+    default y
 
 config ZMK_USB
-	default y
+    default y
 
 endif # BOARD_NRF52840_M2
diff --git a/app/boards/arm/nrf52840_m2/nrf52840_m2.dts b/app/boards/arm/nrf52840_m2/nrf52840_m2.dts
index dc22c40b..253e6b77 100644
--- a/app/boards/arm/nrf52840_m2/nrf52840_m2.dts
+++ b/app/boards/arm/nrf52840_m2/nrf52840_m2.dts
@@ -8,105 +8,105 @@
 #include <nordic/nrf52840_qiaa.dtsi>
 
 / {
-	model = "Makerdiary nRF52840 M.2 module";
-	compatible = "makerdiary,nrf52840_m2";
+    model = "Makerdiary nRF52840 M.2 module";
+    compatible = "makerdiary,nrf52840_m2";
 
-	chosen {
-		zephyr,code-partition = &code_partition;
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &cdc_acm_uart;
-		zmk,battery = &vbatt;
-	};
+    chosen {
+        zephyr,code-partition = &code_partition;
+        zephyr,sram = &sram0;
+        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
+        zmk,battery = &vbatt;
+    };
 
-	leds {
-		compatible = "gpio-leds";
-		red_led: led_0 {
-			gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
-			label = "Red LED";
-		};
-		green_led: led_1 {
-			gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
-			label = "Green LED";
-		};
-		blue_led: led_2 {
-			gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;
-			label = "Blue LED";
-		};
-	};
+    leds {
+        compatible = "gpio-leds";
+        red_led: led_0 {
+            gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
+            label = "Red LED";
+        };
+        green_led: led_1 {
+            gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
+            label = "Green LED";
+        };
+        blue_led: led_2 {
+            gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
+        };
+    };
 
-	vbatt: vbatt {
-		compatible = "zmk,battery-voltage-divider";
-		label = "BATTERY";
-		io-channels = <&adc 0>;
-		output-ohms = <1000000>;
-		full-ohms = <(1000000 + 1000000)>;
-	};
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        label = "BATTERY";
+        io-channels = <&adc 0>;
+        output-ohms = <1000000>;
+        full-ohms = <(1000000 + 1000000)>;
+    };
 
 };
 
 &adc {
-	status = "okay";
+    status = "okay";
 };
 
 &gpiote {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio0 {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio1 {
-	status = "okay";
+    status = "okay";
 };
 
 &usbd {
-	compatible = "nordic,nrf-usbd";
-	status = "okay";
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    compatible = "nordic,nrf-usbd";
+    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
 
 &flash0 {
-	/*
-	 * For more information, see:
-	 * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
-	 */
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
+    /*
+     * For more information, see:
+     * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
+     */
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
 
-		sd_partition: partition@0 {
-			label = "softdevice";
-			reg = <0x00000000 0x00026000>;
-		};
-		code_partition: partition@26000 {
-			label = "code_partition";
-			reg = <0x00026000 0x000c6000>;
-		};
+        sd_partition: partition@0 {
+            label = "softdevice";
+            reg = <0x00000000 0x00026000>;
+        };
+        code_partition: partition@26000 {
+            label = "code_partition";
+            reg = <0x00026000 0x000c6000>;
+        };
 
-		/*
-		 * The flash starting at 0x000ec000 and ending at
-		 * 0x000f3fff is reserved for use by the application.
-		 */
+        /*
+         * The flash starting at 0x000ec000 and ending at
+         * 0x000f3fff is reserved for use by the application.
+         */
 
-		/*
-		 * Storage partition will be used by FCB/LittleFS/NVS
-		 * if enabled.
-		 */
-		storage_partition: partition@ec000 {
-			label = "storage";
-			reg = <0x000ec000 0x00008000>;
-		};
+        /*
+         * Storage partition will be used by FCB/LittleFS/NVS
+         * if enabled.
+         */
+        storage_partition: partition@ec000 {
+            label = "storage";
+            reg = <0x000ec000 0x00008000>;
+        };
 
-		boot_partition: partition@f4000 {
-			label = "adafruit_boot";
-			reg = <0x000f4000 0x0000c000>;
-		};
-	};
+        boot_partition: partition@f4000 {
+            label = "adafruit_boot";
+            reg = <0x000f4000 0x0000c000>;
+        };
+    };
 };
diff --git a/app/boards/arm/nrfmicro/Kconfig b/app/boards/arm/nrfmicro/Kconfig
index 12b06621..233ddbad 100644
--- a/app/boards/arm/nrfmicro/Kconfig
+++ b/app/boards/arm/nrfmicro/Kconfig
@@ -1,10 +1,10 @@
 config BOARD_ENABLE_DCDC
-	bool "Enable DCDC mode"
-	select SOC_DCDC_NRF52X
-	default y
-	depends on (BOARD_NRFMICRO_11 || BOARD_NRFMICRO_11_FLIPPED || BOARD_NRFMICRO_13 || BOARD_NRFMICRO_13_52833)
+    bool "Enable DCDC mode"
+    select SOC_DCDC_NRF52X
+    default y
+    depends on (BOARD_NRFMICRO_11 || BOARD_NRFMICRO_11_FLIPPED || BOARD_NRFMICRO_13 || BOARD_NRFMICRO_13_52833)
 
 config BOARD_NRFMICRO_CHARGER
-	bool "Enable battery charger"
-	default y
-	depends on (BOARD_NRFMICRO_13 || BOARD_NRFMICRO_13_52833)
+    bool "Enable battery charger"
+    default y
+    depends on (BOARD_NRFMICRO_13 || BOARD_NRFMICRO_13_52833)
diff --git a/app/boards/arm/nrfmicro/Kconfig.board b/app/boards/arm/nrfmicro/Kconfig.board
index 244242a9..441de5cf 100644
--- a/app/boards/arm/nrfmicro/Kconfig.board
+++ b/app/boards/arm/nrfmicro/Kconfig.board
@@ -4,17 +4,17 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_NRFMICRO_11
-	bool "nrfmicro_11"
-	depends on SOC_NRF52840_QIAA
+    bool "nrfmicro_11"
+    depends on SOC_NRF52840_QIAA
 
 config BOARD_NRFMICRO_11_FLIPPED
-	bool "nrfmicro_11_flipped"
-	depends on SOC_NRF52840_QIAA
+    bool "nrfmicro_11_flipped"
+    depends on SOC_NRF52840_QIAA
 
 config BOARD_NRFMICRO_13
-	bool "nrfmicro_13"
-	depends on SOC_NRF52840_QIAA
+    bool "nrfmicro_13"
+    depends on SOC_NRF52840_QIAA
 
 config BOARD_NRFMICRO_13_52833
-	bool "nrfmicro_13_52833"
-	depends on SOC_NRF52833_QIAA
+    bool "nrfmicro_13_52833"
+    depends on SOC_NRF52833_QIAA
diff --git a/app/boards/arm/nrfmicro/Kconfig.defconfig b/app/boards/arm/nrfmicro/Kconfig.defconfig
index 751d592b..7d752ac6 100644
--- a/app/boards/arm/nrfmicro/Kconfig.defconfig
+++ b/app/boards/arm/nrfmicro/Kconfig.defconfig
@@ -6,31 +6,31 @@
 if BOARD_NRFMICRO_11 || BOARD_NRFMICRO_11_FLIPPED || BOARD_NRFMICRO_13 || BOARD_NRFMICRO_13_52833
 
 config BOARD
-	default "nrfmicro"
+    default "nrfmicro"
 
 if USB_DEVICE_STACK
 
 config USB_NRFX
-	default y
+    default y
 
 endif # USB_DEVICE_STACK
 
 config BT_CTLR
-	default BT
+    default BT
 
 config ZMK_BLE
-	default y
+    default y
 
 config ZMK_USB
-	default y
+    default y
 
 config PINMUX
-	default y
+    default y
 
-if BOARD_NRFMICRO_13 ||	BOARD_NRFMICRO_13_52833
+if BOARD_NRFMICRO_13 || BOARD_NRFMICRO_13_52833
 
 config BOARD_NRFMICRO_CHARGER
-	default y
+    default y
 
 endif # BOARD_NRFMICRO_13 || BOARD_NRFMICRO_13_52833
 
diff --git a/app/boards/arm/nrfmicro/arduino_pro_micro_pins.dtsi b/app/boards/arm/nrfmicro/arduino_pro_micro_pins.dtsi
index 537aaed3..01e342c0 100644
--- a/app/boards/arm/nrfmicro/arduino_pro_micro_pins.dtsi
+++ b/app/boards/arm/nrfmicro/arduino_pro_micro_pins.dtsi
@@ -6,50 +6,50 @@
 
 
 / {
-	pro_micro: connector {
-		compatible = "arduino-pro-micro";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map
-			= <0 0 &gpio0 8 0>		/* D0 */
-			, <1 0 &gpio0 6 0>		/* D1 */
-			, <2 0 &gpio0 15 0>		/* D2 */
-			, <3 0 &gpio0 17 0>		/* D3 */
-			, <4 0 &gpio0 20 0>		/* D4/A6 */
-			, <5 0 &gpio0 13 0>		/* D5 */
-			, <6 0 &gpio0 24 0>		/* D6/A7 */
-			, <7 0 &gpio0 9 0>		/* D7 */
-			, <8 0 &gpio0 10 0>		/* D8/A8 */
-			, <9 0 &gpio1 6 0>		/* D9/A9 */
-			, <10 0 &gpio1 11 0>	/* D10/A10 */
-			, <16 0 &gpio0 28 0>	/* D16 */
-			, <14 0 &gpio0 3 0>	/* D14 */
-			, <15 0 &gpio1 13 0>	/* D15 */
-			, <18 0 &gpio0 2 0>	/* D18/A0 */
-			, <19 0 &gpio0 29 0>	/* D19/A1 */
-			, <20 0 &gpio0 31 0>	/* D20/A2 */
-			, <21 0 &gpio0 30 0>	/* D21/A3 */
-			;
-	};
+    pro_micro: connector {
+        compatible = "arduino-pro-micro";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map
+            = <0 0 &gpio0 8 0>      /* D0 */
+            , <1 0 &gpio0 6 0>      /* D1 */
+            , <2 0 &gpio0 15 0>     /* D2 */
+            , <3 0 &gpio0 17 0>     /* D3 */
+            , <4 0 &gpio0 20 0>     /* D4/A6 */
+            , <5 0 &gpio0 13 0>     /* D5 */
+            , <6 0 &gpio0 24 0>     /* D6/A7 */
+            , <7 0 &gpio0 9 0>      /* D7 */
+            , <8 0 &gpio0 10 0>     /* D8/A8 */
+            , <9 0 &gpio1 6 0>      /* D9/A9 */
+            , <10 0 &gpio1 11 0>    /* D10/A10 */
+            , <16 0 &gpio0 28 0>    /* D16 */
+            , <14 0 &gpio0 3 0> /* D14 */
+            , <15 0 &gpio1 13 0>    /* D15 */
+            , <18 0 &gpio0 2 0> /* D18/A0 */
+            , <19 0 &gpio0 29 0>    /* D19/A1 */
+            , <20 0 &gpio0 31 0>    /* D20/A2 */
+            , <21 0 &gpio0 30 0>    /* D21/A3 */
+            ;
+    };
 
-	pro_micro_a: connector_a {
-		compatible = "arduino-pro-micro";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map
-			= <0 0 &gpio0 2 0>	/* D18/A0 */
-			, <1 0 &gpio0 29 0>	/* D19/A1 */
-			, <2 0 &gpio0 31 0>	/* D20/A2 */
-			, <3 0 &gpio0 30 0>	/* D21/A3 */
-			, <6 0 &gpio0 20 0>	/* D4/A6 */
-			, <7 0 &gpio0 24 0>	/* D6/A7 */
-			, <8 0 &gpio0 10 0>	/* D8/A8 */
-			, <9 0 &gpio1 6 0>	/* D9/A9 */
-			, <10 0 &gpio1 11 0>	/* D10/A10 */
-			;
-	};
+    pro_micro_a: connector_a {
+        compatible = "arduino-pro-micro";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map
+            = <0 0 &gpio0 2 0>  /* D18/A0 */
+            , <1 0 &gpio0 29 0> /* D19/A1 */
+            , <2 0 &gpio0 31 0> /* D20/A2 */
+            , <3 0 &gpio0 30 0> /* D21/A3 */
+            , <6 0 &gpio0 20 0> /* D4/A6 */
+            , <7 0 &gpio0 24 0> /* D6/A7 */
+            , <8 0 &gpio0 10 0> /* D8/A8 */
+            , <9 0 &gpio1 6 0>  /* D9/A9 */
+            , <10 0 &gpio1 11 0>    /* D10/A10 */
+            ;
+    };
 };
 
 
diff --git a/app/boards/arm/nrfmicro/arduino_pro_micro_pins_52833.dtsi b/app/boards/arm/nrfmicro/arduino_pro_micro_pins_52833.dtsi
index 651edb94..76ece25f 100644
--- a/app/boards/arm/nrfmicro/arduino_pro_micro_pins_52833.dtsi
+++ b/app/boards/arm/nrfmicro/arduino_pro_micro_pins_52833.dtsi
@@ -6,50 +6,50 @@
 
 
 / {
-	pro_micro: connector {
-		compatible = "arduino-pro-micro";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map
-			= <0 0 &gpio0 8 0>		/* D0 */
-			, <1 0 &gpio0 6 0>		/* D1 */
-			, <2 0 &gpio0 15 0>		/* D2 */
-			, <3 0 &gpio0 17 0>		/* D3 */
-			, <4 0 &gpio0 20 0>		/* D4/A6 */
-			, <5 0 &gpio0 13 0>		/* D5 */
-			, <6 0 &gpio0 24 0>		/* D6/A7 */
-			, <7 0 &gpio0 9 0>		/* D7 */
-			, <8 0 &gpio0 10 0>		/* D8/A8 */
-			, <9 0 &gpio1 6 0>		/* D9/A9 */
-			, <10 0 &gpio1 4 0>	/* D10/A10 */
-			, <16 0 &gpio0 28 0>	/* D16 */
-			, <14 0 &gpio0 3 0>	/* D14 */
-			, <15 0 &gpio1 5 0>	/* D15 */
-			, <18 0 &gpio0 2 0>	/* D18/A0 */
-			, <19 0 &gpio0 29 0>	/* D19/A1 */
-			, <20 0 &gpio0 31 0>	/* D20/A2 */
-			, <21 0 &gpio0 30 0>	/* D21/A3 */
-			;
-	};
+    pro_micro: connector {
+        compatible = "arduino-pro-micro";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map
+            = <0 0 &gpio0 8 0>      /* D0 */
+            , <1 0 &gpio0 6 0>      /* D1 */
+            , <2 0 &gpio0 15 0>     /* D2 */
+            , <3 0 &gpio0 17 0>     /* D3 */
+            , <4 0 &gpio0 20 0>     /* D4/A6 */
+            , <5 0 &gpio0 13 0>     /* D5 */
+            , <6 0 &gpio0 24 0>     /* D6/A7 */
+            , <7 0 &gpio0 9 0>      /* D7 */
+            , <8 0 &gpio0 10 0>     /* D8/A8 */
+            , <9 0 &gpio1 6 0>      /* D9/A9 */
+            , <10 0 &gpio1 4 0> /* D10/A10 */
+            , <16 0 &gpio0 28 0>    /* D16 */
+            , <14 0 &gpio0 3 0> /* D14 */
+            , <15 0 &gpio1 5 0> /* D15 */
+            , <18 0 &gpio0 2 0> /* D18/A0 */
+            , <19 0 &gpio0 29 0>    /* D19/A1 */
+            , <20 0 &gpio0 31 0>    /* D20/A2 */
+            , <21 0 &gpio0 30 0>    /* D21/A3 */
+            ;
+    };
 
-	pro_micro_a: connector_a {
-		compatible = "arduino-pro-micro";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map
-			= <0 0 &gpio0 2 0>	/* D18/A0 */
-			, <1 0 &gpio0 29 0>	/* D19/A1 */
-			, <2 0 &gpio0 31 0>	/* D20/A2 */
-			, <3 0 &gpio0 30 0>	/* D21/A3 */
-			, <6 0 &gpio0 20 0>	/* D4/A6 */
-			, <7 0 &gpio0 24 0>	/* D6/A7 */
-			, <8 0 &gpio0 10 0>	/* D8/A8 */
-			, <9 0 &gpio1 6 0>	/* D9/A9 */
-			, <10 0 &gpio1 11 0>	/* D10/A10 */
-			;
-	};
+    pro_micro_a: connector_a {
+        compatible = "arduino-pro-micro";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map
+            = <0 0 &gpio0 2 0>  /* D18/A0 */
+            , <1 0 &gpio0 29 0> /* D19/A1 */
+            , <2 0 &gpio0 31 0> /* D20/A2 */
+            , <3 0 &gpio0 30 0> /* D21/A3 */
+            , <6 0 &gpio0 20 0> /* D4/A6 */
+            , <7 0 &gpio0 24 0> /* D6/A7 */
+            , <8 0 &gpio0 10 0> /* D8/A8 */
+            , <9 0 &gpio1 6 0>  /* D9/A9 */
+            , <10 0 &gpio1 11 0>    /* D10/A10 */
+            ;
+    };
 };
 
 
diff --git a/app/boards/arm/nrfmicro/arduino_pro_micro_pins_flipped.dtsi b/app/boards/arm/nrfmicro/arduino_pro_micro_pins_flipped.dtsi
index 887a3144..923efbbf 100644
--- a/app/boards/arm/nrfmicro/arduino_pro_micro_pins_flipped.dtsi
+++ b/app/boards/arm/nrfmicro/arduino_pro_micro_pins_flipped.dtsi
@@ -5,50 +5,50 @@
  */
 
 / {
-	pro_micro: connector {
-		compatible = "arduino-pro-micro";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map
-			= <0 0 &gpio0 8 0>		/* D0 */
-			, <1 0 &gpio0 6 0>		/* D1 */
-			, <2 0 &gpio0 30 0>		/* D2 */
-			, <3 0 &gpio0 31 0>		/* D3 */
-			, <4 0 &gpio0 29 0>		/* D4/A6 */
-			, <5 0 &gpio0 2 0>		/* D5 */
-			, <6 0 &gpio1 13 0>		/* D6/A7 */
-			, <7 0 &gpio0 3 0>		/* D7 */
-			, <8 0 &gpio0 28 0>		/* D8/A8 */
-			, <9 0 &gpio1 11 0>		/* D9/A9 */
-			, <10 0 &gpio1 6 0>	/* D10/A10 */
-			, <16 0 &gpio0 10 0>	/* D16 */
-			, <14 0 &gpio0 9 0>	/* D14 */
-			, <15 0 &gpio0 24 0>	/* D15 */
-			, <18 0 &gpio0 13 0>	/* D18/A0 */
-			, <19 0 &gpio0 20 0>	/* D19/A1 */
-			, <20 0 &gpio0 17 0>	/* D20/A2 */
-			, <21 0 &gpio0 15 0>	/* D21/A3 */
-			;
-	};
+    pro_micro: connector {
+        compatible = "arduino-pro-micro";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map
+            = <0 0 &gpio0 8 0>      /* D0 */
+            , <1 0 &gpio0 6 0>      /* D1 */
+            , <2 0 &gpio0 30 0>     /* D2 */
+            , <3 0 &gpio0 31 0>     /* D3 */
+            , <4 0 &gpio0 29 0>     /* D4/A6 */
+            , <5 0 &gpio0 2 0>      /* D5 */
+            , <6 0 &gpio1 13 0>     /* D6/A7 */
+            , <7 0 &gpio0 3 0>      /* D7 */
+            , <8 0 &gpio0 28 0>     /* D8/A8 */
+            , <9 0 &gpio1 11 0>     /* D9/A9 */
+            , <10 0 &gpio1 6 0> /* D10/A10 */
+            , <16 0 &gpio0 10 0>    /* D16 */
+            , <14 0 &gpio0 9 0> /* D14 */
+            , <15 0 &gpio0 24 0>    /* D15 */
+            , <18 0 &gpio0 13 0>    /* D18/A0 */
+            , <19 0 &gpio0 20 0>    /* D19/A1 */
+            , <20 0 &gpio0 17 0>    /* D20/A2 */
+            , <21 0 &gpio0 15 0>    /* D21/A3 */
+            ;
+    };
 
-	pro_micro_a: connector_a {
-		compatible = "arduino-pro-micro";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map
-			= <0 0 &gpio0 13 0>	/* D18/A0 */
-			, <1 0 &gpio0 20 0>	/* D19/A1 */
-			, <2 0 &gpio0 17 0>	/* D20/A2 */
-			, <3 0 &gpio0 15 0>	/* D21/A3 */
-			, <6 0 &gpio0 29 0>	/* D4/A6 */
-			, <7 0 &gpio1 13 0>	/* D6/A7 */
-			, <8 0 &gpio0 28 0>	/* D8/A8 */
-			, <9 0 &gpio1 11 0>	/* D9/A9 */
-			, <10 0 &gpio1 6 0>	/* D10/A10 */
-			;
-	};
+    pro_micro_a: connector_a {
+        compatible = "arduino-pro-micro";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map
+            = <0 0 &gpio0 13 0> /* D18/A0 */
+            , <1 0 &gpio0 20 0> /* D19/A1 */
+            , <2 0 &gpio0 17 0> /* D20/A2 */
+            , <3 0 &gpio0 15 0> /* D21/A3 */
+            , <6 0 &gpio0 29 0> /* D4/A6 */
+            , <7 0 &gpio1 13 0> /* D6/A7 */
+            , <8 0 &gpio0 28 0> /* D8/A8 */
+            , <9 0 &gpio1 11 0> /* D9/A9 */
+            , <10 0 &gpio1 6 0> /* D10/A10 */
+            ;
+    };
 };
 
 pro_micro_d: &pro_micro {};
diff --git a/app/boards/arm/nrfmicro/nrfmicro-flipped-pinctrl.dtsi b/app/boards/arm/nrfmicro/nrfmicro-flipped-pinctrl.dtsi
index a54c2598..22bc11d4 100644
--- a/app/boards/arm/nrfmicro/nrfmicro-flipped-pinctrl.dtsi
+++ b/app/boards/arm/nrfmicro/nrfmicro-flipped-pinctrl.dtsi
@@ -4,36 +4,36 @@
  */
 
 &pinctrl {
-	uart0_default: uart0_default {
-		group1 {
-			psels = <NRF_PSEL(UART_RX, 0, 8)>;
-			bias-pull-up;
-		};
-		group2 {
-			psels = <NRF_PSEL(UART_TX, 0, 6)>;
-		};
-	};
+    uart0_default: uart0_default {
+        group1 {
+            psels = <NRF_PSEL(UART_RX, 0, 8)>;
+            bias-pull-up;
+        };
+        group2 {
+            psels = <NRF_PSEL(UART_TX, 0, 6)>;
+        };
+    };
 
-	uart0_sleep: uart0_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_RX, 0, 8)>,
-				<NRF_PSEL(UART_TX, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    uart0_sleep: uart0_sleep {
+        group1 {
+            psels = <NRF_PSEL(UART_RX, 0, 8)>,
+                <NRF_PSEL(UART_TX, 0, 6)>;
+            low-power-enable;
+        };
+    };
 
-	i2c0_default: i2c0_default {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 0, 30)>,
-				<NRF_PSEL(TWIM_SCL, 0, 31)>;
-		};
-	};
+    i2c0_default: i2c0_default {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 30)>,
+                <NRF_PSEL(TWIM_SCL, 0, 31)>;
+        };
+    };
 
-	i2c0_sleep: i2c0_sleep {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 0, 30)>,
-				<NRF_PSEL(TWIM_SCL, 0, 31)>;
-			low-power-enable;
-		};
-	};
+    i2c0_sleep: i2c0_sleep {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 30)>,
+                <NRF_PSEL(TWIM_SCL, 0, 31)>;
+            low-power-enable;
+        };
+    };
 };
diff --git a/app/boards/arm/nrfmicro/nrfmicro-pinctrl.dtsi b/app/boards/arm/nrfmicro/nrfmicro-pinctrl.dtsi
index a5385690..35a46e5a 100644
--- a/app/boards/arm/nrfmicro/nrfmicro-pinctrl.dtsi
+++ b/app/boards/arm/nrfmicro/nrfmicro-pinctrl.dtsi
@@ -4,36 +4,36 @@
  */
 
 &pinctrl {
-	uart0_default: uart0_default {
-		group1 {
-			psels = <NRF_PSEL(UART_RX, 0, 8)>;
-			bias-pull-up;
-		};
-		group2 {
-			psels = <NRF_PSEL(UART_TX, 0, 6)>;
-		};
-	};
+    uart0_default: uart0_default {
+        group1 {
+            psels = <NRF_PSEL(UART_RX, 0, 8)>;
+            bias-pull-up;
+        };
+        group2 {
+            psels = <NRF_PSEL(UART_TX, 0, 6)>;
+        };
+    };
 
-	uart0_sleep: uart0_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_RX, 0, 8)>,
-				<NRF_PSEL(UART_TX, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    uart0_sleep: uart0_sleep {
+        group1 {
+            psels = <NRF_PSEL(UART_RX, 0, 8)>,
+                <NRF_PSEL(UART_TX, 0, 6)>;
+            low-power-enable;
+        };
+    };
 
-	i2c0_default: i2c0_default {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 0, 15)>,
-				<NRF_PSEL(TWIM_SCL, 0, 17)>;
-		};
-	};
+    i2c0_default: i2c0_default {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 15)>,
+                <NRF_PSEL(TWIM_SCL, 0, 17)>;
+        };
+    };
 
-	i2c0_sleep: i2c0_sleep {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 0, 15)>,
-				<NRF_PSEL(TWIM_SCL, 0, 17)>;
-			low-power-enable;
-		};
-	};
+    i2c0_sleep: i2c0_sleep {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 15)>,
+                <NRF_PSEL(TWIM_SCL, 0, 17)>;
+            low-power-enable;
+        };
+    };
 };
diff --git a/app/boards/arm/nrfmicro/nrfmicro_11.dts b/app/boards/arm/nrfmicro/nrfmicro_11.dts
index 48186ac9..68331edc 100644
--- a/app/boards/arm/nrfmicro/nrfmicro_11.dts
+++ b/app/boards/arm/nrfmicro/nrfmicro_11.dts
@@ -10,102 +10,102 @@
 #include "nrfmicro-pinctrl.dtsi"
 
 / {
-	model = "nrfmicro";
-	compatible = "joric,nrfmicro";
+    model = "nrfmicro";
+    compatible = "joric,nrfmicro";
 
-	chosen {
-		zephyr,code-partition = &code_partition;
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &cdc_acm_uart;
-	};
+    chosen {
+        zephyr,code-partition = &code_partition;
+        zephyr,sram = &sram0;
+        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
+    };
 
-	leds {
-		compatible = "gpio-leds";
-		blue_led: led_0 {
-			gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
-			label = "Blue LED";
-		};
-	};
+    leds {
+        compatible = "gpio-leds";
+        blue_led: led_0 {
+            gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
+        };
+    };
 
-	ext-power {
-		compatible = "zmk,ext-power-generic";
-		label = "EXT_POWER";
-		control-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-	};
+    ext-power {
+        compatible = "zmk,ext-power-generic";
+        label = "EXT_POWER";
+        control-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+    };
 };
 
 &gpiote {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio0 {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio1 {
-	status = "okay";
+    status = "okay";
 };
 
 &i2c0 {
-	compatible = "nordic,nrf-twim";
-	pinctrl-0 = <&i2c0_default>;
-	pinctrl-1 = <&i2c0_sleep>;
-	pinctrl-names = "default", "sleep";
+    compatible = "nordic,nrf-twim";
+    pinctrl-0 = <&i2c0_default>;
+    pinctrl-1 = <&i2c0_sleep>;
+    pinctrl-names = "default", "sleep";
 };
 
 &uart0 {
-	compatible = "nordic,nrf-uarte";
-	pinctrl-0 = <&uart0_default>;
-	pinctrl-1 = <&uart0_sleep>;
-	pinctrl-names = "default", "sleep";
+    compatible = "nordic,nrf-uarte";
+    pinctrl-0 = <&uart0_default>;
+    pinctrl-1 = <&uart0_sleep>;
+    pinctrl-names = "default", "sleep";
 };
 
 &usbd {
-	status = "okay";
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
 
 &flash0 {
-	/*
-	 * For more information, see:
-	 * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
-	 */
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
+    /*
+     * For more information, see:
+     * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
+     */
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
 
-		sd_partition: partition@0 {
-			label = "softdevice";
-			reg = <0x00000000 0x00026000>;
-		};
-		code_partition: partition@26000 {
-			label = "code_partition";
-			reg = <0x00026000 0x000c6000>;
-		};
+        sd_partition: partition@0 {
+            label = "softdevice";
+            reg = <0x00000000 0x00026000>;
+        };
+        code_partition: partition@26000 {
+            label = "code_partition";
+            reg = <0x00026000 0x000c6000>;
+        };
 
-		/*
-		 * The flash starting at 0x000ec000 and ending at
-		 * 0x000f3fff is reserved for use by the application.
-		 */
+        /*
+         * The flash starting at 0x000ec000 and ending at
+         * 0x000f3fff is reserved for use by the application.
+         */
 
-		/*
-		 * Storage partition will be used by FCB/LittleFS/NVS
-		 * if enabled.
-		 */
-		storage_partition: partition@ec000 {
-			label = "storage";
-			reg = <0x000ec000 0x00008000>;
-		};
+        /*
+         * Storage partition will be used by FCB/LittleFS/NVS
+         * if enabled.
+         */
+        storage_partition: partition@ec000 {
+            label = "storage";
+            reg = <0x000ec000 0x00008000>;
+        };
 
-		boot_partition: partition@f4000 {
-			label = "adafruit_boot";
-			reg = <0x000f4000 0x0000c000>;
-		};
-	};
+        boot_partition: partition@f4000 {
+            label = "adafruit_boot";
+            reg = <0x000f4000 0x0000c000>;
+        };
+    };
 };
diff --git a/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts b/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts
index 656873a0..9977617c 100644
--- a/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts
+++ b/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts
@@ -10,102 +10,102 @@
 #include "nrfmicro-flipped-pinctrl.dtsi"
 
 / {
-	model = "nrfmicro";
-	compatible = "joric,nrfmicro";
+    model = "nrfmicro";
+    compatible = "joric,nrfmicro";
 
-	chosen {
-		zephyr,code-partition = &code_partition;
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &cdc_acm_uart;
-	};
+    chosen {
+        zephyr,code-partition = &code_partition;
+        zephyr,sram = &sram0;
+        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
+    };
 
-	leds {
-		compatible = "gpio-leds";
-		blue_led: led_0 {
-			gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
-			label = "Blue LED";
-		};
-	};
+    leds {
+        compatible = "gpio-leds";
+        blue_led: led_0 {
+            gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
+        };
+    };
 
-	ext-power {
-		compatible = "zmk,ext-power-generic";
-		label = "EXT_POWER";
-		control-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-	};
+    ext-power {
+        compatible = "zmk,ext-power-generic";
+        label = "EXT_POWER";
+        control-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+    };
 };
 
 &gpiote {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio0 {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio1 {
-	status = "okay";
+    status = "okay";
 };
 
 &i2c0 {
-	compatible = "nordic,nrf-twim";
-	pinctrl-0 = <&i2c0_default>;
-	pinctrl-1 = <&i2c0_sleep>;
-	pinctrl-names = "default", "sleep";
+    compatible = "nordic,nrf-twim";
+    pinctrl-0 = <&i2c0_default>;
+    pinctrl-1 = <&i2c0_sleep>;
+    pinctrl-names = "default", "sleep";
 };
 
 &uart0 {
-	compatible = "nordic,nrf-uarte";
-	pinctrl-0 = <&uart0_default>;
-	pinctrl-1 = <&uart0_sleep>;
-	pinctrl-names = "default", "sleep";
+    compatible = "nordic,nrf-uarte";
+    pinctrl-0 = <&uart0_default>;
+    pinctrl-1 = <&uart0_sleep>;
+    pinctrl-names = "default", "sleep";
 };
 
 &usbd {
-	status = "okay";
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
 
 &flash0 {
-	/*
-	 * For more information, see:
-	 * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
-	 */
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
+    /*
+     * For more information, see:
+     * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
+     */
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
 
-		sd_partition: partition@0 {
-			label = "softdevice";
-			reg = <0x00000000 0x00026000>;
-		};
-		code_partition: partition@26000 {
-			label = "code_partition";
-			reg = <0x00026000 0x000c6000>;
-		};
+        sd_partition: partition@0 {
+            label = "softdevice";
+            reg = <0x00000000 0x00026000>;
+        };
+        code_partition: partition@26000 {
+            label = "code_partition";
+            reg = <0x00026000 0x000c6000>;
+        };
 
-		/*
-		 * The flash starting at 0x000ec000 and ending at
-		 * 0x000f3fff is reserved for use by the application.
-		 */
+        /*
+         * The flash starting at 0x000ec000 and ending at
+         * 0x000f3fff is reserved for use by the application.
+         */
 
-		/*
-		 * Storage partition will be used by FCB/LittleFS/NVS
-		 * if enabled.
-		 */
-		storage_partition: partition@ec000 {
-			label = "storage";
-			reg = <0x000ec000 0x00008000>;
-		};
+        /*
+         * Storage partition will be used by FCB/LittleFS/NVS
+         * if enabled.
+         */
+        storage_partition: partition@ec000 {
+            label = "storage";
+            reg = <0x000ec000 0x00008000>;
+        };
 
-		boot_partition: partition@f4000 {
-			label = "adafruit_boot";
-			reg = <0x000f4000 0x0000c000>;
-		};
-	};
+        boot_partition: partition@f4000 {
+            label = "adafruit_boot";
+            reg = <0x000f4000 0x0000c000>;
+        };
+    };
 };
diff --git a/app/boards/arm/nrfmicro/nrfmicro_13.dts b/app/boards/arm/nrfmicro/nrfmicro_13.dts
index 9fb68562..300838ff 100644
--- a/app/boards/arm/nrfmicro/nrfmicro_13.dts
+++ b/app/boards/arm/nrfmicro/nrfmicro_13.dts
@@ -10,115 +10,115 @@
 #include "nrfmicro-pinctrl.dtsi"
 
 / {
-	model = "nrfmicro";
-	compatible = "joric,nrfmicro";
+    model = "nrfmicro";
+    compatible = "joric,nrfmicro";
 
-	chosen {
-		zephyr,code-partition = &code_partition;
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &cdc_acm_uart;
-		zmk,battery = &vbatt;
-	};
+    chosen {
+        zephyr,code-partition = &code_partition;
+        zephyr,sram = &sram0;
+        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
+        zmk,battery = &vbatt;
+    };
 
-	leds {
-		compatible = "gpio-leds";
-		blue_led: led_0 {
-			gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
-			label = "Blue LED";
-		};
-	};
+    leds {
+        compatible = "gpio-leds";
+        blue_led: led_0 {
+            gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
+        };
+    };
 
-	ext-power {
-		compatible = "zmk,ext-power-generic";
-		label = "EXT_POWER";
-		control-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
-	};
+    ext-power {
+        compatible = "zmk,ext-power-generic";
+        label = "EXT_POWER";
+        control-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+    };
 
-	vbatt: vbatt {
-		compatible = "zmk,battery-voltage-divider";
-		label = "BATTERY";
-		io-channels = <&adc 2>;
-		output-ohms = <2000000>;
-		full-ohms = <(2000000 + 820000)>;
-	};
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        label = "BATTERY";
+        io-channels = <&adc 2>;
+        output-ohms = <2000000>;
+        full-ohms = <(2000000 + 820000)>;
+    };
 };
 
 &adc {
-	status = "okay";
+    status = "okay";
 };
 
 &gpiote {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio0 {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio1 {
-	status = "okay";
+    status = "okay";
 };
 
 &i2c0 {
-	compatible = "nordic,nrf-twim";
-	pinctrl-0 = <&i2c0_default>;
-	pinctrl-1 = <&i2c0_sleep>;
-	pinctrl-names = "default", "sleep";
+    compatible = "nordic,nrf-twim";
+    pinctrl-0 = <&i2c0_default>;
+    pinctrl-1 = <&i2c0_sleep>;
+    pinctrl-names = "default", "sleep";
 };
 
 &uart0 {
-	compatible = "nordic,nrf-uarte";
-	pinctrl-0 = <&uart0_default>;
-	pinctrl-1 = <&uart0_sleep>;
-	pinctrl-names = "default", "sleep";
+    compatible = "nordic,nrf-uarte";
+    pinctrl-0 = <&uart0_default>;
+    pinctrl-1 = <&uart0_sleep>;
+    pinctrl-names = "default", "sleep";
 };
 
 &usbd {
-	status = "okay";
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
 
 &flash0 {
-	/*
-	 * For more information, see:
-	 * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
-	 */
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
+    /*
+     * For more information, see:
+     * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
+     */
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
 
-		sd_partition: partition@0 {
-			label = "softdevice";
-			reg = <0x00000000 0x00026000>;
-		};
-		code_partition: partition@26000 {
-			label = "code_partition";
-			reg = <0x00026000 0x000c6000>;
-		};
+        sd_partition: partition@0 {
+            label = "softdevice";
+            reg = <0x00000000 0x00026000>;
+        };
+        code_partition: partition@26000 {
+            label = "code_partition";
+            reg = <0x00026000 0x000c6000>;
+        };
 
-		/*
-		 * The flash starting at 0x000ec000 and ending at
-		 * 0x000f3fff is reserved for use by the application.
-		 */
+        /*
+         * The flash starting at 0x000ec000 and ending at
+         * 0x000f3fff is reserved for use by the application.
+         */
 
-		/*
-		 * Storage partition will be used by FCB/LittleFS/NVS
-		 * if enabled.
-		 */
-		storage_partition: partition@ec000 {
-			label = "storage";
-			reg = <0x000ec000 0x00008000>;
-		};
+        /*
+         * Storage partition will be used by FCB/LittleFS/NVS
+         * if enabled.
+         */
+        storage_partition: partition@ec000 {
+            label = "storage";
+            reg = <0x000ec000 0x00008000>;
+        };
 
-		boot_partition: partition@f4000 {
-			label = "adafruit_boot";
-			reg = <0x000f4000 0x0000c000>;
-		};
-	};
+        boot_partition: partition@f4000 {
+            label = "adafruit_boot";
+            reg = <0x000f4000 0x0000c000>;
+        };
+    };
 };
diff --git a/app/boards/arm/nrfmicro/nrfmicro_13_52833.dts b/app/boards/arm/nrfmicro/nrfmicro_13_52833.dts
index 9ade364d..86bcb5e5 100644
--- a/app/boards/arm/nrfmicro/nrfmicro_13_52833.dts
+++ b/app/boards/arm/nrfmicro/nrfmicro_13_52833.dts
@@ -10,115 +10,115 @@
 #include "nrfmicro-pinctrl.dtsi"
 
 / {
-	model = "nrfmicro";
-	compatible = "joric,nrfmicro";
+    model = "nrfmicro";
+    compatible = "joric,nrfmicro";
 
-	chosen {
-		zephyr,code-partition = &code_partition;
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &cdc_acm_uart;
-		zmk,battery = &vbatt;
-	};
+    chosen {
+        zephyr,code-partition = &code_partition;
+        zephyr,sram = &sram0;
+        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
+        zmk,battery = &vbatt;
+    };
 
-	leds {
-		compatible = "gpio-leds";
-		blue_led: led_0 {
-			gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
-			label = "Blue LED";
-		};
-	};
+    leds {
+        compatible = "gpio-leds";
+        blue_led: led_0 {
+            gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
+        };
+    };
 
-	ext-power {
-		compatible = "zmk,ext-power-generic";
-		label = "EXT_POWER";
-		control-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
-	};
+    ext-power {
+        compatible = "zmk,ext-power-generic";
+        label = "EXT_POWER";
+        control-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+    };
 
-	vbatt: vbatt {
-		compatible = "zmk,battery-voltage-divider";
-		label = "BATTERY";
-		io-channels = <&adc 2>;
-		output-ohms = <2000000>;
-		full-ohms = <(2000000 + 820000)>;
-	};
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        label = "BATTERY";
+        io-channels = <&adc 2>;
+        output-ohms = <2000000>;
+        full-ohms = <(2000000 + 820000)>;
+    };
 };
 
 &adc {
-	status = "okay";
+    status = "okay";
 };
 
 &gpiote {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio0 {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio1 {
-	status = "okay";
+    status = "okay";
 };
 
 &i2c0 {
-	compatible = "nordic,nrf-twim";
-	pinctrl-0 = <&i2c0_default>;
-	pinctrl-1 = <&i2c0_sleep>;
-	pinctrl-names = "default", "sleep";
+    compatible = "nordic,nrf-twim";
+    pinctrl-0 = <&i2c0_default>;
+    pinctrl-1 = <&i2c0_sleep>;
+    pinctrl-names = "default", "sleep";
 };
 
 &uart0 {
-	compatible = "nordic,nrf-uarte";
-	pinctrl-0 = <&uart0_default>;
-	pinctrl-1 = <&uart0_sleep>;
-	pinctrl-names = "default", "sleep";
+    compatible = "nordic,nrf-uarte";
+    pinctrl-0 = <&uart0_default>;
+    pinctrl-1 = <&uart0_sleep>;
+    pinctrl-names = "default", "sleep";
 };
 
 &usbd {
-	status = "okay";
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
 
 &flash0 {
-	/*
-	 * For more information, see:
-	 * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
-	 */
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
+    /*
+     * For more information, see:
+     * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
+     */
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
 
-		sd_partition: partition@0 {
-			label = "softdevice";
-			reg = <0x00000000 0x00026000>;
-		};
-		code_partition: partition@26000 {
-			label = "code_partition";
-			reg = <0x00026000 0x00046000>;
-		};
+        sd_partition: partition@0 {
+            label = "softdevice";
+            reg = <0x00000000 0x00026000>;
+        };
+        code_partition: partition@26000 {
+            label = "code_partition";
+            reg = <0x00026000 0x00046000>;
+        };
 
-		/*
-		 * The flash starting at 0x0006c000 and ending at
-		 * 0x00073fff is reserved for use by the application.
-		 */
+        /*
+         * The flash starting at 0x0006c000 and ending at
+         * 0x00073fff is reserved for use by the application.
+         */
 
-		/*
-		 * Storage partition will be used by FCB/LittleFS/NVS
-		 * if enabled.
-		 */
-		storage_partition: partition@6c000 {
-			label = "storage";
-			reg = <0x0006c000 0x00008000>;
-		};
+        /*
+         * Storage partition will be used by FCB/LittleFS/NVS
+         * if enabled.
+         */
+        storage_partition: partition@6c000 {
+            label = "storage";
+            reg = <0x0006c000 0x00008000>;
+        };
 
-		boot_partition: partition@74000 {
-			label = "adafruit_boot";
-			reg = <0x00074000 0x0000c000>;
-		};
-	};
+        boot_partition: partition@74000 {
+            label = "adafruit_boot";
+            reg = <0x00074000 0x0000c000>;
+        };
+    };
 };
diff --git a/app/boards/arm/pillbug/pillbug-pinctrl.dtsi b/app/boards/arm/pillbug/pillbug-pinctrl.dtsi
index 8751bc4b..8a9e9fc2 100644
--- a/app/boards/arm/pillbug/pillbug-pinctrl.dtsi
+++ b/app/boards/arm/pillbug/pillbug-pinctrl.dtsi
@@ -4,53 +4,53 @@
  */
 
 &pinctrl {
-	uart0_default: uart0_default {
-		group1 {
-			psels = <NRF_PSEL(UART_RX, 0, 8)>;
-			bias-pull-up;
-		};
-		group2 {
-			psels = <NRF_PSEL(UART_TX, 0, 6)>;
-		};
-	};
+    uart0_default: uart0_default {
+        group1 {
+            psels = <NRF_PSEL(UART_RX, 0, 8)>;
+            bias-pull-up;
+        };
+        group2 {
+            psels = <NRF_PSEL(UART_TX, 0, 6)>;
+        };
+    };
 
-	uart0_sleep: uart0_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_RX, 0, 8)>,
-				<NRF_PSEL(UART_TX, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    uart0_sleep: uart0_sleep {
+        group1 {
+            psels = <NRF_PSEL(UART_RX, 0, 8)>,
+                <NRF_PSEL(UART_TX, 0, 6)>;
+            low-power-enable;
+        };
+    };
 
-	i2c0_default: i2c0_default {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 0, 15)>,
-				<NRF_PSEL(TWIM_SCL, 0, 13)>;
-		};
-	};
+    i2c0_default: i2c0_default {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 15)>,
+                <NRF_PSEL(TWIM_SCL, 0, 13)>;
+        };
+    };
 
-	i2c0_sleep: i2c0_sleep {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 0, 15)>,
-				<NRF_PSEL(TWIM_SCL, 0, 13)>;
-			low-power-enable;
-		};
-	};
+    i2c0_sleep: i2c0_sleep {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 15)>,
+                <NRF_PSEL(TWIM_SCL, 0, 13)>;
+            low-power-enable;
+        };
+    };
 
-	spi1_default: spi1_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 40)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 11)>,
-				<NRF_PSEL(SPIM_MISO, 1, 26)>;
-		};
-	};
+    spi1_default: spi1_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 40)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 11)>,
+                <NRF_PSEL(SPIM_MISO, 1, 26)>;
+        };
+    };
 
-	spi1_sleep: spi1_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 40)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 11)>,
-				<NRF_PSEL(SPIM_MISO, 1, 26)>;
-			low-power-enable;
-		};
-	};
+    spi1_sleep: spi1_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 40)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 11)>,
+                <NRF_PSEL(SPIM_MISO, 1, 26)>;
+            low-power-enable;
+        };
+    };
 };
diff --git a/app/boards/arm/planck/Kconfig.board b/app/boards/arm/planck/Kconfig.board
index fe15e1a9..28b7381f 100644
--- a/app/boards/arm/planck/Kconfig.board
+++ b/app/boards/arm/planck/Kconfig.board
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_PLANCK_REV6
-	bool "Planck V6 Keyboard"
-	depends on SOC_STM32F303XC
+    bool "Planck V6 Keyboard"
+    depends on SOC_STM32F303XC
diff --git a/app/boards/arm/planck/Kconfig.defconfig b/app/boards/arm/planck/Kconfig.defconfig
index 913c1c13..d1304da0 100644
--- a/app/boards/arm/planck/Kconfig.defconfig
+++ b/app/boards/arm/planck/Kconfig.defconfig
@@ -6,10 +6,10 @@
 if BOARD_PLANCK_REV6
 
 config ZMK_KEYBOARD_NAME
-	default "Planck V6"
+    default "Planck V6"
 
 config ZMK_USB
-	default y
+    default y
 
 config ZMK_KSCAN_MATRIX_POLLING
     default y
diff --git a/app/boards/arm/planck/planck_rev6.dts b/app/boards/arm/planck/planck_rev6.dts
index 97239595..5fdd2c21 100644
--- a/app/boards/arm/planck/planck_rev6.dts
+++ b/app/boards/arm/planck/planck_rev6.dts
@@ -10,123 +10,123 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	model = "Plack PCD, rev6";
-	compatible = "planck,rev6", "st,stm32f303";
+    model = "Plack PCD, rev6";
+    compatible = "planck,rev6", "st,stm32f303";
 
-	chosen {
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &cdc_acm_uart;
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &layout_grid_transform;
-	};
+    chosen {
+        zephyr,sram = &sram0;
+        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &layout_grid_transform;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
                 diode-direction = "col2row";
-		row-gpios
-			= <&gpioa 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpioa 9  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpioa 8  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpiob 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpioc 13 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpioc 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpioc 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpioa 2  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
-		col-gpios
-			= <&gpiob 11 GPIO_ACTIVE_HIGH>
-			, <&gpiob 10 GPIO_ACTIVE_HIGH>
-			, <&gpiob 2  GPIO_ACTIVE_HIGH>
-			, <&gpiob 1  GPIO_ACTIVE_HIGH>
-			, <&gpioa 7  GPIO_ACTIVE_HIGH>
-			, <&gpiob 0  GPIO_ACTIVE_HIGH>
-			;
-	};
+        row-gpios
+            = <&gpioa 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpioa 9  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpioa 8  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpiob 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpioc 13 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpioc 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpioc 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpioa 2  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
+        col-gpios
+            = <&gpiob 11 GPIO_ACTIVE_HIGH>
+            , <&gpiob 10 GPIO_ACTIVE_HIGH>
+            , <&gpiob 2  GPIO_ACTIVE_HIGH>
+            , <&gpiob 1  GPIO_ACTIVE_HIGH>
+            , <&gpioa 7  GPIO_ACTIVE_HIGH>
+            , <&gpiob 0  GPIO_ACTIVE_HIGH>
+            ;
+    };
 
 layout_grid_transform:
-	keymap_transform_0 {
-	    compatible = "zmk,matrix-transform";
-	    columns = <6>;
-	    rows = <8>;
-	    map = <
-		RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)
-		RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(5,5)
-		RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4) RC(6,5)
-		RC(3,0) RC(3,1) RC(3,2) RC(7,3) RC(7,4) RC(7,5) RC(7,0) RC(7,1) RC(7,2) RC(3,3) RC(3,4) RC(3,5)
-		>;
-	};
+    keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <6>;
+        rows = <8>;
+        map = <
+        RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)
+        RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(5,5)
+        RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4) RC(6,5)
+        RC(3,0) RC(3,1) RC(3,2) RC(7,3) RC(7,4) RC(7,5) RC(7,0) RC(7,1) RC(7,2) RC(3,3) RC(3,4) RC(3,5)
+        >;
+    };
 layout_mit_transform:
-	keymap_transform_1 {
-	    compatible = "zmk,matrix-transform";
-	    columns = <6>;
-	    rows = <8>;
-	    map = <
-		RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)
-		RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(5,5)
-		RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4) RC(6,5)
-		RC(3,0) RC(3,1) RC(3,2) RC(7,3) RC(7,4)     RC(7,0)     RC(7,1) RC(7,2) RC(3,3) RC(3,4) RC(3,5)
-		>;
-	};
+    keymap_transform_1 {
+        compatible = "zmk,matrix-transform";
+        columns = <6>;
+        rows = <8>;
+        map = <
+        RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)
+        RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(5,5)
+        RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4) RC(6,5)
+        RC(3,0) RC(3,1) RC(3,2) RC(7,3) RC(7,4)     RC(7,0)     RC(7,1) RC(7,2) RC(3,3) RC(3,4) RC(3,5)
+        >;
+    };
 layout_2x2u_transform:
-	keymap_transform_2 {
-	    compatible = "zmk,matrix-transform";
-	    columns = <6>;
-	    rows = <8>;
-	    map = <
-		RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)
-		RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(5,5)
-		RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4) RC(6,5)
-		RC(3,0) RC(3,1) RC(3,2) RC(7,3)     RC(7,5)         RC(7,1)     RC(7,2) RC(3,3) RC(3,4) RC(3,5)
-		>;
-	};
+    keymap_transform_2 {
+        compatible = "zmk,matrix-transform";
+        columns = <6>;
+        rows = <8>;
+        map = <
+        RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)
+        RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(5,5)
+        RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4) RC(6,5)
+        RC(3,0) RC(3,1) RC(3,2) RC(7,3)     RC(7,5)         RC(7,1)     RC(7,2) RC(3,3) RC(3,4) RC(3,5)
+        >;
+    };
 };
 
 &usb {
-	pinctrl-0 = <&usb_dm_pa11 &usb_dp_pa12>;
-	pinctrl-names = "default";
-	status = "okay";
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    pinctrl-0 = <&usb_dm_pa11 &usb_dp_pa12>;
+    pinctrl-names = "default";
+    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
 &clk_hse {
-	status = "okay";
-	clock-frequency = <DT_FREQ_M(8)>;
+    status = "okay";
+    clock-frequency = <DT_FREQ_M(8)>;
 };
 
 &pll {
-	prediv = <1>;
-	mul = <9>;
-	clocks = <&clk_hse>;
-	status = "okay";
+    prediv = <1>;
+    mul = <9>;
+    clocks = <&clk_hse>;
+    status = "okay";
 };
 
 &rcc {
-	clocks = <&pll>;
-	clock-frequency = <DT_FREQ_M(72)>;
-	ahb-prescaler = <1>;
-	apb1-prescaler = <2>;
-	apb2-prescaler = <1>;
+    clocks = <&pll>;
+    clock-frequency = <DT_FREQ_M(72)>;
+    ahb-prescaler = <1>;
+    apb1-prescaler = <2>;
+    apb2-prescaler = <1>;
 };
 
 &flash0 {
-	/*
-	 * For more information, see:
-	 * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
-	 */
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
+    /*
+     * For more information, see:
+     * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
+     */
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
 
-		/* Set 6Kb of storage at the end of the 256Kb of flash */
-		storage_partition: partition@3e800 {
-			label = "storage";
-			reg = <0x0003e800 0x00001800>;
-		};
-	};
+        /* Set 6Kb of storage at the end of the 256Kb of flash */
+        storage_partition: partition@3e800 {
+            label = "storage";
+            reg = <0x0003e800 0x00001800>;
+        };
+    };
 };
diff --git a/app/boards/arm/planck/planck_rev6.keymap b/app/boards/arm/planck/planck_rev6.keymap
index 7e4f6732..65138057 100644
--- a/app/boards/arm/planck/planck_rev6.keymap
+++ b/app/boards/arm/planck/planck_rev6.keymap
@@ -8,39 +8,39 @@
 #include <dt-bindings/zmk/keys.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
-			// -----------------------------------------------------------------------------------------
-			// |  TAB  |  Q   |  W   |  E   |  R   |  T   |   Y   |  U    |  I   |  O   |   P   | BSPC  |
-			// |  ESC  |  A   |  S   |  D   |  F   |  G   |   H   |  J    |  K   |  L   |   ;   |  '    |
-			// | SHIFT |  Z   |  X   |  C   |  V   |  B   |   N   |  M    |  ,   |  .   |   /   |  RET  |
-			// |       | LCTL | LALT | LGUI | LOWR |     SPACE    |  RAIS | LARW | DARW | UARW  |  RARW |
-			bindings = <
-				&kp TAB  &kp Q    &kp W &kp E &kp R &kp T  &kp Y   &kp U  &kp I    &kp O   &kp P    &kp BSPC
-				&kp ESC  &kp A    &kp S &kp D &kp F &kp G  &kp H   &kp J  &kp K    &kp L   &kp SEMI &kp SQT
-				&kp LSHFT &kp Z    &kp X &kp C &kp V &kp B  &kp N   &kp M  &kp COMMA &kp DOT &kp SLASH &kp RET
-				&trans   &kp LCTL &kp LALT &kp LGUI &mo 1 &trans &kp SPACE &mo 2 &kp LEFT &kp DOWN &kp UP &kp RIGHT
-			>;
-		};
+        default_layer {
+            // -----------------------------------------------------------------------------------------
+            // |  TAB  |  Q   |  W   |  E   |  R   |  T   |   Y   |  U    |  I   |  O   |   P   | BSPC  |
+            // |  ESC  |  A   |  S   |  D   |  F   |  G   |   H   |  J    |  K   |  L   |   ;   |  '    |
+            // | SHIFT |  Z   |  X   |  C   |  V   |  B   |   N   |  M    |  ,   |  .   |   /   |  RET  |
+            // |       | LCTL | LALT | LGUI | LOWR |     SPACE    |  RAIS | LARW | DARW | UARW  |  RARW |
+            bindings = <
+                &kp TAB  &kp Q    &kp W &kp E &kp R &kp T  &kp Y   &kp U  &kp I    &kp O   &kp P    &kp BSPC
+                &kp ESC  &kp A    &kp S &kp D &kp F &kp G  &kp H   &kp J  &kp K    &kp L   &kp SEMI &kp SQT
+                &kp LSHFT &kp Z    &kp X &kp C &kp V &kp B  &kp N   &kp M  &kp COMMA &kp DOT &kp SLASH &kp RET
+                &trans   &kp LCTL &kp LALT &kp LGUI &mo 1 &trans &kp SPACE &mo 2 &kp LEFT &kp DOWN &kp UP &kp RIGHT
+            >;
+        };
 
-		lower {
-			bindings = <
-				&kp LS(GRAVE) &kp LS(N1) &kp LS(N2) &kp LS(N3) &kp LS(N4) &kp LS(N5) &kp LS(N6) &kp LS(N7) &kp LS(N8) &kp LS(N9) &kp LS(N0) &kp DEL
-				&kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE
-				&trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp LS(HASH) &kp LS(BSLH) &kp HOME &kp END &trans
-				&trans &trans &trans &trans &trans &trans &trans &trans &kp C_NEXT &kp C_VOL_DN &kp C_VOL_UP &kp C_PP
-			>;
-		};
+        lower {
+            bindings = <
+                &kp LS(GRAVE) &kp LS(N1) &kp LS(N2) &kp LS(N3) &kp LS(N4) &kp LS(N5) &kp LS(N6) &kp LS(N7) &kp LS(N8) &kp LS(N9) &kp LS(N0) &kp DEL
+                &kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE
+                &trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp LS(HASH) &kp LS(BSLH) &kp HOME &kp END &trans
+                &trans &trans &trans &trans &trans &trans &trans &trans &kp C_NEXT &kp C_VOL_DN &kp C_VOL_UP &kp C_PP
+            >;
+        };
 
-		raise {
-			bindings = <
-				&kp GRAVE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC
-				&kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH
-				&trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp HASH &kp BSLH &kp PG_UP &kp PG_DN &trans
-				&sys_reset &bootloader &trans &trans &trans &trans &trans &trans &kp C_NEXT &kp C_VOL_DN &kp C_VOL_UP &kp C_PP
-			>;
-		};
-	};
+        raise {
+            bindings = <
+                &kp GRAVE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC
+                &kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH
+                &trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp HASH &kp BSLH &kp PG_UP &kp PG_DN &trans
+                &sys_reset &bootloader &trans &trans &trans &trans &trans &trans &kp C_NEXT &kp C_VOL_DN &kp C_VOL_UP &kp C_PP
+            >;
+        };
+    };
 };
diff --git a/app/boards/arm/preonic/Kconfig.board b/app/boards/arm/preonic/Kconfig.board
index a930b90f..39f35db6 100644
--- a/app/boards/arm/preonic/Kconfig.board
+++ b/app/boards/arm/preonic/Kconfig.board
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_PREONIC_REV3
-	bool "Preonic V3 Keyboard"
-	depends on SOC_STM32F303XC
+    bool "Preonic V3 Keyboard"
+    depends on SOC_STM32F303XC
diff --git a/app/boards/arm/proton_c/Kconfig.board b/app/boards/arm/proton_c/Kconfig.board
index ffa7ffd6..1596077f 100644
--- a/app/boards/arm/proton_c/Kconfig.board
+++ b/app/boards/arm/proton_c/Kconfig.board
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_QMK_PROTON_C
-	bool "QMK Proton-C"
-	depends on SOC_STM32F303XC
+    bool "QMK Proton-C"
+    depends on SOC_STM32F303XC
diff --git a/app/boards/arm/proton_c/Kconfig.defconfig b/app/boards/arm/proton_c/Kconfig.defconfig
index 78ccbabd..f5089119 100644
--- a/app/boards/arm/proton_c/Kconfig.defconfig
+++ b/app/boards/arm/proton_c/Kconfig.defconfig
@@ -6,9 +6,9 @@
 if BOARD_QMK_PROTON_C
 
 config BOARD
-	default "proton_c"
+    default "proton_c"
 
 config ZMK_USB
-	default y
+    default y
 
 endif # BOARD_QMK_PROTON_C
diff --git a/app/boards/arm/proton_c/arduino_pro_micro_pins.dtsi b/app/boards/arm/proton_c/arduino_pro_micro_pins.dtsi
index 9a026adf..18311942 100644
--- a/app/boards/arm/proton_c/arduino_pro_micro_pins.dtsi
+++ b/app/boards/arm/proton_c/arduino_pro_micro_pins.dtsi
@@ -5,50 +5,50 @@
  */
 
 / {
-	pro_micro: connector {
-		compatible = "arduino-pro-micro";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map
-			= <0 0 &gpioa 10 0>	/* D0 */
-			, <1 0 &gpioa 9 0>		/* D1 */
-			, <2 0 &gpiob 7 0>		/* D2 */
-			, <3 0 &gpiob 6 0>		/* D3 */
-			, <4 0 &gpiob 5 0>		/* D4/A6 */
-			, <5 0 &gpiob 4 0>		/* D5 */
-			, <6 0 &gpiob 3 0>		/* D6/A7 */
-			, <7 0 &gpiob 2 0>		/* D7 */
-			, <8 0 &gpiob 1 0>		/* D8/A8 */
-			, <9 0 &gpiob 0 0>		/* D9/A9 */
-			, <10 0 &gpiob 9 0>		/* D10/A10 */
-			, <16 0 &gpiob 15 0>	/* D16 */
-			, <14 0 &gpiob 14 0>	/* D14 */
-			, <15 0 &gpiob 13 0>	/* D15 */
-			, <18 0 &gpiob 8 0>	/* D18/A0 */
-			, <19 0 &gpioa 0 0>	/* D19/A1 */
-			, <20 0 &gpioa 1 0>	/* D20/A2 */
-			, <21 0 &gpioa 2 0>	/* D21/A3 */
-			;
-	};
+    pro_micro: connector {
+        compatible = "arduino-pro-micro";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map
+            = <0 0 &gpioa 10 0> /* D0 */
+            , <1 0 &gpioa 9 0>      /* D1 */
+            , <2 0 &gpiob 7 0>      /* D2 */
+            , <3 0 &gpiob 6 0>      /* D3 */
+            , <4 0 &gpiob 5 0>      /* D4/A6 */
+            , <5 0 &gpiob 4 0>      /* D5 */
+            , <6 0 &gpiob 3 0>      /* D6/A7 */
+            , <7 0 &gpiob 2 0>      /* D7 */
+            , <8 0 &gpiob 1 0>      /* D8/A8 */
+            , <9 0 &gpiob 0 0>      /* D9/A9 */
+            , <10 0 &gpiob 9 0>     /* D10/A10 */
+            , <16 0 &gpiob 15 0>    /* D16 */
+            , <14 0 &gpiob 14 0>    /* D14 */
+            , <15 0 &gpiob 13 0>    /* D15 */
+            , <18 0 &gpiob 8 0> /* D18/A0 */
+            , <19 0 &gpioa 0 0> /* D19/A1 */
+            , <20 0 &gpioa 1 0> /* D20/A2 */
+            , <21 0 &gpioa 2 0> /* D21/A3 */
+            ;
+    };
 
-	pro_micro_a: connector_a {
-		compatible = "arduino-pro-micro";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map
-			= <0 0 &gpiob 8 0>	/* D18/A0 */
-			, <1 0 &gpioa 0 0>	/* D19/A1 */
-			, <2 0 &gpioa 1 0>	/* D20/A2 */
-			, <3 0 &gpioa 2 0>	/* D21/A3 */
-			, <6 0 &gpiob 5 0>	/* D4/A6 */
-			, <7 0 &gpiob 3 0>	/* D6/A7 */
-			, <8 0 &gpiob 1 0>	/* D8/A8 */
-			, <9 0 &gpiob 0 0>	/* D9/A9 */
-			, <10 0 &gpiob 9 0>	/* D10/A10 */
-			;
-	};
+    pro_micro_a: connector_a {
+        compatible = "arduino-pro-micro";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map
+            = <0 0 &gpiob 8 0>  /* D18/A0 */
+            , <1 0 &gpioa 0 0>  /* D19/A1 */
+            , <2 0 &gpioa 1 0>  /* D20/A2 */
+            , <3 0 &gpioa 2 0>  /* D21/A3 */
+            , <6 0 &gpiob 5 0>  /* D4/A6 */
+            , <7 0 &gpiob 3 0>  /* D6/A7 */
+            , <8 0 &gpiob 1 0>  /* D8/A8 */
+            , <9 0 &gpiob 0 0>  /* D9/A9 */
+            , <10 0 &gpiob 9 0> /* D10/A10 */
+            ;
+    };
 };
 
 pro_micro_d: &pro_micro {};
diff --git a/app/boards/arm/proton_c/proton_c.dts b/app/boards/arm/proton_c/proton_c.dts
index df63427f..b5a490ee 100644
--- a/app/boards/arm/proton_c/proton_c.dts
+++ b/app/boards/arm/proton_c/proton_c.dts
@@ -10,91 +10,91 @@
 #include "arduino_pro_micro_pins.dtsi"
 
 / {
-	model = "QMK Proton C";
-	compatible = "qmk,proton_c", "st,stm32f303";
+    model = "QMK Proton C";
+    compatible = "qmk,proton_c", "st,stm32f303";
 
-	chosen {
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &cdc_acm_uart0;
-	};
+    chosen {
+        zephyr,sram = &sram0;
+        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart0;
+    };
 
-	aliases {
-		led0 = &led;
-	};
+    aliases {
+        led0 = &led;
+    };
 
-	leds {
-		compatible = "gpio-leds";
-		led: led_0 {
-			gpios = <&gpioc 13 GPIO_ACTIVE_HIGH>;
-			label = "User LED";
-		};
-	};
+    leds {
+        compatible = "gpio-leds";
+        led: led_0 {
+            gpios = <&gpioc 13 GPIO_ACTIVE_HIGH>;
+            label = "User LED";
+        };
+    };
 };
 
 &usart1 {
-	pinctrl-0 = <&usart1_tx_pa9 &usart1_rx_pa10>;
-	pinctrl-names = "default";
+    pinctrl-0 = <&usart1_tx_pa9 &usart1_rx_pa10>;
+    pinctrl-names = "default";
 };
 
 &spi2 {
-	pinctrl-0 = <&spi2_sck_pb13 &spi2_miso_pb14 &spi2_mosi_pb15>;
-	pinctrl-names = "default";
+    pinctrl-0 = <&spi2_sck_pb13 &spi2_miso_pb14 &spi2_mosi_pb15>;
+    pinctrl-names = "default";
 };
 
 &i2c1 {
-	pinctrl-0 = <&i2c1_scl_pb6 &i2c1_sda_pb7>;
-	pinctrl-names = "default";
+    pinctrl-0 = <&i2c1_scl_pb6 &i2c1_sda_pb7>;
+    pinctrl-names = "default";
 };
 
 &clk_hse {
-	status = "okay";
-	clock-frequency = <DT_FREQ_M(8)>;
+    status = "okay";
+    clock-frequency = <DT_FREQ_M(8)>;
 };
 
 &pll {
-	prediv = <1>;
-	mul = <9>;
-	clocks = <&clk_hse>;
-	status = "okay";
+    prediv = <1>;
+    mul = <9>;
+    clocks = <&clk_hse>;
+    status = "okay";
 };
 
 &rcc {
-	clocks = <&pll>;
-	clock-frequency = <DT_FREQ_M(72)>;
-	ahb-prescaler = <1>;
-	apb1-prescaler = <2>;
-	apb2-prescaler = <1>;
+    clocks = <&pll>;
+    clock-frequency = <DT_FREQ_M(72)>;
+    ahb-prescaler = <1>;
+    apb1-prescaler = <2>;
+    apb2-prescaler = <1>;
 };
 
 &usb {
-	pinctrl-0 = <&usb_dm_pa11 &usb_dp_pa12>;
-	pinctrl-names = "default";
-	status = "okay";
-	cdc_acm_uart0: cdc_acm_uart0 {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    pinctrl-0 = <&usb_dm_pa11 &usb_dp_pa12>;
+    pinctrl-names = "default";
+    status = "okay";
+    cdc_acm_uart0: cdc_acm_uart0 {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
 &rtc {
-	status = "okay";
+    status = "okay";
 };
 
 &flash0 {
-	/*
-	 * For more information, see:
-	 * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
-	 */
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
+    /*
+     * For more information, see:
+     * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
+     */
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
 
-		/* Set 6Kb of storage at the end of the 256Kb of flash */
-		storage_partition: partition@3e800 {
-			label = "storage";
-			reg = <0x0003e800 0x00001800>;
-		};
-	};
+        /* Set 6Kb of storage at the end of the 256Kb of flash */
+        storage_partition: partition@3e800 {
+            label = "storage";
+            reg = <0x0003e800 0x00001800>;
+        };
+    };
 };
diff --git a/app/boards/arm/puchi_ble/Kconfig.board b/app/boards/arm/puchi_ble/Kconfig.board
index 07638885..0f5b7f96 100644
--- a/app/boards/arm/puchi_ble/Kconfig.board
+++ b/app/boards/arm/puchi_ble/Kconfig.board
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_PUCHI_BLE_v1
-	bool "puchi_ble_v1"
-	depends on SOC_NRF52840_QIAA
+    bool "puchi_ble_v1"
+    depends on SOC_NRF52840_QIAA
diff --git a/app/boards/arm/puchi_ble/Kconfig.defconfig b/app/boards/arm/puchi_ble/Kconfig.defconfig
index 94d12c17..c4fca8e1 100644
--- a/app/boards/arm/puchi_ble/Kconfig.defconfig
+++ b/app/boards/arm/puchi_ble/Kconfig.defconfig
@@ -4,25 +4,25 @@
 if BOARD_PUCHI_BLE_v1
 
 config BOARD
-	default "puchi_ble"
+    default "puchi_ble"
 
 if USB_DEVICE_STACK
 
 config USB_NRFX
-	default y
+    default y
 
 endif # USB_DEVICE_STACK
 
 config BT_CTLR
-	default BT
+    default BT
 
 config ZMK_BLE
-	default y
+    default y
 
 config ZMK_USB
-	default y
+    default y
 
 config PINMUX
-	default y
+    default y
 
 endif # BOARD_PUCHI_BLE_v1
diff --git a/app/boards/arm/puchi_ble/arduino_pro_micro_pins.dtsi b/app/boards/arm/puchi_ble/arduino_pro_micro_pins.dtsi
index ed3317f1..3037ea3e 100644
--- a/app/boards/arm/puchi_ble/arduino_pro_micro_pins.dtsi
+++ b/app/boards/arm/puchi_ble/arduino_pro_micro_pins.dtsi
@@ -6,50 +6,50 @@
 
 
 / {
-	pro_micro: connector {
-		compatible = "arduino-pro-micro";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map
-			= <0 0 &gpio0 8 0>		/* D0 */
-			, <1 0 &gpio0 6 0>		/* D1 */
-			, <2 0 &gpio0 15 0>		/* D2 */
-			, <3 0 &gpio0 17 0>		/* D3 */
-			, <4 0 &gpio0 20 0>		/* D4/A6 */
-			, <5 0 &gpio0 13 0>		/* D5 */
-			, <6 0 &gpio0 24 0>		/* D6/A7 */
-			, <7 0 &gpio0 9 0>		/* D7 */
-			, <8 0 &gpio0 10 0>		/* D8/A8 */
-			, <9 0 &gpio1 6 0>		/* D9/A9 */
-			, <10 0 &gpio1 11 0>	/* D10/A10 */
-			, <16 0 &gpio0 28 0>	/* D16 */
-			, <14 0 &gpio0 3 0>	/* D14 */
-			, <15 0 &gpio1 13 0>	/* D15 */
-			, <18 0 &gpio0 2 0>	/* D18/A0 */
-			, <19 0 &gpio0 29 0>	/* D19/A1 */
-			, <20 0 &gpio0 31 0>	/* D20/A2 */
-			, <21 0 &gpio0 30 0>	/* D21/A3 */
-			;
-	};
+    pro_micro: connector {
+        compatible = "arduino-pro-micro";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map
+            = <0 0 &gpio0 8 0>      /* D0 */
+            , <1 0 &gpio0 6 0>      /* D1 */
+            , <2 0 &gpio0 15 0>     /* D2 */
+            , <3 0 &gpio0 17 0>     /* D3 */
+            , <4 0 &gpio0 20 0>     /* D4/A6 */
+            , <5 0 &gpio0 13 0>     /* D5 */
+            , <6 0 &gpio0 24 0>     /* D6/A7 */
+            , <7 0 &gpio0 9 0>      /* D7 */
+            , <8 0 &gpio0 10 0>     /* D8/A8 */
+            , <9 0 &gpio1 6 0>      /* D9/A9 */
+            , <10 0 &gpio1 11 0>    /* D10/A10 */
+            , <16 0 &gpio0 28 0>    /* D16 */
+            , <14 0 &gpio0 3 0> /* D14 */
+            , <15 0 &gpio1 13 0>    /* D15 */
+            , <18 0 &gpio0 2 0> /* D18/A0 */
+            , <19 0 &gpio0 29 0>    /* D19/A1 */
+            , <20 0 &gpio0 31 0>    /* D20/A2 */
+            , <21 0 &gpio0 30 0>    /* D21/A3 */
+            ;
+    };
 
-	pro_micro_a: connector_a {
-		compatible = "arduino-pro-micro";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map
-			= <0 0 &gpio0 2 0>	/* D18/A0 */
-			, <1 0 &gpio0 29 0>	/* D19/A1 */
-			, <2 0 &gpio0 31 0>	/* D20/A2 */
-			, <3 0 &gpio0 30 0>	/* D21/A3 */
-			, <6 0 &gpio0 20 0>	/* D4/A6 */
-			, <7 0 &gpio0 24 0>	/* D6/A7 */
-			, <8 0 &gpio0 10 0>	/* D8/A8 */
-			, <9 0 &gpio1 6 0>	/* D9/A9 */
-			, <10 0 &gpio1 11 0>	/* D10/A10 */
-			;
-	};
+    pro_micro_a: connector_a {
+        compatible = "arduino-pro-micro";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map
+            = <0 0 &gpio0 2 0>  /* D18/A0 */
+            , <1 0 &gpio0 29 0> /* D19/A1 */
+            , <2 0 &gpio0 31 0> /* D20/A2 */
+            , <3 0 &gpio0 30 0> /* D21/A3 */
+            , <6 0 &gpio0 20 0> /* D4/A6 */
+            , <7 0 &gpio0 24 0> /* D6/A7 */
+            , <8 0 &gpio0 10 0> /* D8/A8 */
+            , <9 0 &gpio1 6 0>  /* D9/A9 */
+            , <10 0 &gpio1 11 0>    /* D10/A10 */
+            ;
+    };
 };
 
 
diff --git a/app/boards/arm/puchi_ble/puchi_ble_v1-pinctrl.dtsi b/app/boards/arm/puchi_ble/puchi_ble_v1-pinctrl.dtsi
index a5385690..35a46e5a 100644
--- a/app/boards/arm/puchi_ble/puchi_ble_v1-pinctrl.dtsi
+++ b/app/boards/arm/puchi_ble/puchi_ble_v1-pinctrl.dtsi
@@ -4,36 +4,36 @@
  */
 
 &pinctrl {
-	uart0_default: uart0_default {
-		group1 {
-			psels = <NRF_PSEL(UART_RX, 0, 8)>;
-			bias-pull-up;
-		};
-		group2 {
-			psels = <NRF_PSEL(UART_TX, 0, 6)>;
-		};
-	};
+    uart0_default: uart0_default {
+        group1 {
+            psels = <NRF_PSEL(UART_RX, 0, 8)>;
+            bias-pull-up;
+        };
+        group2 {
+            psels = <NRF_PSEL(UART_TX, 0, 6)>;
+        };
+    };
 
-	uart0_sleep: uart0_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_RX, 0, 8)>,
-				<NRF_PSEL(UART_TX, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    uart0_sleep: uart0_sleep {
+        group1 {
+            psels = <NRF_PSEL(UART_RX, 0, 8)>,
+                <NRF_PSEL(UART_TX, 0, 6)>;
+            low-power-enable;
+        };
+    };
 
-	i2c0_default: i2c0_default {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 0, 15)>,
-				<NRF_PSEL(TWIM_SCL, 0, 17)>;
-		};
-	};
+    i2c0_default: i2c0_default {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 15)>,
+                <NRF_PSEL(TWIM_SCL, 0, 17)>;
+        };
+    };
 
-	i2c0_sleep: i2c0_sleep {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 0, 15)>,
-				<NRF_PSEL(TWIM_SCL, 0, 17)>;
-			low-power-enable;
-		};
-	};
+    i2c0_sleep: i2c0_sleep {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 15)>,
+                <NRF_PSEL(TWIM_SCL, 0, 17)>;
+            low-power-enable;
+        };
+    };
 };
diff --git a/app/boards/arm/puchi_ble/puchi_ble_v1.dts b/app/boards/arm/puchi_ble/puchi_ble_v1.dts
index a8f25c37..b056f711 100644
--- a/app/boards/arm/puchi_ble/puchi_ble_v1.dts
+++ b/app/boards/arm/puchi_ble/puchi_ble_v1.dts
@@ -10,115 +10,115 @@
 #include "puchi_ble_v1-pinctrl.dtsi"
 
 / {
-	model = "puchi_ble";
-	compatible = "puchi_ble";
+    model = "puchi_ble";
+    compatible = "puchi_ble";
 
-	chosen {
-		zephyr,code-partition = &code_partition;
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &cdc_acm_uart;
-		zmk,battery = &vbatt;
-	};
+    chosen {
+        zephyr,code-partition = &code_partition;
+        zephyr,sram = &sram0;
+        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
+        zmk,battery = &vbatt;
+    };
 
-	leds {
-		compatible = "gpio-leds";
-		blue_led: led_0 {
-			gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
-			label = "Blue LED";
-		};
-	};
+    leds {
+        compatible = "gpio-leds";
+        blue_led: led_0 {
+            gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
+        };
+    };
 
-	ext-power {
-		compatible = "zmk,ext-power-generic";
-		label = "EXT_POWER";
-		control-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
-	};
+    ext-power {
+        compatible = "zmk,ext-power-generic";
+        label = "EXT_POWER";
+        control-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+    };
 
-	vbatt: vbatt {
-		compatible = "zmk,battery-voltage-divider";
-		label = "BATTERY";
-		io-channels = <&adc 2>;
-		output-ohms = <2000000>;
-		full-ohms = <(2000000 + 820000)>;
-	};
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        label = "BATTERY";
+        io-channels = <&adc 2>;
+        output-ohms = <2000000>;
+        full-ohms = <(2000000 + 820000)>;
+    };
 };
 
 &adc {
-	status = "okay";
+    status = "okay";
 };
 
 &gpiote {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio0 {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio1 {
-	status = "okay";
+    status = "okay";
 };
 
 &i2c0 {
-	compatible = "nordic,nrf-twi";
-	pinctrl-0 = <&i2c0_default>;
-	pinctrl-1 = <&i2c0_sleep>;
-	pinctrl-names = "default", "sleep";
+    compatible = "nordic,nrf-twi";
+    pinctrl-0 = <&i2c0_default>;
+    pinctrl-1 = <&i2c0_sleep>;
+    pinctrl-names = "default", "sleep";
 };
 
 &uart0 {
-	compatible = "nordic,nrf-uarte";
-	pinctrl-0 = <&uart0_default>;
-	pinctrl-1 = <&uart0_sleep>;
-	pinctrl-names = "default", "sleep";
+    compatible = "nordic,nrf-uarte";
+    pinctrl-0 = <&uart0_default>;
+    pinctrl-1 = <&uart0_sleep>;
+    pinctrl-names = "default", "sleep";
 };
 
 &usbd {
-	status = "okay";
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
 
 &flash0 {
-	/*
-	 * For more information, see:
-	 * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
-	 */
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
+    /*
+     * For more information, see:
+     * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
+     */
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
 
-		sd_partition: partition@0 {
-			label = "softdevice";
-			reg = <0x00000000 0x00026000>;
-		};
-		code_partition: partition@26000 {
-			label = "code_partition";
-			reg = <0x00026000 0x000c6000>;
-		};
+        sd_partition: partition@0 {
+            label = "softdevice";
+            reg = <0x00000000 0x00026000>;
+        };
+        code_partition: partition@26000 {
+            label = "code_partition";
+            reg = <0x00026000 0x000c6000>;
+        };
 
-		/*
-		 * The flash starting at 0x000ec000 and ending at
-		 * 0x000f3fff is reserved for use by the application.
-		 */
+        /*
+         * The flash starting at 0x000ec000 and ending at
+         * 0x000f3fff is reserved for use by the application.
+         */
 
-		/*
-		 * Storage partition will be used by FCB/LittleFS/NVS
-		 * if enabled.
-		 */
-		storage_partition: partition@ec000 {
-			label = "storage";
-			reg = <0x000ec000 0x00008000>;
-		};
+        /*
+         * Storage partition will be used by FCB/LittleFS/NVS
+         * if enabled.
+         */
+        storage_partition: partition@ec000 {
+            label = "storage";
+            reg = <0x000ec000 0x00008000>;
+        };
 
-		boot_partition: partition@f4000 {
-			label = "adafruit_boot";
-			reg = <0x000f4000 0x0000c000>;
-		};
-	};
+        boot_partition: partition@f4000 {
+            label = "adafruit_boot";
+            reg = <0x000f4000 0x0000c000>;
+        };
+    };
 };
diff --git a/app/boards/arm/s40nc/Kconfig.board b/app/boards/arm/s40nc/Kconfig.board
index 673e3b24..e703d726 100644
--- a/app/boards/arm/s40nc/Kconfig.board
+++ b/app/boards/arm/s40nc/Kconfig.board
@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_S40NC
-	bool "S40NC"
-	depends on SOC_NRF52840_QIAA
+    bool "S40NC"
+    depends on SOC_NRF52840_QIAA
diff --git a/app/boards/arm/s40nc/Kconfig.defconfig b/app/boards/arm/s40nc/Kconfig.defconfig
index 266f8443..11e62cf5 100644
--- a/app/boards/arm/s40nc/Kconfig.defconfig
+++ b/app/boards/arm/s40nc/Kconfig.defconfig
@@ -4,25 +4,25 @@
 if BOARD_S40NC
 
 config ZMK_KEYBOARD_NAME
-	default "S40NC"
+    default "S40NC"
 
 if USB
 
 config USB_NRFX
-	default y
+    default y
 
 config USB_DEVICE_STACK
-	default y
+    default y
 
 endif # USB
 
 config BT_CTLR
-	default BT
+    default BT
 
 config ZMK_BLE
-	default y
+    default y
 
 config ZMK_USB
-	default y
+    default y
 
 endif # BOARD_S40NC
diff --git a/app/boards/arm/s40nc/s40nc.dts b/app/boards/arm/s40nc/s40nc.dts
index 5b588b45..6eb9e2a5 100644
--- a/app/boards/arm/s40nc/s40nc.dts
+++ b/app/boards/arm/s40nc/s40nc.dts
@@ -9,137 +9,137 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	model = "S40NC";
-	compatible = "s40nc";
+    model = "S40NC";
+    compatible = "s40nc";
 
-	chosen {
-		zephyr,code-partition = &code_partition;
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &cdc_acm_uart;
-		zmk,battery = &vbatt;
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zephyr,code-partition = &code_partition;
+        zephyr,sram = &sram0;
+        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
+        zmk,battery = &vbatt;
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <12>;
-		rows = <4>;
-		map = <
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <12>;
+        rows = <4>;
+        map = <
             RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11)
             RC(1,0)  RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9)         RC(1,11)
             RC(2,0)      RC(2,2)   RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)
             RC(3,0)  RC(3,1) RC(3,2)       RC(3,4)         RC(3,6)         RC(3,8) RC(3,9) RC(3,10) RC(3,11)
-		>;
-	};
+        >;
+    };
 
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&gpio1 4  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio1 6  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio0 9  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio0 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
-		col-gpios
-			= <&gpio1 2  GPIO_ACTIVE_HIGH>
-			, <&gpio1 1  GPIO_ACTIVE_HIGH>
-			, <&gpio1 3  GPIO_ACTIVE_HIGH>
-			, <&gpio1 0  GPIO_ACTIVE_HIGH>
-			, <&gpio0 22 GPIO_ACTIVE_HIGH>
-			, <&gpio1 15 GPIO_ACTIVE_HIGH>
-			, <&gpio0 3  GPIO_ACTIVE_HIGH>
-			, <&gpio0 2  GPIO_ACTIVE_HIGH>
-			, <&gpio0 28 GPIO_ACTIVE_HIGH>
-			, <&gpio0 29 GPIO_ACTIVE_HIGH>
-			, <&gpio0 30 GPIO_ACTIVE_HIGH>
-			, <&gpio0 31 GPIO_ACTIVE_HIGH>
-			;
-	};
+        diode-direction = "col2row";
+        row-gpios
+            = <&gpio1 4  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio1 6  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 9  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
+        col-gpios
+            = <&gpio1 2  GPIO_ACTIVE_HIGH>
+            , <&gpio1 1  GPIO_ACTIVE_HIGH>
+            , <&gpio1 3  GPIO_ACTIVE_HIGH>
+            , <&gpio1 0  GPIO_ACTIVE_HIGH>
+            , <&gpio0 22 GPIO_ACTIVE_HIGH>
+            , <&gpio1 15 GPIO_ACTIVE_HIGH>
+            , <&gpio0 3  GPIO_ACTIVE_HIGH>
+            , <&gpio0 2  GPIO_ACTIVE_HIGH>
+            , <&gpio0 28 GPIO_ACTIVE_HIGH>
+            , <&gpio0 29 GPIO_ACTIVE_HIGH>
+            , <&gpio0 30 GPIO_ACTIVE_HIGH>
+            , <&gpio0 31 GPIO_ACTIVE_HIGH>
+            ;
+    };
 
-	leds {
-		compatible = "gpio-leds";
-		blue_led: led_0 {
-			gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;
-			label = "Blue LED";
-		};
-	};
+    leds {
+        compatible = "gpio-leds";
+        blue_led: led_0 {
+            gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
+        };
+    };
 
-	vbatt: vbatt {
-		compatible = "zmk,battery-voltage-divider";
-		label = "BATTERY";
-		io-channels = <&adc 2>;
-		output-ohms = <2000000>;
-		full-ohms = <(2000000 + 820000)>;
-	};
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        label = "BATTERY";
+        io-channels = <&adc 2>;
+        output-ohms = <2000000>;
+        full-ohms = <(2000000 + 820000)>;
+    };
 };
 
 &adc {
-	status = "okay";
+    status = "okay";
 };
 
 &gpiote {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio0 {
-	status = "okay";
+    status = "okay";
 };
 
 &gpio1 {
-	status = "okay";
+    status = "okay";
 };
 
 &usbd {
-	status = "okay";
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
 &flash0 {
-	/*
-	 * For more information, see:
-	 * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
-	 */
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
+    /*
+     * For more information, see:
+     * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
+     */
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
 
-		sd_partition: partition@0 {
-			label = "mbr";
-			reg = <0x00000000 0x00001000>;
-		};
+        sd_partition: partition@0 {
+            label = "mbr";
+            reg = <0x00000000 0x00001000>;
+        };
 
-		code_partition: partition@1000 {
-			label = "code_partition";
-			reg = <0x00001000 0x000d3000>;
-		};
+        code_partition: partition@1000 {
+            label = "code_partition";
+            reg = <0x00001000 0x000d3000>;
+        };
 
-		/*
-		 * The flash starting at 0x000d4000 and ending at
-		 * 0x000f3fff is reserved for use by the application.
-		 */
+        /*
+         * The flash starting at 0x000d4000 and ending at
+         * 0x000f3fff is reserved for use by the application.
+         */
 
-		/*
-		 * Storage partition will be used by FCB/LittleFS/NVS
-		 * if enabled.
-		 */
-		storage_partition: partition@d4000 {
-			label = "storage";
-			reg = <0x000d4000 0x00020000>;
-		};
+        /*
+         * Storage partition will be used by FCB/LittleFS/NVS
+         * if enabled.
+         */
+        storage_partition: partition@d4000 {
+            label = "storage";
+            reg = <0x000d4000 0x00020000>;
+        };
 
-		boot_partition: partition@f4000 {
-			label = "adafruit_boot";
-			reg = <0x000f4000 0x0000c000>;
-		};
-	};
+        boot_partition: partition@f4000 {
+            label = "adafruit_boot";
+            reg = <0x000f4000 0x0000c000>;
+        };
+    };
 };
diff --git a/app/boards/arm/s40nc/s40nc.keymap b/app/boards/arm/s40nc/s40nc.keymap
index f0e60e7d..dfc352d7 100644
--- a/app/boards/arm/s40nc/s40nc.keymap
+++ b/app/boards/arm/s40nc/s40nc.keymap
@@ -15,44 +15,44 @@
 #define CONTROL 3
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
-			bindings = <
+        default_layer {
+            bindings = <
                 &kp ESC    &kp Q     &kp W     &kp E  &kp R     &kp T      &kp Y   &kp U  &kp I     &kp O     &kp P     &kp BSPC
                 &mo LOWER  &kp A     &kp S     &kp D  &kp F     &kp G      &kp H   &kp J  &kp K     &kp L               &kp ENTER
                 &kp LSHFT  &kp Z     &kp X     &kp C  &kp V     &kp B      &kp N   &kp M  &kp FSLH            &kp UP    &kp RSHFT
                 &kp LCTRL  &kp LGUI  &kp LALT  &lt LOWER SPACE  &lt CONTROL SPACE  &lt RAISE SPACE  &kp LEFT  &kp DOWN  &kp RIGHT
-			>;
-		};
+            >;
+        };
 
-		lower_layer {
-			bindings = <
+        lower_layer {
+            bindings = <
                 &kp GRAVE  &kp N1     &kp N2     &kp N3  &kp N4  &kp N5  &kp N6  &kp N7     &kp N8    &kp N9     &kp N0     &kp DEL
                 &kp PSCRN  &kp MINUS  &kp EQUAL  &trans  &trans  &trans  &trans  &kp LBKT   &kp RBKT  &kp SEMI              &kp APOS
                 &trans     &trans     &trans     &trans  &trans  &trans  &trans  &kp COMMA  &kp DOT              &kp PG_UP  &kp BSLH
                 &trans     &trans     &trans     &kp TAB         &kp TAB         &kp TAB              &kp HOME   &kp PG_DN  &kp END
-			>;
-		};
+            >;
+        };
 
         raise_layer {
-			bindings = <
+            bindings = <
                 &kp TILDE  &kp EXCL   &kp AT    &kp HASH  &kp DLLR  &kp PRCNT  &kp CARET  &kp AMPS  &kp STAR  &kp LPAR   &kp RPAR   &trans
                 &kp PSCRN  &kp UNDER  &kp PLUS  &trans    &trans    &trans     &trans     &kp LBRC  &kp RBRC  &kp COLON             &kp DQT
                 &trans     &trans     &trans    &trans    &trans    &trans     &trans     &kp LT    &kp GT               &kp PG_UP  &kp PIPE
                 &trans     &trans     &trans    &kp TAB             &kp TAB               &kp TAB             &kp HOME   &kp PG_DN  &kp END
-			>;
-		};
+            >;
+        };
 
         control_layer {
-			bindings = <
+            bindings = <
                 &bt BT_CLR    &kp F1        &kp F2           &kp F3      &kp F4    &kp F5  &kp F6  &kp F7     &kp F8   &kp F9        &kp F10       &kp C_PP
                 &bt BT_SEL 0  &kp F11       &kp F12          &trans      &trans    &trans  &trans  &trans     &trans   &trans                      &kp K_LOCK
                 &bt BT_SEL 1  &out OUT_USB  &kp CAPS         &kp KP_NUM  &kp SLCK  &trans  &trans  &kp COMMA  &kp DOT                &kp K_VOL_UP  &kp K_MUTE
                 &bt BT_SEL 2  &out OUT_BLE  &kp PAUSE_BREAK  &sys_reset                &trans          &bootloader         &kp C_BRI_DN  &kp K_VOL_DN  &kp C_BRI_UP
-			>;
-		};
-	};
+            >;
+        };
+    };
 };
 
diff --git a/app/boards/native_posix.overlay b/app/boards/native_posix.overlay
index 2c1ed79d..f8a8f700 100644
--- a/app/boards/native_posix.overlay
+++ b/app/boards/native_posix.overlay
@@ -3,16 +3,16 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	chosen {
-		zmk,kscan = &kscan;
-	};
+    chosen {
+        zmk,kscan = &kscan;
+    };
 
-	kscan: kscan {
-		compatible = "zmk,kscan-mock";
-		label = "KSCAN_MOCK";
+    kscan: kscan {
+        compatible = "zmk,kscan-mock";
+        label = "KSCAN_MOCK";
 
-		rows = <2>;
-		columns = <2>;
-		exit-after;
-	};
+        rows = <2>;
+        columns = <2>;
+        exit-after;
+    };
 };
diff --git a/app/boards/native_posix_64.overlay b/app/boards/native_posix_64.overlay
index 2c1ed79d..f8a8f700 100644
--- a/app/boards/native_posix_64.overlay
+++ b/app/boards/native_posix_64.overlay
@@ -3,16 +3,16 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	chosen {
-		zmk,kscan = &kscan;
-	};
+    chosen {
+        zmk,kscan = &kscan;
+    };
 
-	kscan: kscan {
-		compatible = "zmk,kscan-mock";
-		label = "KSCAN_MOCK";
+    kscan: kscan {
+        compatible = "zmk,kscan-mock";
+        label = "KSCAN_MOCK";
 
-		rows = <2>;
-		columns = <2>;
-		exit-after;
-	};
+        rows = <2>;
+        columns = <2>;
+        exit-after;
+    };
 };
diff --git a/app/boards/seeeduino_xiao.overlay b/app/boards/seeeduino_xiao.overlay
index 70080286..a2ddaea4 100644
--- a/app/boards/seeeduino_xiao.overlay
+++ b/app/boards/seeeduino_xiao.overlay
@@ -5,15 +5,15 @@
  */
 
 / {
-	chosen {
-		zephyr,console = &cdc_acm_uart;
-	};
+    chosen {
+        zephyr,console = &cdc_acm_uart;
+    };
 };
 
 &usb0 {
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
diff --git a/app/boards/seeeduino_xiao_ble.overlay b/app/boards/seeeduino_xiao_ble.overlay
index 452786d1..51671a80 100644
--- a/app/boards/seeeduino_xiao_ble.overlay
+++ b/app/boards/seeeduino_xiao_ble.overlay
@@ -6,29 +6,29 @@
 
 
 / {
-	chosen {
-		zephyr,console = &cdc_acm_uart;
-		zmk,battery = &vbatt;
-	};
+    chosen {
+        zephyr,console = &cdc_acm_uart;
+        zmk,battery = &vbatt;
+    };
 
-	vbatt: vbatt {
-		compatible = "zmk,battery-voltage-divider";
-		label = "BATTERY";
-		io-channels = <&adc 7>;
-		power-gpios = <&gpio0 14 (GPIO_OPEN_DRAIN | GPIO_ACTIVE_LOW)>;
-		output-ohms = <510000>;
-		full-ohms = <(1000000 + 510000)>;
-	};
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        label = "BATTERY";
+        io-channels = <&adc 7>;
+        power-gpios = <&gpio0 14 (GPIO_OPEN_DRAIN | GPIO_ACTIVE_LOW)>;
+        output-ohms = <510000>;
+        full-ohms = <(1000000 + 510000)>;
+    };
 };
 
 &adc {
-	status = "okay";
+    status = "okay";
 };
 
 &usbd {
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
diff --git a/app/boards/shields/Kconfig.defconfig b/app/boards/shields/Kconfig.defconfig
index 5b9ca9a1..58dd45d6 100644
--- a/app/boards/shields/Kconfig.defconfig
+++ b/app/boards/shields/Kconfig.defconfig
@@ -2,13 +2,13 @@
 
 
 config ZMK_KEYBOARD_NAME
-	default "cradios"
+    default "cradios"
 
 # Unable to use interrupts as the same pin number is used
 # across A & B controllers, and STM32F303CCT6 can't enable
 # interrutps for multiple controllers for the same "line"
 # for the external interrupts.
 config ZMK_KSCAN_GPIO_POLLING
-	default y
+    default y
 
 
diff --git a/app/boards/shields/Kconfig.shield b/app/boards/shields/Kconfig.shield
index 844d4332..cab78898 100644
--- a/app/boards/shields/Kconfig.shield
+++ b/app/boards/shields/Kconfig.shield
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_CRADIOS
-	def_bool $(shields_list_contains,cradios)
+    def_bool $(shields_list_contains,cradios)
diff --git a/app/boards/shields/a_dux/Kconfig.defconfig b/app/boards/shields/a_dux/Kconfig.defconfig
index 53cd1986..2dc40dbe 100644
--- a/app/boards/shields/a_dux/Kconfig.defconfig
+++ b/app/boards/shields/a_dux/Kconfig.defconfig
@@ -4,16 +4,16 @@
 if SHIELD_A_DUX_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "A. Dux"
+    default "A. Dux"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_A_DUX_LEFT || SHIELD_A_DUX_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 endif
diff --git a/app/boards/shields/a_dux/Kconfig.shield b/app/boards/shields/a_dux/Kconfig.shield
index 6058f290..928f432c 100644
--- a/app/boards/shields/a_dux/Kconfig.shield
+++ b/app/boards/shields/a_dux/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_A_DUX_LEFT
-	def_bool $(shields_list_contains,a_dux_left)
+    def_bool $(shields_list_contains,a_dux_left)
 
 config SHIELD_A_DUX_RIGHT
-	def_bool $(shields_list_contains,a_dux_right)
+    def_bool $(shields_list_contains,a_dux_right)
diff --git a/app/boards/shields/a_dux/a_dux.dtsi b/app/boards/shields/a_dux/a_dux.dtsi
index 4840227c..28156f42 100644
--- a/app/boards/shields/a_dux/a_dux.dtsi
+++ b/app/boards/shields/a_dux/a_dux.dtsi
@@ -8,45 +8,45 @@
 
 / {
 
-	chosen {
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <34>;
-		rows = <1>;
-		map = <
-			RC(0,0)  RC(0,1)  RC(0,2)  RC(0,3)  RC(0,4)    RC(0,21) RC(0,20) RC(0,19) RC(0,18) RC(0,17)
-			RC(0,5)  RC(0,6)  RC(0,7)  RC(0,8)  RC(0,9)    RC(0,26) RC(0,25) RC(0,24) RC(0,23) RC(0,22)
-			RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14)   RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27)
-			                           RC(0,15) RC(0,16)   RC(0,33) RC(0,32)
-		>;
-	};
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <34>;
+        rows = <1>;
+        map = <
+            RC(0,0)  RC(0,1)  RC(0,2)  RC(0,3)  RC(0,4)    RC(0,21) RC(0,20) RC(0,19) RC(0,18) RC(0,17)
+            RC(0,5)  RC(0,6)  RC(0,7)  RC(0,8)  RC(0,9)    RC(0,26) RC(0,25) RC(0,24) RC(0,23) RC(0,22)
+            RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14)   RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27)
+                                       RC(0,15) RC(0,16)   RC(0,33) RC(0,32)
+        >;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-direct";
-		label = "KSCAN";
-		input-gpios =
-			<&pro_micro  5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-			<&pro_micro  0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-			<&pro_micro 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-			<&pro_micro 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-			<&pro_micro 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-			<&pro_micro  6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-			<&pro_micro  3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-			<&pro_micro 19 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-			<&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-			<&pro_micro 20 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-			<&pro_micro  7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-			<&pro_micro  4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-			<&pro_micro  1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-			<&pro_micro 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-			<&pro_micro 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-			<&pro_micro  8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
-			<&pro_micro  9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		;
-	};
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-direct";
+        label = "KSCAN";
+        input-gpios =
+            <&pro_micro  5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+            <&pro_micro  0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+            <&pro_micro 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+            <&pro_micro 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+            <&pro_micro 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+            <&pro_micro  6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+            <&pro_micro  3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+            <&pro_micro 19 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+            <&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+            <&pro_micro 20 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+            <&pro_micro  7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+            <&pro_micro  4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+            <&pro_micro  1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+            <&pro_micro 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+            <&pro_micro 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+            <&pro_micro  8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+            <&pro_micro  9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        ;
+    };
 
 };
diff --git a/app/boards/shields/a_dux/a_dux.keymap b/app/boards/shields/a_dux/a_dux.keymap
index eda03ff9..0f162a33 100644
--- a/app/boards/shields/a_dux/a_dux.keymap
+++ b/app/boards/shields/a_dux/a_dux.keymap
@@ -9,18 +9,18 @@
 
 / {
 
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		// This is a sample keymap intended to be replaced with your own
-		base_layer {
-			bindings = <
-				&kp Q     &kp W     &kp E     &kp R     &kp T     &kp Y     &kp U     &kp I     &kp O     &kp P
-				&kp A     &kp S     &kp D     &kp F     &kp G     &kp H     &kp J     &kp K     &kp L     &kp SEMI
-				&kp Z     &kp X     &kp C     &kp V     &kp B     &kp N     &kp M     &kp COMMA &kp DOT   &kp SLASH
-				                              &kp TAB   &kp BSPC  &kp SPACE &kp ENTER
-			>;
-		};
+        // This is a sample keymap intended to be replaced with your own
+        base_layer {
+            bindings = <
+                &kp Q     &kp W     &kp E     &kp R     &kp T     &kp Y     &kp U     &kp I     &kp O     &kp P
+                &kp A     &kp S     &kp D     &kp F     &kp G     &kp H     &kp J     &kp K     &kp L     &kp SEMI
+                &kp Z     &kp X     &kp C     &kp V     &kp B     &kp N     &kp M     &kp COMMA &kp DOT   &kp SLASH
+                                              &kp TAB   &kp BSPC  &kp SPACE &kp ENTER
+            >;
+        };
 
-	};
+    };
 };
diff --git a/app/boards/shields/a_dux/a_dux_right.overlay b/app/boards/shields/a_dux/a_dux_right.overlay
index 0034317e..d4aed65c 100644
--- a/app/boards/shields/a_dux/a_dux_right.overlay
+++ b/app/boards/shields/a_dux/a_dux_right.overlay
@@ -7,5 +7,5 @@
 #include "a_dux.dtsi"
 
 &default_transform {
-	col-offset = <17>;
+    col-offset = <17>;
 };
diff --git a/app/boards/shields/bfo9000/Kconfig.defconfig b/app/boards/shields/bfo9000/Kconfig.defconfig
index 7e9ccf9c..7e41b04a 100644
--- a/app/boards/shields/bfo9000/Kconfig.defconfig
+++ b/app/boards/shields/bfo9000/Kconfig.defconfig
@@ -4,16 +4,16 @@
 if SHIELD_BFO9000_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "BFO-9000"
+    default "BFO-9000"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_BFO9000_LEFT || SHIELD_BFO9000_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 endif
\ No newline at end of file
diff --git a/app/boards/shields/bfo9000/Kconfig.shield b/app/boards/shields/bfo9000/Kconfig.shield
index 4750e43a..5746abbe 100644
--- a/app/boards/shields/bfo9000/Kconfig.shield
+++ b/app/boards/shields/bfo9000/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_BFO9000_LEFT
-	def_bool $(shields_list_contains,bfo9000_left)
+    def_bool $(shields_list_contains,bfo9000_left)
 
 config SHIELD_BFO9000_RIGHT
-	def_bool $(shields_list_contains,bfo9000_right)
+    def_bool $(shields_list_contains,bfo9000_right)
diff --git a/app/boards/shields/bfo9000/bfo9000.dtsi b/app/boards/shields/bfo9000/bfo9000.dtsi
index 0ceb9127..c5547920 100644
--- a/app/boards/shields/bfo9000/bfo9000.dtsi
+++ b/app/boards/shields/bfo9000/bfo9000.dtsi
@@ -7,38 +7,38 @@
 #include <dt-bindings/zmk/matrix-transform.h>
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <18>;
-		rows = <6>;
-		map = <
-		RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,15) RC(0,16) RC(0,17)
-		RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13) RC(1,14) RC(1,15) RC(1,16) RC(1,17)
-		RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13) RC(2,14) RC(2,15) RC(2,16) RC(2,17)
-		RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12) RC(3,13) RC(3,14) RC(3,15) RC(3,16) RC(3,17)
-		RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC(4,8) RC(4,9) RC(4,10) RC(4,11) RC(4,12) RC(4,13) RC(4,14) RC(4,15) RC(4,16) RC(4,17)
-		RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(5,5) RC(5,6) RC(5,7) RC(5,8) RC(5,9) RC(5,10) RC(5,11) RC(5,12) RC(5,13) RC(5,14) RC(5,15) RC(5,16) RC(5,17)
-		>;
-	};
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <18>;
+        rows = <6>;
+        map = <
+        RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,15) RC(0,16) RC(0,17)
+        RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13) RC(1,14) RC(1,15) RC(1,16) RC(1,17)
+        RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13) RC(2,14) RC(2,15) RC(2,16) RC(2,17)
+        RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12) RC(3,13) RC(3,14) RC(3,15) RC(3,16) RC(3,17)
+        RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC(4,8) RC(4,9) RC(4,10) RC(4,11) RC(4,12) RC(4,13) RC(4,14) RC(4,15) RC(4,16) RC(4,17)
+        RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(5,5) RC(5,6) RC(5,7) RC(5,8) RC(5,9) RC(5,10) RC(5,11) RC(5,12) RC(5,13) RC(5,14) RC(5,15) RC(5,16) RC(5,17)
+        >;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&pro_micro 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
+        diode-direction = "col2row";
+        row-gpios
+            = <&pro_micro 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
 
-	};
+    };
 };
\ No newline at end of file
diff --git a/app/boards/shields/bfo9000/bfo9000.keymap b/app/boards/shields/bfo9000/bfo9000.keymap
index 22186a1d..18a2085c 100644
--- a/app/boards/shields/bfo9000/bfo9000.keymap
+++ b/app/boards/shields/bfo9000/bfo9000.keymap
@@ -15,41 +15,41 @@
 #define LOWER   1
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
-			// | Esc   | Vol Up | Esc   | F1   | F2  | F3  | F4  | F5  | F6    | F5     | F6  | F7  | F8  | F9  | F10  | F11   | F12   | Del    |
-			// | Home  | Vol Dn | `     | 1    | 2   | 3   | 4   | 5   | 6     | 5      | 6   | 7   | 8   | 9   | 0    | -     | =     | Bk Spc |
-			// | End   | Tab    | Tab   | Q    | W   | E   | R   | T   | Y     | T      | Y   | U   | I   | O   | P    | [     | ]     | \      |
-			// | Pg Up | Caps   | Ctrl  | A    | S   | D   | F   | G   | H     | G      | H   | J   | K   | L   | ;    | '     | Enter | Enter  |
-			// | Pg Dn | Up     | Shift | Z    | X   | C   | V   | B   | N     | B      | N   | M   | ,   | .   | /    | Shift | Up    |        |
-			// | Left  | Dn     | Right | Ctrl | Alt | Win | Spc | Spc | Enter | Bk Spc | Spc | Spc | Win | Alt | Ctrl | Left  | Dn    | Right  |
-			bindings = <
-			&kp ESC   &kp C_VOL_UP &kp ESC   &kp F1    &kp F2   &kp F3    &kp F4    &kp F5    &kp F6    &kp F5     &kp F6    &kp F7    &kp F8    &kp F9   &kp F10   &kp F11   &kp F12   &kp DEL
-			&kp HOME  &kp C_VOL_DN &kp GRAVE &kp N1    &kp N2   &kp N3    &kp N4    &kp N5    &kp N6    &kp N5     &kp N6    &kp N7    &kp N8    &kp N9   &kp N0    &kp MINUS &kp EQUAL &kp BSPC
-			&kp END   &kp TAB      &kp TAB   &kp Q     &kp W    &kp E     &kp R     &kp T     &kp Y     &kp T      &kp Y     &kp U     &kp I     &kp O    &kp P     &kp LBKT  &kp RBKT  &kp BSLH
-			&kp PG_UP &kp CAPS     &kp LCTRL &kp A     &kp S    &kp D     &kp F     &kp G     &kp H     &kp G      &kp H     &kp J     &kp K     &kp L    &kp SEMI  &kp APOS  &kp ENTER &kp ENTER
-			&kp PG_DN &kp UP       &kp LSHFT &kp Z     &kp X    &kp C     &kp V     &kp B     &kp N     &kp B      &kp N     &kp M     &kp COMMA &kp DOT  &kp SLASH &kp RSHFT &kp UP    &mo LOWER
-			&kp LEFT  &kp DOWN     &kp RIGHT &kp LCTRL &kp LALT &kp LMETA &kp SPACE &kp SPACE &kp ENTER &kp BSPC   &kp SPACE &kp SPACE &kp RMETA &kp RALT &kp RCTRL &kp LEFT  &kp DOWN  &kp RIGHT
-			>;
-		};
+        default_layer {
+            // | Esc   | Vol Up | Esc   | F1   | F2  | F3  | F4  | F5  | F6    | F5     | F6  | F7  | F8  | F9  | F10  | F11   | F12   | Del    |
+            // | Home  | Vol Dn | `     | 1    | 2   | 3   | 4   | 5   | 6     | 5      | 6   | 7   | 8   | 9   | 0    | -     | =     | Bk Spc |
+            // | End   | Tab    | Tab   | Q    | W   | E   | R   | T   | Y     | T      | Y   | U   | I   | O   | P    | [     | ]     | \      |
+            // | Pg Up | Caps   | Ctrl  | A    | S   | D   | F   | G   | H     | G      | H   | J   | K   | L   | ;    | '     | Enter | Enter  |
+            // | Pg Dn | Up     | Shift | Z    | X   | C   | V   | B   | N     | B      | N   | M   | ,   | .   | /    | Shift | Up    |        |
+            // | Left  | Dn     | Right | Ctrl | Alt | Win | Spc | Spc | Enter | Bk Spc | Spc | Spc | Win | Alt | Ctrl | Left  | Dn    | Right  |
+            bindings = <
+            &kp ESC   &kp C_VOL_UP &kp ESC   &kp F1    &kp F2   &kp F3    &kp F4    &kp F5    &kp F6    &kp F5     &kp F6    &kp F7    &kp F8    &kp F9   &kp F10   &kp F11   &kp F12   &kp DEL
+            &kp HOME  &kp C_VOL_DN &kp GRAVE &kp N1    &kp N2   &kp N3    &kp N4    &kp N5    &kp N6    &kp N5     &kp N6    &kp N7    &kp N8    &kp N9   &kp N0    &kp MINUS &kp EQUAL &kp BSPC
+            &kp END   &kp TAB      &kp TAB   &kp Q     &kp W    &kp E     &kp R     &kp T     &kp Y     &kp T      &kp Y     &kp U     &kp I     &kp O    &kp P     &kp LBKT  &kp RBKT  &kp BSLH
+            &kp PG_UP &kp CAPS     &kp LCTRL &kp A     &kp S    &kp D     &kp F     &kp G     &kp H     &kp G      &kp H     &kp J     &kp K     &kp L    &kp SEMI  &kp APOS  &kp ENTER &kp ENTER
+            &kp PG_DN &kp UP       &kp LSHFT &kp Z     &kp X    &kp C     &kp V     &kp B     &kp N     &kp B      &kp N     &kp M     &kp COMMA &kp DOT  &kp SLASH &kp RSHFT &kp UP    &mo LOWER
+            &kp LEFT  &kp DOWN     &kp RIGHT &kp LCTRL &kp LALT &kp LMETA &kp SPACE &kp SPACE &kp ENTER &kp BSPC   &kp SPACE &kp SPACE &kp RMETA &kp RALT &kp RCTRL &kp LEFT  &kp DOWN  &kp RIGHT
+            >;
+        };
 
-		lower_layer {
-			// | | | | | | | | | | | | | | | | | | |
-			// | | | | | | | | | | | | | | | | | | |
-			// | | | | | | | | | | | | | | | | | | |
-			// | | | | | | | | | | | | | | | | | | |
-			// | | | | | | | | | | | | | | | | | | |
-			// | | | | | | | | | | | | | | | | | | |
-			bindings = <
-			&bt BT_CLR       &bt BT_SEL 0      &bt BT_SEL 1    &bt BT_SEL 2    &bt BT_SEL 3    &bt BT_SEL 4    &bt BT_SEL 5 &bt BT_SEL 6 &bt BT_SEL 7 &bt BT_CLR       &bt BT_SEL 0      &bt BT_SEL 1    &bt BT_SEL 2    &bt BT_SEL 3    &bt BT_SEL 4    &bt BT_SEL 5 &bt BT_SEL 6 &bt BT_SEL 7
-			&out OUT_USB     &out OUT_BLE      &trans          &trans          &trans          &trans          &trans       &trans       &trans       &out OUT_USB     &out OUT_BLE      &trans          &trans          &trans          &trans          &trans       &trans       &trans
-			&ext_power EP_ON &ext_power EP_OFF &trans          &trans          &trans          &trans          &trans       &trans       &trans       &ext_power EP_ON &ext_power EP_OFF &trans          &trans          &trans          &trans          &trans       &trans       &trans
-			&sys_reset           &bootloader       &trans          &trans          &trans          &trans          &trans       &trans       &trans       &sys_reset           &bootloader       &trans          &trans          &trans          &trans          &trans       &trans       &trans
-			&rgb_ug RGB_TOG  &rgb_ug RGB_HUI   &rgb_ug RGB_SAI &rgb_ug RGB_BRI &rgb_ug RGB_SPI &rgb_ug RGB_EFF &trans       &trans       &trans       &rgb_ug RGB_TOG  &rgb_ug RGB_HUI   &rgb_ug RGB_SAI &rgb_ug RGB_BRI &rgb_ug RGB_SPI &rgb_ug RGB_EFF &trans       &trans       &trans
-			&trans           &rgb_ug RGB_HUD   &rgb_ug RGB_SAD &rgb_ug RGB_BRD &rgb_ug RGB_SPD &rgb_ug RGB_EFR &trans       &trans       &trans       &trans           &rgb_ug RGB_HUD   &rgb_ug RGB_SAD &rgb_ug RGB_BRD &rgb_ug RGB_SPD &rgb_ug RGB_EFR &trans       &trans       &trans
-			>;
-		};
-	};
+        lower_layer {
+            // | | | | | | | | | | | | | | | | | | |
+            // | | | | | | | | | | | | | | | | | | |
+            // | | | | | | | | | | | | | | | | | | |
+            // | | | | | | | | | | | | | | | | | | |
+            // | | | | | | | | | | | | | | | | | | |
+            // | | | | | | | | | | | | | | | | | | |
+            bindings = <
+            &bt BT_CLR       &bt BT_SEL 0      &bt BT_SEL 1    &bt BT_SEL 2    &bt BT_SEL 3    &bt BT_SEL 4    &bt BT_SEL 5 &bt BT_SEL 6 &bt BT_SEL 7 &bt BT_CLR       &bt BT_SEL 0      &bt BT_SEL 1    &bt BT_SEL 2    &bt BT_SEL 3    &bt BT_SEL 4    &bt BT_SEL 5 &bt BT_SEL 6 &bt BT_SEL 7
+            &out OUT_USB     &out OUT_BLE      &trans          &trans          &trans          &trans          &trans       &trans       &trans       &out OUT_USB     &out OUT_BLE      &trans          &trans          &trans          &trans          &trans       &trans       &trans
+            &ext_power EP_ON &ext_power EP_OFF &trans          &trans          &trans          &trans          &trans       &trans       &trans       &ext_power EP_ON &ext_power EP_OFF &trans          &trans          &trans          &trans          &trans       &trans       &trans
+            &sys_reset           &bootloader       &trans          &trans          &trans          &trans          &trans       &trans       &trans       &sys_reset           &bootloader       &trans          &trans          &trans          &trans          &trans       &trans       &trans
+            &rgb_ug RGB_TOG  &rgb_ug RGB_HUI   &rgb_ug RGB_SAI &rgb_ug RGB_BRI &rgb_ug RGB_SPI &rgb_ug RGB_EFF &trans       &trans       &trans       &rgb_ug RGB_TOG  &rgb_ug RGB_HUI   &rgb_ug RGB_SAI &rgb_ug RGB_BRI &rgb_ug RGB_SPI &rgb_ug RGB_EFF &trans       &trans       &trans
+            &trans           &rgb_ug RGB_HUD   &rgb_ug RGB_SAD &rgb_ug RGB_BRD &rgb_ug RGB_SPD &rgb_ug RGB_EFR &trans       &trans       &trans       &trans           &rgb_ug RGB_HUD   &rgb_ug RGB_SAD &rgb_ug RGB_BRD &rgb_ug RGB_SPD &rgb_ug RGB_EFR &trans       &trans       &trans
+            >;
+        };
+    };
 };
diff --git a/app/boards/shields/bfo9000/bfo9000_left.overlay b/app/boards/shields/bfo9000/bfo9000_left.overlay
index 3f034d95..9e921053 100644
--- a/app/boards/shields/bfo9000/bfo9000_left.overlay
+++ b/app/boards/shields/bfo9000/bfo9000_left.overlay
@@ -7,15 +7,15 @@
 #include "bfo9000.dtsi"
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 9 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 20 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 21 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 9 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 21 GPIO_ACTIVE_HIGH>
+        ;
 };
diff --git a/app/boards/shields/bfo9000/bfo9000_right.overlay b/app/boards/shields/bfo9000/bfo9000_right.overlay
index 30bd35e2..897c6b0b 100644
--- a/app/boards/shields/bfo9000/bfo9000_right.overlay
+++ b/app/boards/shields/bfo9000/bfo9000_right.overlay
@@ -7,19 +7,19 @@
 #include "bfo9000.dtsi"
 
 &default_transform {
-	col-offset = <9>;
+    col-offset = <9>;
 };
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 9 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 20 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 21 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 9 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 21 GPIO_ACTIVE_HIGH>
+        ;
 };
diff --git a/app/boards/shields/boardsource3x4/Kconfig.shield b/app/boards/shields/boardsource3x4/Kconfig.shield
index cda55d07..7f574cea 100644
--- a/app/boards/shields/boardsource3x4/Kconfig.shield
+++ b/app/boards/shields/boardsource3x4/Kconfig.shield
@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_BOARDSOURCE3X4
-	def_bool $(shields_list_contains,boardsource3x4)
+    def_bool $(shields_list_contains,boardsource3x4)
 
diff --git a/app/boards/shields/chalice/boards/nice_nano.overlay b/app/boards/shields/chalice/boards/nice_nano.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/chalice/boards/nice_nano.overlay
+++ b/app/boards/shields/chalice/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/chalice/boards/nice_nano_v2.overlay b/app/boards/shields/chalice/boards/nice_nano_v2.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/chalice/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/chalice/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/clog/Kconfig.defconfig b/app/boards/shields/clog/Kconfig.defconfig
index 1ca779f3..53ded4d7 100644
--- a/app/boards/shields/clog/Kconfig.defconfig
+++ b/app/boards/shields/clog/Kconfig.defconfig
@@ -4,16 +4,16 @@
 if SHIELD_CLOG_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Clog"
+    default "Clog"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_CLOG_LEFT || SHIELD_CLOG_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 endif
diff --git a/app/boards/shields/clog/Kconfig.shield b/app/boards/shields/clog/Kconfig.shield
index 2301af94..69ecef8d 100644
--- a/app/boards/shields/clog/Kconfig.shield
+++ b/app/boards/shields/clog/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_CLOG_LEFT
-	def_bool $(shields_list_contains,clog_left)
+    def_bool $(shields_list_contains,clog_left)
 
 config SHIELD_CLOG_RIGHT
-	def_bool $(shields_list_contains,clog_right)
+    def_bool $(shields_list_contains,clog_right)
diff --git a/app/boards/shields/clog/clog.dtsi b/app/boards/shields/clog/clog.dtsi
index ccad150c..40e9a39f 100644
--- a/app/boards/shields/clog/clog.dtsi
+++ b/app/boards/shields/clog/clog.dtsi
@@ -8,44 +8,44 @@
 
 / {
     chosen {
-	    zmk,kscan = &kscan0;
-	    zmk,matrix_transform = &default_transform;
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
     };
 
     default_transform: keymap_transform_0 {
-	    compatible = "zmk,matrix-transform";
-	    columns = <34>;
-	    rows = <1>;
-	    map = <
-	                     RC(0,0)  RC(0,1)  RC(0,2)  RC(0,3)     RC(0,20) RC(0,19) RC(0,18) RC(0,17)
-	    RC(0,4) RC(0,5)  RC(0,6)  RC(0,7)  RC(0,8)  RC(0,9)     RC(0,26) RC(0,25) RC(0,24) RC(0,23) RC(0,22) RC(0,21)
-	            RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14)    RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27)
-	                                       RC(0,15) RC(0,16)    RC(0,33) RC(0,32)
-	    >;
+        compatible = "zmk,matrix-transform";
+        columns = <34>;
+        rows = <1>;
+        map = <
+                         RC(0,0)  RC(0,1)  RC(0,2)  RC(0,3)     RC(0,20) RC(0,19) RC(0,18) RC(0,17)
+        RC(0,4) RC(0,5)  RC(0,6)  RC(0,7)  RC(0,8)  RC(0,9)     RC(0,26) RC(0,25) RC(0,24) RC(0,23) RC(0,22) RC(0,21)
+                RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14)    RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27)
+                                           RC(0,15) RC(0,16)    RC(0,33) RC(0,32)
+        >;
     };
 
     kscan0: kscan {
-	    compatible = "zmk,kscan-gpio-direct";
-	    label = "KSCAN";
+        compatible = "zmk,kscan-gpio-direct";
+        label = "KSCAN";
 
-	    input-gpios
-		    = <&pro_micro 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		    , <&pro_micro 19 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		    , <&pro_micro 20 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		    , <&pro_micro 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		    , <&pro_micro 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		    , <&pro_micro 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		    , <&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		    , <&pro_micro 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		    , <&pro_micro 1  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		    , <&pro_micro 2  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		    , <&pro_micro 3  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		    , <&pro_micro 4  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		    , <&pro_micro 5  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		    , <&pro_micro 6  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		    , <&pro_micro 7  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		    , <&pro_micro 8  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		    , <&pro_micro 9  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		    ;
+        input-gpios
+            = <&pro_micro 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 19 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 20 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 1  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 2  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 3  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 4  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 5  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 6  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 7  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 8  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 9  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            ;
     };
 };
diff --git a/app/boards/shields/clog/clog_right.overlay b/app/boards/shields/clog/clog_right.overlay
index 0dc5d64f..8b0efb3d 100644
--- a/app/boards/shields/clog/clog_right.overlay
+++ b/app/boards/shields/clog/clog_right.overlay
@@ -7,5 +7,5 @@
 #include "clog.dtsi"
 
 &default_transform {
-	col-offset = <17>;
+    col-offset = <17>;
 };
diff --git a/app/boards/shields/clueboard_california/Kconfig.defconfig b/app/boards/shields/clueboard_california/Kconfig.defconfig
index e101ea76..278aaa44 100644
--- a/app/boards/shields/clueboard_california/Kconfig.defconfig
+++ b/app/boards/shields/clueboard_california/Kconfig.defconfig
@@ -2,13 +2,13 @@
 if SHIELD_CLUEBOARD_CALIFORNIA
 
 config ZMK_KEYBOARD_NAME
-	default "Clueboard California Macropad"
+    default "Clueboard California Macropad"
 
 # Unable to use interrupts as the same pin number is used
 # across A & B controllers, and STM32F303CCT6 can't enable
 # interrutps for multiple controllers for the same "line"
 # for the external interrupts.
 config ZMK_KSCAN_DIRECT_POLLING
-	default y
+    default y
 
 endif
diff --git a/app/boards/shields/clueboard_california/Kconfig.shield b/app/boards/shields/clueboard_california/Kconfig.shield
index eca025d1..e987d29a 100644
--- a/app/boards/shields/clueboard_california/Kconfig.shield
+++ b/app/boards/shields/clueboard_california/Kconfig.shield
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_CLUEBOARD_CALIFORNIA
-	def_bool $(shields_list_contains,clueboard_california)
+    def_bool $(shields_list_contains,clueboard_california)
diff --git a/app/boards/shields/clueboard_california/clueboard_california.keymap b/app/boards/shields/clueboard_california/clueboard_california.keymap
index b9041c37..9af22fa1 100644
--- a/app/boards/shields/clueboard_california/clueboard_california.keymap
+++ b/app/boards/shields/clueboard_california/clueboard_california.keymap
@@ -8,18 +8,18 @@
 #include <dt-bindings/zmk/keys.h>
 
 / {
-	keymap0: keymap {
-		compatible = "zmk,keymap";
+    keymap0: keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
-			bindings = <
-				&kp N9 &kp N8
-				&kp N7 &kp N6
-				       &kp N5
-				        &kp N4 &kp N3
-				              &kp N2 &kp N1
-				                        &kp N0
-				>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp N9 &kp N8
+                &kp N7 &kp N6
+                       &kp N5
+                        &kp N4 &kp N3
+                              &kp N2 &kp N1
+                                        &kp N0
+                >;
+        };
+    };
 };
\ No newline at end of file
diff --git a/app/boards/shields/clueboard_california/clueboard_california.overlay b/app/boards/shields/clueboard_california/clueboard_california.overlay
index 9f52d0d3..dfa5d9cf 100644
--- a/app/boards/shields/clueboard_california/clueboard_california.overlay
+++ b/app/boards/shields/clueboard_california/clueboard_california.overlay
@@ -5,30 +5,30 @@
  */
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+    };
 
-	kscan0: kscan_0 {
-		compatible = "zmk,kscan-gpio-direct";
+    kscan0: kscan_0 {
+        compatible = "zmk,kscan-gpio-direct";
 
-		label = "KSCAN";
+        label = "KSCAN";
 
-		input-gpios
-			= <&gpioa 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&gpioa 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&gpioa 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&gpiob 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&gpiob 11 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&gpiob 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&gpioa 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&gpioa 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&gpiob 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&gpiob 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			;
+        input-gpios
+            = <&gpioa 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&gpioa 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&gpioa 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&gpiob 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&gpiob 11 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&gpiob 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&gpioa 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&gpioa 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&gpiob 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&gpiob 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            ;
 
-	};
+    };
 
-	// TODO: Per-key LED node(s)
+    // TODO: Per-key LED node(s)
 };
 
diff --git a/app/boards/shields/contra/Kconfig.shield b/app/boards/shields/contra/Kconfig.shield
index 59412ff5..e9f8e804 100644
--- a/app/boards/shields/contra/Kconfig.shield
+++ b/app/boards/shields/contra/Kconfig.shield
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_CONTRA
-	def_bool $(shields_list_contains,contra)
\ No newline at end of file
+    def_bool $(shields_list_contains,contra)
\ No newline at end of file
diff --git a/app/boards/shields/corne/Kconfig.defconfig b/app/boards/shields/corne/Kconfig.defconfig
index acf542d7..07dd07e9 100644
--- a/app/boards/shields/corne/Kconfig.defconfig
+++ b/app/boards/shields/corne/Kconfig.defconfig
@@ -1,44 +1,44 @@
 if SHIELD_CORNE_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Corne"
+    default "Corne"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_CORNE_LEFT || SHIELD_CORNE_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 if ZMK_DISPLAY
 
 config I2C
-	default y
+    default y
 
 config SSD1306
-	default y
+    default y
 
 config SSD1306_REVERSE_MODE
-	default y
+    default y
 
 endif # ZMK_DISPLAY
 
 if LVGL
 
 config LV_Z_VDB_SIZE
-	default 64
+    default 64
 
 config LV_Z_DPI
-	default 148
+    default 148
 
 config LV_Z_BITS_PER_PIXEL
-	default 1
+    default 1
 
 choice LV_COLOR_DEPTH
-	default LV_COLOR_DEPTH_1
+    default LV_COLOR_DEPTH_1
 endchoice
 
 endif # LVGL
diff --git a/app/boards/shields/corne/Kconfig.shield b/app/boards/shields/corne/Kconfig.shield
index 3cac86fe..099680b9 100644
--- a/app/boards/shields/corne/Kconfig.shield
+++ b/app/boards/shields/corne/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_CORNE_LEFT
-	def_bool $(shields_list_contains,corne_left)
+    def_bool $(shields_list_contains,corne_left)
 
 config SHIELD_CORNE_RIGHT
-	def_bool $(shields_list_contains,corne_right)
+    def_bool $(shields_list_contains,corne_right)
diff --git a/app/boards/shields/corne/boards/nice_nano.overlay b/app/boards/shields/corne/boards/nice_nano.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/corne/boards/nice_nano.overlay
+++ b/app/boards/shields/corne/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/corne/boards/nice_nano_v2.overlay b/app/boards/shields/corne/boards/nice_nano_v2.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/corne/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/corne/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/corne/corne.dtsi b/app/boards/shields/corne/corne.dtsi
index a9c1c287..0e9eddf9 100644
--- a/app/boards/shields/corne/corne.dtsi
+++ b/app/boards/shields/corne/corne.dtsi
@@ -7,77 +7,77 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zephyr,display = &oled;
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zephyr,display = &oled;
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <12>;
-		rows = <4>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <12>;
+        rows = <4>;
 // | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |   | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  |
 // | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |   | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |
 // | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |
 //                      | SW19 | SW20 | SW21 |   | SW21 | SW20 | SW19 |
-		map = <
+        map = <
 RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)  RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11)
 RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)  RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11)
 RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)
                         RC(3,3) RC(3,4) RC(3,5)  RC(3,6) RC(3,7) RC(3,8)
-		>;
-	};
+        >;
+    };
 
-	five_column_transform: keymap_transform_1 {
-		compatible = "zmk,matrix-transform";
-		columns = <10>;
-		rows = <4>;
+    five_column_transform: keymap_transform_1 {
+        compatible = "zmk,matrix-transform";
+        columns = <10>;
+        rows = <4>;
 // | SW2  | SW3  | SW4  | SW5  | SW6  |   | SW6  | SW5  | SW4  | SW3  | SW2  |
 // | SW8  | SW9  | SW10 | SW11 | SW12 |   | SW12 | SW11 | SW10 | SW9  | SW8  |
 // | SW14 | SW15 | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 | SW15 | SW14 |
 //                      | SW19 | SW20 | SW21 |   | SW21 | SW20 | SW19 |
-		map = <
+        map = <
 RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)  RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10)
 RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)  RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10)
 RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10)
                         RC(3,3) RC(3,4) RC(3,5)  RC(3,6) RC(3,7) RC(3,8)
-		>;
-	};
+        >;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
+        diode-direction = "col2row";
+        row-gpios
+            = <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
 
-	};
+    };
 
-	// TODO: per-key RGB node(s)?
+    // TODO: per-key RGB node(s)?
 };
 
 &pro_micro_i2c {
-	status = "okay";
+    status = "okay";
 
-	oled: ssd1306@3c {
-		compatible = "solomon,ssd1306fb";
-		reg = <0x3c>;
-		label = "DISPLAY";
-		width = <128>;
-		height = <32>;
-		segment-offset = <0>;
-		page-offset = <0>;
-		display-offset = <0>;
-		multiplex-ratio = <31>;
-		segment-remap;
-		com-invdir;
-		com-sequential;
-		prechargep = <0x22>;
-	};
+    oled: ssd1306@3c {
+        compatible = "solomon,ssd1306fb";
+        reg = <0x3c>;
+        label = "DISPLAY";
+        width = <128>;
+        height = <32>;
+        segment-offset = <0>;
+        page-offset = <0>;
+        display-offset = <0>;
+        multiplex-ratio = <31>;
+        segment-remap;
+        com-invdir;
+        com-sequential;
+        prechargep = <0x22>;
+    };
 };
diff --git a/app/boards/shields/corne/corne.keymap b/app/boards/shields/corne/corne.keymap
index 53218a86..0555cf41 100644
--- a/app/boards/shields/corne/corne.keymap
+++ b/app/boards/shields/corne/corne.keymap
@@ -35,7 +35,7 @@
    &kp TAB    &kp N1       &kp N2       &kp N3       &kp N4       &kp N5         &kp N6   &kp N7   &kp N8 &kp N9    &kp N0 &kp BSPC
    &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4   &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &trans
    &kp LSHFT  &trans       &trans       &trans       &trans       &trans         &trans   &trans   &trans &trans    &trans &trans
-                          	        &kp LGUI     &trans       &kp SPACE      &kp RET  &trans   &kp RALT
+                                    &kp LGUI     &trans       &kp SPACE      &kp RET  &trans   &kp RALT
                         >;
                 };
 
@@ -49,7 +49,7 @@
    &kp  TAB  &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT   &kp CARET &kp AMPS  &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp BSPC
    &kp LCTRL &trans   &trans &trans   &trans   &trans      &kp MINUS &kp EQUAL &kp LBKT        &kp RBKT &kp BSLH &kp GRAVE
    &kp LSHFT &trans   &trans &trans   &trans   &trans      &kp UNDER &kp PLUS  &kp LBRC        &kp RBRC &kp PIPE &kp TILDE
-                    	     &kp LGUI &trans   &kp SPACE   &kp RET   &trans    &kp RALT
+                             &kp LGUI &trans   &kp SPACE   &kp RET   &trans    &kp RALT
                         >;
                 };
         };
diff --git a/app/boards/shields/corne/corne_left.overlay b/app/boards/shields/corne/corne_left.overlay
index fe7e3c78..117cb19e 100644
--- a/app/boards/shields/corne/corne_left.overlay
+++ b/app/boards/shields/corne/corne_left.overlay
@@ -7,12 +7,12 @@
 #include "corne.dtsi"
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 21 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 20 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 21 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        ;
 };
diff --git a/app/boards/shields/corne/corne_right.overlay b/app/boards/shields/corne/corne_right.overlay
index 1d7ed9ec..a8a0cfe7 100644
--- a/app/boards/shields/corne/corne_right.overlay
+++ b/app/boards/shields/corne/corne_right.overlay
@@ -7,20 +7,20 @@
 #include "corne.dtsi"
 
 &default_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &five_column_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 20 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 21 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 21 GPIO_ACTIVE_HIGH>
+        ;
 };
diff --git a/app/boards/shields/cradio/Kconfig.defconfig b/app/boards/shields/cradio/Kconfig.defconfig
index b600383a..c5d03f4e 100644
--- a/app/boards/shields/cradio/Kconfig.defconfig
+++ b/app/boards/shields/cradio/Kconfig.defconfig
@@ -4,16 +4,16 @@
 if SHIELD_CRADIO_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Cradio"
+    default "Cradio"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_CRADIO_LEFT || SHIELD_CRADIO_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 endif
diff --git a/app/boards/shields/cradio/Kconfig.shield b/app/boards/shields/cradio/Kconfig.shield
index bb5f0735..affb1c53 100644
--- a/app/boards/shields/cradio/Kconfig.shield
+++ b/app/boards/shields/cradio/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_CRADIO_LEFT
-	def_bool $(shields_list_contains,cradio_left)
+    def_bool $(shields_list_contains,cradio_left)
 
 config SHIELD_CRADIO_RIGHT
-	def_bool $(shields_list_contains,cradio_right)
+    def_bool $(shields_list_contains,cradio_right)
diff --git a/app/boards/shields/cradio/README.md b/app/boards/shields/cradio/README.md
index ee1cab0e..2c4e2e60 100644
--- a/app/boards/shields/cradio/README.md
+++ b/app/boards/shields/cradio/README.md
@@ -10,25 +10,25 @@ Some revisions of the aforementioned PCBs have slightly different pin arrangemen
 /* Adjusted Cradio pin arrangement */
 /* The position of Q and B keys have been swapped */
 &kscan0 {
-	input-gpios
-	= <&pro_micro  6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-	, <&pro_micro 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-	, <&pro_micro 19 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-	, <&pro_micro 20 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-	, <&pro_micro 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-	, <&pro_micro 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-	, <&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-	, <&pro_micro 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-	, <&pro_micro 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-	, <&pro_micro  1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-	, <&pro_micro  2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-	, <&pro_micro  3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-	, <&pro_micro  4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-	, <&pro_micro  5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-	, <&pro_micro  7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-	, <&pro_micro  8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-	, <&pro_micro  9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-	;
+    input-gpios
+    = <&pro_micro  6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+    , <&pro_micro 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+    , <&pro_micro 19 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+    , <&pro_micro 20 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+    , <&pro_micro 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+    , <&pro_micro 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+    , <&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+    , <&pro_micro 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+    , <&pro_micro 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+    , <&pro_micro  1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+    , <&pro_micro  2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+    , <&pro_micro  3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+    , <&pro_micro  4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+    , <&pro_micro  5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+    , <&pro_micro  7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+    , <&pro_micro  8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+    , <&pro_micro  9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+    ;
 };
 ```
 
diff --git a/app/boards/shields/cradio/cradio.dtsi b/app/boards/shields/cradio/cradio.dtsi
index ca464c95..57dcfd4b 100644
--- a/app/boards/shields/cradio/cradio.dtsi
+++ b/app/boards/shields/cradio/cradio.dtsi
@@ -8,45 +8,45 @@
 
 / {
 
-	chosen {
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <34>;
-		rows = <1>;
-		map = <
-		RC(0,0)  RC(0,1)  RC(0,2)  RC(0,3)  RC(0,4)    RC(0,21) RC(0,20) RC(0,19) RC(0,18) RC(0,17)
-		RC(0,5)  RC(0,6)  RC(0,7)  RC(0,8)  RC(0,9)    RC(0,26) RC(0,25) RC(0,24) RC(0,23) RC(0,22)
-		RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14)   RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27)
-		                           RC(0,15) RC(0,16)   RC(0,33) RC(0,32)
-		>;
-	};
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <34>;
+        rows = <1>;
+        map = <
+        RC(0,0)  RC(0,1)  RC(0,2)  RC(0,3)  RC(0,4)    RC(0,21) RC(0,20) RC(0,19) RC(0,18) RC(0,17)
+        RC(0,5)  RC(0,6)  RC(0,7)  RC(0,8)  RC(0,9)    RC(0,26) RC(0,25) RC(0,24) RC(0,23) RC(0,22)
+        RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14)   RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27)
+                                   RC(0,15) RC(0,16)   RC(0,33) RC(0,32)
+        >;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-direct";
-		label = "KSCAN";
-		input-gpios
-		= <&pro_micro  7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro 19 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro 20 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro  1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro  2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro  3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro  4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro  5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro  6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro  8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro  9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		;
-	};
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-direct";
+        label = "KSCAN";
+        input-gpios
+        = <&pro_micro  7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro 19 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro 20 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro  1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro  2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro  3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro  4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro  5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro  6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro  8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro  9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        ;
+    };
 
 };
diff --git a/app/boards/shields/cradio/cradio_right.overlay b/app/boards/shields/cradio/cradio_right.overlay
index 41436e97..fea9ae1c 100644
--- a/app/boards/shields/cradio/cradio_right.overlay
+++ b/app/boards/shields/cradio/cradio_right.overlay
@@ -7,5 +7,5 @@
 #include "cradio.dtsi"
 
 &default_transform {
-	col-offset = <17>;
+    col-offset = <17>;
 };
diff --git a/app/boards/shields/crbn/Kconfig.defconfig b/app/boards/shields/crbn/Kconfig.defconfig
index 2a5c8e39..c00e97a4 100644
--- a/app/boards/shields/crbn/Kconfig.defconfig
+++ b/app/boards/shields/crbn/Kconfig.defconfig
@@ -4,6 +4,6 @@
 if SHIELD_CRBN
 
 config ZMK_KEYBOARD_NAME
-	default "CRBN"
+    default "CRBN"
 
 endif
diff --git a/app/boards/shields/crbn/Kconfig.shield b/app/boards/shields/crbn/Kconfig.shield
index ceeb5f63..bf92dbf1 100644
--- a/app/boards/shields/crbn/Kconfig.shield
+++ b/app/boards/shields/crbn/Kconfig.shield
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_CRBN
-	def_bool $(shields_list_contains,crbn)
+    def_bool $(shields_list_contains,crbn)
diff --git a/app/boards/shields/crbn/crbn.keymap b/app/boards/shields/crbn/crbn.keymap
index b967e5e2..f963ba84 100644
--- a/app/boards/shields/crbn/crbn.keymap
+++ b/app/boards/shields/crbn/crbn.keymap
@@ -9,54 +9,54 @@
 #include <dt-bindings/zmk/bt.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
-			// -----------------------------------------------------------------------------------------
-			// |  TAB  |  Q   |  W   |  E   |  R   |  T   |   Y   |  U    |  I   |  O   |   P   | BSPC  |
-			// |  ESC  |  A   |  S   |  D   |  F   |  G   |   H   |  J    |  K   |  L   |   ;   |  '    |
-			// | SHIFT |  Z   |  X   |  C   |  V   |  B   |   N   |  M    |  ,   |  .   |   /   |  RET  |
-			// |       | LCTL | LALT | LGUI | LOWR |     SPACE    |  RAIS | LARW | DARW | UARW  |  RARW |
-			bindings = <
-				&kp TAB  &kp Q    &kp W &kp E &kp R &kp T  &kp Y   &kp U  &kp I    &kp O   &kp P    &kp BSPC
-				&kp ESC  &kp A    &kp S &kp D &kp F &kp G  &kp H   &kp J  &kp K    &kp L   &kp SEMI &kp SQT
-				&kp LSHFT &kp Z    &kp X &kp C &kp V &kp B  &kp N   &kp M  &kp COMMA &kp DOT &kp SLASH &kp RET
-				&trans   &kp LCTL &kp LALT &kp LGUI &mo 1 &kp SPACE &trans &mo 2 &kp LEFT &kp DOWN &kp UP &kp RIGHT
-			>;
+        default_layer {
+            // -----------------------------------------------------------------------------------------
+            // |  TAB  |  Q   |  W   |  E   |  R   |  T   |   Y   |  U    |  I   |  O   |   P   | BSPC  |
+            // |  ESC  |  A   |  S   |  D   |  F   |  G   |   H   |  J    |  K   |  L   |   ;   |  '    |
+            // | SHIFT |  Z   |  X   |  C   |  V   |  B   |   N   |  M    |  ,   |  .   |   /   |  RET  |
+            // |       | LCTL | LALT | LGUI | LOWR |     SPACE    |  RAIS | LARW | DARW | UARW  |  RARW |
+            bindings = <
+                &kp TAB  &kp Q    &kp W &kp E &kp R &kp T  &kp Y   &kp U  &kp I    &kp O   &kp P    &kp BSPC
+                &kp ESC  &kp A    &kp S &kp D &kp F &kp G  &kp H   &kp J  &kp K    &kp L   &kp SEMI &kp SQT
+                &kp LSHFT &kp Z    &kp X &kp C &kp V &kp B  &kp N   &kp M  &kp COMMA &kp DOT &kp SLASH &kp RET
+                &trans   &kp LCTL &kp LALT &kp LGUI &mo 1 &kp SPACE &trans &mo 2 &kp LEFT &kp DOWN &kp UP &kp RIGHT
+            >;
 
-			sensor-bindings = <&inc_dec_kp PG_UP PG_DN>;
-		};
+            sensor-bindings = <&inc_dec_kp PG_UP PG_DN>;
+        };
 
-		lower {
-			bindings = <
-				&kp LS(GRAVE) &kp LS(N1) &kp LS(N2) &kp LS(N3) &kp LS(N4) &kp LS(N5) &kp LS(N6) &kp LS(N7) &kp LS(N8) &kp LS(N9) &kp LS(N0) &kp DEL
-				&kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE
-				&trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp LS(HASH) &kp LS(BSLH) &kp HOME &kp END &trans
-				&trans &trans &trans &trans &trans &trans &trans &mo 3 &kp C_NEXT &kp C_VOL_DN &kp C_VOL_UP &kp C_PP
-			>;
+        lower {
+            bindings = <
+                &kp LS(GRAVE) &kp LS(N1) &kp LS(N2) &kp LS(N3) &kp LS(N4) &kp LS(N5) &kp LS(N6) &kp LS(N7) &kp LS(N8) &kp LS(N9) &kp LS(N0) &kp DEL
+                &kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE
+                &trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp LS(HASH) &kp LS(BSLH) &kp HOME &kp END &trans
+                &trans &trans &trans &trans &trans &trans &trans &mo 3 &kp C_NEXT &kp C_VOL_DN &kp C_VOL_UP &kp C_PP
+            >;
 
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
-		};
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
 
-		raise {
-			bindings = <
-				&kp GRAVE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC
-				&kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH
-				&trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp HASH &kp BSLH &kp PG_UP &kp PG_DN &trans
-				&trans &trans &trans &trans &mo 3 &trans &trans &trans &kp C_NEXT &kp C_VOL_DN &kp C_VOL_UP &kp C_PP
-			>;
+        raise {
+            bindings = <
+                &kp GRAVE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC
+                &kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH
+                &trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp HASH &kp BSLH &kp PG_UP &kp PG_DN &trans
+                &trans &trans &trans &trans &mo 3 &trans &trans &trans &kp C_NEXT &kp C_VOL_DN &kp C_VOL_UP &kp C_PP
+            >;
 
-			sensor-bindings = <&inc_dec_kp PG_UP PG_DN>;
-		};
+            sensor-bindings = <&inc_dec_kp PG_UP PG_DN>;
+        };
 
-		control {
-			bindings = <
-				&sys_reset &bootloader &bt BT_CLR &bt BT_PRV &bt BT_NXT &trans &trans &trans &trans &trans &trans &trans
-				&bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &trans &trans &trans &trans &trans &trans &trans &trans &trans
-				&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
-				&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
-			>;
-		};
-	};
+        control {
+            bindings = <
+                &sys_reset &bootloader &bt BT_CLR &bt BT_PRV &bt BT_NXT &trans &trans &trans &trans &trans &trans &trans
+                &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &trans &trans &trans &trans &trans &trans &trans &trans &trans
+                &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
+                &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
+            >;
+        };
+    };
 };
diff --git a/app/boards/shields/crbn/crbn.overlay b/app/boards/shields/crbn/crbn.overlay
index 18382cce..817a83d0 100644
--- a/app/boards/shields/crbn/crbn.overlay
+++ b/app/boards/shields/crbn/crbn.overlay
@@ -7,49 +7,49 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+    };
 
-	kscan0: kscan_0 {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
-		diode-direction = "col2row";
+    kscan0: kscan_0 {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
+        diode-direction = "col2row";
 
-		col-gpios
-			= <&pro_micro 1 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 0 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 2 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 3 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 4 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 5 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 6 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 7 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 8 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 9 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 10 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-			;
+        col-gpios
+            = <&pro_micro 1 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 0 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 2 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 3 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 4 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 5 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 6 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 7 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 8 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 9 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 10 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+            ;
 
-		row-gpios
-			= <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
-	};
+        row-gpios
+            = <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
+    };
 
-	encoder: encoder {
-		compatible = "alps,ec11";
-		label = "ENCODER";
-		a-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		b-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		resolution = <2>;
-		status = "okay";
-	};
+    encoder: encoder {
+        compatible = "alps,ec11";
+        label = "ENCODER";
+        a-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        resolution = <2>;
+        status = "okay";
+    };
 
-	sensors {
-		compatible = "zmk,keymap-sensors";
-		sensors = <&encoder>;
-	};
+    sensors {
+        compatible = "zmk,keymap-sensors";
+        sensors = <&encoder>;
+    };
 };
diff --git a/app/boards/shields/elephant42/Kconfig.defconfig b/app/boards/shields/elephant42/Kconfig.defconfig
index 55ee6c87..70a312c1 100644
--- a/app/boards/shields/elephant42/Kconfig.defconfig
+++ b/app/boards/shields/elephant42/Kconfig.defconfig
@@ -14,34 +14,34 @@ endif
 if SHIELD_ELEPHANT42_LEFT || SHIELD_ELEPHANT42_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 if ZMK_DISPLAY
 
 config I2C
-	default y
+    default y
 
 config SSD1306
-	default y
+    default y
 
 config SSD1306_REVERSE_MODE
-	default y
+    default y
 
 endif # ZMK_DISPLAY
 
 if LVGL
 
 config LV_Z_VDB_SIZE
-	default 64
+    default 64
 
 config LV_Z_DPI
-	default 148
+    default 148
 
 config LV_Z_BITS_PER_PIXEL
-	default 1
+    default 1
 
 choice LV_COLOR_DEPTH
-	default LV_COLOR_DEPTH_1
+    default LV_COLOR_DEPTH_1
 endchoice
 
 endif # LVGL
diff --git a/app/boards/shields/elephant42/boards/nice_nano.overlay b/app/boards/shields/elephant42/boards/nice_nano.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/elephant42/boards/nice_nano.overlay
+++ b/app/boards/shields/elephant42/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/elephant42/boards/nice_nano_v2.overlay b/app/boards/shields/elephant42/boards/nice_nano_v2.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/elephant42/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/elephant42/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/elephant42/elephant42.dtsi b/app/boards/shields/elephant42/elephant42.dtsi
index 2d3f5166..b0e9a32e 100644
--- a/app/boards/shields/elephant42/elephant42.dtsi
+++ b/app/boards/shields/elephant42/elephant42.dtsi
@@ -40,21 +40,21 @@ RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)                 RC(1,6) RC(1,7)
 };
 
 &pro_micro_i2c {
-	status = "okay";
+    status = "okay";
 
-	oled: ssd1306@3c {
-		compatible = "solomon,ssd1306fb";
-		reg = <0x3c>;
-		label = "DISPLAY";
-		width = <128>;
-		height = <32>;
-		segment-offset = <0>;
-		page-offset = <0>;
-		display-offset = <0>;
-		multiplex-ratio = <31>;
-		segment-remap;
-		com-invdir;
-		com-sequential;
-		prechargep = <0x22>;
-	};
+    oled: ssd1306@3c {
+        compatible = "solomon,ssd1306fb";
+        reg = <0x3c>;
+        label = "DISPLAY";
+        width = <128>;
+        height = <32>;
+        segment-offset = <0>;
+        page-offset = <0>;
+        display-offset = <0>;
+        multiplex-ratio = <31>;
+        segment-remap;
+        com-invdir;
+        com-sequential;
+        prechargep = <0x22>;
+    };
 };
\ No newline at end of file
diff --git a/app/boards/shields/ergodash/Kconfig.defconfig b/app/boards/shields/ergodash/Kconfig.defconfig
index 43cab0b1..34a87e8e 100644
--- a/app/boards/shields/ergodash/Kconfig.defconfig
+++ b/app/boards/shields/ergodash/Kconfig.defconfig
@@ -4,16 +4,16 @@
 if SHIELD_ERGODASH_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Ergodash"
+    default "Ergodash"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_ERGODASH_LEFT || SHIELD_ERGODASH_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 endif
diff --git a/app/boards/shields/ergodash/Kconfig.shield b/app/boards/shields/ergodash/Kconfig.shield
index b3cca293..5814e21e 100644
--- a/app/boards/shields/ergodash/Kconfig.shield
+++ b/app/boards/shields/ergodash/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_ERGODASH_LEFT
-	def_bool $(shields_list_contains,ergodash_left)
+    def_bool $(shields_list_contains,ergodash_left)
 
 config SHIELD_ERGODASH_RIGHT
-	def_bool $(shields_list_contains,ergodash_right)
+    def_bool $(shields_list_contains,ergodash_right)
diff --git a/app/boards/shields/ergodash/ergodash.dtsi b/app/boards/shields/ergodash/ergodash.dtsi
index a2b76075..d109fa66 100644
--- a/app/boards/shields/ergodash/ergodash.dtsi
+++ b/app/boards/shields/ergodash/ergodash.dtsi
@@ -7,15 +7,15 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <14>;
-		rows = <5>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <14>;
+        rows = <5>;
 // Numbering based on rev 1.2 schema
 // * keys that can be in different positions are denoted as MW
 // * MW40 can be broken off
@@ -24,38 +24,38 @@
 // | SW3  | SW7  | SW11 | SW15 | SW19 | SW23 | SW27 |      |    |      | SW27 | SW23 | SW19 | SW15 | SW11 | SW7  | SW3  |
 // | SW4  | SW8  | SW12 | SW16 | SW20 | SW24 |      | MW28 |    | MW28 |      | SW24 | SW20 | SW16 | SW12 | SW8  | SW4  |
 // | SW30 | SW31 | SW32 | MW33 | SW34 |      | MW35 | MW40 |    | MW40 | MW35 |      | SW34 | MW33 | SW32 | SW31 | SW30 |
-		map = <
+        map = <
 RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6)                 RC(0,13) RC(0,12) RC(0,11) RC(0,10) RC(0,9) RC(0,8) RC(0,7)
 RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6)                 RC(1,13) RC(1,12) RC(1,11) RC(1,10) RC(1,9) RC(1,8) RC(1,7)
 RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6)                 RC(2,13) RC(2,12) RC(2,11) RC(2,10) RC(2,9) RC(2,8) RC(2,7)
 RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5)         RC(3,6) RC(3,13)         RC(3,12) RC(3,11) RC(3,10) RC(3,9) RC(3,8) RC(3,7)
 RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4)         RC(4,5) RC(4,6) RC(4,13) RC(4,12)         RC(4,11) RC(4,10) RC(4,9) RC(4,8) RC(4,7)
-		>;
+        >;
   };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
+        diode-direction = "col2row";
 
-		row-gpios
-			= <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
+        row-gpios
+            = <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
 
-		col-gpios
-			= <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
-	};
+        col-gpios
+            = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
+    };
 };
 
diff --git a/app/boards/shields/ergodash/ergodash_right.overlay b/app/boards/shields/ergodash/ergodash_right.overlay
index 464b3f5d..07fbbb70 100644
--- a/app/boards/shields/ergodash/ergodash_right.overlay
+++ b/app/boards/shields/ergodash/ergodash_right.overlay
@@ -7,5 +7,5 @@
 #include "ergodash.dtsi"
 
 &default_transform {
-	col-offset = <7>;
+    col-offset = <7>;
 };
diff --git a/app/boards/shields/eternal_keypad/Kconfig.defconfig b/app/boards/shields/eternal_keypad/Kconfig.defconfig
index 4d4195ef..72514192 100644
--- a/app/boards/shields/eternal_keypad/Kconfig.defconfig
+++ b/app/boards/shields/eternal_keypad/Kconfig.defconfig
@@ -4,6 +4,6 @@
 if SHIELD_ETERNAL_KEYPAD || SHIELD_ETERNAL_KEYPAD_LEFTY
 
 config ZMK_KEYBOARD_NAME
-	default "Eternal Keypad"
+    default "Eternal Keypad"
 
 endif
diff --git a/app/boards/shields/eternal_keypad/Kconfig.shield b/app/boards/shields/eternal_keypad/Kconfig.shield
index 4a59379e..23015153 100644
--- a/app/boards/shields/eternal_keypad/Kconfig.shield
+++ b/app/boards/shields/eternal_keypad/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_ETERNAL_KEYPAD
-	def_bool $(shields_list_contains,eternal_keypad)
+    def_bool $(shields_list_contains,eternal_keypad)
 
 config SHIELD_ETERNAL_KEYPAD_LEFTY
-	def_bool $(shields_list_contains,eternal_keypad_lefty)
+    def_bool $(shields_list_contains,eternal_keypad_lefty)
diff --git a/app/boards/shields/eternal_keypad/boards/nice_nano.overlay b/app/boards/shields/eternal_keypad/boards/nice_nano.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/eternal_keypad/boards/nice_nano.overlay
+++ b/app/boards/shields/eternal_keypad/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/eternal_keypad/boards/nice_nano_v2.overlay b/app/boards/shields/eternal_keypad/boards/nice_nano_v2.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/eternal_keypad/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/eternal_keypad/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/fourier/Kconfig.defconfig b/app/boards/shields/fourier/Kconfig.defconfig
index b887870c..a07ca714 100644
--- a/app/boards/shields/fourier/Kconfig.defconfig
+++ b/app/boards/shields/fourier/Kconfig.defconfig
@@ -5,16 +5,16 @@
 if SHIELD_FOURIER_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Fourier"
+    default "Fourier"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_FOURIER_LEFT || SHIELD_FOURIER_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 endif
diff --git a/app/boards/shields/fourier/Kconfig.shield b/app/boards/shields/fourier/Kconfig.shield
index 2e337410..ee28c7ac 100644
--- a/app/boards/shields/fourier/Kconfig.shield
+++ b/app/boards/shields/fourier/Kconfig.shield
@@ -3,7 +3,7 @@
 
 
 config SHIELD_FOURIER_LEFT
-	def_bool $(shields_list_contains,fourier_left)
+    def_bool $(shields_list_contains,fourier_left)
 
 config SHIELD_FOURIER_RIGHT
-	def_bool $(shields_list_contains,fourier_right)
+    def_bool $(shields_list_contains,fourier_right)
diff --git a/app/boards/shields/fourier/fourier.dtsi b/app/boards/shields/fourier/fourier.dtsi
index 99027ea9..0902d687 100644
--- a/app/boards/shields/fourier/fourier.dtsi
+++ b/app/boards/shields/fourier/fourier.dtsi
@@ -7,37 +7,37 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	/*
-	 * This transform correspondsto the 60% left without macro keypad and 65% right, even this
-	 * combination of PCBs can have keys in different locations based on configuration.
-	 */
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <13>;
-		rows = <4>;
-		map = <
+    /*
+     * This transform correspondsto the 60% left without macro keypad and 65% right, even this
+     * combination of PCBs can have keys in different locations based on configuration.
+     */
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <13>;
+        rows = <4>;
+        map = <
 RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)      /**/  RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0, 11) RC(0,12)
 RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)    /**/  RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,12)
 RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  /**/    RC(2,6) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12)
 RC(3,0)   RC(3,1) RC(3,2) RC(3,3) RC(3,4)            /**/  RC(3,6)        RC(3,9)  RC(3,10)  RC(3,11)  RC(3,12)
-		>;
-	};
+        >;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>  // Row A
-			, <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>   // Row B
-			, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>   // Row C
-			, <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>   // Row D
-			;
-	};
+        diode-direction = "col2row";
+        row-gpios
+            = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>  // Row A
+            , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>   // Row B
+            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>   // Row C
+            , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>   // Row D
+            ;
+    };
 };
diff --git a/app/boards/shields/helix/boards/nice_nano.overlay b/app/boards/shields/helix/boards/nice_nano.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/helix/boards/nice_nano.overlay
+++ b/app/boards/shields/helix/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/helix/boards/nice_nano_v2.overlay b/app/boards/shields/helix/boards/nice_nano_v2.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/helix/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/helix/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/helix/helix_right.overlay b/app/boards/shields/helix/helix_right.overlay
index 42dd0f52..0d3cc63d 100644
--- a/app/boards/shields/helix/helix_right.overlay
+++ b/app/boards/shields/helix/helix_right.overlay
@@ -7,7 +7,7 @@
 #include "helix.dtsi"
 
 &default_transform {
-	col-offset = <7>;
+    col-offset = <7>;
 };
 
 &kscan0 {
diff --git a/app/boards/shields/hummingbird/hummingbird.overlay b/app/boards/shields/hummingbird/hummingbird.overlay
index 0c48c128..1b40acba 100644
--- a/app/boards/shields/hummingbird/hummingbird.overlay
+++ b/app/boards/shields/hummingbird/hummingbird.overlay
@@ -10,8 +10,8 @@
     chosen {
         zmk,kscan = &kscan0;
         zmk,matrix_transform = &default_transform;
-	/delete-property/ zephyr,console;
-	/delete-property/ zephyr,shell-uart;
+    /delete-property/ zephyr,console;
+    /delete-property/ zephyr,shell-uart;
     };
 
     default_transform: keymap_transform_0 {
diff --git a/app/boards/shields/iris/Kconfig.defconfig b/app/boards/shields/iris/Kconfig.defconfig
index 83331d10..b68bc999 100644
--- a/app/boards/shields/iris/Kconfig.defconfig
+++ b/app/boards/shields/iris/Kconfig.defconfig
@@ -4,16 +4,16 @@
 if SHIELD_IRIS_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Iris"
+    default "Iris"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_IRIS_LEFT || SHIELD_IRIS_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 endif
\ No newline at end of file
diff --git a/app/boards/shields/iris/Kconfig.shield b/app/boards/shields/iris/Kconfig.shield
index 370bd222..764d8101 100644
--- a/app/boards/shields/iris/Kconfig.shield
+++ b/app/boards/shields/iris/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_IRIS_LEFT
-	def_bool $(shields_list_contains,iris_left)
+    def_bool $(shields_list_contains,iris_left)
 
 config SHIELD_IRIS_RIGHT
-	def_bool $(shields_list_contains,iris_right)
+    def_bool $(shields_list_contains,iris_right)
diff --git a/app/boards/shields/iris/iris.dtsi b/app/boards/shields/iris/iris.dtsi
index 0e976f86..a0caf1ad 100644
--- a/app/boards/shields/iris/iris.dtsi
+++ b/app/boards/shields/iris/iris.dtsi
@@ -7,41 +7,41 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <16>;
-		rows = <4>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <16>;
+        rows = <4>;
 // | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  |                 | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |
 // | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |                 | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |
 // | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |                 | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |
 // | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 | SW25 |   | SW25 | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 |
 //                      | SW29 | SW28 | SW27 | SW26 |   | SW26 | SW27 | SW28 | SW29 |
-		map = <
+        map = <
 RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)                 RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11)
 RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)                 RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11)
 RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)                 RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)
 RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,2) RC(4,9) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11)
-                        		RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC(4,8)
-		>;
-	};
+                                RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC(4,8)
+        >;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
+        diode-direction = "col2row";
+        row-gpios
+            = <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
 
-	};
+    };
 };
\ No newline at end of file
diff --git a/app/boards/shields/iris/iris.keymap b/app/boards/shields/iris/iris.keymap
index 7c00d0a5..209c2277 100644
--- a/app/boards/shields/iris/iris.keymap
+++ b/app/boards/shields/iris/iris.keymap
@@ -9,55 +9,55 @@
 #include <dt-bindings/zmk/bt.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
+        default_layer {
 // ------------------------------------------------------------------------------------------------------------
 // |  ESC  |  1  |  2  |  3   |  4   |  5   |                   |  6   |  7    |  8    |  9   |   0   |   `   |
 // |  TAB  |  Q  |  W  |  E   |  R   |  T   |                   |  Y   |  U    |  I    |  O   |   P   |   -   |
 // |  CTRL |  A  |  S  |  D   |  F   |  G   |                   |  H   |  J    |  K    |  L   |   ;   |   '   |
 // | SHIFT |  Z  |  X  |  C   |  V   |  B   |   "["  |  |  "]"  |  N   |  M    |  ,    |  .   |   /   | SHIFT |
-//                     		  | GUI  | LOWER|  SPACE |  | ENTER | RAISE|  ALT  |
-			bindings = <
+//                            | GUI  | LOWER|  SPACE |  | ENTER | RAISE|  ALT  |
+            bindings = <
 &kp ESC   &kp N1 &kp N2 &kp N3 &kp N4   &kp N5                      &kp N6 &kp N7 &kp N8    &kp N9  &kp N0   &kp GRAVE
 &kp TAB   &kp Q  &kp W  &kp E  &kp R    &kp T                       &kp Y  &kp U  &kp I     &kp O   &kp P    &kp MINUS
 &kp LCTRL &kp A  &kp S  &kp D  &kp F    &kp G                       &kp H  &kp J  &kp K     &kp L   &kp SEMI &kp SQT
 &kp LSHFT &kp Z  &kp X  &kp C  &kp V    &kp B   &kp LBKT  &kp RBKT  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH &kp RSHFT
-                   			   &kp LGUI &mo 1   &kp SPACE &kp RET   &mo 2  &kp RALT
-			>;
-		};
+                               &kp LGUI &mo 1   &kp SPACE &kp RET   &mo 2  &kp RALT
+            >;
+        };
 
-		lower_layer {
+        lower_layer {
 // ------------------------------------------------------------------------------------------------------------
 // | BTCLR | BT1 | BT2 |  BT3 |  BT4 |  BT5 |                   |      |       |       |      |       |       |
 // |  F1   |  F2 |  F3 |  F4  |  F5  |  F6  |                   |  F7  |  F8   |  F9   |  F10 |  F11  |  F12  |
 // |   `   |  !  |  @  |  #   |  $   |  %   |                   |  ^   |  &    |  *    |  (   |   )   |   ~   |
 // |       |     |     |      |      |      |        |  |       |      |  _    |  +    |  {   |   }   |  "|"  |
 //                            |      |      |        |  |       |      |       |
-			bindings = <
+            bindings = <
 &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4                &trans    &trans    &trans          &trans    &trans    &trans
 &kp F1     &kp F2       &kp F3       &kp F4       &kp F5       &kp F6                      &kp F7    &kp F8    &kp F9          &kp F10   &kp F11   &kp F12
 &kp GRAVE  &kp EXCL     &kp AT       &kp HASH     &kp DOLLAR   &kp PRCNT                   &kp CARET &kp AMPS  &kp KP_MULTIPLY &kp LPAR  &kp RPAR  &kp TILDE
 &trans     &trans       &trans       &trans       &trans       &trans    &trans   &trans   &trans    &kp MINUS &kp KP_PLUS     &kp LBRC  &kp RBRC  &kp PIPE
-                   					              &trans       &trans    &trans   &trans   &trans    &trans
-			>;
-		};
+                                                  &trans       &trans    &trans   &trans   &trans    &trans
+            >;
+        };
 
-		raise_layer {
+        raise_layer {
 // ------------------------------------------------------------------------------------------------------------
 // |       |     |     |      |      |      |                   |      |       |       |      |       |       |
 // |   `   |  1  |  2  |  3   |  4   |  5   |                   |  6   |   7   |   8   |  9   |   0   |       |
 // |   F1  |  F2 |  F3 |  F4  |  F5  |  F6  |                   |      |   <-  |   ^   |  v   |  ->   |       |
 // |   F7  |  F8 |  F9 |  F10 |  F11 |  F12 |        |  |       |  +   |   -   |   =   |  [   |   ]   |   \   |
 //                            |      |      |        |  |       |      |       |
-			bindings = <
+            bindings = <
 &trans    &trans &trans &trans  &trans  &trans                       &trans      &trans    &trans    &trans   &trans    &trans
 &kp GRAVE &kp N1 &kp N2 &kp N3  &kp N4  &kp N5                       &kp N6      &kp N7    &kp N8    &kp N9   &kp N0    &trans
 &kp F1    &kp F2 &kp F3 &kp F4  &kp F5  &kp F6                       &trans      &kp LEFT  &kp DOWN  &kp UP   &kp RIGHT &trans
 &kp F7    &kp F8 &kp F9 &kp F10 &kp F11 &kp F12   &trans   &trans    &kp KP_PLUS &kp MINUS &kp EQUAL &kp LBKT &kp RBKT  &kp BSLH
-                   				&trans  &trans    &trans   &trans    &trans      &trans
-			>;
-		};
-	};
+                                &trans  &trans    &trans   &trans    &trans      &trans
+            >;
+        };
+    };
 };
diff --git a/app/boards/shields/iris/iris_left.overlay b/app/boards/shields/iris/iris_left.overlay
index 2c52fca8..eb330d31 100644
--- a/app/boards/shields/iris/iris_left.overlay
+++ b/app/boards/shields/iris/iris_left.overlay
@@ -7,12 +7,12 @@
 #include "iris.dtsi"
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        ;
 };
diff --git a/app/boards/shields/iris/iris_right.overlay b/app/boards/shields/iris/iris_right.overlay
index 2ed712a2..d2375b18 100644
--- a/app/boards/shields/iris/iris_right.overlay
+++ b/app/boards/shields/iris/iris_right.overlay
@@ -7,16 +7,16 @@
 #include "iris.dtsi"
 
 &default_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        ;
 };
diff --git a/app/boards/shields/jian/Kconfig.defconfig b/app/boards/shields/jian/Kconfig.defconfig
index bbdafbae..2f3d0a17 100644
--- a/app/boards/shields/jian/Kconfig.defconfig
+++ b/app/boards/shields/jian/Kconfig.defconfig
@@ -2,16 +2,16 @@
 if SHIELD_JIAN_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Jian"
+    default "Jian"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_JIAN_LEFT || SHIELD_JIAN_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 endif
diff --git a/app/boards/shields/jian/Kconfig.shield b/app/boards/shields/jian/Kconfig.shield
index 5b874f03..efcfa214 100644
--- a/app/boards/shields/jian/Kconfig.shield
+++ b/app/boards/shields/jian/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_JIAN_LEFT
-	def_bool $(shields_list_contains,jian_left)
+    def_bool $(shields_list_contains,jian_left)
 
 config SHIELD_JIAN_RIGHT
-	def_bool $(shields_list_contains,jian_right)
+    def_bool $(shields_list_contains,jian_right)
diff --git a/app/boards/shields/jian/jian.dtsi b/app/boards/shields/jian/jian.dtsi
index 2b1eb391..8e772791 100644
--- a/app/boards/shields/jian/jian.dtsi
+++ b/app/boards/shields/jian/jian.dtsi
@@ -7,70 +7,70 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <12>;
-		rows = <4>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <12>;
+        rows = <4>;
 // | SW0  | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |   | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  | SW0  |
 // |      | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |   | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |
 // |      | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |
 //                             | SW19 | SW20 | SW21 |   | SW21 | SW20 | SW19 |
-		map = <
+        map = <
     RC(2,0) RC(0,0) RC(0,1) RC(1,2) RC(0,2) RC(0,3) RC(0,4)  RC(0,7) RC(0,8) RC(0,9) RC(1,9) RC(0,10) RC(0,11) RC(2,11)
             RC(1,0) RC(1,1) RC(2,2) RC(1,3) RC(1,4) RC(0,5)  RC(0,6) RC(1,7) RC(1,8) RC(2,9) RC(1,10) RC(1,11)
             RC(2,1) RC(3,2) RC(3,3) RC(2,3) RC(2,4) RC(1,5)  RC(1,6) RC(2,7) RC(2,8) RC(3,8) RC(3,9)  RC(2,10)
                                     RC(3,4) RC(2,5) RC(3,5)  RC(3,6) RC(2,6) RC(3,7)
-		>;
-	};
+        >;
+    };
 
-		crkbd_transform: keymap_transform_1 {
-		compatible = "zmk,matrix-transform";
-		columns = <12>;
-		rows = <4>;
+        crkbd_transform: keymap_transform_1 {
+        compatible = "zmk,matrix-transform";
+        columns = <12>;
+        rows = <4>;
 // | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |   | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  |
 // | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |   | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |
 // | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |
 //                      | SW19 | SW20 | SW21 |   | SW21 | SW20 | SW19 |
-		map = <
-		RC(0,0) RC(0,1) RC(1,2) RC(0,2) RC(0,3) RC(0,4)  RC(0,7) RC(0,8) RC(0,9) RC(1,9) RC(0,10) RC(0,11)
+        map = <
+        RC(0,0) RC(0,1) RC(1,2) RC(0,2) RC(0,3) RC(0,4)  RC(0,7) RC(0,8) RC(0,9) RC(1,9) RC(0,10) RC(0,11)
         RC(1,0) RC(1,1) RC(2,2) RC(1,3) RC(1,4) RC(0,5)  RC(0,6) RC(1,7) RC(1,8) RC(2,9) RC(1,10) RC(1,11)
         RC(2,1) RC(3,2) RC(3,3) RC(2,3) RC(2,4) RC(1,5)  RC(1,6) RC(2,7) RC(2,8) RC(3,8) RC(3,9)  RC(2,10)
                                 RC(3,4) RC(2,5) RC(3,5)  RC(3,6) RC(2,6) RC(3,7)
-		>;
-	};
+        >;
+    };
 
-	five_column_transform: keymap_transform_2 {
-		compatible = "zmk,matrix-transform";
-		columns = <10>;
-		rows = <4>;
+    five_column_transform: keymap_transform_2 {
+        compatible = "zmk,matrix-transform";
+        columns = <10>;
+        rows = <4>;
 // | SW2  | SW3  | SW4  | SW5  | SW6  |   | SW6  | SW5  | SW4  | SW3  | SW2  |
 // | SW8  | SW9  | SW10 | SW11 | SW12 |   | SW12 | SW11 | SW10 | SW9  | SW8  |
 // | SW14 | SW15 | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 | SW15 | SW14 |
 //                      | SW19 | SW20 | SW21 |   | SW21 | SW20 | SW19 |
-		map = <
-		RC(0,1) RC(1,2) RC(0,2) RC(0,3) RC(0,4)  RC(0,7) RC(0,8) RC(0,9) RC(1,9) RC(0,10)
+        map = <
+        RC(0,1) RC(1,2) RC(0,2) RC(0,3) RC(0,4)  RC(0,7) RC(0,8) RC(0,9) RC(1,9) RC(0,10)
         RC(1,1) RC(2,2) RC(1,3) RC(1,4) RC(0,5)  RC(0,6) RC(1,7) RC(1,8) RC(2,9) RC(1,10)
         RC(3,2) RC(3,3) RC(2,3) RC(2,4) RC(1,5)  RC(1,6) RC(2,7) RC(2,8) RC(3,8) RC(3,9)
                                 RC(3,4) RC(2,5) RC(3,5)  RC(3,6) RC(2,6) RC(3,7)
-		>;
-	};
+        >;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
+        diode-direction = "col2row";
+        row-gpios
+            = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
 
-	};
+    };
 };
diff --git a/app/boards/shields/jian/jian_left.overlay b/app/boards/shields/jian/jian_left.overlay
index e7f9d5b5..e402f03b 100644
--- a/app/boards/shields/jian/jian_left.overlay
+++ b/app/boards/shields/jian/jian_left.overlay
@@ -7,12 +7,12 @@
 #include "jian.dtsi"
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro  1 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  0 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  8 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro  1 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  0 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  8 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        ;
 };
diff --git a/app/boards/shields/jian/jian_right.overlay b/app/boards/shields/jian/jian_right.overlay
index cac83fd3..f646741b 100644
--- a/app/boards/shields/jian/jian_right.overlay
+++ b/app/boards/shields/jian/jian_right.overlay
@@ -7,24 +7,24 @@
 #include "jian.dtsi"
 
 &default_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &crkbd_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &five_column_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  8 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  0 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  1 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  8 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  0 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  1 GPIO_ACTIVE_HIGH>
+        ;
 };
diff --git a/app/boards/shields/jiran/Kconfig.defconfig b/app/boards/shields/jiran/Kconfig.defconfig
index b5b1f97b..0c6683f4 100644
--- a/app/boards/shields/jiran/Kconfig.defconfig
+++ b/app/boards/shields/jiran/Kconfig.defconfig
@@ -4,16 +4,16 @@
 if SHIELD_JIRAN_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Jiran"
+    default "Jiran"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_JIRAN_LEFT || SHIELD_JIRAN_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 endif
diff --git a/app/boards/shields/jiran/Kconfig.shield b/app/boards/shields/jiran/Kconfig.shield
index 8a24ace0..8f480723 100644
--- a/app/boards/shields/jiran/Kconfig.shield
+++ b/app/boards/shields/jiran/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_JIRAN_LEFT
-	def_bool $(shields_list_contains,jiran_left)
+    def_bool $(shields_list_contains,jiran_left)
 
 config SHIELD_JIRAN_RIGHT
-	def_bool $(shields_list_contains,jiran_right)
+    def_bool $(shields_list_contains,jiran_right)
diff --git a/app/boards/shields/jiran/jiran.dtsi b/app/boards/shields/jiran/jiran.dtsi
index f0727dd4..b7e74c27 100644
--- a/app/boards/shields/jiran/jiran.dtsi
+++ b/app/boards/shields/jiran/jiran.dtsi
@@ -7,76 +7,76 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <12>;
-		rows = <5>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <12>;
+        rows = <5>;
 
 //        | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |   | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  |
 // | SW0  | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |   | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  | SW0  |
 //        | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |
 //        | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 |   | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 |
 //                             | SW25 | SW26 | SW27 |   | SW27 | SW26 | SW25 |
-		map = <
+        map = <
             RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)  RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11)
     RC(4,0) RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)  RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(4,11)
             RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)
             RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5)  RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11)
                                     RC(4,3) RC(4,4) RC(4,5)  RC(4,6) RC(4,7) RC(4,8)
-		>;
-	};
+        >;
+    };
 
-	jian_transform: keymap_transform_1 {
-		compatible = "zmk,matrix-transform";
-		columns = <12>;
-		rows = <5>;
+    jian_transform: keymap_transform_1 {
+        compatible = "zmk,matrix-transform";
+        columns = <12>;
+        rows = <5>;
 
 // | SW0  | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |   | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  | SW0  |
 //        | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |
 //        | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 |   | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 |
 //                             | SW25 | SW26 | SW27 |   | SW27 | SW26 | SW25 |
-		map = <
+        map = <
     RC(4,0) RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)  RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(4,11)
             RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)
             RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5)  RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11)
                                     RC(4,3) RC(4,4) RC(4,5)  RC(4,6) RC(4,7) RC(4,8)
-		>;
-	};
+        >;
+    };
 
-	crkbd_transform: keymap_transform_2 {
-		compatible = "zmk,matrix-transform";
-		columns = <12>;
-		rows = <5>;
+    crkbd_transform: keymap_transform_2 {
+        compatible = "zmk,matrix-transform";
+        columns = <12>;
+        rows = <5>;
 
 //        | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |   | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |
 //        | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |
 //        | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 |   | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 |
 //                             | SW25 | SW26 | SW27 |   | SW27 | SW26 | SW25 |
-		map = <
+        map = <
             RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)  RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11)
             RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)
             RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5)  RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11)
                                     RC(4,3) RC(4,4) RC(4,5)  RC(4,6) RC(4,7) RC(4,8)
-		>;
-	};
+        >;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&pro_micro   8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro   9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro  21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro  20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro  19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
+        diode-direction = "col2row";
+        row-gpios
+            = <&pro_micro   8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro   9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro  21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro  20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro  19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
 
-	};
+    };
 };
diff --git a/app/boards/shields/jiran/jiran_left.overlay b/app/boards/shields/jiran/jiran_left.overlay
index 4466202c..3b7f5e55 100644
--- a/app/boards/shields/jiran/jiran_left.overlay
+++ b/app/boards/shields/jiran/jiran_left.overlay
@@ -7,12 +7,12 @@
 #include "jiran.dtsi"
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro  1 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  0 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  4 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  5 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  6 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  7 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro  1 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  0 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  4 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  5 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  6 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  7 GPIO_ACTIVE_HIGH>
+        ;
 };
diff --git a/app/boards/shields/jiran/jiran_right.overlay b/app/boards/shields/jiran/jiran_right.overlay
index c3648797..668c5513 100644
--- a/app/boards/shields/jiran/jiran_right.overlay
+++ b/app/boards/shields/jiran/jiran_right.overlay
@@ -7,24 +7,24 @@
 #include "jiran.dtsi"
 
 &default_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &jian_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &crkbd_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro  7 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  6 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  5 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  4 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  0 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  1 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro  7 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  6 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  5 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  4 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  0 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  1 GPIO_ACTIVE_HIGH>
+        ;
 };
diff --git a/app/boards/shields/jorne/Kconfig.defconfig b/app/boards/shields/jorne/Kconfig.defconfig
index 775bb56a..04beb792 100644
--- a/app/boards/shields/jorne/Kconfig.defconfig
+++ b/app/boards/shields/jorne/Kconfig.defconfig
@@ -2,44 +2,44 @@
 if SHIELD_JORNE_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Jorne"
+    default "Jorne"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_JORNE_LEFT || SHIELD_JORNE_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 if ZMK_DISPLAY
 
 config I2C
-	default y
+    default y
 
 config SSD1306
-	default y
+    default y
 
 config SSD1306_REVERSE_MODE
-	default y
+    default y
 
 endif # ZMK_DISPLAY
 
 if LVGL
 
 config LV_Z_VDB_SIZE
-	default 64
+    default 64
 
 config LV_Z_DPI
-	default 148
+    default 148
 
 config LV_Z_BITS_PER_PIXEL
-	default 1
+    default 1
 
 choice LV_COLOR_DEPTH
-	default LV_COLOR_DEPTH_1
+    default LV_COLOR_DEPTH_1
 endchoice
 
 endif # LVGL
diff --git a/app/boards/shields/jorne/Kconfig.shield b/app/boards/shields/jorne/Kconfig.shield
index 88fd4e5a..37a3cab5 100644
--- a/app/boards/shields/jorne/Kconfig.shield
+++ b/app/boards/shields/jorne/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_JORNE_LEFT
-	def_bool $(shields_list_contains,jorne_left)
+    def_bool $(shields_list_contains,jorne_left)
 
 config SHIELD_JORNE_RIGHT
-	def_bool $(shields_list_contains,jorne_right)
+    def_bool $(shields_list_contains,jorne_right)
diff --git a/app/boards/shields/jorne/boards/nice_nano.overlay b/app/boards/shields/jorne/boards/nice_nano.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/jorne/boards/nice_nano.overlay
+++ b/app/boards/shields/jorne/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/jorne/boards/nice_nano_v2.overlay b/app/boards/shields/jorne/boards/nice_nano_v2.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/jorne/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/jorne/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/jorne/jorne.dtsi b/app/boards/shields/jorne/jorne.dtsi
index bb862b8d..1d12b85c 100644
--- a/app/boards/shields/jorne/jorne.dtsi
+++ b/app/boards/shields/jorne/jorne.dtsi
@@ -7,93 +7,93 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zephyr,display = &oled;
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zephyr,display = &oled;
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <12>;
-		rows = <4>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <12>;
+        rows = <4>;
 // | SW0  | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |   | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  | SW0  |
 // |      | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |   | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |
 // |      | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |
 //                             | SW19 | SW20 | SW21 |   | SW21 | SW20 | SW19 |
-		map = <
+        map = <
     RC(3,0) RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)  RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(3,11)
             RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)  RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11)
             RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)
                                     RC(3,3) RC(3,4) RC(3,5)  RC(3,6) RC(3,7) RC(3,8)
-		>;
-	};
+        >;
+    };
 
-		crkbd_transform: keymap_transform_1 {
-		compatible = "zmk,matrix-transform";
-		columns = <12>;
-		rows = <4>;
+        crkbd_transform: keymap_transform_1 {
+        compatible = "zmk,matrix-transform";
+        columns = <12>;
+        rows = <4>;
 // | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |   | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  |
 // | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |   | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |
 // | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |
 //                      | SW19 | SW20 | SW21 |   | SW21 | SW20 | SW19 |
-		map = <
+        map = <
     RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)  RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11)
     RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)  RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11)
     RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)
                             RC(3,3) RC(3,4) RC(3,5)  RC(3,6) RC(3,7) RC(3,8)
-		>;
-	};
+        >;
+    };
 
-	five_column_transform: keymap_transform_2 {
-		compatible = "zmk,matrix-transform";
-		columns = <10>;
-		rows = <4>;
+    five_column_transform: keymap_transform_2 {
+        compatible = "zmk,matrix-transform";
+        columns = <10>;
+        rows = <4>;
 // | SW2  | SW3  | SW4  | SW5  | SW6  |   | SW6  | SW5  | SW4  | SW3  | SW2  |
 // | SW8  | SW9  | SW10 | SW11 | SW12 |   | SW12 | SW11 | SW10 | SW9  | SW8  |
 // | SW14 | SW15 | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 | SW15 | SW14 |
 //               | SW19 | SW20 | SW21 |   | SW21 | SW20 | SW19 |
-		map = <
+        map = <
 RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)  RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10)
 RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)  RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10)
 RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10)
                         RC(3,3) RC(3,4) RC(3,5)  RC(3,6) RC(3,7) RC(3,8)
-		>;
-	};
+        >;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
+        diode-direction = "col2row";
+        row-gpios
+            = <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
 
-	};
+    };
 
-	// TODO: per-key RGB node(s)?
+    // TODO: per-key RGB node(s)?
 };
 
 &pro_micro_i2c {
-	status = "okay";
+    status = "okay";
 
-	oled: ssd1306@3c {
-		compatible = "solomon,ssd1306fb";
-		reg = <0x3c>;
-		label = "DISPLAY";
-		width = <128>;
-		height = <32>;
-		segment-offset = <0>;
-		page-offset = <0>;
-		display-offset = <0>;
-		multiplex-ratio = <31>;
-		segment-remap;
-		com-invdir;
-		com-sequential;
-		prechargep = <0x22>;
-	};
+    oled: ssd1306@3c {
+        compatible = "solomon,ssd1306fb";
+        reg = <0x3c>;
+        label = "DISPLAY";
+        width = <128>;
+        height = <32>;
+        segment-offset = <0>;
+        page-offset = <0>;
+        display-offset = <0>;
+        multiplex-ratio = <31>;
+        segment-remap;
+        com-invdir;
+        com-sequential;
+        prechargep = <0x22>;
+    };
 };
diff --git a/app/boards/shields/jorne/jorne_left.overlay b/app/boards/shields/jorne/jorne_left.overlay
index 7e132cd9..f0476b41 100644
--- a/app/boards/shields/jorne/jorne_left.overlay
+++ b/app/boards/shields/jorne/jorne_left.overlay
@@ -7,12 +7,12 @@
 #include "jorne.dtsi"
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 21 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 20 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 21 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        ;
 };
diff --git a/app/boards/shields/jorne/jorne_right.overlay b/app/boards/shields/jorne/jorne_right.overlay
index 698bf9dd..604f4816 100644
--- a/app/boards/shields/jorne/jorne_right.overlay
+++ b/app/boards/shields/jorne/jorne_right.overlay
@@ -7,24 +7,24 @@
 #include "jorne.dtsi"
 
 &default_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &crkbd_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &five_column_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 20 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 21 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 21 GPIO_ACTIVE_HIGH>
+        ;
 };
diff --git a/app/boards/shields/kyria/Kconfig.defconfig b/app/boards/shields/kyria/Kconfig.defconfig
index 82f48b4c..2d162736 100644
--- a/app/boards/shields/kyria/Kconfig.defconfig
+++ b/app/boards/shields/kyria/Kconfig.defconfig
@@ -2,44 +2,44 @@
 if SHIELD_KYRIA_LEFT || SHIELD_KYRIA_REV2_LEFT || SHIELD_KYRIA_REV3_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Kyria"
+    default "Kyria"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_KYRIA
 
 config ZMK_SPLIT
-	default y
+    default y
 
 if ZMK_DISPLAY
 
 config I2C
-	default y
+    default y
 
 config SSD1306
-	default y
+    default y
 
 config SSD1306_REVERSE_MODE
-	default y
+    default y
 
 endif # ZMK_DISPLAY
 
 if LVGL
 
 config LV_Z_VDB_SIZE
-	default 64
+    default 64
 
 config LV_Z_DPI
-	default 148
+    default 148
 
 config LV_Z_BITS_PER_PIXEL
-	default 1
+    default 1
 
 choice LV_COLOR_DEPTH
-	default LV_COLOR_DEPTH_1
+    default LV_COLOR_DEPTH_1
 endchoice
 
 endif # LVGL
diff --git a/app/boards/shields/kyria/Kconfig.shield b/app/boards/shields/kyria/Kconfig.shield
index 52df9378..a9d5ac4f 100644
--- a/app/boards/shields/kyria/Kconfig.shield
+++ b/app/boards/shields/kyria/Kconfig.shield
@@ -5,25 +5,25 @@ config SHIELD_KYRIA
     bool
 
 config SHIELD_KYRIA_LEFT
-	def_bool $(shields_list_contains,kyria_left)
-	select SHIELD_KYRIA
+    def_bool $(shields_list_contains,kyria_left)
+    select SHIELD_KYRIA
 
 config SHIELD_KYRIA_RIGHT
-	def_bool $(shields_list_contains,kyria_right)
-	select SHIELD_KYRIA
+    def_bool $(shields_list_contains,kyria_right)
+    select SHIELD_KYRIA
 
 config SHIELD_KYRIA_REV2_LEFT
-	def_bool $(shields_list_contains,kyria_rev2_left)
-	select SHIELD_KYRIA
+    def_bool $(shields_list_contains,kyria_rev2_left)
+    select SHIELD_KYRIA
 
 config SHIELD_KYRIA_REV2_RIGHT
-	def_bool $(shields_list_contains,kyria_rev2_right)
-	select SHIELD_KYRIA
+    def_bool $(shields_list_contains,kyria_rev2_right)
+    select SHIELD_KYRIA
 
 config SHIELD_KYRIA_REV3_LEFT
-	def_bool $(shields_list_contains,kyria_rev3_left)
-	select SHIELD_KYRIA
+    def_bool $(shields_list_contains,kyria_rev3_left)
+    select SHIELD_KYRIA
 
 config SHIELD_KYRIA_REV3_RIGHT
-	def_bool $(shields_list_contains,kyria_rev3_right)
-	select SHIELD_KYRIA
+    def_bool $(shields_list_contains,kyria_rev3_right)
+    select SHIELD_KYRIA
diff --git a/app/boards/shields/kyria/boards/nice_nano.overlay b/app/boards/shields/kyria/boards/nice_nano.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/kyria/boards/nice_nano.overlay
+++ b/app/boards/shields/kyria/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/kyria/boards/nice_nano_v2.overlay b/app/boards/shields/kyria/boards/nice_nano_v2.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/kyria/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/kyria/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/kyria/boards/nrfmicro_11.overlay b/app/boards/shields/kyria/boards/nrfmicro_11.overlay
index 172859ae..8754dec6 100644
--- a/app/boards/shields/kyria/boards/nrfmicro_11.overlay
+++ b/app/boards/shields/kyria/boards/nrfmicro_11.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi1_default: spi1_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi1_default: spi1_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi1_sleep: spi1_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi1_sleep: spi1_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi1 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi1_default>;
-	pinctrl-1 = <&spi1_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi1_default>;
+    pinctrl-1 = <&spi1_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/kyria/boards/nrfmicro_11_flipped.overlay b/app/boards/shields/kyria/boards/nrfmicro_11_flipped.overlay
index 172859ae..8754dec6 100644
--- a/app/boards/shields/kyria/boards/nrfmicro_11_flipped.overlay
+++ b/app/boards/shields/kyria/boards/nrfmicro_11_flipped.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi1_default: spi1_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi1_default: spi1_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi1_sleep: spi1_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi1_sleep: spi1_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi1 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi1_default>;
-	pinctrl-1 = <&spi1_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi1_default>;
+    pinctrl-1 = <&spi1_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/kyria/boards/nrfmicro_13.overlay b/app/boards/shields/kyria/boards/nrfmicro_13.overlay
index 172859ae..8754dec6 100644
--- a/app/boards/shields/kyria/boards/nrfmicro_13.overlay
+++ b/app/boards/shields/kyria/boards/nrfmicro_13.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi1_default: spi1_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi1_default: spi1_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi1_sleep: spi1_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi1_sleep: spi1_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi1 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi1_default>;
-	pinctrl-1 = <&spi1_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi1_default>;
+    pinctrl-1 = <&spi1_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/kyria/kyria.dtsi b/app/boards/shields/kyria/kyria.dtsi
index cffe23b0..b98240e4 100644
--- a/app/boards/shields/kyria/kyria.dtsi
+++ b/app/boards/shields/kyria/kyria.dtsi
@@ -7,58 +7,58 @@
 #include "kyria_common.dtsi"
 
 / {
-	chosen {
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <16>;
-		rows = <4>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <16>;
+        rows = <4>;
 // | MX6  | MX5  | MX4  | MX3  | MX2  | MX1  |                               | MX1  | MX2  | MX3  | MX4  | MX5  | MX6  |
 // | MX12 | MX11 | MX10 | MX9  | MX8  | MX7  |                               | MX7  | MX8  | MX9  | MX10 | MX11 | MX12 |
 // | MX20 | MX19 | MX18 | MX17 | MX16 | MX15 | MX14 | MX13 |   | MX13 | MX14 | MX15 | MX16 | MX17 | MX18 | MX19 | MX20 |
 //                    | MX25 | MX24 | MX23 | MX22 | MX21 |       | MX21 | MX22 | MX23 | MX24 | MX25 |
-		map = <
+        map = <
 RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)                                 RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,15)
 RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)                                 RC(1,10) RC(1,11) RC(1,12) RC(1,13) RC(1,14) RC(1,15)
 RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13) RC(2,14) RC(2,15)
                         RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12)
-		>;
-	};
+        >;
+    };
 
 // | MX5  | MX4  | MX3  | MX2  | MX1  |                               | MX1  | MX2  | MX3  | MX4  | MX5  |
 // | MX11 | MX10 | MX9  | MX8  | MX7  |                               | MX7  | MX8  | MX9  | MX10 | MX11 |
 // | MX19 | MX18 | MX17 | MX16 | MX15 | MX14 | MX13 |   | MX13 | MX14 | MX15 | MX16 | MX17 | MX18 | MX19 |
 //             | MX25 | MX24 | MX23 | MX22 | MX21 |       | MX21 | MX22 | MX23 | MX24 | MX25 |
-	five_column_transform: keymap_transform_1 {
-		compatible = "zmk,matrix-transform";
-		columns = <14>;
-		rows = <4>;
-		map = <
+    five_column_transform: keymap_transform_1 {
+        compatible = "zmk,matrix-transform";
+        columns = <14>;
+        rows = <4>;
+        map = <
 RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)                                 RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14)
 RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)                                 RC(1,10) RC(1,11) RC(1,12) RC(1,13) RC(1,14)
 RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13) RC(2,14)
                 RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12)
-		>;
-	};
+        >;
+    };
 };
 
 &kscan0 {
-	row-gpios
-		= <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		;
+    row-gpios
+        = <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        ;
 };
 
 &left_encoder {
-	a-gpios = <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-	b-gpios = <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+    a-gpios = <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+    b-gpios = <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
 };
 
 &right_encoder {
-	a-gpios = <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-	b-gpios = <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+    a-gpios = <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+    b-gpios = <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
 };
diff --git a/app/boards/shields/kyria/kyria.keymap b/app/boards/shields/kyria/kyria.keymap
index a8804dd9..9a2163db 100644
--- a/app/boards/shields/kyria/kyria.keymap
+++ b/app/boards/shields/kyria/kyria.keymap
@@ -8,23 +8,23 @@
 #include <dt-bindings/zmk/keys.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
+        default_layer {
 // ---------------------------------------------------------------------------------------------------------------------------------
 // |  ESC  |  Q  |  W  |  E   |  R   |  T   |                                          |  Y   |  U    |  I    |  O   |   P   |   \  |
 // |  TAB  |  A  |  S  |  D   |  F   |  G   |                                          |  H   |  J    |  K    |  L   |   ;   |   '  |
 // | SHIFT |  Z  |  X  |  C   |  V   |  B   | L SHIFT | L SHIFT |  | L SHIFT | L SHIFT |  N   |  M    |  ,    |  .   |   /   | CTRL |
 //                     | GUI  | DEL  | RET  |  SPACE  |   ESC   |  |   RET   |  SPACE  | TAB  | BSPC  | R-ALT |
-			bindings = <
-	&kp ESC   &kp Q &kp W &kp E &kp R &kp T                                                &kp Y &kp U  &kp I     &kp O   &kp P    &kp BSLH
-	&kp TAB   &kp A &kp S &kp D &kp F &kp G                                                &kp H &kp J  &kp K     &kp L   &kp SEMI &kp SQT
-	&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp LSHFT &kp LSHFT        &kp LSHFT &kp LSHFT &kp N &kp M  &kp COMMA &kp DOT &kp FSLH &kp RCTRL
-	                 &kp LGUI &kp DEL &kp RET &kp SPACE &kp ESC        &kp RET  &kp SPACE  &kp TAB &kp BSPC &kp RALT
-			>;
+            bindings = <
+    &kp ESC   &kp Q &kp W &kp E &kp R &kp T                                                &kp Y &kp U  &kp I     &kp O   &kp P    &kp BSLH
+    &kp TAB   &kp A &kp S &kp D &kp F &kp G                                                &kp H &kp J  &kp K     &kp L   &kp SEMI &kp SQT
+    &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp LSHFT &kp LSHFT        &kp LSHFT &kp LSHFT &kp N &kp M  &kp COMMA &kp DOT &kp FSLH &kp RCTRL
+                     &kp LGUI &kp DEL &kp RET &kp SPACE &kp ESC        &kp RET  &kp SPACE  &kp TAB &kp BSPC &kp RALT
+            >;
 
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_UP PG_DN>;
-		};
-	};
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_UP PG_DN>;
+        };
+    };
 };
diff --git a/app/boards/shields/kyria/kyria_common.dtsi b/app/boards/shields/kyria/kyria_common.dtsi
index 1e61cc6b..2e10cd37 100644
--- a/app/boards/shields/kyria/kyria_common.dtsi
+++ b/app/boards/shields/kyria/kyria_common.dtsi
@@ -7,54 +7,54 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zephyr,display = &oled;
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zephyr,display = &oled;
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-	};
+        diode-direction = "col2row";
+    };
 
-	left_encoder: encoder_left {
-		compatible = "alps,ec11";
-		label = "LEFT_ENCODER";
-		resolution = <4>;
-		status = "disabled";
-	};
+    left_encoder: encoder_left {
+        compatible = "alps,ec11";
+        label = "LEFT_ENCODER";
+        resolution = <4>;
+        status = "disabled";
+    };
 
-	right_encoder: encoder_right {
-		compatible = "alps,ec11";
-		label = "RIGHT_ENCODER";
-		resolution = <4>;
-		status = "disabled";
-	};
+    right_encoder: encoder_right {
+        compatible = "alps,ec11";
+        label = "RIGHT_ENCODER";
+        resolution = <4>;
+        status = "disabled";
+    };
 
-	sensors {
-		compatible = "zmk,keymap-sensors";
-		sensors = <&left_encoder &right_encoder>;
-	};
+    sensors {
+        compatible = "zmk,keymap-sensors";
+        sensors = <&left_encoder &right_encoder>;
+    };
 
-	// TODO: RGB node(s)
+    // TODO: RGB node(s)
 };
 
 &pro_micro_i2c {
-	status = "okay";
+    status = "okay";
 
-	oled: ssd1306@3c {
-		compatible = "solomon,ssd1306fb";
-		reg = <0x3c>;
-		label = "DISPLAY";
-		width = <128>;
-		height = <64>;
-		segment-offset = <0>;
-		page-offset = <0>;
-		display-offset = <0>;
-		multiplex-ratio = <63>;
-		prechargep = <0x22>;
-	};
+    oled: ssd1306@3c {
+        compatible = "solomon,ssd1306fb";
+        reg = <0x3c>;
+        label = "DISPLAY";
+        width = <128>;
+        height = <64>;
+        segment-offset = <0>;
+        page-offset = <0>;
+        display-offset = <0>;
+        multiplex-ratio = <63>;
+        prechargep = <0x22>;
+    };
 };
diff --git a/app/boards/shields/kyria/kyria_left.overlay b/app/boards/shields/kyria/kyria_left.overlay
index 20ced548..d89a0775 100644
--- a/app/boards/shields/kyria/kyria_left.overlay
+++ b/app/boards/shields/kyria/kyria_left.overlay
@@ -7,18 +7,18 @@
 #include "kyria.dtsi"
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 21 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 20 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 21 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        ;
 };
 
 &left_encoder {
-	status = "okay";
+    status = "okay";
 };
diff --git a/app/boards/shields/kyria/kyria_rev2.dtsi b/app/boards/shields/kyria/kyria_rev2.dtsi
index b40af365..e61131bf 100644
--- a/app/boards/shields/kyria/kyria_rev2.dtsi
+++ b/app/boards/shields/kyria/kyria_rev2.dtsi
@@ -7,49 +7,49 @@
 #include "kyria_common.dtsi"
 
 / {
-	chosen {
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <16>;
-		rows = <4>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <16>;
+        rows = <4>;
 // | MX6  | MX5  | MX4  | MX3  | MX2  | MX1  |                               | MX1  | MX2  | MX3  | MX4  | MX5  | MX6  |
 // | MX12 | MX11 | MX10 | MX9  | MX8  | MX7  |                               | MX7  | MX8  | MX9  | MX10 | MX11 | MX12 |
 // | MX20 | MX19 | MX18 | MX17 | MX16 | MX15 | MX14 | MX13 |   | MX13 | MX14 | MX15 | MX16 | MX17 | MX18 | MX19 | MX20 |
 //                    | MX25 | MX24 | MX23 | MX22 | MX21 |       | MX21 | MX22 | MX23 | MX24 | MX25 |
-		map = <
+        map = <
 RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)                                 RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,15)
 RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)                                 RC(1,10) RC(1,11) RC(1,12) RC(1,13) RC(1,14) RC(1,15)
 RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13) RC(2,14) RC(2,15)
                         RC(3,2) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,13)
-		>;
-	};
+        >;
+    };
 
 // | MX5  | MX4  | MX3  | MX2  | MX1  |                               | MX1  | MX2  | MX3  | MX4  | MX5  |
 // | MX11 | MX10 | MX9  | MX8  | MX7  |                               | MX7  | MX8  | MX9  | MX10 | MX11 |
 // | MX19 | MX18 | MX17 | MX16 | MX15 | MX14 | MX13 |   | MX13 | MX14 | MX15 | MX16 | MX17 | MX18 | MX19 |
 //             | MX25 | MX24 | MX23 | MX22 | MX21 |       | MX21 | MX22 | MX23 | MX24 | MX25 |
-	five_column_transform: keymap_transform_1 {
-		compatible = "zmk,matrix-transform";
-		columns = <14>;
-		rows = <4>;
-		map = <
+    five_column_transform: keymap_transform_1 {
+        compatible = "zmk,matrix-transform";
+        columns = <14>;
+        rows = <4>;
+        map = <
 RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)                                 RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14)
 RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)                                 RC(1,10) RC(1,11) RC(1,12) RC(1,13) RC(1,14)
 RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13) RC(2,14)
                 RC(3,2) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,13)
-		>;
-	};
+        >;
+    };
 };
 
 &left_encoder {
-	a-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-	b-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+    a-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+    b-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
 };
 
 &right_encoder {
-	a-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-	b-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+    a-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+    b-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
 };
diff --git a/app/boards/shields/kyria/kyria_rev2.keymap b/app/boards/shields/kyria/kyria_rev2.keymap
index a8804dd9..9a2163db 100644
--- a/app/boards/shields/kyria/kyria_rev2.keymap
+++ b/app/boards/shields/kyria/kyria_rev2.keymap
@@ -8,23 +8,23 @@
 #include <dt-bindings/zmk/keys.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
+        default_layer {
 // ---------------------------------------------------------------------------------------------------------------------------------
 // |  ESC  |  Q  |  W  |  E   |  R   |  T   |                                          |  Y   |  U    |  I    |  O   |   P   |   \  |
 // |  TAB  |  A  |  S  |  D   |  F   |  G   |                                          |  H   |  J    |  K    |  L   |   ;   |   '  |
 // | SHIFT |  Z  |  X  |  C   |  V   |  B   | L SHIFT | L SHIFT |  | L SHIFT | L SHIFT |  N   |  M    |  ,    |  .   |   /   | CTRL |
 //                     | GUI  | DEL  | RET  |  SPACE  |   ESC   |  |   RET   |  SPACE  | TAB  | BSPC  | R-ALT |
-			bindings = <
-	&kp ESC   &kp Q &kp W &kp E &kp R &kp T                                                &kp Y &kp U  &kp I     &kp O   &kp P    &kp BSLH
-	&kp TAB   &kp A &kp S &kp D &kp F &kp G                                                &kp H &kp J  &kp K     &kp L   &kp SEMI &kp SQT
-	&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp LSHFT &kp LSHFT        &kp LSHFT &kp LSHFT &kp N &kp M  &kp COMMA &kp DOT &kp FSLH &kp RCTRL
-	                 &kp LGUI &kp DEL &kp RET &kp SPACE &kp ESC        &kp RET  &kp SPACE  &kp TAB &kp BSPC &kp RALT
-			>;
+            bindings = <
+    &kp ESC   &kp Q &kp W &kp E &kp R &kp T                                                &kp Y &kp U  &kp I     &kp O   &kp P    &kp BSLH
+    &kp TAB   &kp A &kp S &kp D &kp F &kp G                                                &kp H &kp J  &kp K     &kp L   &kp SEMI &kp SQT
+    &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp LSHFT &kp LSHFT        &kp LSHFT &kp LSHFT &kp N &kp M  &kp COMMA &kp DOT &kp FSLH &kp RCTRL
+                     &kp LGUI &kp DEL &kp RET &kp SPACE &kp ESC        &kp RET  &kp SPACE  &kp TAB &kp BSPC &kp RALT
+            >;
 
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_UP PG_DN>;
-		};
-	};
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_UP PG_DN>;
+        };
+    };
 };
diff --git a/app/boards/shields/kyria/kyria_rev2_left.overlay b/app/boards/shields/kyria/kyria_rev2_left.overlay
index cee2e2a8..67eaeac2 100644
--- a/app/boards/shields/kyria/kyria_rev2_left.overlay
+++ b/app/boards/shields/kyria/kyria_rev2_left.overlay
@@ -7,24 +7,24 @@
 #include "kyria_rev2.dtsi"
 
 &kscan0 {
-	row-gpios
-	    = <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		;
-	col-gpios
-		= <&pro_micro 4 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 5 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 6 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 7 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 8 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 9 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		;
+    row-gpios
+        = <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        ;
+    col-gpios
+        = <&pro_micro 4 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 5 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 6 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 7 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 8 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 9 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        ;
 };
 
 &left_encoder {
-	status = "okay";
+    status = "okay";
 };
diff --git a/app/boards/shields/kyria/kyria_rev2_right.overlay b/app/boards/shields/kyria/kyria_rev2_right.overlay
index 9e29c6f7..acc806cf 100644
--- a/app/boards/shields/kyria/kyria_rev2_right.overlay
+++ b/app/boards/shields/kyria/kyria_rev2_right.overlay
@@ -7,32 +7,32 @@
 #include "kyria_rev2.dtsi"
 
 &default_transform {
-	col-offset = <8>;
+    col-offset = <8>;
 };
 
 &five_column_transform {
-	col-offset = <8>;
+    col-offset = <8>;
 };
 
 &kscan0 {
-	row-gpios
-	    = <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		;
-	col-gpios
-		= <&pro_micro 8 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 9 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		;
+    row-gpios
+        = <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        ;
+    col-gpios
+        = <&pro_micro 8 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 9 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        ;
 };
 
 &right_encoder {
-	status = "okay";
+    status = "okay";
 };
diff --git a/app/boards/shields/kyria/kyria_rev3.dtsi b/app/boards/shields/kyria/kyria_rev3.dtsi
index 4a500006..0cf91c60 100644
--- a/app/boards/shields/kyria/kyria_rev3.dtsi
+++ b/app/boards/shields/kyria/kyria_rev3.dtsi
@@ -7,35 +7,35 @@
 #include "kyria_common.dtsi"
 
 / {
-	chosen {
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <14>;
-		rows = <4>;
-		// | MX6  | MX5  | MX4  | MX3  | MX2  | MX1  |                               | MX1  | MX2  | MX3  | MX4  | MX5  | MX6  |
-		// | MX12 | MX11 | MX10 | MX9  | MX8  | MX7  |                               | MX7  | MX8  | MX9  | MX10 | MX11 | MX12 |
-		// | MX20 | MX19 | MX18 | MX17 | MX16 | MX15 | MX14 | MX13 |   | MX13 | MX14 | MX15 | MX16 | MX17 | MX18 | MX19 | MX20 |
-		//                    | MX25 | MX24 | MX23 | MX22 | MX21 |       | MX21 | MX22 | MX23 | MX24 | MX25 |
-		map = <
-		RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)                                  RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,13)
-		RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)                                  RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13)
-		RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(3,3) RC(2,6) RC(2,7) RC(3,10) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13)
-		RC(3,2) RC(3,4) RC(3,5) RC(3,1) RC(3,6) RC(3,7) RC(3,12) RC(3,8) RC(3,9) RC(3,11)
-		>;
-	};
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <14>;
+        rows = <4>;
+        // | MX6  | MX5  | MX4  | MX3  | MX2  | MX1  |                               | MX1  | MX2  | MX3  | MX4  | MX5  | MX6  |
+        // | MX12 | MX11 | MX10 | MX9  | MX8  | MX7  |                               | MX7  | MX8  | MX9  | MX10 | MX11 | MX12 |
+        // | MX20 | MX19 | MX18 | MX17 | MX16 | MX15 | MX14 | MX13 |   | MX13 | MX14 | MX15 | MX16 | MX17 | MX18 | MX19 | MX20 |
+        //                    | MX25 | MX24 | MX23 | MX22 | MX21 |       | MX21 | MX22 | MX23 | MX24 | MX25 |
+        map = <
+        RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)                                  RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,13)
+        RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)                                  RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13)
+        RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(3,3) RC(2,6) RC(2,7) RC(3,10) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13)
+        RC(3,2) RC(3,4) RC(3,5) RC(3,1) RC(3,6) RC(3,7) RC(3,12) RC(3,8) RC(3,9) RC(3,11)
+        >;
+    };
 };
 
 &left_encoder {
-	resolution = <2>;
-	a-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-	b-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+    resolution = <2>;
+    a-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+    b-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
 };
 
 &right_encoder {
-	resolution = <2>;
-	a-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-	b-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+    resolution = <2>;
+    a-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+    b-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
 };
diff --git a/app/boards/shields/kyria/kyria_rev3.keymap b/app/boards/shields/kyria/kyria_rev3.keymap
index fff2e051..d74757ca 100644
--- a/app/boards/shields/kyria/kyria_rev3.keymap
+++ b/app/boards/shields/kyria/kyria_rev3.keymap
@@ -9,30 +9,30 @@
 
 /* Uncomment this block if using RGB
 &led_strip {
-	chain-length = <6>;
-	// chain-length = <31>; // Uncomment if using both per-key and underglow LEDs
-	// chain-length = <25>; // Uncomment if using only per-key LEDs.
+    chain-length = <6>;
+    // chain-length = <31>; // Uncomment if using both per-key and underglow LEDs
+    // chain-length = <25>; // Uncomment if using only per-key LEDs.
 };
  */
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
-			// ---------------------------------------------------------------------------------------------------------------------------------
-			// |  ESC  |  Q  |  W  |  E   |  R   |  T   |                                          |  Y   |  U    |  I    |  O   |   P   |   \  |
-			// |  TAB  |  A  |  S  |  D   |  F   |  G   |                                          |  H   |  J    |  K    |  L   |   ;   |   '  |
-			// | SHIFT |  Z  |  X  |  C   |  V   |  B   | L SHIFT | L SHIFT |  | L SHIFT | L SHIFT |  N   |  M    |  ,    |  .   |   /   | CTRL |
-			//                     | GUI  | DEL  | RET  |  SPACE  |   ESC   |  |   RET   |  SPACE  | TAB  | BSPC  | R-ALT |
-			bindings = <
-			&kp ESC   &kp Q &kp W &kp E &kp R &kp T                                                &kp Y &kp U  &kp I     &kp O   &kp P    &kp BSLH
-			&kp TAB   &kp A &kp S &kp D &kp F &kp G                                                &kp H &kp J  &kp K     &kp L   &kp SEMI &kp SQT
-			&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp LSHFT &kp LSHFT        &kp LSHFT &kp LSHFT &kp N &kp M  &kp COMMA &kp DOT &kp FSLH &kp RCTRL
-			&kp LGUI &kp DEL &kp RET &kp SPACE &kp ESC        &kp RET  &kp SPACE  &kp TAB &kp BSPC &kp RALT
-			>;
+        default_layer {
+            // ---------------------------------------------------------------------------------------------------------------------------------
+            // |  ESC  |  Q  |  W  |  E   |  R   |  T   |                                          |  Y   |  U    |  I    |  O   |   P   |   \  |
+            // |  TAB  |  A  |  S  |  D   |  F   |  G   |                                          |  H   |  J    |  K    |  L   |   ;   |   '  |
+            // | SHIFT |  Z  |  X  |  C   |  V   |  B   | L SHIFT | L SHIFT |  | L SHIFT | L SHIFT |  N   |  M    |  ,    |  .   |   /   | CTRL |
+            //                     | GUI  | DEL  | RET  |  SPACE  |   ESC   |  |   RET   |  SPACE  | TAB  | BSPC  | R-ALT |
+            bindings = <
+            &kp ESC   &kp Q &kp W &kp E &kp R &kp T                                                &kp Y &kp U  &kp I     &kp O   &kp P    &kp BSLH
+            &kp TAB   &kp A &kp S &kp D &kp F &kp G                                                &kp H &kp J  &kp K     &kp L   &kp SEMI &kp SQT
+            &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp LSHFT &kp LSHFT        &kp LSHFT &kp LSHFT &kp N &kp M  &kp COMMA &kp DOT &kp FSLH &kp RCTRL
+            &kp LGUI &kp DEL &kp RET &kp SPACE &kp ESC        &kp RET  &kp SPACE  &kp TAB &kp BSPC &kp RALT
+            >;
 
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_UP PG_DN>;
-		};
-	};
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_UP PG_DN>;
+        };
+    };
 };
diff --git a/app/boards/shields/kyria/kyria_rev3_left.overlay b/app/boards/shields/kyria/kyria_rev3_left.overlay
index d00b9e4a..577b89dc 100644
--- a/app/boards/shields/kyria/kyria_rev3_left.overlay
+++ b/app/boards/shields/kyria/kyria_rev3_left.overlay
@@ -7,23 +7,23 @@
 #include "kyria_rev3.dtsi"
 
 &kscan0 {
-	row-gpios
-	= <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-	, <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-	, <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-	, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-	;
-	col-gpios
-	= <&pro_micro 10 GPIO_ACTIVE_HIGH>
-	, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-	, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-	, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-	, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-	, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-	, <&pro_micro 8 GPIO_ACTIVE_HIGH>
-	;
+    row-gpios
+    = <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+    , <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+    , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+    , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+    ;
+    col-gpios
+    = <&pro_micro 10 GPIO_ACTIVE_HIGH>
+    , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+    , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+    , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+    , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+    , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+    , <&pro_micro 8 GPIO_ACTIVE_HIGH>
+    ;
 };
 
 &left_encoder {
-	status = "okay";
+    status = "okay";
 };
diff --git a/app/boards/shields/kyria/kyria_rev3_right.overlay b/app/boards/shields/kyria/kyria_rev3_right.overlay
index ee69730c..88ed6589 100644
--- a/app/boards/shields/kyria/kyria_rev3_right.overlay
+++ b/app/boards/shields/kyria/kyria_rev3_right.overlay
@@ -7,27 +7,27 @@
 #include "kyria_rev3.dtsi"
 
 &default_transform {
-	col-offset = <7>;
+    col-offset = <7>;
 };
 
 &kscan0 {
-	row-gpios
-	= <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-	, <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-	, <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-	, <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-	;
-	col-gpios
-	= <&pro_micro 16 GPIO_ACTIVE_HIGH>
-	, <&pro_micro 4  GPIO_ACTIVE_HIGH>
-	, <&pro_micro 5  GPIO_ACTIVE_HIGH>
-	, <&pro_micro 6  GPIO_ACTIVE_HIGH>
-	, <&pro_micro 7  GPIO_ACTIVE_HIGH>
-	, <&pro_micro 8  GPIO_ACTIVE_HIGH>
-	, <&pro_micro 10 GPIO_ACTIVE_HIGH>
-	;
+    row-gpios
+    = <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+    , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+    , <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+    , <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+    ;
+    col-gpios
+    = <&pro_micro 16 GPIO_ACTIVE_HIGH>
+    , <&pro_micro 4  GPIO_ACTIVE_HIGH>
+    , <&pro_micro 5  GPIO_ACTIVE_HIGH>
+    , <&pro_micro 6  GPIO_ACTIVE_HIGH>
+    , <&pro_micro 7  GPIO_ACTIVE_HIGH>
+    , <&pro_micro 8  GPIO_ACTIVE_HIGH>
+    , <&pro_micro 10 GPIO_ACTIVE_HIGH>
+    ;
 };
 
 &right_encoder {
-	status = "okay";
+    status = "okay";
 };
diff --git a/app/boards/shields/kyria/kyria_right.overlay b/app/boards/shields/kyria/kyria_right.overlay
index 00ba5b2f..72d97027 100644
--- a/app/boards/shields/kyria/kyria_right.overlay
+++ b/app/boards/shields/kyria/kyria_right.overlay
@@ -7,27 +7,27 @@
 #include "kyria.dtsi"
 
 &default_transform {
-	col-offset = <8>;
+    col-offset = <8>;
 };
 
 &five_column_transform {
-	col-offset = <8>;
+    col-offset = <8>;
 };
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 20 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 21 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 21 GPIO_ACTIVE_HIGH>
+        ;
 };
 
 
 &right_encoder {
-	status = "okay";
+    status = "okay";
 };
diff --git a/app/boards/shields/leeloo/Kconfig.defconfig b/app/boards/shields/leeloo/Kconfig.defconfig
index d5bfab3d..7388a4b9 100644
--- a/app/boards/shields/leeloo/Kconfig.defconfig
+++ b/app/boards/shields/leeloo/Kconfig.defconfig
@@ -4,28 +4,28 @@
 if SHIELD_LEELOO_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Leeloo"
+    default "Leeloo"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_LEELOO_LEFT || SHIELD_LEELOO_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 if ZMK_DISPLAY
 
 config I2C
-	default y
+    default y
 
 config SSD1306
-	default y
+    default y
 
 config SSD1306_REVERSE_MODE
-	default y
+    default y
 
 endif # ZMK_DISPLAY
 
@@ -33,16 +33,16 @@ if LVGL
 
 
 config LV_Z_VDB_SIZE
-	default 64
+    default 64
 
 config LV_Z_DPI
-	default 148
+    default 148
 
 config LV_Z_BITS_PER_PIXEL
-	default 1
+    default 1
 
 choice LV_COLOR_DEPTH
-	default LV_COLOR_DEPTH_1
+    default LV_COLOR_DEPTH_1
 endchoice
 
 endif # LVGL
diff --git a/app/boards/shields/leeloo/Kconfig.shield b/app/boards/shields/leeloo/Kconfig.shield
index 1736c6eb..46ea9640 100644
--- a/app/boards/shields/leeloo/Kconfig.shield
+++ b/app/boards/shields/leeloo/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_LEELOO_LEFT
-	def_bool $(shields_list_contains,leeloo_left)
+    def_bool $(shields_list_contains,leeloo_left)
 
 config SHIELD_LEELOO_RIGHT
-	def_bool $(shields_list_contains,leeloo_right)
+    def_bool $(shields_list_contains,leeloo_right)
diff --git a/app/boards/shields/leeloo/leeloo.dtsi b/app/boards/shields/leeloo/leeloo.dtsi
index 5f2cbeac..438f9a9d 100644
--- a/app/boards/shields/leeloo/leeloo.dtsi
+++ b/app/boards/shields/leeloo/leeloo.dtsi
@@ -67,21 +67,21 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5)                 RC(3,6) RC(3,7)
 };
 
 &pro_micro_i2c {
-	status = "okay";
+    status = "okay";
 
-	oled: ssd1306@3c {
-		compatible = "solomon,ssd1306fb";
-		reg = <0x3c>;
-		label = "DISPLAY";
-		width = <128>;
-		height = <32>;
-		segment-offset = <0>;
-		page-offset = <0>;
-		display-offset = <0>;
-		multiplex-ratio = <31>;
-		segment-remap;
-		com-invdir;
-		com-sequential;
-		prechargep = <0x22>;
-	};
+    oled: ssd1306@3c {
+        compatible = "solomon,ssd1306fb";
+        reg = <0x3c>;
+        label = "DISPLAY";
+        width = <128>;
+        height = <32>;
+        segment-offset = <0>;
+        page-offset = <0>;
+        display-offset = <0>;
+        multiplex-ratio = <31>;
+        segment-remap;
+        com-invdir;
+        com-sequential;
+        prechargep = <0x22>;
+    };
 };
diff --git a/app/boards/shields/leeloo/leeloo_left.overlay b/app/boards/shields/leeloo/leeloo_left.overlay
index 1d6424fd..59fce1b0 100644
--- a/app/boards/shields/leeloo/leeloo_left.overlay
+++ b/app/boards/shields/leeloo/leeloo_left.overlay
@@ -6,16 +6,16 @@
 #include "leeloo.dtsi"
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        ;
 };
 
 &left_encoder {
-	status = "okay";
+    status = "okay";
 };
diff --git a/app/boards/shields/leeloo/leeloo_right.overlay b/app/boards/shields/leeloo/leeloo_right.overlay
index 2f3fbf5c..80e89529 100644
--- a/app/boards/shields/leeloo/leeloo_right.overlay
+++ b/app/boards/shields/leeloo/leeloo_right.overlay
@@ -6,20 +6,20 @@
 #include "leeloo.dtsi"
 
 &default_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        ;
 };
 
 &right_encoder {
-	status = "okay";
+    status = "okay";
 };
diff --git a/app/boards/shields/lily58/Kconfig.defconfig b/app/boards/shields/lily58/Kconfig.defconfig
index 97cecce1..e77a9c22 100644
--- a/app/boards/shields/lily58/Kconfig.defconfig
+++ b/app/boards/shields/lily58/Kconfig.defconfig
@@ -2,44 +2,44 @@
 if SHIELD_LILY58_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Lily58"
+    default "Lily58"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_LILY58_LEFT || SHIELD_LILY58_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 if ZMK_DISPLAY
 
 config I2C
-	default y
+    default y
 
 config SSD1306
-	default y
+    default y
 
 config SSD1306_REVERSE_MODE
-	default y
+    default y
 
 endif # ZMK_DISPLAY
 
 if LVGL
 
 config LV_Z_VDB_SIZE
-	default 64
+    default 64
 
 config LV_Z_DPI
-	default 148
+    default 148
 
 config LV_Z_BITS_PER_PIXEL
-	default 1
+    default 1
 
 choice LV_COLOR_DEPTH
-	default LV_COLOR_DEPTH_1
+    default LV_COLOR_DEPTH_1
 endchoice
 
 endif # LVGL
diff --git a/app/boards/shields/lily58/Kconfig.shield b/app/boards/shields/lily58/Kconfig.shield
index 932e33b3..1b3bb6ba 100644
--- a/app/boards/shields/lily58/Kconfig.shield
+++ b/app/boards/shields/lily58/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_LILY58_LEFT
-	def_bool $(shields_list_contains,lily58_left)
+    def_bool $(shields_list_contains,lily58_left)
 
 config SHIELD_LILY58_RIGHT
-	def_bool $(shields_list_contains,lily58_right)
+    def_bool $(shields_list_contains,lily58_right)
diff --git a/app/boards/shields/lily58/boards/nice_nano.overlay b/app/boards/shields/lily58/boards/nice_nano.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/lily58/boards/nice_nano.overlay
+++ b/app/boards/shields/lily58/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/lily58/boards/nice_nano_v2.overlay b/app/boards/shields/lily58/boards/nice_nano_v2.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/lily58/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/lily58/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/lily58/lily58.dtsi b/app/boards/shields/lily58/lily58.dtsi
index 1a296a8c..ec520f6b 100644
--- a/app/boards/shields/lily58/lily58.dtsi
+++ b/app/boards/shields/lily58/lily58.dtsi
@@ -7,75 +7,75 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zephyr,display = &oled;
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zephyr,display = &oled;
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <16>;
-		rows = <5>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <16>;
+        rows = <5>;
 // | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  |                 | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |
 // | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |                 | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |
 // | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |                 | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |
 // | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 | SW25 |   | SW25 | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 |
 //                      | SW29 | SW28 | SW27 | SW26 |   | SW26 | SW27 | SW28 | SW29 |
-		map = <
+        map = <
 RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)                 RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11)
 RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)                 RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11)
 RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)                 RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)
 RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11)
                         RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,7) RC(4,8) RC(4,9) RC(4,10)
-		>;
-	};
+        >;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
+        diode-direction = "col2row";
+        row-gpios
+            = <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
 
-	};
+    };
 
-	left_encoder: encoder_left {
-		compatible = "alps,ec11";
-		label = "LEFT_ENCODER";
-		a-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		b-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		resolution = <4>;
-	};
+    left_encoder: encoder_left {
+        compatible = "alps,ec11";
+        label = "LEFT_ENCODER";
+        a-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        resolution = <4>;
+    };
 
-	sensors {
-		compatible = "zmk,keymap-sensors";
-		sensors = <&left_encoder>;
-	};
+    sensors {
+        compatible = "zmk,keymap-sensors";
+        sensors = <&left_encoder>;
+    };
 };
 
 &pro_micro_i2c {
-	status = "okay";
+    status = "okay";
 
-	oled: ssd1306@3c {
-		compatible = "solomon,ssd1306fb";
-		reg = <0x3c>;
-		label = "DISPLAY";
-		width = <128>;
-		height = <32>;
-		segment-offset = <0>;
-		page-offset = <0>;
-		display-offset = <0>;
-		multiplex-ratio = <31>;
-		segment-remap;
-		com-invdir;
-		com-sequential;
-		prechargep = <0x22>;
-	};
+    oled: ssd1306@3c {
+        compatible = "solomon,ssd1306fb";
+        reg = <0x3c>;
+        label = "DISPLAY";
+        width = <128>;
+        height = <32>;
+        segment-offset = <0>;
+        page-offset = <0>;
+        display-offset = <0>;
+        multiplex-ratio = <31>;
+        segment-remap;
+        com-invdir;
+        com-sequential;
+        prechargep = <0x22>;
+    };
 };
diff --git a/app/boards/shields/lily58/lily58.keymap b/app/boards/shields/lily58/lily58.keymap
index dd935c7a..7df3277f 100644
--- a/app/boards/shields/lily58/lily58.keymap
+++ b/app/boards/shields/lily58/lily58.keymap
@@ -10,61 +10,61 @@
 #include <dt-bindings/zmk/ext_power.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
+        default_layer {
 // ------------------------------------------------------------------------------------------------------------
 // |  ESC  |  1  |  2  |  3   |  4   |  5   |                   |  6   |  7    |  8    |  9   |   0   |   `   |
 // |  TAB  |  Q  |  W  |  E   |  R   |  T   |                   |  Y   |  U    |  I    |  O   |   P   |   -   |
 // |  CTRL |  A  |  S  |  D   |  F   |  G   |                   |  H   |  J    |  K    |  L   |   ;   |   '   |
 // | SHIFT |  Z  |  X  |  C   |  V   |  B   |   "["  |  |  "]"  |  N   |  M    |  ,    |  .   |   /   | SHIFT |
 //                     | ALT  | GUI  | LOWER|  SPACE |  | ENTER | RAISE| BSPC  | GUI   |
-			bindings = <
+            bindings = <
 &kp ESC   &kp N1 &kp N2 &kp N3   &kp N4   &kp N5                     &kp N6 &kp N7   &kp N8    &kp N9  &kp N0   &kp GRAVE
 &kp TAB   &kp Q  &kp W  &kp E    &kp R    &kp T                      &kp Y  &kp U    &kp I     &kp O   &kp P    &kp MINUS
 &kp LCTRL &kp A  &kp S  &kp D    &kp F    &kp G                      &kp H  &kp J    &kp K     &kp L   &kp SEMI &kp SQT
 &kp LSHFT &kp Z  &kp X  &kp C    &kp V    &kp B  &kp LBKT   &kp RBKT &kp N  &kp M    &kp COMMA &kp DOT &kp FSLH &kp RSHFT
                         &kp LALT &kp LGUI &mo 1  &kp SPACE  &kp RET  &mo 2  &kp BSPC &kp RGUI
-			>;
+            >;
 
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
-		};
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
 
-		lower_layer {
+        lower_layer {
 // ------------------------------------------------------------------------------------------------------------
 // | BTCLR | BT1 | BT2 |  BT3 |  BT4 |  BT5 |                   |      |       |       |      |       |       |
 // |  F1   |  F2 |  F3 |  F4  |  F5  |  F6  |                   |  F7  |  F8   |  F9   |  F10 |  F11  |  F12  |
 // |   `   |  !  |  @  |  #   |  $   |  %   |                   |  ^   |  &    |  *    |  (   |   )   |   ~   |
 // |       |     |     |      |      |      |        |  |       |      |  _    |  +    |  {   |   }   |  "|"  |
 //                     |      |      |      |        |  |       |      |       |       |
-			bindings = <
+            bindings = <
 &bt BT_CLR &bt BT_SEL 0     &bt BT_SEL 1      &bt BT_SEL 2      &bt BT_SEL 3 &bt BT_SEL 4                 &trans    &trans    &trans          &trans    &trans    &trans
 &kp F1     &kp F2           &kp F3            &kp F4            &kp F5       &kp F6                       &kp F7    &kp F8    &kp F9          &kp F10   &kp F11   &kp F12
 &kp GRAVE  &kp EXCL         &kp AT            &kp HASH          &kp DOLLAR   &kp PRCNT                    &kp CARET &kp AMPS  &kp KP_MULTIPLY &kp LPAR  &kp RPAR  &kp TILDE
 &trans     &ext_power EP_ON &ext_power EP_OFF &ext_power EP_TOG &trans       &trans    &trans   &trans    &trans    &kp MINUS &kp KP_PLUS     &kp LBRC  &kp RBRC  &kp PIPE
                                               &trans            &trans       &trans    &trans   &trans    &trans    &trans    &trans
-			>;
+            >;
 
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
-		};
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
 
-		raise_layer {
+        raise_layer {
 // ------------------------------------------------------------------------------------------------------------
 // |       |     |     |      |      |      |                   |      |       |       |      |       |       |
 // |   `   |  1  |  2  |  3   |  4   |  5   |                   |  6   |   7   |   8   |  9   |   0   |       |
 // |   F1  |  F2 |  F3 |  F4  |  F5  |  F6  |                   |      |   <-  |   v   |  ^   |  ->   |       |
 // |   F7  |  F8 |  F9 |  F10 |  F11 |  F12 |        |  |       |  +   |   -   |   =   |  [   |   ]   |   \   |
 //                     |      |      |      |        |  |       |      |       |       |
-			bindings = <
+            bindings = <
 &trans    &trans &trans &trans  &trans  &trans                       &trans      &trans    &trans    &trans   &trans    &trans
 &kp GRAVE &kp N1 &kp N2 &kp N3  &kp N4  &kp N5                       &kp N6      &kp N7    &kp N8    &kp N9   &kp N0    &trans
 &kp F1    &kp F2 &kp F3 &kp F4  &kp F5  &kp F6                       &trans      &kp LEFT  &kp DOWN  &kp UP   &kp RIGHT &trans
 &kp F7    &kp F8 &kp F9 &kp F10 &kp F11 &kp F12   &trans   &trans    &kp KP_PLUS &kp MINUS &kp EQUAL &kp LBKT &kp RBKT  &kp BSLH
                         &trans  &trans  &trans    &trans   &trans    &trans      &trans    &trans
-			>;
+            >;
 
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
-		};
-	};
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
+    };
 };
diff --git a/app/boards/shields/lily58/lily58_left.overlay b/app/boards/shields/lily58/lily58_left.overlay
index daa53651..b95332d9 100644
--- a/app/boards/shields/lily58/lily58_left.overlay
+++ b/app/boards/shields/lily58/lily58_left.overlay
@@ -7,16 +7,16 @@
 #include "lily58.dtsi"
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        ;
 };
 
 &left_encoder {
-	status = "okay";
+    status = "okay";
 };
diff --git a/app/boards/shields/lily58/lily58_right.overlay b/app/boards/shields/lily58/lily58_right.overlay
index 18ec806b..15820ad2 100644
--- a/app/boards/shields/lily58/lily58_right.overlay
+++ b/app/boards/shields/lily58/lily58_right.overlay
@@ -7,16 +7,16 @@
 #include "lily58.dtsi"
 
 &default_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        ;
 };
diff --git a/app/boards/shields/lotus58/Kconfig.defconfig b/app/boards/shields/lotus58/Kconfig.defconfig
index b6bb37d8..62695c20 100644
--- a/app/boards/shields/lotus58/Kconfig.defconfig
+++ b/app/boards/shields/lotus58/Kconfig.defconfig
@@ -4,44 +4,44 @@
 if SHIELD_LOTUS58_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Lotus58"
+    default "Lotus58"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_LOTUS58_LEFT || SHIELD_LOTUS58_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 if ZMK_DISPLAY
 
 config I2C
-	default y
+    default y
 
 config SSD1306
-	default y
+    default y
 
 config SSD1306_REVERSE_MODE
-	default y
+    default y
 
 endif # ZMK_DISPLAY
 
 if LVGL
 
 config LV_Z_VDB_SIZE
-	default 64
+    default 64
 
 config LV_Z_DPI
-	default 148
+    default 148
 
 config LV_Z_BITS_PER_PIXEL
-	default 1
+    default 1
 
 choice LV_COLOR_DEPTH
-	default LV_COLOR_DEPTH_1
+    default LV_COLOR_DEPTH_1
 endchoice
 
 endif # LVGL
diff --git a/app/boards/shields/lotus58/Kconfig.shield b/app/boards/shields/lotus58/Kconfig.shield
index dbf7ba01..2d91c58c 100644
--- a/app/boards/shields/lotus58/Kconfig.shield
+++ b/app/boards/shields/lotus58/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_LOTUS58_LEFT
-	def_bool $(shields_list_contains,lotus58_left)
+    def_bool $(shields_list_contains,lotus58_left)
 
 config SHIELD_LOTUS58_RIGHT
-	def_bool $(shields_list_contains,lotus58_right)
+    def_bool $(shields_list_contains,lotus58_right)
diff --git a/app/boards/shields/lotus58/lotus58_left.overlay b/app/boards/shields/lotus58/lotus58_left.overlay
index a51659df..a1fc1e28 100644
--- a/app/boards/shields/lotus58/lotus58_left.overlay
+++ b/app/boards/shields/lotus58/lotus58_left.overlay
@@ -7,16 +7,16 @@
 #include "lotus58.dtsi"
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        ;
 };
 
 &left_encoder {
-	status = "okay";
+    status = "okay";
 };
diff --git a/app/boards/shields/lotus58/lotus58_right.overlay b/app/boards/shields/lotus58/lotus58_right.overlay
index dffcaeb1..5bdfe710 100644
--- a/app/boards/shields/lotus58/lotus58_right.overlay
+++ b/app/boards/shields/lotus58/lotus58_right.overlay
@@ -7,20 +7,20 @@
 #include "lotus58.dtsi"
 
 &default_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        ;
 };
 
 &right_encoder {
-	status = "okay";
+    status = "okay";
 };
diff --git a/app/boards/shields/m60/Kconfig.defconfig b/app/boards/shields/m60/Kconfig.defconfig
index ad105ed9..a4696954 100644
--- a/app/boards/shields/m60/Kconfig.defconfig
+++ b/app/boards/shields/m60/Kconfig.defconfig
@@ -4,6 +4,6 @@
 if SHIELD_M60
 
 config ZMK_KEYBOARD_NAME
-	default "m60"
+    default "m60"
 
 endif
diff --git a/app/boards/shields/m60/Kconfig.shield b/app/boards/shields/m60/Kconfig.shield
index 4ed58c49..b1414b96 100644
--- a/app/boards/shields/m60/Kconfig.shield
+++ b/app/boards/shields/m60/Kconfig.shield
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_M60
-	def_bool $(shields_list_contains,m60)
+    def_bool $(shields_list_contains,m60)
diff --git a/app/boards/shields/m60/m60.keymap b/app/boards/shields/m60/m60.keymap
index aa656929..8daa6b7c 100644
--- a/app/boards/shields/m60/m60.keymap
+++ b/app/boards/shields/m60/m60.keymap
@@ -9,10 +9,10 @@
 #include <dt-bindings/zmk/bt.h>
 
 / {
-	keymap0: keymap {
-		compatible = "zmk,keymap";
+    keymap0: keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
+        default_layer {
 // ------------------------------------------------------------------------------------------
 // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   |
 // | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \    |
@@ -20,23 +20,23 @@
 // |  SHIFT  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |      SHIFT       |
 // |  CTL  |  WIN  |  ALT  |            SPACE               | ALT | MO(1) |  WIN  | CTRL    |
 // ------------------------------------------------------------------------------------------
-			bindings = <
-	&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp   N8  &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC
-	&kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp   I   &kp  O  &kp   P  &kp LBKT &kp RBKT  &kp BSLH
-	&kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp   K   &kp  L  &kp SEMI &kp SQT           &kp RET
-	&kp LSHFT  &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH         &kp RSHFT
-	&kp LCTRL &kp LGUI &kp LALT               &kp SPACE                 &kp  RALT  &mo  1  &kp  RGUI  &kp  RCTRL
-			>;
-		};
+            bindings = <
+    &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp   N8  &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC
+    &kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp   I   &kp  O  &kp   P  &kp LBKT &kp RBKT  &kp BSLH
+    &kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp   K   &kp  L  &kp SEMI &kp SQT           &kp RET
+    &kp LSHFT  &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH         &kp RSHFT
+    &kp LCTRL &kp LGUI &kp LALT               &kp SPACE                 &kp  RALT  &mo  1  &kp  RGUI  &kp  RCTRL
+            >;
+        };
 
-		fn_layer {
-			bindings = <
+        fn_layer {
+            bindings = <
 &kp GRAVE  &kp F1     &kp F2     &kp F3     &kp F4     &kp F5     &kp F6     &kp F7     &kp F8     &kp F9     &kp F10    &kp F11    &kp F12    &bootloader
 &trans         &bt BT_CLR &none      &none      &none      &none      &none      &none      &none      &none      &none      &none      &none      &sys_reset
 &trans           &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &kp LEFT   &kp DOWN   &kp UP   &kp RIGHT   &none      &none      &trans
 &trans                &none      &none      &none      &none      &none      &none      &none      &none      &none      &none      &trans
 &trans       &trans       &trans       &trans                                                                     &trans     &trans     &trans     &trans
-			>;
-		};
-	};
+            >;
+        };
+    };
 };
diff --git a/app/boards/shields/m60/m60.overlay b/app/boards/shields/m60/m60.overlay
index 18d06511..a2ab2593 100644
--- a/app/boards/shields/m60/m60.overlay
+++ b/app/boards/shields/m60/m60.overlay
@@ -7,42 +7,42 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&gpio0 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio0 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio0 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio0 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio1 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio1 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio0 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio0 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
-		col-gpios
-			= <&gpio0 19 GPIO_ACTIVE_HIGH>
-			, <&gpio0 20 GPIO_ACTIVE_HIGH>
-			, <&gpio0 21 GPIO_ACTIVE_HIGH>
-			, <&gpio0 22 GPIO_ACTIVE_HIGH>
-			, <&gpio0 23 GPIO_ACTIVE_HIGH>
-			, <&gpio0 24 GPIO_ACTIVE_HIGH>
-			, <&gpio0 25 GPIO_ACTIVE_HIGH>
-			, <&gpio0 26 GPIO_ACTIVE_HIGH>
-			;
-	};
+        diode-direction = "col2row";
+        row-gpios
+            = <&gpio0 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio1 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio1 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
+        col-gpios
+            = <&gpio0 19 GPIO_ACTIVE_HIGH>
+            , <&gpio0 20 GPIO_ACTIVE_HIGH>
+            , <&gpio0 21 GPIO_ACTIVE_HIGH>
+            , <&gpio0 22 GPIO_ACTIVE_HIGH>
+            , <&gpio0 23 GPIO_ACTIVE_HIGH>
+            , <&gpio0 24 GPIO_ACTIVE_HIGH>
+            , <&gpio0 25 GPIO_ACTIVE_HIGH>
+            , <&gpio0 26 GPIO_ACTIVE_HIGH>
+            ;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <8>;
-		rows = <8>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <8>;
+        rows = <8>;
 // | MX1  | MX2  | MX3  | MX4  | MX5  | MX6  | MX7  | MX8  | MX9  | MX10 | MX11 | MX12 | MX13 |    MX14     |
 // |   MX15   | MX16 | MX17 | MX18 | MX19 | MX20 | MX21 | MX22 | MX23 | MX24 | MX25 | MX26 | MX27 |  MX28   |
 // |    MX29    | MX30 | MX31 | MX32 | MX33 | MX34 | MX35 | MX36 | MX37 | MX38 | MX39 | MX40 |     MX41     |
@@ -55,6 +55,6 @@ RC(3,4)     RC(3,5) RC(3,6) RC(3,7) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4
 RC(6,4)       RC(6,3) RC(6,2) RC(6,1) RC(6,0) RC(5,7) RC(5,6) RC(5,5) RC(5,4) RC(5,3) RC(5,2)                RC(5,1)
 RC(6,5)    RC(6,6)   RC(6,7)                     RC(7,0)                    RC(7,1)    RC(7,2)    RC(7,3)    RC(7,4)
         >;
-	};
+    };
 };
 
diff --git a/app/boards/shields/microdox/Kconfig.defconfig b/app/boards/shields/microdox/Kconfig.defconfig
index 8c0b042e..d05ae045 100644
--- a/app/boards/shields/microdox/Kconfig.defconfig
+++ b/app/boards/shields/microdox/Kconfig.defconfig
@@ -4,44 +4,44 @@
 if SHIELD_MICRODOX_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Microdox"
+    default "Microdox"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_MICRODOX_LEFT || SHIELD_MICRODOX_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 if ZMK_DISPLAY
 
 config I2C
-	default y
+    default y
 
 config SSD1306
-	default y
+    default y
 
 config SSD1306_REVERSE_MODE
-	default y
+    default y
 
 endif # ZMK_DISPLAY
 
 if LVGL
 
 config LV_Z_VDB_SIZE
-	default 64
+    default 64
 
 config LV_Z_DPI
-	default 148
+    default 148
 
 config LV_Z_BITS_PER_PIXEL
-	default 1
+    default 1
 
 choice LV_COLOR_DEPTH
-	default LV_COLOR_DEPTH_1
+    default LV_COLOR_DEPTH_1
 endchoice
 
 endif # LVGL
diff --git a/app/boards/shields/microdox/Kconfig.shield b/app/boards/shields/microdox/Kconfig.shield
index ac79eab6..47543760 100644
--- a/app/boards/shields/microdox/Kconfig.shield
+++ b/app/boards/shields/microdox/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_MICRODOX_LEFT
-	def_bool $(shields_list_contains,microdox_left)
+    def_bool $(shields_list_contains,microdox_left)
 
 config SHIELD_MICRODOX_RIGHT
-	def_bool $(shields_list_contains,microdox_right)
+    def_bool $(shields_list_contains,microdox_right)
diff --git a/app/boards/shields/microdox/boards/nice_nano.overlay b/app/boards/shields/microdox/boards/nice_nano.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/microdox/boards/nice_nano.overlay
+++ b/app/boards/shields/microdox/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/microdox/boards/nice_nano_v2.overlay b/app/boards/shields/microdox/boards/nice_nano_v2.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/microdox/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/microdox/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/microdox/microdox.dtsi b/app/boards/shields/microdox/microdox.dtsi
index e3fabb3e..e02aa554 100644
--- a/app/boards/shields/microdox/microdox.dtsi
+++ b/app/boards/shields/microdox/microdox.dtsi
@@ -7,59 +7,59 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zephyr,display = &oled;
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zephyr,display = &oled;
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <10>;
-		rows = <4>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <10>;
+        rows = <4>;
 // | SW1  | SW2  | SW3  | SW4  | SW5  |   | SW5  | SW4  | SW3  | SW2  | SW1  |
 // | SW6  | SW7  | SW8  | SW9  | SW10 |   | SW10 | SW9  | SW8  | SW7  | SW6  |
 // | SW11 | SW12 | SW13 | SW14 | SW15 |   | SW15 | SW14 | SW13 | SW12 | SW11 |
 //               | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 |
-		map = <
+        map = <
 RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4)  RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9)
 RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4)  RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9)
 RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4)  RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
                 RC(3,2) RC(3,3) RC(3,4)  RC(3,5) RC(3,6) RC(3,7)
-		>;
-	};
+        >;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 8  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 9  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
+        diode-direction = "col2row";
+        row-gpios
+            = <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 8  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 9  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
 
-	};
+    };
 
-	// TODO: per-key RGB node(s)?
+    // TODO: per-key RGB node(s)?
 };
 
 &pro_micro_i2c {
-	status = "okay";
+    status = "okay";
 
-	oled: ssd1306@3c {
-		compatible = "solomon,ssd1306fb";
-		reg = <0x3c>;
-		label = "DISPLAY";
-		width = <128>;
-		height = <32>;
-		segment-offset = <0>;
-		page-offset = <0>;
-		display-offset = <0>;
-		multiplex-ratio = <31>;
-		com-sequential;
-		prechargep = <0x22>;
-	};
+    oled: ssd1306@3c {
+        compatible = "solomon,ssd1306fb";
+        reg = <0x3c>;
+        label = "DISPLAY";
+        width = <128>;
+        height = <32>;
+        segment-offset = <0>;
+        page-offset = <0>;
+        display-offset = <0>;
+        multiplex-ratio = <31>;
+        com-sequential;
+        prechargep = <0x22>;
+    };
 };
diff --git a/app/boards/shields/microdox/microdox_left.overlay b/app/boards/shields/microdox/microdox_left.overlay
index 307776e7..d38f50da 100644
--- a/app/boards/shields/microdox/microdox_left.overlay
+++ b/app/boards/shields/microdox/microdox_left.overlay
@@ -7,11 +7,11 @@
 #include "microdox.dtsi"
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 21 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 20 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 21 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        ;
 };
diff --git a/app/boards/shields/microdox/microdox_right.overlay b/app/boards/shields/microdox/microdox_right.overlay
index 5475c31f..4dd29016 100644
--- a/app/boards/shields/microdox/microdox_right.overlay
+++ b/app/boards/shields/microdox/microdox_right.overlay
@@ -7,20 +7,20 @@
 #include "microdox.dtsi"
 
 &default_transform {
-	col-offset = <5>;
+    col-offset = <5>;
 };
 
 &oled {
-	segment-remap;
-	com-invdir;
+    segment-remap;
+    com-invdir;
 };
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 20 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 21 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 21 GPIO_ACTIVE_HIGH>
+        ;
 };
diff --git a/app/boards/shields/murphpad/Kconfig.defconfig b/app/boards/shields/murphpad/Kconfig.defconfig
index 07e71826..80e65351 100644
--- a/app/boards/shields/murphpad/Kconfig.defconfig
+++ b/app/boards/shields/murphpad/Kconfig.defconfig
@@ -4,34 +4,34 @@
 if SHIELD_MURPHPAD
 
 config ZMK_KEYBOARD_NAME
-	default "MurphPad"
+    default "MurphPad"
 
 if ZMK_DISPLAY
 
 config I2C
-	default y
+    default y
 
 config SSD1306
-	default y
+    default y
 
 config SSD1306_REVERSE_MODE
-	default y
+    default y
 
 endif # ZMK_DISPLAY
 
 if LVGL
 
 config LV_Z_VDB_SIZE
-	default 64
+    default 64
 
 config LV_Z_DPI
-	default 148
+    default 148
 
 config LV_Z_BITS_PER_PIXEL
-	default 1
+    default 1
 
 choice LV_COLOR_DEPTH
-	default LV_COLOR_DEPTH_1
+    default LV_COLOR_DEPTH_1
 endchoice
 
 endif # LVGL
diff --git a/app/boards/shields/murphpad/Kconfig.shield b/app/boards/shields/murphpad/Kconfig.shield
index 389caa26..1c961aea 100644
--- a/app/boards/shields/murphpad/Kconfig.shield
+++ b/app/boards/shields/murphpad/Kconfig.shield
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_MURPHPAD
-	def_bool $(shields_list_contains,murphpad)
\ No newline at end of file
+    def_bool $(shields_list_contains,murphpad)
\ No newline at end of file
diff --git a/app/boards/shields/murphpad/boards/nice_nano.overlay b/app/boards/shields/murphpad/boards/nice_nano.overlay
index 3e2241a2..ac6c51d5 100644
--- a/app/boards/shields/murphpad/boards/nice_nano.overlay
+++ b/app/boards/shields/murphpad/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 31)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 31)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 31)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 31)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/murphpad/boards/nice_nano_v2.overlay b/app/boards/shields/murphpad/boards/nice_nano_v2.overlay
index 3e2241a2..ac6c51d5 100644
--- a/app/boards/shields/murphpad/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/murphpad/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 31)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 31)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 31)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 31)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/murphpad/murphpad.overlay b/app/boards/shields/murphpad/murphpad.overlay
index b7fead60..13905092 100644
--- a/app/boards/shields/murphpad/murphpad.overlay
+++ b/app/boards/shields/murphpad/murphpad.overlay
@@ -7,69 +7,69 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zephyr,display = &oled;
-		zmk,kscan = &kscan0;
-	};
+    chosen {
+        zephyr,display = &oled;
+        zmk,kscan = &kscan0;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&pro_micro 20  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            		, <&pro_micro 18  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            		, <&pro_micro 19  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        diode-direction = "col2row";
+        row-gpios
+            = <&pro_micro 20  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+                    , <&pro_micro 18  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+                    , <&pro_micro 19  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
             ;
-		col-gpios
-			= <&pro_micro 9  GPIO_ACTIVE_HIGH>
-			, <&pro_micro 6  GPIO_ACTIVE_HIGH>
-			, <&pro_micro 5  GPIO_ACTIVE_HIGH>
-			, <&pro_micro 4  GPIO_ACTIVE_HIGH>
-            		, <&pro_micro 10 GPIO_ACTIVE_HIGH>
-			;
-	};
+        col-gpios
+            = <&pro_micro 9  GPIO_ACTIVE_HIGH>
+            , <&pro_micro 6  GPIO_ACTIVE_HIGH>
+            , <&pro_micro 5  GPIO_ACTIVE_HIGH>
+            , <&pro_micro 4  GPIO_ACTIVE_HIGH>
+                    , <&pro_micro 10 GPIO_ACTIVE_HIGH>
+            ;
+    };
 
-	encoder_1: encoder_1 {
-		compatible = "alps,ec11";
-		label = "Encoder 1";
-		a-gpios = <&pro_micro 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-		b-gpios = <&pro_micro 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-		resolution = <4>;
-		status = "disabled";
-	};
+    encoder_1: encoder_1 {
+        compatible = "alps,ec11";
+        label = "Encoder 1";
+        a-gpios = <&pro_micro 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        resolution = <4>;
+        status = "disabled";
+    };
 
-	encoder_2: encoder_2 {
-		compatible = "alps,ec11";
-		label = "Encoder 2";
-		a-gpios = <&pro_micro 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-		b-gpios = <&pro_micro 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-		resolution = <4>;
-		status = "disabled";
-	};
+    encoder_2: encoder_2 {
+        compatible = "alps,ec11";
+        label = "Encoder 2";
+        a-gpios = <&pro_micro 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        resolution = <4>;
+        status = "disabled";
+    };
 
 };
 
 &pro_micro_i2c {
-	status = "okay";
+    status = "okay";
 
-	oled: ssd1306@3c {
-		compatible = "solomon,ssd1306fb";
-		reg = <0x3c>;
-		label = "DISPLAY";
-		width = <128>;
-		height = <32>;
-		segment-offset = <0>;
-		page-offset = <0>;
-		display-offset = <0>;
-		multiplex-ratio = <31>;
-		segment-remap;
-		com-invdir;
-		com-sequential;
-		prechargep = <0x22>;
-	};
+    oled: ssd1306@3c {
+        compatible = "solomon,ssd1306fb";
+        reg = <0x3c>;
+        label = "DISPLAY";
+        width = <128>;
+        height = <32>;
+        segment-offset = <0>;
+        page-offset = <0>;
+        display-offset = <0>;
+        multiplex-ratio = <31>;
+        segment-remap;
+        com-invdir;
+        com-sequential;
+        prechargep = <0x22>;
+    };
 };
diff --git a/app/boards/shields/nibble/Kconfig.defconfig b/app/boards/shields/nibble/Kconfig.defconfig
index d5e8cbeb..31ac7cfe 100644
--- a/app/boards/shields/nibble/Kconfig.defconfig
+++ b/app/boards/shields/nibble/Kconfig.defconfig
@@ -4,38 +4,38 @@
 if SHIELD_NIBBLE
 
 config ZMK_KEYBOARD_NAME
-	default "NIBBLE"
+    default "NIBBLE"
 
 config ZMK_USB
-	default y
+    default y
 
 
 if ZMK_DISPLAY
 
 config I2C
-	default y
+    default y
 
 config SSD1306
-	default y
+    default y
 
 config SSD1306_REVERSE_MODE
-	default y
+    default y
 
 endif # ZMK_DISPLAY
 
 if LVGL
 
 config LV_Z_VDB_SIZE
-	default 64
+    default 64
 
 config LV_Z_DPI
-	default 148
+    default 148
 
 config LV_Z_BITS_PER_PIXEL
-	default 1
+    default 1
 
 choice LV_COLOR_DEPTH
-	default LV_COLOR_DEPTH_1
+    default LV_COLOR_DEPTH_1
 endchoice
 
 endif # LVGL
diff --git a/app/boards/shields/nibble/Kconfig.shield b/app/boards/shields/nibble/Kconfig.shield
index 44364f4e..cb6fd15e 100644
--- a/app/boards/shields/nibble/Kconfig.shield
+++ b/app/boards/shields/nibble/Kconfig.shield
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_NIBBLE
-	def_bool $(shields_list_contains,nibble)
+    def_bool $(shields_list_contains,nibble)
diff --git a/app/boards/shields/nibble/boards/nice_nano.overlay b/app/boards/shields/nibble/boards/nice_nano.overlay
index 54ab9fec..45c55263 100644
--- a/app/boards/shields/nibble/boards/nice_nano.overlay
+++ b/app/boards/shields/nibble/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 11)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 11)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 11)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 11)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/nibble/boards/nice_nano_v2.overlay b/app/boards/shields/nibble/boards/nice_nano_v2.overlay
index 54ab9fec..45c55263 100644
--- a/app/boards/shields/nibble/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/nibble/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 11)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 11)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 11)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 11)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/nibble/nibble.keymap b/app/boards/shields/nibble/nibble.keymap
index c02aad75..5b90f6c1 100644
--- a/app/boards/shields/nibble/nibble.keymap
+++ b/app/boards/shields/nibble/nibble.keymap
@@ -9,39 +9,39 @@
 #include <dt-bindings/zmk/bt.h>
 
 / {
-	sensors {
-		compatible = "zmk,keymap-sensors";
-		sensors = <&encoder_1>;
-	};
+    sensors {
+        compatible = "zmk,keymap-sensors";
+        sensors = <&encoder_1>;
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
-			label = "Default";
+        default_layer {
+            label = "Default";
 
-			sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>;
+            sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>;
 
-			bindings = <
+            bindings = <
             &kp ESC   &kp N1    &kp N2    &kp N3    &kp N4    &kp N5    &kp N6    &kp N7    &kp N8  &kp N9    &kp N0    &kp MINUS &kp EQUAL &kp BSPC &kp HOME
 &kp C_MUTE  &kp TAB   &kp Q     &kp W     &kp E     &kp R     &kp T     &kp Y     &kp U     &kp I   &kp O     &kp P     &kp LBKT  &kp RBKT  &kp BSLH &kp DEL
 &trans      &kp CLCK  &kp A     &kp S     &kp D     &kp F     &kp G     &kp H     &kp J     &kp K   &kp L     &kp SEMI  &kp SQT             &kp RET  &kp PG_UP
 &trans      &kp LSHFT &trans    &kp Z     &kp X     &kp C     &kp V     &kp B     &kp N     &kp M   &kp COMMA &kp DOT   &kp FSLH  &kp RSHFT &kp UP   &kp PG_DN
 &trans      &kp LCTRL &kp LGUI  &kp LALT                      &kp SPACE                     &mo 1   &kp RALT  &kp RCTRL &kp LEFT            &kp DOWN &kp RIGHT
-			>;
-		};
-		function_layer {
-			label = "Function";
+            >;
+        };
+        function_layer {
+            label = "Function";
 
-			sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>;
+            sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>;
 
-			bindings = <
+            bindings = <
             &kp TILDE &kp F1    &kp F2    &kp F3    &kp F4    &kp F5    &kp F6    &kp F7    &kp F8  &kp F9    &kp F10   &kp F11   &kp F12   &trans   &kp END
 &kp C_MUTE  &trans    &trans    &trans    &trans    &trans    &trans    &trans    &trans    &trans  &trans    &trans    &trans    &trans    &trans   &bootloader
 &bt BT_CLR  &trans    &trans    &trans    &trans    &trans    &trans    &trans    &trans    &trans  &trans    &trans    &trans              &trans   &trans
 &bt BT_PRV  &trans    &trans    &trans    &trans    &trans    &trans    &trans    &trans    &trans  &trans    &trans    &trans    &trans    &trans   &trans
 &bt BT_NXT  &trans    &trans    &trans                        &trans                        &trans  &trans    &trans    &kp C_PREV          &kp C_PP &kp C_NEXT
-			>;
-		};
-	};
+            >;
+        };
+    };
 };
diff --git a/app/boards/shields/nibble/nibble.overlay b/app/boards/shields/nibble/nibble.overlay
index baf1eb10..cd117640 100644
--- a/app/boards/shields/nibble/nibble.overlay
+++ b/app/boards/shields/nibble/nibble.overlay
@@ -7,69 +7,69 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zephyr,display = &oled;
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zephyr,display = &oled;
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	encoder_1: encoder_1 {
-		compatible = "alps,ec11";
-		label = "Encoder 1";
-		a-gpios = <&pro_micro 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-		b-gpios = <&pro_micro 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-		resolution = <4>;
-		status = "okay";
-	};
+    encoder_1: encoder_1 {
+        compatible = "alps,ec11";
+        label = "Encoder 1";
+        a-gpios = <&pro_micro 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        resolution = <4>;
+        status = "okay";
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-demux";
-		label = "KSCAN";
-		polling-interval-msec = <25>;
-		input-gpios
-			= <&pro_micro 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro 4  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			;
-		output-gpios
-			= <&pro_micro 21 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 20 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-			;
-	};
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-demux";
+        label = "KSCAN";
+        polling-interval-msec = <25>;
+        input-gpios
+            = <&pro_micro 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 4  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            ;
+        output-gpios
+            = <&pro_micro 21 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+            ;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <16>;
-		rows = <5>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <16>;
+        rows = <5>;
 
-		map = <
+        map = <
         RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,13)  RC(0,14) RC(0,15)
 RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9)  RC(1,10) RC(1,11) RC(1,12) RC(1,13) RC(1,14) RC(1,15)
-RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)  RC(2,10) RC(2,11) RC(2,12) 	     RC(2,14) RC(2,15)
+RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)  RC(2,10) RC(2,11) RC(2,12)          RC(2,14) RC(2,15)
 RC(3,0) RC(3,1) RC(0,0) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8)  RC(3,9)  RC(3,10) RC(3,11) RC(3,12) RC(3,14) RC(3,15)
 RC(4,0) RC(4,1) RC(4,2) RC(4,3)                 RC(4,6)                 RC(4,9)  RC(4,10) RC(4,11) RC(4,12)          RC(4,14) RC(4,15)
-		>;
-	};
+        >;
+    };
 };
 
 &pro_micro_i2c {
-	status = "okay";
+    status = "okay";
 
-	oled: ssd1306@3c {
-		compatible = "solomon,ssd1306fb";
-		reg = <0x3c>;
-		label = "DISPLAY";
-		width = <128>;
-		height = <32>;
-		segment-offset = <0>;
-		page-offset = <0>;
-		display-offset = <0>;
-		multiplex-ratio = <31>;
-		com-sequential;
-		prechargep = <0x22>;
-	};
+    oled: ssd1306@3c {
+        compatible = "solomon,ssd1306fb";
+        reg = <0x3c>;
+        label = "DISPLAY";
+        width = <128>;
+        height = <32>;
+        segment-offset = <0>;
+        page-offset = <0>;
+        display-offset = <0>;
+        multiplex-ratio = <31>;
+        com-sequential;
+        prechargep = <0x22>;
+    };
 };
diff --git a/app/boards/shields/nice_view/Kconfig.defconfig b/app/boards/shields/nice_view/Kconfig.defconfig
index 22c5f647..d2378409 100644
--- a/app/boards/shields/nice_view/Kconfig.defconfig
+++ b/app/boards/shields/nice_view/Kconfig.defconfig
@@ -4,24 +4,24 @@
 if SHIELD_NICE_VIEW
 
 config ZMK_DISPLAY
-	select LV_FONT_MONTSERRAT_26
+    select LV_FONT_MONTSERRAT_26
 
 if ZMK_DISPLAY
 
 config SPI
-	default y
+    default y
 
 config LS0XX
-	default y
+    default y
 
 config ZMK_WIDGET_WPM_STATUS
-	default y if !ZMK_SPLIT || ZMK_SPLIT_ROLE_CENTRAL
+    default y if !ZMK_SPLIT || ZMK_SPLIT_ROLE_CENTRAL
 
 config LV_Z_BITS_PER_PIXEL
-	default 1
+    default 1
 
 choice LV_COLOR_DEPTH
-	default LV_COLOR_DEPTH_1
+    default LV_COLOR_DEPTH_1
 endchoice
 
 endif # ZMK_DISPLAY
diff --git a/app/boards/shields/nice_view/Kconfig.shield b/app/boards/shields/nice_view/Kconfig.shield
index 55cba788..fbe4fde8 100644
--- a/app/boards/shields/nice_view/Kconfig.shield
+++ b/app/boards/shields/nice_view/Kconfig.shield
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_NICE_VIEW
-	def_bool $(shields_list_contains,nice_view)
+    def_bool $(shields_list_contains,nice_view)
diff --git a/app/boards/shields/nice_view/nice_view.overlay b/app/boards/shields/nice_view/nice_view.overlay
index eacdd41a..49ce0f23 100644
--- a/app/boards/shields/nice_view/nice_view.overlay
+++ b/app/boards/shields/nice_view/nice_view.overlay
@@ -5,19 +5,19 @@
  */
 
 &nice_view_spi {
-	status = "okay";
-	nice_view: ls0xx@0 {
-		compatible = "sharp,ls0xx";
-		label = "DISPLAY";
-		spi-max-frequency = <1000000>;
-		reg = <0>;
-		width = <160>;
-		height = <68>;
-	};
+    status = "okay";
+    nice_view: ls0xx@0 {
+        compatible = "sharp,ls0xx";
+        label = "DISPLAY";
+        spi-max-frequency = <1000000>;
+        reg = <0>;
+        width = <160>;
+        height = <68>;
+    };
 };
 
 / {
-	chosen {
-		zephyr,display = &nice_view;
-	};
+    chosen {
+        zephyr,display = &nice_view;
+    };
 };
diff --git a/app/boards/shields/nice_view_adapter/Kconfig.shield b/app/boards/shields/nice_view_adapter/Kconfig.shield
index bf9ba7cb..f95a209c 100644
--- a/app/boards/shields/nice_view_adapter/Kconfig.shield
+++ b/app/boards/shields/nice_view_adapter/Kconfig.shield
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_NICE_VIEW_ADAPTER
-	def_bool $(shields_list_contains,nice_view_adapter)
+    def_bool $(shields_list_contains,nice_view_adapter)
diff --git a/app/boards/shields/nice_view_adapter/boards/bluemicro840_v1.overlay b/app/boards/shields/nice_view_adapter/boards/bluemicro840_v1.overlay
index b8b07258..706cffbe 100644
--- a/app/boards/shields/nice_view_adapter/boards/bluemicro840_v1.overlay
+++ b/app/boards/shields/nice_view_adapter/boards/bluemicro840_v1.overlay
@@ -5,31 +5,31 @@
  */
 
 &pinctrl {
-	spi0_default: spi0_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 17)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 15)>,
-				<NRF_PSEL(SPIM_MISO, 0, 25)>;
-		};
-	};
-	spi0_sleep: spi0_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 17)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 15)>,
-				<NRF_PSEL(SPIM_MISO, 0, 25)>;
-			low-power-enable;
-		};
-	};
+    spi0_default: spi0_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 17)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 15)>,
+                <NRF_PSEL(SPIM_MISO, 0, 25)>;
+        };
+    };
+    spi0_sleep: spi0_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 17)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 15)>,
+                <NRF_PSEL(SPIM_MISO, 0, 25)>;
+            low-power-enable;
+        };
+    };
 };
 
 nice_view_spi: &spi0 {
-	compatible = "nordic,nrf-spim";
-	pinctrl-0 = <&spi0_default>;
-	pinctrl-1 = <&spi0_sleep>;
-	pinctrl-names = "default", "sleep";
-	cs-gpios = <&pro_micro 1 GPIO_ACTIVE_HIGH>;
+    compatible = "nordic,nrf-spim";
+    pinctrl-0 = <&spi0_default>;
+    pinctrl-1 = <&spi0_sleep>;
+    pinctrl-names = "default", "sleep";
+    cs-gpios = <&pro_micro 1 GPIO_ACTIVE_HIGH>;
 };
 
 &pro_micro_i2c {
-	status = "disabled";
+    status = "disabled";
 };
diff --git a/app/boards/shields/nice_view_adapter/boards/mikoto_520.overlay b/app/boards/shields/nice_view_adapter/boards/mikoto_520.overlay
index d9cc0835..e00b599c 100644
--- a/app/boards/shields/nice_view_adapter/boards/mikoto_520.overlay
+++ b/app/boards/shields/nice_view_adapter/boards/mikoto_520.overlay
@@ -5,31 +5,31 @@
  */
 
 &pinctrl {
-	spi0_default: spi0_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 17)>,
-				<NRF_PSEL(SPIM_MISO, 0, 5)>;
-		};
-	};
-	spi0_sleep: spi0_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 17)>,
-				<NRF_PSEL(SPIM_MISO, 0, 5)>;
-			low-power-enable;
-		};
-	};
+    spi0_default: spi0_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 17)>,
+                <NRF_PSEL(SPIM_MISO, 0, 5)>;
+        };
+    };
+    spi0_sleep: spi0_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 17)>,
+                <NRF_PSEL(SPIM_MISO, 0, 5)>;
+            low-power-enable;
+        };
+    };
 };
 
 nice_view_spi: &spi0 {
-	compatible = "nordic,nrf-spim";
-	pinctrl-0 = <&spi0_default>;
-	pinctrl-1 = <&spi0_sleep>;
-	pinctrl-names = "default", "sleep";
-	cs-gpios = <&pro_micro 1 GPIO_ACTIVE_HIGH>;
+    compatible = "nordic,nrf-spim";
+    pinctrl-0 = <&spi0_default>;
+    pinctrl-1 = <&spi0_sleep>;
+    pinctrl-names = "default", "sleep";
+    cs-gpios = <&pro_micro 1 GPIO_ACTIVE_HIGH>;
 };
 
 &pro_micro_i2c {
-	status = "disabled";
+    status = "disabled";
 };
diff --git a/app/boards/shields/nice_view_adapter/boards/nice_nano.overlay b/app/boards/shields/nice_view_adapter/boards/nice_nano.overlay
index 2a1b757d..45ba34de 100644
--- a/app/boards/shields/nice_view_adapter/boards/nice_nano.overlay
+++ b/app/boards/shields/nice_view_adapter/boards/nice_nano.overlay
@@ -5,31 +5,31 @@
  */
 
 &pinctrl {
-	spi0_default: spi0_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 17)>,
-				<NRF_PSEL(SPIM_MISO, 0, 25)>;
-		};
-	};
-	spi0_sleep: spi0_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 17)>,
-				<NRF_PSEL(SPIM_MISO, 0, 25)>;
-			low-power-enable;
-		};
-	};
+    spi0_default: spi0_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 17)>,
+                <NRF_PSEL(SPIM_MISO, 0, 25)>;
+        };
+    };
+    spi0_sleep: spi0_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 17)>,
+                <NRF_PSEL(SPIM_MISO, 0, 25)>;
+            low-power-enable;
+        };
+    };
 };
 
 nice_view_spi: &spi0 {
-	compatible = "nordic,nrf-spim";
-	pinctrl-0 = <&spi0_default>;
-	pinctrl-1 = <&spi0_sleep>;
-	pinctrl-names = "default", "sleep";
-	cs-gpios = <&pro_micro 1 GPIO_ACTIVE_HIGH>;
+    compatible = "nordic,nrf-spim";
+    pinctrl-0 = <&spi0_default>;
+    pinctrl-1 = <&spi0_sleep>;
+    pinctrl-names = "default", "sleep";
+    cs-gpios = <&pro_micro 1 GPIO_ACTIVE_HIGH>;
 };
 
 &pro_micro_i2c {
-	status = "disabled";
+    status = "disabled";
 };
diff --git a/app/boards/shields/nice_view_adapter/boards/nice_nano_v2.overlay b/app/boards/shields/nice_view_adapter/boards/nice_nano_v2.overlay
index 2a1b757d..45ba34de 100644
--- a/app/boards/shields/nice_view_adapter/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/nice_view_adapter/boards/nice_nano_v2.overlay
@@ -5,31 +5,31 @@
  */
 
 &pinctrl {
-	spi0_default: spi0_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 17)>,
-				<NRF_PSEL(SPIM_MISO, 0, 25)>;
-		};
-	};
-	spi0_sleep: spi0_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 17)>,
-				<NRF_PSEL(SPIM_MISO, 0, 25)>;
-			low-power-enable;
-		};
-	};
+    spi0_default: spi0_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 17)>,
+                <NRF_PSEL(SPIM_MISO, 0, 25)>;
+        };
+    };
+    spi0_sleep: spi0_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 17)>,
+                <NRF_PSEL(SPIM_MISO, 0, 25)>;
+            low-power-enable;
+        };
+    };
 };
 
 nice_view_spi: &spi0 {
-	compatible = "nordic,nrf-spim";
-	pinctrl-0 = <&spi0_default>;
-	pinctrl-1 = <&spi0_sleep>;
-	pinctrl-names = "default", "sleep";
-	cs-gpios = <&pro_micro 1 GPIO_ACTIVE_HIGH>;
+    compatible = "nordic,nrf-spim";
+    pinctrl-0 = <&spi0_default>;
+    pinctrl-1 = <&spi0_sleep>;
+    pinctrl-names = "default", "sleep";
+    cs-gpios = <&pro_micro 1 GPIO_ACTIVE_HIGH>;
 };
 
 &pro_micro_i2c {
-	status = "disabled";
+    status = "disabled";
 };
diff --git a/app/boards/shields/nice_view_adapter/boards/nrfmicro_11.overlay b/app/boards/shields/nice_view_adapter/boards/nrfmicro_11.overlay
index b8b07258..706cffbe 100644
--- a/app/boards/shields/nice_view_adapter/boards/nrfmicro_11.overlay
+++ b/app/boards/shields/nice_view_adapter/boards/nrfmicro_11.overlay
@@ -5,31 +5,31 @@
  */
 
 &pinctrl {
-	spi0_default: spi0_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 17)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 15)>,
-				<NRF_PSEL(SPIM_MISO, 0, 25)>;
-		};
-	};
-	spi0_sleep: spi0_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 17)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 15)>,
-				<NRF_PSEL(SPIM_MISO, 0, 25)>;
-			low-power-enable;
-		};
-	};
+    spi0_default: spi0_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 17)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 15)>,
+                <NRF_PSEL(SPIM_MISO, 0, 25)>;
+        };
+    };
+    spi0_sleep: spi0_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 17)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 15)>,
+                <NRF_PSEL(SPIM_MISO, 0, 25)>;
+            low-power-enable;
+        };
+    };
 };
 
 nice_view_spi: &spi0 {
-	compatible = "nordic,nrf-spim";
-	pinctrl-0 = <&spi0_default>;
-	pinctrl-1 = <&spi0_sleep>;
-	pinctrl-names = "default", "sleep";
-	cs-gpios = <&pro_micro 1 GPIO_ACTIVE_HIGH>;
+    compatible = "nordic,nrf-spim";
+    pinctrl-0 = <&spi0_default>;
+    pinctrl-1 = <&spi0_sleep>;
+    pinctrl-names = "default", "sleep";
+    cs-gpios = <&pro_micro 1 GPIO_ACTIVE_HIGH>;
 };
 
 &pro_micro_i2c {
-	status = "disabled";
+    status = "disabled";
 };
diff --git a/app/boards/shields/nice_view_adapter/boards/nrfmicro_11_flipped.overlay b/app/boards/shields/nice_view_adapter/boards/nrfmicro_11_flipped.overlay
index 1cd19db9..5b5dbfb1 100644
--- a/app/boards/shields/nice_view_adapter/boards/nrfmicro_11_flipped.overlay
+++ b/app/boards/shields/nice_view_adapter/boards/nrfmicro_11_flipped.overlay
@@ -5,31 +5,31 @@
  */
 
 &pinctrl {
-	spi0_default: spi0_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 31)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 30)>,
-				<NRF_PSEL(SPIM_MISO, 0, 25)>;
-		};
-	};
-	spi0_sleep: spi0_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 31)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 30)>,
-				<NRF_PSEL(SPIM_MISO, 0, 25)>;
-			low-power-enable;
-		};
-	};
+    spi0_default: spi0_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 31)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 30)>,
+                <NRF_PSEL(SPIM_MISO, 0, 25)>;
+        };
+    };
+    spi0_sleep: spi0_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 31)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 30)>,
+                <NRF_PSEL(SPIM_MISO, 0, 25)>;
+            low-power-enable;
+        };
+    };
 };
 
 nice_view_spi: &spi0 {
-	compatible = "nordic,nrf-spim";
-	pinctrl-0 = <&spi0_default>;
-	pinctrl-1 = <&spi0_sleep>;
-	pinctrl-names = "default", "sleep";
-	cs-gpios = <&pro_micro 1 GPIO_ACTIVE_HIGH>;
+    compatible = "nordic,nrf-spim";
+    pinctrl-0 = <&spi0_default>;
+    pinctrl-1 = <&spi0_sleep>;
+    pinctrl-names = "default", "sleep";
+    cs-gpios = <&pro_micro 1 GPIO_ACTIVE_HIGH>;
 };
 
 &pro_micro_i2c {
-	status = "disabled";
+    status = "disabled";
 };
diff --git a/app/boards/shields/nice_view_adapter/boards/nrfmicro_13.overlay b/app/boards/shields/nice_view_adapter/boards/nrfmicro_13.overlay
index b8b07258..706cffbe 100644
--- a/app/boards/shields/nice_view_adapter/boards/nrfmicro_13.overlay
+++ b/app/boards/shields/nice_view_adapter/boards/nrfmicro_13.overlay
@@ -5,31 +5,31 @@
  */
 
 &pinctrl {
-	spi0_default: spi0_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 17)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 15)>,
-				<NRF_PSEL(SPIM_MISO, 0, 25)>;
-		};
-	};
-	spi0_sleep: spi0_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 17)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 15)>,
-				<NRF_PSEL(SPIM_MISO, 0, 25)>;
-			low-power-enable;
-		};
-	};
+    spi0_default: spi0_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 17)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 15)>,
+                <NRF_PSEL(SPIM_MISO, 0, 25)>;
+        };
+    };
+    spi0_sleep: spi0_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 17)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 15)>,
+                <NRF_PSEL(SPIM_MISO, 0, 25)>;
+            low-power-enable;
+        };
+    };
 };
 
 nice_view_spi: &spi0 {
-	compatible = "nordic,nrf-spim";
-	pinctrl-0 = <&spi0_default>;
-	pinctrl-1 = <&spi0_sleep>;
-	pinctrl-names = "default", "sleep";
-	cs-gpios = <&pro_micro 1 GPIO_ACTIVE_HIGH>;
+    compatible = "nordic,nrf-spim";
+    pinctrl-0 = <&spi0_default>;
+    pinctrl-1 = <&spi0_sleep>;
+    pinctrl-names = "default", "sleep";
+    cs-gpios = <&pro_micro 1 GPIO_ACTIVE_HIGH>;
 };
 
 &pro_micro_i2c {
-	status = "disabled";
+    status = "disabled";
 };
diff --git a/app/boards/shields/nice_view_adapter/boards/puchi_ble_v1.overlay b/app/boards/shields/nice_view_adapter/boards/puchi_ble_v1.overlay
index b8b07258..706cffbe 100644
--- a/app/boards/shields/nice_view_adapter/boards/puchi_ble_v1.overlay
+++ b/app/boards/shields/nice_view_adapter/boards/puchi_ble_v1.overlay
@@ -5,31 +5,31 @@
  */
 
 &pinctrl {
-	spi0_default: spi0_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 17)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 15)>,
-				<NRF_PSEL(SPIM_MISO, 0, 25)>;
-		};
-	};
-	spi0_sleep: spi0_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 17)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 15)>,
-				<NRF_PSEL(SPIM_MISO, 0, 25)>;
-			low-power-enable;
-		};
-	};
+    spi0_default: spi0_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 17)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 15)>,
+                <NRF_PSEL(SPIM_MISO, 0, 25)>;
+        };
+    };
+    spi0_sleep: spi0_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 17)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 15)>,
+                <NRF_PSEL(SPIM_MISO, 0, 25)>;
+            low-power-enable;
+        };
+    };
 };
 
 nice_view_spi: &spi0 {
-	compatible = "nordic,nrf-spim";
-	pinctrl-0 = <&spi0_default>;
-	pinctrl-1 = <&spi0_sleep>;
-	pinctrl-names = "default", "sleep";
-	cs-gpios = <&pro_micro 1 GPIO_ACTIVE_HIGH>;
+    compatible = "nordic,nrf-spim";
+    pinctrl-0 = <&spi0_default>;
+    pinctrl-1 = <&spi0_sleep>;
+    pinctrl-names = "default", "sleep";
+    cs-gpios = <&pro_micro 1 GPIO_ACTIVE_HIGH>;
 };
 
 &pro_micro_i2c {
-	status = "disabled";
+    status = "disabled";
 };
diff --git a/app/boards/shields/pancake/Kconfig.shield b/app/boards/shields/pancake/Kconfig.shield
index 784d25a4..ca00d303 100644
--- a/app/boards/shields/pancake/Kconfig.shield
+++ b/app/boards/shields/pancake/Kconfig.shield
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_PANCAKE
-	def_bool $(shields_list_contains,pancake)
\ No newline at end of file
+    def_bool $(shields_list_contains,pancake)
\ No newline at end of file
diff --git a/app/boards/shields/quefrency/Kconfig.defconfig b/app/boards/shields/quefrency/Kconfig.defconfig
index 28e46a56..db618287 100644
--- a/app/boards/shields/quefrency/Kconfig.defconfig
+++ b/app/boards/shields/quefrency/Kconfig.defconfig
@@ -5,16 +5,16 @@
 if SHIELD_QUEFRENCY_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Quefrency"
+    default "Quefrency"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_QUEFRENCY_LEFT || SHIELD_QUEFRENCY_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 endif
\ No newline at end of file
diff --git a/app/boards/shields/quefrency/Kconfig.shield b/app/boards/shields/quefrency/Kconfig.shield
index d205e58f..d30d30f1 100644
--- a/app/boards/shields/quefrency/Kconfig.shield
+++ b/app/boards/shields/quefrency/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_QUEFRENCY_LEFT
-	def_bool $(shields_list_contains,quefrency_left)
+    def_bool $(shields_list_contains,quefrency_left)
 
 config SHIELD_QUEFRENCY_RIGHT
-	def_bool $(shields_list_contains,quefrency_right)
+    def_bool $(shields_list_contains,quefrency_right)
diff --git a/app/boards/shields/quefrency/quefrency.dtsi b/app/boards/shields/quefrency/quefrency.dtsi
index c9cb7d43..f7dc4489 100644
--- a/app/boards/shields/quefrency/quefrency.dtsi
+++ b/app/boards/shields/quefrency/quefrency.dtsi
@@ -7,26 +7,26 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-	    zmk,kscan = &kscan0;
+    chosen {
+        zmk,kscan = &kscan0;
 
-	    zmk,matrix_transform = &default_transform;
-	};
+        zmk,matrix_transform = &default_transform;
+    };
 
-	/*
-	 * This transform correspondsto the 60% left without macro keypad and 65% right, even this
-	 * combination of PCBs can have keys in different locations based on configuration.
-	 */
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <15>;
-		rows = <6>;
-		map = <
+    /*
+     * This transform correspondsto the 60% left without macro keypad and 65% right, even this
+     * combination of PCBs can have keys in different locations based on configuration.
+     */
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <15>;
+        rows = <6>;
+        map = <
 RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6)   /**/ RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)   RC(0,14)     RC(5,13)
 RC(1,0)     RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)       /**/RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13)   RC(1,14)  RC(5,14)
 RC(2,0)       RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)     /**/ RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12)     RC(2,14)       RC(2,13)
 RC(3,0)          RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6)  /**/   RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,12)     RC(3,13)     RC(3,14) RC(3,11)
 RC(4,0)  RC(4,1)  RC(4,2)         RC(4,4)         RC(4,6) /**/   RC(4,7)                 RC(4,10) RC(4,11) RC(4,12) RC(4,13) RC(4,14) RC(4,9)
-		>;
-	};
+        >;
+    };
 };
diff --git a/app/boards/shields/redox/Kconfig.defconfig b/app/boards/shields/redox/Kconfig.defconfig
index bf122b5e..32e30ad5 100644
--- a/app/boards/shields/redox/Kconfig.defconfig
+++ b/app/boards/shields/redox/Kconfig.defconfig
@@ -3,16 +3,16 @@
 if SHIELD_REDOX_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Redox"
+    default "Redox"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_REDOX_LEFT || SHIELD_REDOX_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 endif
\ No newline at end of file
diff --git a/app/boards/shields/redox/Kconfig.shield b/app/boards/shields/redox/Kconfig.shield
index 2df91c11..8e6c601d 100644
--- a/app/boards/shields/redox/Kconfig.shield
+++ b/app/boards/shields/redox/Kconfig.shield
@@ -1,7 +1,7 @@
 # Copyright (c) 2021 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 config SHIELD_REDOX_LEFT
-	def_bool $(shields_list_contains,redox_left)
+    def_bool $(shields_list_contains,redox_left)
 
 config SHIELD_REDOX_RIGHT
-	def_bool $(shields_list_contains,redox_right)
+    def_bool $(shields_list_contains,redox_right)
diff --git a/app/boards/shields/redox/boards/nice_nano.overlay b/app/boards/shields/redox/boards/nice_nano.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/redox/boards/nice_nano.overlay
+++ b/app/boards/shields/redox/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/redox/boards/nice_nano_v2.overlay b/app/boards/shields/redox/boards/nice_nano_v2.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/redox/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/redox/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/redox/redox.dtsi b/app/boards/shields/redox/redox.dtsi
index 9c0705a6..d2d72d0f 100644
--- a/app/boards/shields/redox/redox.dtsi
+++ b/app/boards/shields/redox/redox.dtsi
@@ -7,42 +7,42 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <14>;
-		rows = <5>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <14>;
+        rows = <5>;
 // | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |                               | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  |
 // | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 | SW13 |                 | SW13 | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |
 // | SW14 | SW15 | SW16 | SW17 | SW18 | SW19 | SW20 |                 | SW20 | SW19 | SW18 | SW17 | SW16 | SW15 | SW14 |
 // | SW21 | SW22 | SW23 | SW24 | SW25 | SW26 | SW27 | SW28 |   | SW28 | SW27 | SW26 | SW25 | SW24 | SW23 | SW22 | SW21 |
 // | SW29 | SW30 | SW31 | SW32 |     SW33    | SW34 | SW35 |   | SW35 | SW34 |     SW33    | SW32 | SW31 | SW30 | SW29 |
-		map = <
+        map = <
 RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)                                 RC(0,8) RC(0,9)  RC(0,10) RC(0,11) RC(0,12) RC(0,13)
 RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(0,6)                 RC(0,7) RC(1,8) RC(1,9)  RC(1,10) RC(1,11) RC(1,12) RC(1,13)
 RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(1,6)                 RC(1,7) RC(2,8) RC(2,9)  RC(2,10) RC(2,11) RC(2,12) RC(2,13)
 RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(2,6) RC(3,6) RC(3,7) RC(2,7) RC(3,8) RC(3,9)  RC(3,10) RC(3,11) RC(3,12) RC(3,13)
 RC(4,0) RC(4,1) RC(4,2) RC(4,3)      RC(4,4)    RC(4,5) RC(4,6) RC(4,7) RC(4,8)     RC(4,9)      RC(4,10) RC(4,11) RC(4,12) RC(4,13)
-		>;
-	};
+        >;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
+        diode-direction = "col2row";
+        row-gpios
+            = <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
 
-	};
+    };
 
 };
diff --git a/app/boards/shields/redox/redox_left.overlay b/app/boards/shields/redox/redox_left.overlay
index 322dca79..d68029d8 100644
--- a/app/boards/shields/redox/redox_left.overlay
+++ b/app/boards/shields/redox/redox_left.overlay
@@ -7,13 +7,13 @@
 #include "redox.dtsi"
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 20 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 20 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        ;
 };
diff --git a/app/boards/shields/redox/redox_right.overlay b/app/boards/shields/redox/redox_right.overlay
index f2dcfed0..09b14637 100644
--- a/app/boards/shields/redox/redox_right.overlay
+++ b/app/boards/shields/redox/redox_right.overlay
@@ -7,17 +7,17 @@
 #include "redox.dtsi"
 
 &default_transform {
-	col-offset = <7>;
+    col-offset = <7>;
 };
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 20 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+        ;
 };
diff --git a/app/boards/shields/reviung41/boards/nice_nano.overlay b/app/boards/shields/reviung41/boards/nice_nano.overlay
index 741237e1..8590149e 100644
--- a/app/boards/shields/reviung41/boards/nice_nano.overlay
+++ b/app/boards/shields/reviung41/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <11>;
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <11>;
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/reviung41/boards/nice_nano_v2.overlay b/app/boards/shields/reviung41/boards/nice_nano_v2.overlay
index 741237e1..8590149e 100644
--- a/app/boards/shields/reviung41/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/reviung41/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <11>;
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <11>;
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/romac/Kconfig.defconfig b/app/boards/shields/romac/Kconfig.defconfig
index 53527971..5cd94faa 100644
--- a/app/boards/shields/romac/Kconfig.defconfig
+++ b/app/boards/shields/romac/Kconfig.defconfig
@@ -4,7 +4,7 @@
 if SHIELD_ROMAC
 
 config ZMK_KEYBOARD_NAME
-	default "RoMac"
+    default "RoMac"
 
 endif
 
diff --git a/app/boards/shields/romac/Kconfig.shield b/app/boards/shields/romac/Kconfig.shield
index 59669d33..9bdd2c5f 100644
--- a/app/boards/shields/romac/Kconfig.shield
+++ b/app/boards/shields/romac/Kconfig.shield
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_ROMAC
-	def_bool $(shields_list_contains,romac)
+    def_bool $(shields_list_contains,romac)
diff --git a/app/boards/shields/romac/romac.overlay b/app/boards/shields/romac/romac.overlay
index 827273a4..480d3f84 100644
--- a/app/boards/shields/romac/romac.overlay
+++ b/app/boards/shields/romac/romac.overlay
@@ -7,28 +7,28 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
+        diode-direction = "col2row";
+        row-gpios
+            = <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
 
-		col-gpios
-			= <&pro_micro 18 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-			;
+        col-gpios
+            = <&pro_micro 18 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+            ;
 
-	};
+    };
 };
 
diff --git a/app/boards/shields/romac_plus/Kconfig.defconfig b/app/boards/shields/romac_plus/Kconfig.defconfig
index c4efdb97..442bc0bd 100644
--- a/app/boards/shields/romac_plus/Kconfig.defconfig
+++ b/app/boards/shields/romac_plus/Kconfig.defconfig
@@ -4,6 +4,6 @@
 if SHIELD_ROMAC_PLUS
 
 config ZMK_KEYBOARD_NAME
-	default "RoMac+ v4"
+    default "RoMac+ v4"
 
 endif
\ No newline at end of file
diff --git a/app/boards/shields/romac_plus/Kconfig.shield b/app/boards/shields/romac_plus/Kconfig.shield
index a7c7c614..277f1eb3 100644
--- a/app/boards/shields/romac_plus/Kconfig.shield
+++ b/app/boards/shields/romac_plus/Kconfig.shield
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_ROMAC_PLUS
-	def_bool $(shields_list_contains,romac_plus)
+    def_bool $(shields_list_contains,romac_plus)
diff --git a/app/boards/shields/romac_plus/boards/nice_nano.overlay b/app/boards/shields/romac_plus/boards/nice_nano.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/romac_plus/boards/nice_nano.overlay
+++ b/app/boards/shields/romac_plus/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/romac_plus/boards/nice_nano_v2.overlay b/app/boards/shields/romac_plus/boards/nice_nano_v2.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/romac_plus/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/romac_plus/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/romac_plus/romac_plus.dtsi b/app/boards/shields/romac_plus/romac_plus.dtsi
index 0fd4374a..71ec87b2 100644
--- a/app/boards/shields/romac_plus/romac_plus.dtsi
+++ b/app/boards/shields/romac_plus/romac_plus.dtsi
@@ -7,50 +7,50 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <3>;
-		rows = <4>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <3>;
+        rows = <4>;
 
-		map = <
+        map = <
 RC(0,0) RC(0,1) RC(0,2)
 RC(1,0) RC(1,1) RC(1,2)
 RC(2,0) RC(2,1) RC(2,2)
 RC(3,0) RC(3,1) RC(3,2)
-		>;
-	};
+        >;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
-	};
+        diode-direction = "col2row";
+        row-gpios
+            = <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
+    };
 
-	left_encoder: encoder_left {
-		compatible = "alps,ec11";
-		label = "LEFT_ENCODER";
-		a-gpios = <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		b-gpios = <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		resolution = <4>;
-		status = "disabled";
-	};
+    left_encoder: encoder_left {
+        compatible = "alps,ec11";
+        label = "LEFT_ENCODER";
+        a-gpios = <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        resolution = <4>;
+        status = "disabled";
+    };
 
-	sensors {
-		compatible = "zmk,keymap-sensors";
-		sensors = <&left_encoder>;
-	};
+    sensors {
+        compatible = "zmk,keymap-sensors";
+        sensors = <&left_encoder>;
+    };
 
-	// TODO: per-key RGB node(s)?
+    // TODO: per-key RGB node(s)?
 };
\ No newline at end of file
diff --git a/app/boards/shields/romac_plus/romac_plus.overlay b/app/boards/shields/romac_plus/romac_plus.overlay
index 4ef38744..2308e284 100644
--- a/app/boards/shields/romac_plus/romac_plus.overlay
+++ b/app/boards/shields/romac_plus/romac_plus.overlay
@@ -7,22 +7,22 @@
 #include "romac_plus.dtsi"
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
+        diode-direction = "col2row";
 
-		col-gpios
-			= <&pro_micro 19 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 20 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 21 GPIO_ACTIVE_HIGH>
-			;
-	};
+        col-gpios
+            = <&pro_micro 19 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 21 GPIO_ACTIVE_HIGH>
+            ;
+    };
 
 };
 
diff --git a/app/boards/shields/settings_reset/Kconfig.defconfig b/app/boards/shields/settings_reset/Kconfig.defconfig
index 6d050cb4..05f3b406 100644
--- a/app/boards/shields/settings_reset/Kconfig.defconfig
+++ b/app/boards/shields/settings_reset/Kconfig.defconfig
@@ -4,7 +4,7 @@
 if SHIELD_SETTINGS_RESET
 
 config ZMK_KEYBOARD_NAME
-	default "SETTINGS RESET"
+    default "SETTINGS RESET"
 
 endif
 
diff --git a/app/boards/shields/settings_reset/Kconfig.shield b/app/boards/shields/settings_reset/Kconfig.shield
index b5ce97f9..b1e6ed0e 100644
--- a/app/boards/shields/settings_reset/Kconfig.shield
+++ b/app/boards/shields/settings_reset/Kconfig.shield
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_SETTINGS_RESET
-	def_bool $(shields_list_contains,settings_reset)
+    def_bool $(shields_list_contains,settings_reset)
diff --git a/app/boards/shields/settings_reset/settings_reset.overlay b/app/boards/shields/settings_reset/settings_reset.overlay
index 51e04ba7..77a9d858 100644
--- a/app/boards/shields/settings_reset/settings_reset.overlay
+++ b/app/boards/shields/settings_reset/settings_reset.overlay
@@ -7,18 +7,18 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-direct";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-direct";
+        label = "KSCAN";
 
-		input-gpios
-			= <&pro_micro 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			;
-	};
+        input-gpios
+            = <&pro_micro 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            ;
+    };
 
 };
 
diff --git a/app/boards/shields/snap/Kconfig.defconfig b/app/boards/shields/snap/Kconfig.defconfig
index c4a67e65..e21111e9 100644
--- a/app/boards/shields/snap/Kconfig.defconfig
+++ b/app/boards/shields/snap/Kconfig.defconfig
@@ -4,44 +4,44 @@
 if SHIELD_SNAP_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "SNAP"
+    default "SNAP"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_SNAP_LEFT || SHIELD_SNAP_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 if ZMK_DISPLAY
 
 config I2C
-	default y
+    default y
 
 config SSD1306
-	default y
+    default y
 
 config SSD1306_REVERSE_MODE
-	default y
+    default y
 
 endif # ZMK_DISPLAY
 
 if LVGL
 
 config LV_Z_VDB_SIZE
-	default 64
+    default 64
 
 config LV_Z_DPI
-	default 148
+    default 148
 
 config LV_Z_BITS_PER_PIXEL
-	default 1
+    default 1
 
 choice LV_COLOR_DEPTH
-	default LV_COLOR_DEPTH_1
+    default LV_COLOR_DEPTH_1
 endchoice
 
 endif # LVGL
diff --git a/app/boards/shields/snap/Kconfig.shield b/app/boards/shields/snap/Kconfig.shield
index eb02c45f..edbd1b57 100644
--- a/app/boards/shields/snap/Kconfig.shield
+++ b/app/boards/shields/snap/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_SNAP_LEFT
-	def_bool $(shields_list_contains,snap_left)
+    def_bool $(shields_list_contains,snap_left)
 
 config SHIELD_SNAP_RIGHT
-	def_bool $(shields_list_contains,snap_right)
+    def_bool $(shields_list_contains,snap_right)
diff --git a/app/boards/shields/snap/boards/nice_nano.overlay b/app/boards/shields/snap/boards/nice_nano.overlay
index 28e9ce69..1a51eb16 100644
--- a/app/boards/shields/snap/boards/nice_nano.overlay
+++ b/app/boards/shields/snap/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 10)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 10)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 10)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 10)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/snap/boards/nice_nano_v2.overlay b/app/boards/shields/snap/boards/nice_nano_v2.overlay
index 28e9ce69..1a51eb16 100644
--- a/app/boards/shields/snap/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/snap/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 10)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 10)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 10)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 10)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/snap/snap.dtsi b/app/boards/shields/snap/snap.dtsi
index 77070db9..a374ad17 100644
--- a/app/boards/shields/snap/snap.dtsi
+++ b/app/boards/shields/snap/snap.dtsi
@@ -7,30 +7,30 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zephyr,display = &oled;
-		zmk,kscan = &kscan_composite;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zephyr,display = &oled;
+        zmk,kscan = &kscan_composite;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	left_encoder: encoder_left {
-		compatible = "alps,ec11";
-		label = "LEFT_ENCODER";
-		resolution = <4>;
-		status = "disabled";
-	};
+    left_encoder: encoder_left {
+        compatible = "alps,ec11";
+        label = "LEFT_ENCODER";
+        resolution = <4>;
+        status = "disabled";
+    };
 
-	right_encoder: encoder_right {
-		compatible = "alps,ec11";
-		label = "RIGHT_ENCODER";
-		resolution = <4>;
-		status = "disabled";
-	};
+    right_encoder: encoder_right {
+        compatible = "alps,ec11";
+        label = "RIGHT_ENCODER";
+        resolution = <4>;
+        status = "disabled";
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <17>;
-		rows = <6>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <17>;
+        rows = <6>;
 
 //        | R0C06L | R0C05L | R0C04L | R0C03L | R0C02L | R0C01L | R0C00L | | R0C15R | R0C14R | R0C13R | R0C12R | R0C11R | R0C10R | R0C09R | R0C08R |
 // R1C07L | R1C06L | R1C05L | R1C04L | R1C03L | R1C02L | R1C01L | R1C00L | | R1C15R | R1C14R | R1C13R | R1C12R | R1C11R | R1C10R | R1C09R | R1C08R | R2C0XR |
@@ -39,48 +39,48 @@
 // R4C07L | R4C06L | R4C05L | R4C04L | R4C03L | R4C02L | R4C01L | R4C00L | | R4C15R | R4C14R | R4C13R | R4C12R | R4C11R | R4C10R |          R4C09R | R5C08R |
 // R5C07L | R5C06L | R5C05L | R5C04L |          R5C02L |          R5C00L | | R5C15R |                   R5C14R | R5C13R | R5C12R | R5C11R | R5C10R | R5C09R |
 
-	map = <
-		RC(0,6) RC(0,5) RC(0,4) RC(0,3) RC(0,2) RC(0,1) RC(0,0)    RC(0,15) RC(0,14) RC(0,13) RC(0,12) RC(0,11) RC(0,10) RC(0,9)  RC(0,8)
+    map = <
+        RC(0,6) RC(0,5) RC(0,4) RC(0,3) RC(0,2) RC(0,1) RC(0,0)    RC(0,15) RC(0,14) RC(0,13) RC(0,12) RC(0,11) RC(0,10) RC(0,9)  RC(0,8)
 RC(1,7) RC(1,6) RC(1,5) RC(1,4) RC(1,3) RC(1,2) RC(1,1) RC(1,0)    RC(1,15) RC(1,14) RC(1,13) RC(1,12) RC(1,11) RC(1,10) RC(1,9)  RC(1,8)  RC(1,16)
 RC(2,7) RC(2,6) RC(2,5) RC(2,4) RC(2,3) RC(2,2)         RC(2,0)    RC(2,15) RC(2,14) RC(2,13) RC(2,12) RC(2,11) RC(2,10) RC(2,9)  RC(3,8)  RC(2,8)
 RC(3,7) RC(3,6) RC(3,5) RC(3,4) RC(3,3) RC(3,2)         RC(3,0)    RC(3,15) RC(3,14) RC(3,13) RC(3,12) RC(3,11) RC(3,10) RC(3,9)           RC(4,8)
 RC(4,7) RC(4,6) RC(4,5) RC(4,4) RC(4,3) RC(4,2) RC(4,1) RC(4,0)    RC(4,15) RC(4,14) RC(4,13) RC(4,12) RC(4,11) RC(4,10)          RC(4,9)  RC(5,8)
 RC(5,7) RC(5,6) RC(5,5) RC(5,4)         RC(5,2)         RC(5,0)    RC(5,15)                   RC(5,14) RC(5,13) RC(5,12) RC(5,11) RC(5,10) RC(5,9)
-		>;
-	};
+        >;
+    };
 
-	kscan_composite: kscan {
-		compatible = "zmk,kscan-composite";
-		label = "KSCAN";
-		rows = <6>;
-		columns = <17>;
+    kscan_composite: kscan {
+        compatible = "zmk,kscan-composite";
+        label = "KSCAN";
+        rows = <6>;
+        columns = <17>;
 
-		demux {
-			kscan = <&kscan_demux>;
-		};
-	};
+        demux {
+            kscan = <&kscan_demux>;
+        };
+    };
 
-	kscan_demux: kscan_demux {
-		compatible = "zmk,kscan-gpio-demux";
-		label = "DEMUX";
-		polling-interval-msec = <25>;
-	};
+    kscan_demux: kscan_demux {
+        compatible = "zmk,kscan-gpio-demux";
+        label = "DEMUX";
+        polling-interval-msec = <25>;
+    };
 };
 
 &pro_micro_i2c {
-	status = "okay";
+    status = "okay";
 
-	oled: ssd1306@3c {
-		compatible = "solomon,ssd1306fb";
-		reg = <0x3c>;
-		label = "DISPLAY";
-		width = <128>;
-		height = <32>;
-		segment-offset = <0>;
-		page-offset = <0>;
-		display-offset = <0>;
-		multiplex-ratio = <31>;
-		com-sequential;
-		prechargep = <0x22>;
-	};
+    oled: ssd1306@3c {
+        compatible = "solomon,ssd1306fb";
+        reg = <0x3c>;
+        label = "DISPLAY";
+        width = <128>;
+        height = <32>;
+        segment-offset = <0>;
+        page-offset = <0>;
+        display-offset = <0>;
+        multiplex-ratio = <31>;
+        com-sequential;
+        prechargep = <0x22>;
+    };
 };
diff --git a/app/boards/shields/snap/snap.keymap b/app/boards/shields/snap/snap.keymap
index cc4c5255..7c750f9f 100644
--- a/app/boards/shields/snap/snap.keymap
+++ b/app/boards/shields/snap/snap.keymap
@@ -10,38 +10,38 @@
 #include <dt-bindings/zmk/rgb.h>
 
 / {
-	sensors {
-		compatible = "zmk,keymap-sensors";
-		sensors = <&left_encoder &right_encoder>;
-	};
+    sensors {
+        compatible = "zmk,keymap-sensors";
+        sensors = <&left_encoder &right_encoder>;
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
-			label = "Default";
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp C_VOL_UP C_VOL_DN>;
-			bindings = <
+        default_layer {
+            label = "Default";
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp C_VOL_UP C_VOL_DN>;
+            bindings = <
              &kp ESC     &kp F1   &kp F2   &kp F3   &kp F4   &kp F5   &kp F6     &kp F7   &kp F8   &kp F9    &kp F10  &kp F11     &kp F12     &kp KP_NUM   &kp PAUSE_BREAK
 &kp C_MUTE   &kp TILDE   &kp N1   &kp N2   &kp N3   &kp N4   &kp N5   &kp N6     &kp N7   &kp N8   &kp N9    &kp N0   &kp MINUS   &kp EQUAL   &kp BSPC     &kp DEL    &kp HOME
 &kp F13      &kp TAB     &kp Q    &kp W    &kp E    &kp R             &kp T      &kp Y    &kp U    &kp I     &kp O    &kp P       &kp LBKT    &kp RBKT     &kp BSLH   &kp END
 &kp F14      &kp CLCK    &kp A    &kp S    &kp D    &kp F             &kp G      &kp H    &kp J    &kp K     &kp L    &kp SEMI    &kp SQT     &kp RET                 &kp PG_UP
 &kp F15      &kp LSHFT   &kp NUHS &kp Z    &kp X    &kp C    &kp V    &kp B      &kp N    &kp M    &kp COMMA &kp DOT  &kp FSLH    &kp RSHFT                &kp UP     &kp PG_DN
 &kp F16      &kp LCTRL   &kp LGUI &kp LALT          &mo 1            &kp SPACE    &kp BSPC                   &mo 1    &kp RALT    &kp RCTRL   &kp LEFT     &kp DOWN   &kp RIGHT
-			>;
-		};
+            >;
+        };
 
-		function_layer {
-			label = "Function";
-			sensor-bindings = <&inc_dec_kp C_NEXT C_PREV &inc_dec_kp C_NEXT C_PREV>;
-			bindings = <
+        function_layer {
+            label = "Function";
+            sensor-bindings = <&inc_dec_kp C_NEXT C_PREV &inc_dec_kp C_NEXT C_PREV>;
+            bindings = <
              &bootloader &trans   &trans   &trans   &trans   &trans   &trans     &trans   &trans   &trans   &trans    &trans      &trans      &trans       &bootloader
 &kp C_PP     &trans      &trans   &trans   &trans   &trans   &trans   &trans     &trans   &trans   &trans   &trans    &trans      &trans      &trans       &trans     &kp C_PP
 &trans       &trans      &trans   &trans   &trans   &trans            &trans     &trans   &trans   &trans   &trans    &trans      &trans      &trans       &trans     &trans
 &trans       &trans      &trans   &trans   &trans   &trans            &trans     &trans   &trans   &trans   &trans    &trans      &trans                   &trans     &trans
 &trans       &trans      &trans   &trans   &trans   &trans   &trans   &trans     &trans   &trans   &trans   &trans    &trans          &rgb_ug RGB_TOG &rgb_ug RGB_BRI &rgb_ug RGB_EFF
 &trans       &trans      &trans   &trans            &trans           &trans       &trans                    &trans    &trans  &trans  &rgb_ug RGB_HUD &rgb_ug RGB_BRD &rgb_ug RGB_HUI
-			>;
-		};
-	};
+            >;
+        };
+    };
 };
diff --git a/app/boards/shields/snap/snap_left.overlay b/app/boards/shields/snap/snap_left.overlay
index b5b8a841..abbe9450 100644
--- a/app/boards/shields/snap/snap_left.overlay
+++ b/app/boards/shields/snap/snap_left.overlay
@@ -7,28 +7,28 @@
 #include "snap.dtsi"
 
 &kscan_demux {
-	input-gpios
-		= <&pro_micro 4  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro 5  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro 6  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro 8  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro 9  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		;
-	output-gpios
-		= <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 20 GPIO_ACTIVE_HIGH>
-		;
+    input-gpios
+        = <&pro_micro 4  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro 5  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro 6  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro 8  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro 9  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        ;
+    output-gpios
+        = <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+        ;
 };
 
 &left_encoder {
-	a-gpios = <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-	b-gpios = <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-	status = "okay";
+    a-gpios = <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+    b-gpios = <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+    status = "okay";
 };
 
 &oled {
-	segment-remap;
-	com-invdir;
+    segment-remap;
+    com-invdir;
 };
diff --git a/app/boards/shields/snap/snap_right.overlay b/app/boards/shields/snap/snap_right.overlay
index dc71a5cf..ad04ae24 100644
--- a/app/boards/shields/snap/snap_right.overlay
+++ b/app/boards/shields/snap/snap_right.overlay
@@ -8,44 +8,44 @@
 
 / {
 kscan_direct: kscan_direct {
-	compatible = "zmk,kscan-gpio-direct";
-	label = "DIRECT";
-	input-gpios
-		= <&pro_micro 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		;
-	};
+    compatible = "zmk,kscan-gpio-direct";
+    label = "DIRECT";
+    input-gpios
+        = <&pro_micro 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        ;
+    };
 };
 
 &default_transform {
-	col-offset = <8>;
+    col-offset = <8>;
 };
 
 &kscan_composite {
-		direct {
-			kscan = <&kscan_direct>;
-			row-offset = <1>;
-			column-offset = <8>;
-	};
+        direct {
+            kscan = <&kscan_direct>;
+            row-offset = <1>;
+            column-offset = <8>;
+    };
 };
 
 &kscan_demux {
-	input-gpios
-		= <&pro_micro 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro 20 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro 19 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		, <&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-		;
-	output-gpios
-		= <&pro_micro 6 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 5 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 4 GPIO_ACTIVE_HIGH>
-		;
+    input-gpios
+        = <&pro_micro 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro 20 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro 19 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        , <&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        ;
+    output-gpios
+        = <&pro_micro 6 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 5 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 4 GPIO_ACTIVE_HIGH>
+        ;
 };
 
 &right_encoder {
-	a-gpios = <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-	b-gpios = <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-	status = "okay";
+    a-gpios = <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+    b-gpios = <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+    status = "okay";
 };
diff --git a/app/boards/shields/sofle/Kconfig.defconfig b/app/boards/shields/sofle/Kconfig.defconfig
index afa710ff..cc598d67 100644
--- a/app/boards/shields/sofle/Kconfig.defconfig
+++ b/app/boards/shields/sofle/Kconfig.defconfig
@@ -4,44 +4,44 @@
 if SHIELD_SOFLE_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Sofle"
+    default "Sofle"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_SOFLE_LEFT || SHIELD_SOFLE_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 if ZMK_DISPLAY
 
 config I2C
-	default y
+    default y
 
 config SSD1306
-	default y
+    default y
 
 config SSD1306_REVERSE_MODE
-	default y
+    default y
 
 endif # ZMK_DISPLAY
 
 if LVGL
 
 config LV_Z_VDB_SIZE
-	default 64
+    default 64
 
 config LV_Z_DPI
-	default 148
+    default 148
 
 config LV_Z_BITS_PER_PIXEL
-	default 1
+    default 1
 
 choice LV_COLOR_DEPTH
-	default LV_COLOR_DEPTH_1
+    default LV_COLOR_DEPTH_1
 endchoice
 
 endif # LVGL
diff --git a/app/boards/shields/sofle/Kconfig.shield b/app/boards/shields/sofle/Kconfig.shield
index e23a97a1..a865e839 100644
--- a/app/boards/shields/sofle/Kconfig.shield
+++ b/app/boards/shields/sofle/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_SOFLE_LEFT
-	def_bool $(shields_list_contains,sofle_left)
+    def_bool $(shields_list_contains,sofle_left)
 
 config SHIELD_SOFLE_RIGHT
-	def_bool $(shields_list_contains,sofle_right)
+    def_bool $(shields_list_contains,sofle_right)
diff --git a/app/boards/shields/sofle/sofle_left.overlay b/app/boards/shields/sofle/sofle_left.overlay
index 13bfb397..057e6050 100644
--- a/app/boards/shields/sofle/sofle_left.overlay
+++ b/app/boards/shields/sofle/sofle_left.overlay
@@ -7,16 +7,16 @@
 #include "sofle.dtsi"
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        ;
 };
 
 &left_encoder {
-	status = "okay";
+    status = "okay";
 };
diff --git a/app/boards/shields/sofle/sofle_right.overlay b/app/boards/shields/sofle/sofle_right.overlay
index 53b10e60..65e5f330 100644
--- a/app/boards/shields/sofle/sofle_right.overlay
+++ b/app/boards/shields/sofle/sofle_right.overlay
@@ -7,20 +7,20 @@
 #include "sofle.dtsi"
 
 &default_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        ;
 };
 
 &right_encoder {
-	status = "okay";
+    status = "okay";
 };
diff --git a/app/boards/shields/splitkb_aurora_corne/Kconfig.defconfig b/app/boards/shields/splitkb_aurora_corne/Kconfig.defconfig
index 03078cd6..a28792c7 100644
--- a/app/boards/shields/splitkb_aurora_corne/Kconfig.defconfig
+++ b/app/boards/shields/splitkb_aurora_corne/Kconfig.defconfig
@@ -4,50 +4,50 @@
 if SHIELD_SPLITKB_AURORA_CORNE_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Aurora Corne"
+    default "Aurora Corne"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif # SHIELD_SPLITKB_AURORA_CORNE_LEFT
 
 if SHIELD_SPLITKB_AURORA_CORNE_LEFT || SHIELD_SPLITKB_AURORA_CORNE_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 config ZMK_RGB_UNDERGLOW
-	select WS2812_STRIP
-	select SPI
+    select WS2812_STRIP
+    select SPI
 
 config ZMK_DISPLAY
 
 if ZMK_DISPLAY
 
 config SSD1306
-	default y
+    default y
 
 config I2C
-	default y
+    default y
 
 config SSD1306_REVERSE_MODE
-	default y
+    default y
 
 endif # ZMK_DISPLAY
 
 if LVGL
 
 config LV_Z_VDB_SIZE
-	default 64
+    default 64
 
 config LV_Z_DPI
-	default 148
+    default 148
 
 config LV_Z_BITS_PER_PIXEL
-	default 1
+    default 1
 
 choice LV_COLOR_DEPTH
-	default LV_COLOR_DEPTH_1
+    default LV_COLOR_DEPTH_1
 endchoice
 
 endif # LVGL
diff --git a/app/boards/shields/splitkb_aurora_corne/Kconfig.shield b/app/boards/shields/splitkb_aurora_corne/Kconfig.shield
index 3de10105..1efcdf00 100644
--- a/app/boards/shields/splitkb_aurora_corne/Kconfig.shield
+++ b/app/boards/shields/splitkb_aurora_corne/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_SPLITKB_AURORA_CORNE_LEFT
-	def_bool $(shields_list_contains,splitkb_aurora_corne_left)
+    def_bool $(shields_list_contains,splitkb_aurora_corne_left)
 
 config SHIELD_SPLITKB_AURORA_CORNE_RIGHT
-	def_bool $(shields_list_contains,splitkb_aurora_corne_right)
+    def_bool $(shields_list_contains,splitkb_aurora_corne_right)
diff --git a/app/boards/shields/splitkb_aurora_corne/boards/nice_nano.overlay b/app/boards/shields/splitkb_aurora_corne/boards/nice_nano.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/splitkb_aurora_corne/boards/nice_nano.overlay
+++ b/app/boards/shields/splitkb_aurora_corne/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/splitkb_aurora_corne/boards/nice_nano_v2.overlay b/app/boards/shields/splitkb_aurora_corne/boards/nice_nano_v2.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/splitkb_aurora_corne/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/splitkb_aurora_corne/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne.dtsi b/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne.dtsi
index aa525948..a1b7b643 100644
--- a/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne.dtsi
+++ b/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne.dtsi
@@ -8,85 +8,85 @@
 
 / {
 
-	chosen {
-		zephyr,display = &oled;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zephyr,display = &oled;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <12>;
-		rows = <4>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <12>;
+        rows = <4>;
 // | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |   | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  |
 // | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |   | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |
 // | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |
 //                      | SW19 | SW20 | SW21 |   | SW21 | SW20 | SW19 |
-		map = <
+        map = <
 RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)  RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11)
 RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)  RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11)
 RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)
                         RC(3,3) RC(3,4) RC(3,5)  RC(3,6) RC(3,7) RC(3,8)
-		>;
-	};
+        >;
+    };
 
-	five_column_transform: keymap_transform_1 {
-		compatible = "zmk,matrix-transform";
-		columns = <10>;
-		rows = <4>;
+    five_column_transform: keymap_transform_1 {
+        compatible = "zmk,matrix-transform";
+        columns = <10>;
+        rows = <4>;
 // | SW2  | SW3  | SW4  | SW5  | SW6  |   | SW6  | SW5  | SW4  | SW3  | SW2  |
 // | SW8  | SW9  | SW10 | SW11 | SW12 |   | SW12 | SW11 | SW10 | SW9  | SW8  |
 // | SW14 | SW15 | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 | SW15 | SW14 |
 //               | SW19 | SW20 | SW21 |   | SW21 | SW20 | SW19 |
-		map = <
+        map = <
 RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)  RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10)
 RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)  RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10)
 RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10)
                 RC(3,3) RC(3,4) RC(3,5)  RC(3,6) RC(3,7) RC(3,8)
-		>;
-	};
+        >;
+    };
 
-	left_encoder: left_encoder {
-		compatible = "alps,ec11";
-		label = "L_ENCODER";
-		resolution = <4>;
-		status = "disabled";
+    left_encoder: left_encoder {
+        compatible = "alps,ec11";
+        label = "L_ENCODER";
+        resolution = <4>;
+        status = "disabled";
 
-		a-gpios = <&pro_micro 4 GPIO_PULL_UP>;
-		b-gpios = <&pro_micro 5 GPIO_PULL_UP>;
-	};
+        a-gpios = <&pro_micro 4 GPIO_PULL_UP>;
+        b-gpios = <&pro_micro 5 GPIO_PULL_UP>;
+    };
 
-	right_encoder: right_encoder {
-		compatible = "alps,ec11";
-		label = "R_ENCODER";
-		resolution = <4>;
-		status = "disabled";
+    right_encoder: right_encoder {
+        compatible = "alps,ec11";
+        label = "R_ENCODER";
+        resolution = <4>;
+        status = "disabled";
 
-		a-gpios = <&pro_micro 19 GPIO_PULL_UP>;
-		b-gpios = <&pro_micro 18 GPIO_PULL_UP>;
-	};
+        a-gpios = <&pro_micro 19 GPIO_PULL_UP>;
+        b-gpios = <&pro_micro 18 GPIO_PULL_UP>;
+    };
 
-	sensors {
-		compatible = "zmk,keymap-sensors";
-		sensors = <&left_encoder &right_encoder>;
-	};
+    sensors {
+        compatible = "zmk,keymap-sensors";
+        sensors = <&left_encoder &right_encoder>;
+    };
 };
 
 &pro_micro_i2c {
-	status = "okay";
+    status = "okay";
 
-	oled: ssd1306@3c {
-		compatible = "solomon,ssd1306fb";
-		reg = <0x3c>;
-		label = "DISPLAY";
-		width = <128>;
-		height = <32>;
-		segment-offset = <0>;
-		page-offset = <0>;
-		display-offset = <0>;
-		multiplex-ratio = <31>;
-		segment-remap;
-		com-invdir;
-		com-sequential;
-		prechargep = <0x22>;
-	};
+    oled: ssd1306@3c {
+        compatible = "solomon,ssd1306fb";
+        reg = <0x3c>;
+        label = "DISPLAY";
+        width = <128>;
+        height = <32>;
+        segment-offset = <0>;
+        page-offset = <0>;
+        display-offset = <0>;
+        multiplex-ratio = <31>;
+        segment-remap;
+        com-invdir;
+        com-sequential;
+        prechargep = <0x22>;
+    };
 };
diff --git a/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne.keymap b/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne.keymap
index 53218a86..0555cf41 100644
--- a/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne.keymap
+++ b/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne.keymap
@@ -35,7 +35,7 @@
    &kp TAB    &kp N1       &kp N2       &kp N3       &kp N4       &kp N5         &kp N6   &kp N7   &kp N8 &kp N9    &kp N0 &kp BSPC
    &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4   &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &trans
    &kp LSHFT  &trans       &trans       &trans       &trans       &trans         &trans   &trans   &trans &trans    &trans &trans
-                          	        &kp LGUI     &trans       &kp SPACE      &kp RET  &trans   &kp RALT
+                                    &kp LGUI     &trans       &kp SPACE      &kp RET  &trans   &kp RALT
                         >;
                 };
 
@@ -49,7 +49,7 @@
    &kp  TAB  &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT   &kp CARET &kp AMPS  &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp BSPC
    &kp LCTRL &trans   &trans &trans   &trans   &trans      &kp MINUS &kp EQUAL &kp LBKT        &kp RBKT &kp BSLH &kp GRAVE
    &kp LSHFT &trans   &trans &trans   &trans   &trans      &kp UNDER &kp PLUS  &kp LBRC        &kp RBRC &kp PIPE &kp TILDE
-                    	     &kp LGUI &trans   &kp SPACE   &kp RET   &trans    &kp RALT
+                             &kp LGUI &trans   &kp SPACE   &kp RET   &trans    &kp RALT
                         >;
                 };
         };
diff --git a/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne_left.overlay b/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne_left.overlay
index 82234278..89563f42 100644
--- a/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne_left.overlay
+++ b/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne_left.overlay
@@ -7,36 +7,36 @@
 #include "splitkb_aurora_corne.dtsi"
 
 / {
-	chosen {
-		zmk,kscan = &kscan;
-	};
+    chosen {
+        zmk,kscan = &kscan;
+    };
 
-	kscan: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
+    kscan: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
 
-		label = "KSCAN";
-		diode-direction = "col2row";
+        label = "KSCAN";
+        diode-direction = "col2row";
 
-		row-gpios
-			= <&pro_micro 6 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 7 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 8 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 9 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			;
+        row-gpios
+            = <&pro_micro 6 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 7 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 8 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 9 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            ;
 
-		col-gpios
-			= <&pro_micro 16 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 10 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-			;
-	};
+        col-gpios
+            = <&pro_micro 16 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 10 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+            ;
+    };
 };
 
 &left_encoder {
-	status = "okay";
+    status = "okay";
 };
 
 
diff --git a/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne_right.overlay b/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne_right.overlay
index c1d34ffd..e05df223 100644
--- a/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne_right.overlay
+++ b/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne_right.overlay
@@ -7,42 +7,42 @@
 #include "splitkb_aurora_corne.dtsi"
 
 / {
-	chosen {
-		zmk,kscan = &kscan;
-	};
+    chosen {
+        zmk,kscan = &kscan;
+    };
 
-	kscan: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
+    kscan: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
 
-		label = "KSCAN";
-		diode-direction = "col2row";
+        label = "KSCAN";
+        diode-direction = "col2row";
 
-		row-gpios
-			= <&pro_micro 15 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 14 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 16 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 10 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			;
+        row-gpios
+            = <&pro_micro 15 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 14 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 16 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 10 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            ;
 
-		col-gpios
-			= <&pro_micro 9 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 8 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 7 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 6 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 5 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 4 GPIO_ACTIVE_HIGH>
-			;
-	};
+        col-gpios
+            = <&pro_micro 9 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 8 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 7 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 6 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 5 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 4 GPIO_ACTIVE_HIGH>
+            ;
+    };
 };
 
 &right_encoder {
-	status = "okay";
+    status = "okay";
 };
 
 &default_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &five_column_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
diff --git a/app/boards/shields/splitkb_aurora_lily58/Kconfig.defconfig b/app/boards/shields/splitkb_aurora_lily58/Kconfig.defconfig
index 221bf90a..e54e2b43 100644
--- a/app/boards/shields/splitkb_aurora_lily58/Kconfig.defconfig
+++ b/app/boards/shields/splitkb_aurora_lily58/Kconfig.defconfig
@@ -4,50 +4,50 @@
 if SHIELD_SPLITKB_AURORA_LILY58_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Aurora Lily58"
+    default "Aurora Lily58"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif # SHIELD_SPLITKB_AURORA_LILY58_LEFT
 
 if SHIELD_SPLITKB_AURORA_LILY58_LEFT || SHIELD_SPLITKB_AURORA_LILY58_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 config ZMK_RGB_UNDERGLOW
-	select WS2812_STRIP
-	select SPI
+    select WS2812_STRIP
+    select SPI
 
 config ZMK_DISPLAY
 
 if ZMK_DISPLAY
 
 config SSD1306
-	default y
+    default y
 
 config I2C
-	default y
+    default y
 
 config SSD1306_REVERSE_MODE
-	default y
+    default y
 
 endif # ZMK_DISPLAY
 
 if LVGL
 
 config LV_Z_VDB_SIZE
-	default 64
+    default 64
 
 config LV_Z_DPI
-	default 148
+    default 148
 
 config LV_Z_BITS_PER_PIXEL
-	default 1
+    default 1
 
 choice LV_COLOR_DEPTH
-	default LV_COLOR_DEPTH_1
+    default LV_COLOR_DEPTH_1
 endchoice
 
 endif # LVGL
diff --git a/app/boards/shields/splitkb_aurora_lily58/Kconfig.shield b/app/boards/shields/splitkb_aurora_lily58/Kconfig.shield
index 35f8b2d1..a64f47dc 100644
--- a/app/boards/shields/splitkb_aurora_lily58/Kconfig.shield
+++ b/app/boards/shields/splitkb_aurora_lily58/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_SPLITKB_AURORA_LILY58_LEFT
-	def_bool $(shields_list_contains,splitkb_aurora_lily58_left)
+    def_bool $(shields_list_contains,splitkb_aurora_lily58_left)
 
 config SHIELD_SPLITKB_AURORA_LILY58_RIGHT
-	def_bool $(shields_list_contains,splitkb_aurora_lily58_right)
+    def_bool $(shields_list_contains,splitkb_aurora_lily58_right)
diff --git a/app/boards/shields/splitkb_aurora_lily58/boards/nice_nano.overlay b/app/boards/shields/splitkb_aurora_lily58/boards/nice_nano.overlay
index 5b9ce4a8..0eafa704 100644
--- a/app/boards/shields/splitkb_aurora_lily58/boards/nice_nano.overlay
+++ b/app/boards/shields/splitkb_aurora_lily58/boards/nice_nano.overlay
@@ -2,46 +2,46 @@
 
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <5>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        /* WS2812 */
+        chain-length = <5>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/splitkb_aurora_lily58/boards/nice_nano_v2.overlay b/app/boards/shields/splitkb_aurora_lily58/boards/nice_nano_v2.overlay
index 9e168625..6601d27d 100644
--- a/app/boards/shields/splitkb_aurora_lily58/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/splitkb_aurora_lily58/boards/nice_nano_v2.overlay
@@ -1,46 +1,46 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <5>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        /* WS2812 */
+        chain-length = <5>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.dtsi b/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.dtsi
index 08e2ac9e..908356c7 100644
--- a/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.dtsi
+++ b/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.dtsi
@@ -8,71 +8,71 @@
 
 / {
 
-	chosen {
-		zephyr,display = &oled;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zephyr,display = &oled;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <14>;
-		rows = <5>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <14>;
+        rows = <5>;
 // | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  |                 | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |
 // | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |                 | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |
 // | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |                 | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |
 // | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 | SW25 |   | SW25 | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 |
 //                      | SW29 | SW28 | SW27 | SW26 |   | SW26 | SW27 | SW28 | SW29 |
-		map = <
+        map = <
 RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)                 RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11)
 RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)                 RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11)
 RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)                 RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)
 RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,1) RC(4,10) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11)
                         RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC(4,8) RC(4,9)
-		>;
-	};
+        >;
+    };
 
-	left_encoder: left_encoder {
-		compatible = "alps,ec11";
-		label = "L_ENCODER";
-		resolution = <4>;
-		status = "disabled";
+    left_encoder: left_encoder {
+        compatible = "alps,ec11";
+        label = "L_ENCODER";
+        resolution = <4>;
+        status = "disabled";
 
-		a-gpios = <&pro_micro 5 GPIO_PULL_UP>;
-		b-gpios = <&pro_micro 4 GPIO_PULL_UP>;
-	};
+        a-gpios = <&pro_micro 5 GPIO_PULL_UP>;
+        b-gpios = <&pro_micro 4 GPIO_PULL_UP>;
+    };
 
-	right_encoder: right_encoder {
-		compatible = "alps,ec11";
-		label = "R_ENCODER";
-		resolution = <4>;
-		status = "disabled";
+    right_encoder: right_encoder {
+        compatible = "alps,ec11";
+        label = "R_ENCODER";
+        resolution = <4>;
+        status = "disabled";
 
-		a-gpios = <&pro_micro 18 GPIO_PULL_UP>;
-		b-gpios = <&pro_micro 19 GPIO_PULL_UP>;
-	};
+        a-gpios = <&pro_micro 18 GPIO_PULL_UP>;
+        b-gpios = <&pro_micro 19 GPIO_PULL_UP>;
+    };
 
-	sensors {
-		compatible = "zmk,keymap-sensors";
-		sensors = <&left_encoder &right_encoder>;
-	};
+    sensors {
+        compatible = "zmk,keymap-sensors";
+        sensors = <&left_encoder &right_encoder>;
+    };
 };
 
 &pro_micro_i2c {
-	status = "okay";
+    status = "okay";
 
-	oled: ssd1306@3c {
-		compatible = "solomon,ssd1306fb";
-		reg = <0x3c>;
-		label = "DISPLAY";
-		width = <128>;
-		height = <32>;
-		segment-offset = <0>;
-		page-offset = <0>;
-		display-offset = <0>;
-		multiplex-ratio = <31>;
-		segment-remap;
-		com-invdir;
-		com-sequential;
-		prechargep = <0x22>;
-	};
+    oled: ssd1306@3c {
+        compatible = "solomon,ssd1306fb";
+        reg = <0x3c>;
+        label = "DISPLAY";
+        width = <128>;
+        height = <32>;
+        segment-offset = <0>;
+        page-offset = <0>;
+        display-offset = <0>;
+        multiplex-ratio = <31>;
+        segment-remap;
+        com-invdir;
+        com-sequential;
+        prechargep = <0x22>;
+    };
 };
diff --git a/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.keymap b/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.keymap
index 376bcf26..b8a9103b 100644
--- a/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.keymap
+++ b/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.keymap
@@ -10,61 +10,61 @@
 #include <dt-bindings/zmk/ext_power.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
+        default_layer {
 // ------------------------------------------------------------------------------------------------------------
 // |  ESC  |  1  |  2  |  3   |  4   |  5   |                   |  6   |  7    |  8    |  9   |   0   |   `   |
 // |  TAB  |  Q  |  W  |  E   |  R   |  T   |                   |  Y   |  U    |  I    |  O   |   P   |   -   |
 // |  CTRL |  A  |  S  |  D   |  F   |  G   |                   |  H   |  J    |  K    |  L   |   ;   |   '   |
 // | SHIFT |  Z  |  X  |  C   |  V   |  B   |   "["  |  |  "]"  |  N   |  M    |  ,    |  .   |   /   | SHIFT |
 //                     | ALT  | GUI  | LOWER|  SPACE |  | ENTER | RAISE| BSPC  | GUI   |
-			bindings = <
+            bindings = <
 &kp ESC   &kp N1 &kp N2 &kp N3   &kp N4   &kp N5                     &kp N6 &kp N7   &kp N8    &kp N9  &kp N0   &kp GRAVE
 &kp TAB   &kp Q  &kp W  &kp E    &kp R    &kp T                      &kp Y  &kp U    &kp I     &kp O   &kp P    &kp MINUS
 &kp LCTRL &kp A  &kp S  &kp D    &kp F    &kp G                      &kp H  &kp J    &kp K     &kp L   &kp SEMI &kp SQT
 &kp LSHFT &kp Z  &kp X  &kp C    &kp V    &kp B  &kp LBKT   &kp RBKT &kp N  &kp M    &kp COMMA &kp DOT &kp FSLH &kp RSHFT
                         &kp LALT &kp LGUI &mo 1  &kp SPACE  &kp RET  &mo 2  &kp BSPC &kp RGUI
-			>;
+            >;
 
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
-		};
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
 
-		lower_layer {
+        lower_layer {
 // ------------------------------------------------------------------------------------------------------------
 // | BTCLR | BT1 | BT2 |  BT3 |  BT4 |  BT5 |                   |      |       |       |      |       |       |
 // |  F1   |  F2 |  F3 |  F4  |  F5  |  F6  |                   |  F7  |  F8   |  F9   |  F10 |  F11  |  F12  |
 // |   `   |  !  |  @  |  #   |  $   |  %   |                   |  ^   |  &    |  *    |  (   |   )   |   ~   |
 // |       |     |     |      |      |      |        |  |       |      |  _    |  +    |  {   |   }   |  "|"  |
 //                     |      |      |      |        |  |       |      |       |       |
-			bindings = <
+            bindings = <
 &bt BT_CLR &bt BT_SEL 0     &bt BT_SEL 1      &bt BT_SEL 2      &bt BT_SEL 3 &bt BT_SEL 4                 &trans    &trans    &trans          &trans    &trans    &trans
 &kp F1     &kp F2           &kp F3            &kp F4            &kp F5       &kp F6                       &kp F7    &kp F8    &kp F9          &kp F10   &kp F11   &kp F12
 &kp GRAVE  &kp EXCL         &kp AT            &kp HASH          &kp DOLLAR   &kp PRCNT                    &kp CARET &kp AMPS  &kp STAR         &kp LPAR  &kp RPAR  &kp TILDE
 &trans     &ext_power EP_ON &ext_power EP_OFF &ext_power EP_TOG &trans       &trans    &trans   &trans    &trans    &kp MINUS &kp PLUS        &kp LBRC  &kp RBRC  &kp PIPE
                                               &trans            &trans       &trans    &trans   &trans    &trans    &trans    &trans
-			>;
+            >;
 
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
-		};
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
 
-		raise_layer {
+        raise_layer {
 // ------------------------------------------------------------------------------------------------------------
 // |       |     |     |      |      |      |                   |      |       |       |      |       |       |
 // |   `   |  1  |  2  |  3   |  4   |  5   |                   |  6   |   7   |   8   |  9   |   0   |       |
 // |   F1  |  F2 |  F3 |  F4  |  F5  |  F6  |                   |      |   <-  |   v   |  ^   |  ->   |       |
 // |   F7  |  F8 |  F9 |  F10 |  F11 |  F12 |        |  |       |  +   |   -   |   =   |  [   |   ]   |   \   |
 //                     |      |      |      |        |  |       |      |       |       |
-			bindings = <
+            bindings = <
 &trans    &trans &trans &trans  &trans  &trans                       &trans      &trans    &trans    &trans   &trans    &trans
 &kp GRAVE &kp N1 &kp N2 &kp N3  &kp N4  &kp N5                       &kp N6      &kp N7    &kp N8    &kp N9   &kp N0    &trans
 &kp F1    &kp F2 &kp F3 &kp F4  &kp F5  &kp F6                       &trans      &kp LEFT  &kp DOWN  &kp UP   &kp RIGHT &trans
 &kp F7    &kp F8 &kp F9 &kp F10 &kp F11 &kp F12   &trans   &trans    &kp KP_PLUS &kp MINUS &kp EQUAL &kp LBKT &kp RBKT  &kp BSLH
                         &trans  &trans  &trans    &trans   &trans    &trans      &trans    &trans
-			>;
+            >;
 
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
-		};
-	};
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
+    };
 };
diff --git a/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58_left.overlay b/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58_left.overlay
index 10a195ff..c4f12dda 100644
--- a/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58_left.overlay
+++ b/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58_left.overlay
@@ -7,37 +7,37 @@
 #include "splitkb_aurora_lily58.dtsi"
 
 / {
-	chosen {
-		zmk,kscan = &kscan;
-	};
+    chosen {
+        zmk,kscan = &kscan;
+    };
 
-	kscan: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
+    kscan: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
 
-		label = "KSCAN";
-		diode-direction = "row2col";
+        label = "KSCAN";
+        diode-direction = "row2col";
 
-		row-gpios
-			= <&pro_micro 21 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 6  GPIO_ACTIVE_HIGH>
-			, <&pro_micro 7  GPIO_ACTIVE_HIGH>
-			, <&pro_micro 8  GPIO_ACTIVE_HIGH>
-			;
+        row-gpios
+            = <&pro_micro 21 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 6  GPIO_ACTIVE_HIGH>
+            , <&pro_micro 7  GPIO_ACTIVE_HIGH>
+            , <&pro_micro 8  GPIO_ACTIVE_HIGH>
+            ;
 
-		col-gpios
-			= <&pro_micro 9  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 18 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 15 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 14 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 16 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 10 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			;
-	};
+        col-gpios
+            = <&pro_micro 9  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 18 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 15 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 14 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 16 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 10 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            ;
+    };
 };
 
 &left_encoder {
-	status = "okay";
+    status = "okay";
 };
 
 
diff --git a/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58_right.overlay b/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58_right.overlay
index eaebff36..09da298c 100644
--- a/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58_right.overlay
+++ b/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58_right.overlay
@@ -7,39 +7,39 @@
 #include "splitkb_aurora_lily58.dtsi"
 
 / {
-	chosen {
-		zmk,kscan = &kscan;
-	};
+    chosen {
+        zmk,kscan = &kscan;
+    };
 
-	kscan: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
+    kscan: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
 
-		label = "KSCAN";
-		diode-direction = "row2col";
+        label = "KSCAN";
+        diode-direction = "row2col";
 
-		row-gpios
-			= <&pro_micro 21 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 4  GPIO_ACTIVE_HIGH>
-			, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 10 GPIO_ACTIVE_HIGH>
-			;
+        row-gpios
+            = <&pro_micro 21 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 4  GPIO_ACTIVE_HIGH>
+            , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 10 GPIO_ACTIVE_HIGH>
+            ;
 
-		col-gpios
-			= <&pro_micro 9  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 8  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 7  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 6  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 5  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 15 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			;
-	};
+        col-gpios
+            = <&pro_micro 9  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 8  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 7  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 6  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 5  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 15 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            ;
+    };
 };
 
 &right_encoder {
-	status = "okay";
+    status = "okay";
 };
 
 &default_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
diff --git a/app/boards/shields/splitkb_aurora_sweep/Kconfig.defconfig b/app/boards/shields/splitkb_aurora_sweep/Kconfig.defconfig
index ac07c935..83cb1bf6 100644
--- a/app/boards/shields/splitkb_aurora_sweep/Kconfig.defconfig
+++ b/app/boards/shields/splitkb_aurora_sweep/Kconfig.defconfig
@@ -4,50 +4,50 @@
 if SHIELD_SPLITKB_AURORA_SWEEP_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Aurora Sweep"
+    default "Aurora Sweep"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif # SHIELD_SPLITKB_AURORA_SWEEP_LEFT
 
 if SHIELD_SPLITKB_AURORA_SWEEP_LEFT || SHIELD_SPLITKB_AURORA_SWEEP_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 config ZMK_RGB_UNDERGLOW
-	select WS2812_STRIP
-	select SPI
+    select WS2812_STRIP
+    select SPI
 
 config ZMK_DISPLAY
 
 if ZMK_DISPLAY
 
 config SSD1306
-	default y
+    default y
 
 config I2C
-	default y
+    default y
 
 config SSD1306_REVERSE_MODE
-	default y
+    default y
 
 endif # ZMK_DISPLAY
 
 if LVGL
 
 config LV_Z_VDB_SIZE
-	default 64
+    default 64
 
 config LV_Z_DPI
-	default 148
+    default 148
 
 config LV_Z_BITS_PER_PIXEL
-	default 1
+    default 1
 
 choice LV_COLOR_DEPTH
-	default LV_COLOR_DEPTH_1
+    default LV_COLOR_DEPTH_1
 endchoice
 
 endif # LVGL
diff --git a/app/boards/shields/splitkb_aurora_sweep/Kconfig.shield b/app/boards/shields/splitkb_aurora_sweep/Kconfig.shield
index abb05282..7d92134c 100644
--- a/app/boards/shields/splitkb_aurora_sweep/Kconfig.shield
+++ b/app/boards/shields/splitkb_aurora_sweep/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_SPLITKB_AURORA_SWEEP_LEFT
-	def_bool $(shields_list_contains,splitkb_aurora_sweep_left)
+    def_bool $(shields_list_contains,splitkb_aurora_sweep_left)
 
 config SHIELD_SPLITKB_AURORA_SWEEP_RIGHT
-	def_bool $(shields_list_contains,splitkb_aurora_sweep_right)
+    def_bool $(shields_list_contains,splitkb_aurora_sweep_right)
diff --git a/app/boards/shields/splitkb_aurora_sweep/boards/nice_nano.overlay b/app/boards/shields/splitkb_aurora_sweep/boards/nice_nano.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/splitkb_aurora_sweep/boards/nice_nano.overlay
+++ b/app/boards/shields/splitkb_aurora_sweep/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/splitkb_aurora_sweep/boards/nice_nano_v2.overlay b/app/boards/shields/splitkb_aurora_sweep/boards/nice_nano_v2.overlay
index f1330669..810340f9 100644
--- a/app/boards/shields/splitkb_aurora_sweep/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/splitkb_aurora_sweep/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep.dtsi b/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep.dtsi
index a999df6a..ab568a09 100644
--- a/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep.dtsi
+++ b/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep.dtsi
@@ -8,73 +8,73 @@
 
 / {
 
-	chosen {
-		zephyr,display = &oled;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zephyr,display = &oled;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <10>;
-		rows = <4>;
-		map = <
-		RC(0,4)  RC(0,3)  RC(0,2)  RC(0,1)  RC(0,0)  RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9)
-		RC(1,4)  RC(1,3)  RC(1,2)  RC(1,1)  RC(1,0)  RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9)
-		RC(2,4)  RC(2,3)  RC(2,2)  RC(2,1)  RC(2,0)  RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
-		                           RC(3,1)  RC(3,0)  RC(3,5) RC(3,6)
-		>;
-	};
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <10>;
+        rows = <4>;
+        map = <
+        RC(0,4)  RC(0,3)  RC(0,2)  RC(0,1)  RC(0,0)  RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9)
+        RC(1,4)  RC(1,3)  RC(1,2)  RC(1,1)  RC(1,0)  RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9)
+        RC(2,4)  RC(2,3)  RC(2,2)  RC(2,1)  RC(2,0)  RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
+                                   RC(3,1)  RC(3,0)  RC(3,5) RC(3,6)
+        >;
+    };
 
-	left_encoder1: left_encoder1 {
-		compatible = "alps,ec11";
-		label = "L_ENCODER1";
-		resolution = <4>;
-		status = "disabled";
-	};
+    left_encoder1: left_encoder1 {
+        compatible = "alps,ec11";
+        label = "L_ENCODER1";
+        resolution = <4>;
+        status = "disabled";
+    };
 
-	left_encoder2: left_encoder2 {
-		compatible = "alps,ec11";
-		label = "L_ENCODER2";
-		resolution = <4>;
-		status = "disabled";
-	};
+    left_encoder2: left_encoder2 {
+        compatible = "alps,ec11";
+        label = "L_ENCODER2";
+        resolution = <4>;
+        status = "disabled";
+    };
 
-	right_encoder1: right_encoder1 {
-		compatible = "alps,ec11";
-		label = "R_ENCODER1";
-		resolution = <4>;
-		status = "disabled";
-	};
+    right_encoder1: right_encoder1 {
+        compatible = "alps,ec11";
+        label = "R_ENCODER1";
+        resolution = <4>;
+        status = "disabled";
+    };
 
-	right_encoder2: right_encoder2 {
-		compatible = "alps,ec11";
-		label = "R_ENCODER2";
-		resolution = <4>;
-		status = "disabled";
-	};
+    right_encoder2: right_encoder2 {
+        compatible = "alps,ec11";
+        label = "R_ENCODER2";
+        resolution = <4>;
+        status = "disabled";
+    };
 
-	sensors {
-		compatible = "zmk,keymap-sensors";
-		sensors = <&left_encoder1 &right_encoder1>;
-	};
+    sensors {
+        compatible = "zmk,keymap-sensors";
+        sensors = <&left_encoder1 &right_encoder1>;
+    };
 };
 
 &pro_micro_i2c {
-	status = "okay";
+    status = "okay";
 
-	oled: ssd1306@3c {
-		compatible = "solomon,ssd1306fb";
-		reg = <0x3c>;
-		label = "DISPLAY";
-		width = <128>;
-		height = <32>;
-		segment-offset = <0>;
-		page-offset = <0>;
-		display-offset = <0>;
-		multiplex-ratio = <31>;
-		segment-remap;
-		com-invdir;
-		com-sequential;
-		prechargep = <0x22>;
-	};
+    oled: ssd1306@3c {
+        compatible = "solomon,ssd1306fb";
+        reg = <0x3c>;
+        label = "DISPLAY";
+        width = <128>;
+        height = <32>;
+        segment-offset = <0>;
+        page-offset = <0>;
+        display-offset = <0>;
+        multiplex-ratio = <31>;
+        segment-remap;
+        com-invdir;
+        com-sequential;
+        prechargep = <0x22>;
+    };
 };
diff --git a/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep.keymap b/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep.keymap
index 385d2022..4b57beac 100644
--- a/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep.keymap
+++ b/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep.keymap
@@ -62,41 +62,41 @@
         keymap {
                 compatible = "zmk,keymap";
 
-       		default_layer {
-		bindings = <
-		&kp Q &kp W &kp E &kp R &kp T 						&kp Y &kp U  &kp I    &kp O   &kp P
-		&kp A &kp S &kp D &kp F &kp G 			        	        &kp H &kp J &kp K &kp L &kp QUOT
-		&mt LSFT Z &kp X &kp C &kp V &kp B				        &kp N &kp M  &kp CMMA &kp DOT &mt LSFT RET
-          				&mo 1 &kp LCTL  				&kp SPC &mo 2
-		>;
-		};
+            default_layer {
+        bindings = <
+        &kp Q &kp W &kp E &kp R &kp T                       &kp Y &kp U  &kp I    &kp O   &kp P
+        &kp A &kp S &kp D &kp F &kp G                               &kp H &kp J &kp K &kp L &kp QUOT
+        &mt LSFT Z &kp X &kp C &kp V &kp B                      &kp N &kp M  &kp CMMA &kp DOT &mt LSFT RET
+                        &mo 1 &kp LCTL                  &kp SPC &mo 2
+        >;
+        };
 
-       		left_layer {
-		bindings = <
-		&kp NUM_1  &kp NUM_2    &kp NUM_3    &kp NUM_4    &kp NUM_5		&kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0
-		&kp TAB    &kp LC(S)    &kp DQT      &kp PIPE2     &kp HASH 		&kp MINUS &kp EQL  &kp LBKT &kp RBKT  &kp DEL
-		&kp ESC    &kp TILDE 	&kp NON_US_BSLH &kp NON_US_HASH  &kp TILDE2 	&kp MINUS &kp GRAVE &kp LBKT &kp RBKT  &kp DEL
-					    &mo 1  &kp LGUI  					&kp RGUI &mo 2
-		>;
-		};
+            left_layer {
+        bindings = <
+        &kp NUM_1  &kp NUM_2    &kp NUM_3    &kp NUM_4    &kp NUM_5     &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0
+        &kp TAB    &kp LC(S)    &kp DQT      &kp PIPE2     &kp HASH         &kp MINUS &kp EQL  &kp LBKT &kp RBKT  &kp DEL
+        &kp ESC    &kp TILDE    &kp NON_US_BSLH &kp NON_US_HASH  &kp TILDE2     &kp MINUS &kp GRAVE &kp LBKT &kp RBKT  &kp DEL
+                        &mo 1  &kp LGUI                     &kp RGUI &mo 2
+        >;
+        };
 
-		right_layer {
-		bindings = <
-		&kp BANG  &kp ATSN &kp HASH  &kp DLLR  &kp PRCT    			&kp CRRT  &kp AMPS &kp KMLT &kp LPRN &kp RPRN
-		&kp HASH  &kp QMARK  &kp FSLH  &kp COLN  &kp SCLN 			&kp MINUS &kp KP_EQUAL  &kp LBRC  &kp RBRC   &kp BKSP
-		&kp LSFT  &kp KPLS &kp LBKT &kp RBKT   &kp BSLH    			&kp UNDER &kp LEFT &kp DOWN &kp UP  &kp RIGHT
-					  &mo 3 &kp LCTL  				&kp SPC  &mo 2
-		>;
-		};
+        right_layer {
+        bindings = <
+        &kp BANG  &kp ATSN &kp HASH  &kp DLLR  &kp PRCT             &kp CRRT  &kp AMPS &kp KMLT &kp LPRN &kp RPRN
+        &kp HASH  &kp QMARK  &kp FSLH  &kp COLN  &kp SCLN           &kp MINUS &kp KP_EQUAL  &kp LBRC  &kp RBRC   &kp BKSP
+        &kp LSFT  &kp KPLS &kp LBKT &kp RBKT   &kp BSLH             &kp UNDER &kp LEFT &kp DOWN &kp UP  &kp RIGHT
+                      &mo 3 &kp LCTL                &kp SPC  &mo 2
+        >;
+        };
 
-		tri_layer {
-		bindings = <
-		&kp NUM_1  &kp NUM_2    &kp NUM_3    &kp NUM_4    &kp NUM_5 			&trans &trans   &trans   &trans  &trans
-		&kp F1 &kp F2 &kp F3 &kp F4 &kp F5  						&trans &kp PG_UP  &kp K_VOL_UP &kp K_MUTE &trans
-		&bt BT_CLR  &bt BT_NXT &bt BT_PRV &kp F6 &kp F7   				&trans &kp PG_DN  &kp K_VOL_DN  &trans &trans
-					 &trans &trans  					&trans &trans
-		>;
-		};
+        tri_layer {
+        bindings = <
+        &kp NUM_1  &kp NUM_2    &kp NUM_3    &kp NUM_4    &kp NUM_5             &trans &trans   &trans   &trans  &trans
+        &kp F1 &kp F2 &kp F3 &kp F4 &kp F5                          &trans &kp PG_UP  &kp K_VOL_UP &kp K_MUTE &trans
+        &bt BT_CLR  &bt BT_NXT &bt BT_PRV &kp F6 &kp F7                 &trans &kp PG_DN  &kp K_VOL_DN  &trans &trans
+                     &trans &trans                      &trans &trans
+        >;
+        };
 
-	};
+    };
 };
diff --git a/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep_left.overlay b/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep_left.overlay
index 1ff5ed5e..f62d24fa 100644
--- a/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep_left.overlay
+++ b/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep_left.overlay
@@ -7,42 +7,42 @@
 #include "splitkb_aurora_sweep.dtsi"
 
 / {
-	chosen {
-		zmk,kscan = &kscan;
-	};
+    chosen {
+        zmk,kscan = &kscan;
+    };
 
-	kscan: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
+    kscan: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
 
-		label = "KSCAN";
-		diode-direction = "row2col";
+        label = "KSCAN";
+        diode-direction = "row2col";
 
-		row-gpios
-			= <&pro_micro 19 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 20 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-			;
+        row-gpios
+            = <&pro_micro 19 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+            ;
 
-		col-gpios
-			= <&pro_micro 10 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 4  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 5  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 6  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 7  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			;
-	};
+        col-gpios
+            = <&pro_micro 10 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 4  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 5  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 6  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 7  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            ;
+    };
 };
 
 &left_encoder1 {
-	status = "okay";
-	a-gpios = <&pro_micro 9 GPIO_PULL_UP>;
-	b-gpios = <&pro_micro 8 GPIO_PULL_UP>;
+    status = "okay";
+    a-gpios = <&pro_micro 9 GPIO_PULL_UP>;
+    b-gpios = <&pro_micro 8 GPIO_PULL_UP>;
 };
 
 &left_encoder2 {
-	status = "okay";
-	a-gpios = <&pro_micro 14 GPIO_PULL_UP>;
-	b-gpios = <&pro_micro 16 GPIO_PULL_UP>;
+    status = "okay";
+    a-gpios = <&pro_micro 14 GPIO_PULL_UP>;
+    b-gpios = <&pro_micro 16 GPIO_PULL_UP>;
 };
 
diff --git a/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep_right.overlay b/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep_right.overlay
index 81ddca40..ff1d16d3 100644
--- a/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep_right.overlay
+++ b/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep_right.overlay
@@ -7,45 +7,45 @@
 #include "splitkb_aurora_sweep.dtsi"
 
 / {
-	chosen {
-		zmk,kscan = &kscan;
-	};
+    chosen {
+        zmk,kscan = &kscan;
+    };
 
-	kscan: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
+    kscan: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
 
-		label = "KSCAN";
-		diode-direction = "row2col";
+        label = "KSCAN";
+        diode-direction = "row2col";
 
-		row-gpios
-			= <&pro_micro 15 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-			;
+        row-gpios
+            = <&pro_micro 15 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+            ;
 
-		col-gpios
-			= <&pro_micro 9 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 8  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 7  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 6  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			, <&pro_micro 5  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
-			;
-	};
+        col-gpios
+            = <&pro_micro 9 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 8  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 7  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 6  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            , <&pro_micro 5  (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>
+            ;
+    };
 };
 
 &right_encoder1 {
-	status = "okay";
-	a-gpios = <&pro_micro 16 GPIO_PULL_UP>;
-	b-gpios = <&pro_micro 10 GPIO_PULL_UP>;
+    status = "okay";
+    a-gpios = <&pro_micro 16 GPIO_PULL_UP>;
+    b-gpios = <&pro_micro 10 GPIO_PULL_UP>;
 };
 
 &right_encoder2 {
-	status = "okay";
-	a-gpios = <&pro_micro 20 GPIO_PULL_UP>;
-	b-gpios = <&pro_micro 4  GPIO_PULL_UP>;
+    status = "okay";
+    a-gpios = <&pro_micro 20 GPIO_PULL_UP>;
+    b-gpios = <&pro_micro 4  GPIO_PULL_UP>;
 };
 
 &default_transform {
-	col-offset = <5>;
+    col-offset = <5>;
 };
diff --git a/app/boards/shields/splitreus62/Kconfig.defconfig b/app/boards/shields/splitreus62/Kconfig.defconfig
index 14063d3e..52d62c9d 100644
--- a/app/boards/shields/splitreus62/Kconfig.defconfig
+++ b/app/boards/shields/splitreus62/Kconfig.defconfig
@@ -6,16 +6,16 @@
 if SHIELD_SPLITREUS62_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Splitreus62"
+    default "Splitreus62"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_SPLITREUS62_LEFT || SHIELD_SPLITREUS62_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 endif
diff --git a/app/boards/shields/splitreus62/Kconfig.shield b/app/boards/shields/splitreus62/Kconfig.shield
index 762d991b..951ab9fb 100644
--- a/app/boards/shields/splitreus62/Kconfig.shield
+++ b/app/boards/shields/splitreus62/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_SPLITREUS62_LEFT
-	def_bool $(shields_list_contains,splitreus62_left)
+    def_bool $(shields_list_contains,splitreus62_left)
 
 config SHIELD_SPLITREUS62_RIGHT
-	def_bool $(shields_list_contains,splitreus62_right)
+    def_bool $(shields_list_contains,splitreus62_right)
diff --git a/app/boards/shields/splitreus62/splitreus62.dtsi b/app/boards/shields/splitreus62/splitreus62.dtsi
index 905605e9..abc3b7f7 100644
--- a/app/boards/shields/splitreus62/splitreus62.dtsi
+++ b/app/boards/shields/splitreus62/splitreus62.dtsi
@@ -7,44 +7,44 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <12>;
-		rows = <6>;
-// | SW0 | SW5 | SW10 | SW15 | SW20 | SW25		             | SW25 | SW20 | SW15 | SW10 | SW5 | SW1 |
-// | SW1 | SW6 | SW11 | SW16 | SW21 | SW26		             | SW26 | SW21 | SW16 | SW11 | SW6 | SW2 |
-// | SW2 | SW7 | SW12 | SW17 | SW22 | SW27		             | SW27 | SW22 | SW17 | SW12 | SW7 | SW3 |
-// | SW3 | SW8 | SW13 | SW18 | SW23 | SW28		             | SW28 | SW23 | SW18 | SW13 | SW8 | SW4 |
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <12>;
+        rows = <6>;
+// | SW0 | SW5 | SW10 | SW15 | SW20 | SW25                   | SW25 | SW20 | SW15 | SW10 | SW5 | SW1 |
+// | SW1 | SW6 | SW11 | SW16 | SW21 | SW26                   | SW26 | SW21 | SW16 | SW11 | SW6 | SW2 |
+// | SW2 | SW7 | SW12 | SW17 | SW22 | SW27                   | SW27 | SW22 | SW17 | SW12 | SW7 | SW3 |
+// | SW3 | SW8 | SW13 | SW18 | SW23 | SW28                   | SW28 | SW23 | SW18 | SW13 | SW8 | SW4 |
 // | SW4 | SW9 | SW14 | SW19 | SW24 | SW29                   | SW29 | SW24 | SW19 | SW14 | SW9 | SW5 |
 //                                    SW30                   | SW30
-		map = <
+        map = <
 RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)                 RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11)
 RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)                 RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11)
 RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)                 RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)
 RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5)                 RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11)
 RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)                 RC(4,6) RC(4,7) RC(4,8) RC(4,9) RC(4,10) RC(4,11)
                                         RC(5,5)                 RC(5,6)
-		>;
-	};
+        >;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "row2col";
-		row-gpios
-			= <&pro_micro 1 GPIO_ACTIVE_HIGH >
-			, <&pro_micro 0 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 2 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 4 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 5 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 6 GPIO_ACTIVE_HIGH>
-			;
+        diode-direction = "row2col";
+        row-gpios
+            = <&pro_micro 1 GPIO_ACTIVE_HIGH >
+            , <&pro_micro 0 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 2 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 4 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 5 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 6 GPIO_ACTIVE_HIGH>
+            ;
 
-	};
+    };
 };
diff --git a/app/boards/shields/splitreus62/splitreus62.keymap b/app/boards/shields/splitreus62/splitreus62.keymap
index c1b0f50f..c7bdb443 100644
--- a/app/boards/shields/splitreus62/splitreus62.keymap
+++ b/app/boards/shields/splitreus62/splitreus62.keymap
@@ -9,24 +9,24 @@
 #include <dt-bindings/zmk/keys.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
+        default_layer {
 // ------------------------------------------------------------------------------------------------------------
 // |  ESC  |  1  |  2  |  3   |  4   |  5   |                   |  6   |  7    |  8    |  9   |   0   |   -   |
 // |  TAB  |  Q  |  W  |  E   |  R   |  T   |                   |  Y   |  U    |  I    |  O   |   P   |   \   |
 // |  CTRL |  A  |  S  |  D   |  F   |  G   |                   |  H   |  J    |  K    |  L   |   ;   |   '   |
 // | SHIFT |  Z  |  X  |  C   |  V   |  B   |                   |  N   |  M    |  ,    |  .   |   /   | SHIFT |
 // | LCTL  | LGUI  | LALT |  GRAV |  | EQL | DEL | BKSP|  | RET | SPC  | LBKT |  RBKT  | LBKT | HOME  |   END |
-			bindings = <
+            bindings = <
 &kp ESC   &kp N1    &kp N2   &kp N3    &kp N4    &kp N5                    &kp N6    &kp N7   &kp N8    &kp N9    &kp N0   &kp MINUS
 &kp TAB   &kp Q     &kp W    &kp E     &kp R     &kp T                     &kp Y     &kp U    &kp I     &kp O     &kp P    &kp BSLH
 &kp LCTRL &kp A     &kp S    &kp D     &kp F     &kp G                     &kp H     &kp J    &kp K     &kp L     &kp SEMI &kp SQT
 &kp LSHFT &kp Z     &kp X    &kp C     &kp V     &kp B                     &kp N     &kp M    &kp COMMA &kp DOT   &kp FSLH &kp RSHFT
 &kp LCTRL &kp LGUI  &kp LALT &kp GRAVE &kp EQUAL &kp DEL                   &kp SPACE &kp LBKT &kp RBKT  &kp MINUS &kp HOME &kp END
                                                  &kp BSPC                  &kp RET
-			>;
-		};
-	};
+            >;
+        };
+    };
 };
diff --git a/app/boards/shields/splitreus62/splitreus62_left.overlay b/app/boards/shields/splitreus62/splitreus62_left.overlay
index ba5c21ff..992eb0db 100644
--- a/app/boards/shields/splitreus62/splitreus62_left.overlay
+++ b/app/boards/shields/splitreus62/splitreus62_left.overlay
@@ -7,12 +7,12 @@
 #include "splitreus62.dtsi"
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro  7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&pro_micro  8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&pro_micro  9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		;
+    col-gpios
+        = <&pro_micro  7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&pro_micro  8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&pro_micro  9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        ;
 };
diff --git a/app/boards/shields/splitreus62/splitreus62_right.overlay b/app/boards/shields/splitreus62/splitreus62_right.overlay
index 9f76e7eb..d83db26d 100644
--- a/app/boards/shields/splitreus62/splitreus62_right.overlay
+++ b/app/boards/shields/splitreus62/splitreus62_right.overlay
@@ -7,16 +7,16 @@
 #include "splitreus62.dtsi"
 
 &default_transform {
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&pro_micro  9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&pro_micro  8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		, <&pro_micro  7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-		;
+    col-gpios
+        = <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&pro_micro  9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&pro_micro  8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&pro_micro  7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        ;
 };
diff --git a/app/boards/shields/tg4x/Kconfig.shield b/app/boards/shields/tg4x/Kconfig.shield
index 27166b10..d7fc1c13 100644
--- a/app/boards/shields/tg4x/Kconfig.shield
+++ b/app/boards/shields/tg4x/Kconfig.shield
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_TG4X
-	def_bool $(shields_list_contains,tg4x)
+    def_bool $(shields_list_contains,tg4x)
diff --git a/app/boards/shields/tg4x/boards/nice_nano.overlay b/app/boards/shields/tg4x/boards/nice_nano.overlay
index 54046bf5..85ab6fbc 100644
--- a/app/boards/shields/tg4x/boards/nice_nano.overlay
+++ b/app/boards/shields/tg4x/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 8)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 8)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 8)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 8)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/tg4x/boards/nice_nano_v2.overlay b/app/boards/shields/tg4x/boards/nice_nano_v2.overlay
index 54046bf5..85ab6fbc 100644
--- a/app/boards/shields/tg4x/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/tg4x/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 8)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 8)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 8)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 8)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/tg4x/tg4x.keymap b/app/boards/shields/tg4x/tg4x.keymap
index e68d0f92..89a478ae 100644
--- a/app/boards/shields/tg4x/tg4x.keymap
+++ b/app/boards/shields/tg4x/tg4x.keymap
@@ -9,46 +9,46 @@
 #include <dt-bindings/zmk/bt.h>
 
 / {
-	behaviors {
-		ht: hold_tap {
-			compatible = "zmk,behavior-hold-tap";
-			label = "Hold Tap";
-			#binding-cells = <2>;
-			tapping-term-ms = <200>;
-			flavor = "tap-preferred";
-			bindings = <&kp>, <&kp>;
-		};
-	};
+    behaviors {
+        ht: hold_tap {
+            compatible = "zmk,behavior-hold-tap";
+            label = "Hold Tap";
+            #binding-cells = <2>;
+            tapping-term-ms = <200>;
+            flavor = "tap-preferred";
+            bindings = <&kp>, <&kp>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
-			bindings = <
+        default_layer {
+            bindings = <
 &kp ESC      &kp Q    &kp W    &kp E       &kp R &kp T &kp Y &kp U    &kp I     &kp O    &kp P    &kp SEMI  &kp BSPC
 &ht CAPS TAB &kp A    &kp S    &kp D       &kp F &kp G &kp H &kp J    &kp K     &kp L    &kp APOS           &kp RET
 &kp LSHFT    &kp Z    &kp X    &kp C       &kp V &kp B &kp N &kp M    &kp COMMA &kp DOT                     &kp RSHFT
 &kp LCTRL    &kp LGUI &kp LALT &lt 1 SPACE                  &kp SPACE &kp RALT  &kp RGUI &mo 2              &kp RCTRL
-			>;
-		};
+            >;
+        };
 
-		function_layer {
-			bindings = <
+        function_layer {
+            bindings = <
 &kp GRAVE &kp N1   &kp N2    &kp N3 &kp N4 &kp N5 &kp N6   &kp N7   &kp N8    &kp N9    &kp N0   &kp MINUS &kp DEL
 &none     &kp HOME &kp PG_UP &trans &trans &trans &kp LBKT &kp RBKT &kp EQUAL &kp BSLH  &kp FSLH           &trans
 &trans    &kp END  &kp PG_DN &trans &trans &trans &trans   &trans   &trans    &kp UP                       &trans
 &trans    &trans   &trans    &trans                        &trans   &trans    &kp LEFT  &kp DOWN           &kp RIGHT
-			>;
-		};
+            >;
+        };
 
-		other_layer {
-			bindings = <
+        other_layer {
+            bindings = <
 &kp PRINTSCREEN &kp F1     &kp F2     &kp F3     &kp F4 &kp F5 &kp F6 &kp F7 &kp F8       &kp F9       &kp F10  &kp F11 &kp F12
 &trans          &trans     &trans     &trans     &trans &trans &trans &trans &trans       &trans       &trans           &trans
 &trans          &bt BT_CLR &bt BT_PRV &bt BT_NXT &trans &trans &trans &trans &bootloader  &sys_reset                        &trans
 &trans          &trans     &trans     &trans                          &trans &kp C_VOL_UP &kp C_VOL_DN                  &kp C_PP
-			>;
-		};
+            >;
+        };
 
-	};
+    };
 };
diff --git a/app/boards/shields/tg4x/tg4x.overlay b/app/boards/shields/tg4x/tg4x.overlay
index ca6e23c3..c0b1b3bc 100644
--- a/app/boards/shields/tg4x/tg4x.overlay
+++ b/app/boards/shields/tg4x/tg4x.overlay
@@ -7,49 +7,49 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
+        diode-direction = "col2row";
 
-		row-gpios
-			= <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
+        row-gpios
+            = <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
 
-		col-gpios
-			= <&pro_micro 1 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 20 GPIO_ACTIVE_HIGH>
-			, <&pro_micro 21 GPIO_ACTIVE_HIGH>
-			;
-	};
+        col-gpios
+            = <&pro_micro 1 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+            , <&pro_micro 21 GPIO_ACTIVE_HIGH>
+            ;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		rows = <8>;
-		columns = <7>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        rows = <8>;
+        columns = <7>;
 
-		map = <
+        map = <
 RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)
 RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(5,0) RC(5,1) RC(5,2) RC(5,3)         RC(5,4)
 RC(2,0)         RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(6,0) RC(6,1) RC(6,2)         RC(6,4)
 RC(3,0) RC(3,1) RC(3,2) RC(3,4)                                 RC(3,5) RC(7,1) RC(7,2) RC(7,3) RC(7,4)
-		>;
-	};
+        >;
+    };
 
-	chosen {
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 };
diff --git a/app/boards/shields/tidbit/Kconfig.defconfig b/app/boards/shields/tidbit/Kconfig.defconfig
index e3655a9e..393fbef1 100644
--- a/app/boards/shields/tidbit/Kconfig.defconfig
+++ b/app/boards/shields/tidbit/Kconfig.defconfig
@@ -4,35 +4,35 @@
 if SHIELD_TIDBIT
 
 config ZMK_KEYBOARD_NAME
-	default "tidbit"
+    default "tidbit"
 
 
 if ZMK_DISPLAY
 
 config I2C
-	default y
+    default y
 
 config SSD1306
-	default y
+    default y
 
 config SSD1306_REVERSE_MODE
-	default y
+    default y
 
 endif # ZMK_DISPLAY
 
 if LVGL
 
 config LV_Z_VDB_SIZE
-	default 64
+    default 64
 
 config LV_Z_DPI
-	default 148
+    default 148
 
 config LV_Z_BITS_PER_PIXEL
-	default 1
+    default 1
 
 choice LV_COLOR_DEPTH
-	default LV_COLOR_DEPTH_1
+    default LV_COLOR_DEPTH_1
 endchoice
 
 endif # LVGL
diff --git a/app/boards/shields/tidbit/Kconfig.shield b/app/boards/shields/tidbit/Kconfig.shield
index c1e8ecca..dc811bb2 100644
--- a/app/boards/shields/tidbit/Kconfig.shield
+++ b/app/boards/shields/tidbit/Kconfig.shield
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_TIDBIT
-	def_bool $(shields_list_contains,tidbit)
+    def_bool $(shields_list_contains,tidbit)
diff --git a/app/boards/shields/tidbit/boards/nice_nano.overlay b/app/boards/shields/tidbit/boards/nice_nano.overlay
index ad66feac..75514ac4 100644
--- a/app/boards/shields/tidbit/boards/nice_nano.overlay
+++ b/app/boards/shields/tidbit/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 9)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 9)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 9)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 9)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/tidbit/boards/nice_nano_v2.overlay b/app/boards/shields/tidbit/boards/nice_nano_v2.overlay
index ad66feac..75514ac4 100644
--- a/app/boards/shields/tidbit/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/tidbit/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 9)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 9)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 9)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 9)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/tidbit/tidbit.dtsi b/app/boards/shields/tidbit/tidbit.dtsi
index ba97a57a..fb84c89e 100644
--- a/app/boards/shields/tidbit/tidbit.dtsi
+++ b/app/boards/shields/tidbit/tidbit.dtsi
@@ -7,111 +7,111 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "row2col";
+        diode-direction = "row2col";
 
-		row-gpios
-			= <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
+        row-gpios
+            = <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
 
-		col-gpios
-			= <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
+        col-gpios
+            = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
 
-	};
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <4>;
-		rows = <5>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <4>;
+        rows = <5>;
 
-		map = <
-			RC(0,1) RC(0,2) RC(0,3)
-			RC(1,0) RC(1,1) RC(1,2) RC(1,3)
-			RC(2,0) RC(2,1) RC(2,2) RC(2,3)
-			RC(3,0) RC(3,1) RC(3,2) RC(3,3)
-			RC(4,0) RC(4,1) RC(4,2) RC(4,3)
-		>;
-	};
+        map = <
+            RC(0,1) RC(0,2) RC(0,3)
+            RC(1,0) RC(1,1) RC(1,2) RC(1,3)
+            RC(2,0) RC(2,1) RC(2,2) RC(2,3)
+            RC(3,0) RC(3,1) RC(3,2) RC(3,3)
+            RC(4,0) RC(4,1) RC(4,2) RC(4,3)
+        >;
+    };
 
-	encoder_1_top_row: encoder_1_top_row {
-		compatible = "alps,ec11";
-		label = "Top Row Encoder";
-		a-gpios = <&pro_micro 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-		b-gpios = <&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-		resolution = <4>;
-		status = "disabled";
-	};
+    encoder_1_top_row: encoder_1_top_row {
+        compatible = "alps,ec11";
+        label = "Top Row Encoder";
+        a-gpios = <&pro_micro 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        resolution = <4>;
+        status = "disabled";
+    };
 
-	encoder_1: encoder_1 {
-		compatible = "alps,ec11";
-		label = "Encoder 1";
-		a-gpios = <&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-		b-gpios = <&pro_micro 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-		resolution = <4>;
-		status = "disabled";
-	};
+    encoder_1: encoder_1 {
+        compatible = "alps,ec11";
+        label = "Encoder 1";
+        a-gpios = <&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        resolution = <4>;
+        status = "disabled";
+    };
 
-	encoder_2: encoder_2 {
-		compatible = "alps,ec11";
-		label = "Encoder 2";
-		a-gpios = <&pro_micro 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-		b-gpios = <&pro_micro 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-		resolution = <4>;
-		status = "disabled";
-	};
+    encoder_2: encoder_2 {
+        compatible = "alps,ec11";
+        label = "Encoder 2";
+        a-gpios = <&pro_micro 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        resolution = <4>;
+        status = "disabled";
+    };
 
-	encoder_3: encoder_3 {
-		compatible = "alps,ec11";
-		label = "Encoder 3";
-		a-gpios = <&pro_micro 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-		b-gpios = <&pro_micro 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-		resolution = <4>;
-		status = "disabled";
-	};
+    encoder_3: encoder_3 {
+        compatible = "alps,ec11";
+        label = "Encoder 3";
+        a-gpios = <&pro_micro 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        resolution = <4>;
+        status = "disabled";
+    };
 
-	encoder_4: encoder_4 {
-		compatible = "alps,ec11";
-		label = "Encoder 4";
-		a-gpios = <&pro_micro 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-		b-gpios = <&pro_micro 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-		resolution = <4>;
-		status = "disabled";
-	};
+    encoder_4: encoder_4 {
+        compatible = "alps,ec11";
+        label = "Encoder 4";
+        a-gpios = <&pro_micro 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        resolution = <4>;
+        status = "disabled";
+    };
 
-	chosen {
-		zephyr,display = &oled;
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zephyr,display = &oled;
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 };
 
 &pro_micro_i2c {
-	status = "okay";
+    status = "okay";
 
-	oled: ssd1306@3c {
-		compatible = "solomon,ssd1306fb";
-		reg = <0x3c>;
-		label = "DISPLAY";
-		width = <128>;
-		height = <32>;
-		segment-offset = <0>;
-		page-offset = <0>;
-		display-offset = <0>;
-		multiplex-ratio = <31>;
-		segment-remap;
-		com-invdir;
-		com-sequential;
-		prechargep = <0x22>;
-	};
+    oled: ssd1306@3c {
+        compatible = "solomon,ssd1306fb";
+        reg = <0x3c>;
+        label = "DISPLAY";
+        width = <128>;
+        height = <32>;
+        segment-offset = <0>;
+        page-offset = <0>;
+        display-offset = <0>;
+        multiplex-ratio = <31>;
+        segment-remap;
+        com-invdir;
+        com-sequential;
+        prechargep = <0x22>;
+    };
 };
diff --git a/app/boards/shields/tidbit/tidbit.keymap b/app/boards/shields/tidbit/tidbit.keymap
index 11424dc8..2e415bf8 100644
--- a/app/boards/shields/tidbit/tidbit.keymap
+++ b/app/boards/shields/tidbit/tidbit.keymap
@@ -10,40 +10,40 @@
 #include <dt-bindings/zmk/keys.h>
 
 &encoder_1_top_row {
-	status = "okay";
+    status = "okay";
 };
 
 / {
-	sensors {
-		compatible = "zmk,keymap-sensors";
-		sensors = <&encoder_1_top_row>;
-	};
+    sensors {
+        compatible = "zmk,keymap-sensors";
+        sensors = <&encoder_1_top_row>;
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
-			bindings = <
-								&kp KP_NUMLOCK  &kp KP_ASTERISK &kp KP_MINUS
-				&kp KP_NUMBER_7 &kp KP_NUMBER_8 &kp KP_NUMBER_9 &kp KP_PLUS
-				&kp KP_NUMBER_4 &kp KP_NUMBER_5 &kp KP_NUMBER_6 &none
-				&kp KP_NUMBER_1 &kp KP_NUMBER_2 &kp KP_NUMBER_3 &lt 1 KP_ENTER
-				&none           &kp KP_NUMBER_0 &kp KP_DOT      &none
-			>;
+        default_layer {
+            bindings = <
+                                &kp KP_NUMLOCK  &kp KP_ASTERISK &kp KP_MINUS
+                &kp KP_NUMBER_7 &kp KP_NUMBER_8 &kp KP_NUMBER_9 &kp KP_PLUS
+                &kp KP_NUMBER_4 &kp KP_NUMBER_5 &kp KP_NUMBER_6 &none
+                &kp KP_NUMBER_1 &kp KP_NUMBER_2 &kp KP_NUMBER_3 &lt 1 KP_ENTER
+                &none           &kp KP_NUMBER_0 &kp KP_DOT      &none
+            >;
 
-			sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>;
-		};
+            sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>;
+        };
 
-		 func_layer {
-			 bindings = <
-								&none           &sys_reset          &bootloader
-				&out OUT_TOG    &out OUT_USB    &out OUT_BLE    &none
-				&bt BT_SEL 0    &bt BT_PRV      &bt BT_NXT      &bt BT_CLR
-				&bt BT_SEL 1    &bt BT_SEL 2    &bt BT_SEL 3    &tog 0
-				&kp C_MUTE      &none           &none           &none
-			 >;
+         func_layer {
+             bindings = <
+                                &none           &sys_reset          &bootloader
+                &out OUT_TOG    &out OUT_USB    &out OUT_BLE    &none
+                &bt BT_SEL 0    &bt BT_PRV      &bt BT_NXT      &bt BT_CLR
+                &bt BT_SEL 1    &bt BT_SEL 2    &bt BT_SEL 3    &tog 0
+                &kp C_MUTE      &none           &none           &none
+             >;
 
-			 sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>;
-		 };
-	};
+             sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>;
+         };
+    };
 };
diff --git a/app/boards/shields/tidbit/tidbit_19key.keymap b/app/boards/shields/tidbit/tidbit_19key.keymap
index 5710aeaf..1be71e7a 100644
--- a/app/boards/shields/tidbit/tidbit_19key.keymap
+++ b/app/boards/shields/tidbit/tidbit_19key.keymap
@@ -11,40 +11,40 @@
 #include <dt-bindings/zmk/outputs.h>
 
 &encoder_4 {
-	status = "okay";
+    status = "okay";
 };
 
 / {
-	sensors {
-		compatible = "zmk,keymap-sensors";
-		sensors = <&encoder_4>;
-	};
+    sensors {
+        compatible = "zmk,keymap-sensors";
+        sensors = <&encoder_4>;
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
-			bindings = <
-								&tog 1          &kp KP_NUMLOCK  &kp KP_SLASH
-				&kp KP_NUMBER_7 &kp KP_NUMBER_8 &kp KP_NUMBER_9 &kp KP_ASTERISK
-				&kp KP_NUMBER_4 &kp KP_NUMBER_5 &kp KP_NUMBER_6 &kp KP_MINUS
-				&kp KP_NUMBER_1 &kp KP_NUMBER_2 &kp KP_NUMBER_3 &kp KP_PLUS
-				&kp C_MUTE      &kp KP_NUMBER_0 &kp KP_DOT      &kp KP_ENTER
-			>;
+        default_layer {
+            bindings = <
+                                &tog 1          &kp KP_NUMLOCK  &kp KP_SLASH
+                &kp KP_NUMBER_7 &kp KP_NUMBER_8 &kp KP_NUMBER_9 &kp KP_ASTERISK
+                &kp KP_NUMBER_4 &kp KP_NUMBER_5 &kp KP_NUMBER_6 &kp KP_MINUS
+                &kp KP_NUMBER_1 &kp KP_NUMBER_2 &kp KP_NUMBER_3 &kp KP_PLUS
+                &kp C_MUTE      &kp KP_NUMBER_0 &kp KP_DOT      &kp KP_ENTER
+            >;
 
-			sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>;
-		};
+            sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>;
+        };
 
-		 func_layer {
-			 bindings = <
-								&tog 0          &sys_reset          &bootloader
-				&out OUT_TOG    &out OUT_USB    &out OUT_BLE    &none
-				&bt BT_SEL 0    &bt BT_PRV      &bt BT_NXT      &bt BT_CLR
-				&bt BT_SEL 1    &bt BT_SEL 2    &bt BT_SEL 3    &none
-				&kp C_MUTE      &none           &none           &none
-			 >;
+         func_layer {
+             bindings = <
+                                &tog 0          &sys_reset          &bootloader
+                &out OUT_TOG    &out OUT_USB    &out OUT_BLE    &none
+                &bt BT_SEL 0    &bt BT_PRV      &bt BT_NXT      &bt BT_CLR
+                &bt BT_SEL 1    &bt BT_SEL 2    &bt BT_SEL 3    &none
+                &kp C_MUTE      &none           &none           &none
+             >;
 
-			sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>;
-		 };
-	};
+            sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>;
+         };
+    };
 };
diff --git a/app/boards/shields/two_percent_milk/Kconfig.shield b/app/boards/shields/two_percent_milk/Kconfig.shield
index ec2c3b1f..b6fbcfdc 100644
--- a/app/boards/shields/two_percent_milk/Kconfig.shield
+++ b/app/boards/shields/two_percent_milk/Kconfig.shield
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_TWO_PERCENT_MILK
-	def_bool $(shields_list_contains,two_percent_milk)
+    def_bool $(shields_list_contains,two_percent_milk)
diff --git a/app/boards/shields/two_percent_milk/boards/nice_nano.overlay b/app/boards/shields/two_percent_milk/boards/nice_nano.overlay
index ad66feac..75514ac4 100644
--- a/app/boards/shields/two_percent_milk/boards/nice_nano.overlay
+++ b/app/boards/shields/two_percent_milk/boards/nice_nano.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 9)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 9)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 9)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 9)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/two_percent_milk/boards/nice_nano_v2.overlay b/app/boards/shields/two_percent_milk/boards/nice_nano_v2.overlay
index ad66feac..75514ac4 100644
--- a/app/boards/shields/two_percent_milk/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/two_percent_milk/boards/nice_nano_v2.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 9)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 9)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 9)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 9)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi3_default>;
-	pinctrl-1 = <&spi3_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/two_percent_milk/boards/nrfmicro_11.overlay b/app/boards/shields/two_percent_milk/boards/nrfmicro_11.overlay
index 64d16572..d20e58e7 100644
--- a/app/boards/shields/two_percent_milk/boards/nrfmicro_11.overlay
+++ b/app/boards/shields/two_percent_milk/boards/nrfmicro_11.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi1_default: spi1_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 1, 11)>;
-		};
-	};
+    spi1_default: spi1_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 1, 11)>;
+        };
+    };
 
-	spi1_sleep: spi1_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 1, 11)>;
-			low-power-enable;
-		};
-	};
+    spi1_sleep: spi1_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 1, 11)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi1 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi1_default>;
-	pinctrl-1 = <&spi1_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi1_default>;
+    pinctrl-1 = <&spi1_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/two_percent_milk/boards/nrfmicro_11_flipped.overlay b/app/boards/shields/two_percent_milk/boards/nrfmicro_11_flipped.overlay
index b84beb93..31678980 100644
--- a/app/boards/shields/two_percent_milk/boards/nrfmicro_11_flipped.overlay
+++ b/app/boards/shields/two_percent_milk/boards/nrfmicro_11_flipped.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi1_default: spi1_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 1, 6)>;
-		};
-	};
+    spi1_default: spi1_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 1, 6)>;
+        };
+    };
 
-	spi1_sleep: spi1_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 1, 6)>;
-			low-power-enable;
-		};
-	};
+    spi1_sleep: spi1_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 1, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi1 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi1_default>;
-	pinctrl-1 = <&spi1_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi1_default>;
+    pinctrl-1 = <&spi1_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/two_percent_milk/boards/nrfmicro_13.overlay b/app/boards/shields/two_percent_milk/boards/nrfmicro_13.overlay
index 64d16572..d20e58e7 100644
--- a/app/boards/shields/two_percent_milk/boards/nrfmicro_13.overlay
+++ b/app/boards/shields/two_percent_milk/boards/nrfmicro_13.overlay
@@ -1,47 +1,47 @@
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi1_default: spi1_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 1, 11)>;
-		};
-	};
+    spi1_default: spi1_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 1, 11)>;
+        };
+    };
 
-	spi1_sleep: spi1_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 1, 11)>;
-			low-power-enable;
-		};
-	};
+    spi1_sleep: spi1_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 1, 11)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi1 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
+    compatible = "nordic,nrf-spim";
+    status = "okay";
 
-	pinctrl-0 = <&spi1_default>;
-	pinctrl-1 = <&spi1_sleep>;
-	pinctrl-names = "default", "sleep";
+    pinctrl-0 = <&spi1_default>;
+    pinctrl-1 = <&spi1_sleep>;
+    pinctrl-names = "default", "sleep";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
-		label = "WS2812";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <10>; /* arbitrary; change at will */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <10>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
diff --git a/app/boards/shields/two_percent_milk/two_percent_milk.overlay b/app/boards/shields/two_percent_milk/two_percent_milk.overlay
index d43ed321..8d4a244a 100644
--- a/app/boards/shields/two_percent_milk/two_percent_milk.overlay
+++ b/app/boards/shields/two_percent_milk/two_percent_milk.overlay
@@ -5,20 +5,20 @@
  */
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-direct";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-direct";
 
-		label = "KSCAN";
+        label = "KSCAN";
 
-		input-gpios
-			= <&pro_micro 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			;
+        input-gpios
+            = <&pro_micro 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&pro_micro 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            ;
 
-	};
+    };
 
 };
\ No newline at end of file
diff --git a/app/boards/shields/waterfowl/Kconfig.defconfig b/app/boards/shields/waterfowl/Kconfig.defconfig
index 5a77ca11..dbee82b8 100644
--- a/app/boards/shields/waterfowl/Kconfig.defconfig
+++ b/app/boards/shields/waterfowl/Kconfig.defconfig
@@ -2,44 +2,44 @@
 if SHIELD_WATERFOWL_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Waterfowl"
+    default "Waterfowl"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_WATERFOWL_LEFT || SHIELD_WATERFOWL_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 if ZMK_DISPLAY
 
 config I2C
-	default y
+    default y
 
 config SSD1306
-	default y
+    default y
 
 config SSD1306_REVERSE_MODE
-	default y
+    default y
 
 endif # ZMK_DISPLAY
 
 if LVGL
 
 config LV_Z_VDB_SIZE
-	default 64
+    default 64
 
 config LV_Z_DPI
-	default 148
+    default 148
 
 config LV_Z_BITS_PER_PIXEL
-	default 1
+    default 1
 
 choice LV_COLOR_DEPTH
-	default LV_COLOR_DEPTH_1
+    default LV_COLOR_DEPTH_1
 endchoice
 
 endif # LVGL
diff --git a/app/boards/shields/waterfowl/Kconfig.shield b/app/boards/shields/waterfowl/Kconfig.shield
index a321b73d..ec01a626 100644
--- a/app/boards/shields/waterfowl/Kconfig.shield
+++ b/app/boards/shields/waterfowl/Kconfig.shield
@@ -3,7 +3,7 @@
 
 
 config SHIELD_WATERFOWL_LEFT
-	def_bool $(shields_list_contains,waterfowl_left)
+    def_bool $(shields_list_contains,waterfowl_left)
 
 config SHIELD_WATERFOWL_RIGHT
-	def_bool $(shields_list_contains,waterfowl_right)
+    def_bool $(shields_list_contains,waterfowl_right)
diff --git a/app/boards/shields/waterfowl/waterfowl.dtsi b/app/boards/shields/waterfowl/waterfowl.dtsi
index a156360e..7f4929b3 100644
--- a/app/boards/shields/waterfowl/waterfowl.dtsi
+++ b/app/boards/shields/waterfowl/waterfowl.dtsi
@@ -7,79 +7,79 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zephyr,display = &oled;
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zephyr,display = &oled;
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <16>;
-		rows = <4>;
-// | MX5  | MX4  | MX3  | MX2  | MX1  |									| MX1  | MX2  | MX3  | MX4  | MX5  |
-// | MX10 | MX9  | MX8  | MX7  | MX6  |									| MX6  | MX7  | MX8  | MX9  | MX10 |
-// | MX15 | MX14 | MX13 | MX12 | MX11 |									| MX11 | MX12 | MX13 | MX14 | MX15 |
-// | MX20 | MX19 | MX18 | MX17 | MX16 |									| MX16 | MX17 | MX18 | MX19 | MX20 |
-		map = <
-RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4)									RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9)
-RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4)									RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9)
-RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4)									RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
-RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4)									RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9)
-		>;
-	};
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <16>;
+        rows = <4>;
+// | MX5  | MX4  | MX3  | MX2  | MX1  |                                 | MX1  | MX2  | MX3  | MX4  | MX5  |
+// | MX10 | MX9  | MX8  | MX7  | MX6  |                                 | MX6  | MX7  | MX8  | MX9  | MX10 |
+// | MX15 | MX14 | MX13 | MX12 | MX11 |                                 | MX11 | MX12 | MX13 | MX14 | MX15 |
+// | MX20 | MX19 | MX18 | MX17 | MX16 |                                 | MX16 | MX17 | MX18 | MX19 | MX20 |
+        map = <
+RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4)                                 RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9)
+RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4)                                 RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9)
+RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4)                                 RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
+RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4)                                 RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9)
+        >;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
+        diode-direction = "col2row";
+        row-gpios
+            = <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
 
-	};
+    };
 
-	left_encoder: encoder_left {    //roller
-		compatible = "alps,ec11";
-		label = "LEFT_ENCODER";
-		a-gpios = <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		b-gpios = <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		resolution = <4>;
-	};
+    left_encoder: encoder_left {    //roller
+        compatible = "alps,ec11";
+        label = "LEFT_ENCODER";
+        a-gpios = <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        resolution = <4>;
+    };
 
-	right_encoder: encoder_right {  //Standard encoder on left half
-		compatible = "alps,ec11";
-		label = "RIGHT_ENCODER";
-		a-gpios = <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		b-gpios = <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		resolution = <2>;
-	};
+    right_encoder: encoder_right {  //Standard encoder on left half
+        compatible = "alps,ec11";
+        label = "RIGHT_ENCODER";
+        a-gpios = <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        resolution = <2>;
+    };
 
-	sensors {
-		compatible = "zmk,keymap-sensors";
-		sensors = <&left_encoder &right_encoder>;
-	};
+    sensors {
+        compatible = "zmk,keymap-sensors";
+        sensors = <&left_encoder &right_encoder>;
+    };
 
-	// TODO: RGB node(s)
+    // TODO: RGB node(s)
 };
 
 &pro_micro_i2c {
-	status = "okay";
+    status = "okay";
 
-	oled: ssd1306@3c {
-		compatible = "solomon,ssd1306fb";
-		reg = <0x3c>;
-		label = "DISPLAY";
-		width = <128>;
-		height = <64>;
-		segment-offset = <0>;
-		page-offset = <0>;
-		display-offset = <0>;
-		multiplex-ratio = <63>;
-		prechargep = <0x22>;
-	};
+    oled: ssd1306@3c {
+        compatible = "solomon,ssd1306fb";
+        reg = <0x3c>;
+        label = "DISPLAY";
+        width = <128>;
+        height = <64>;
+        segment-offset = <0>;
+        page-offset = <0>;
+        display-offset = <0>;
+        multiplex-ratio = <63>;
+        prechargep = <0x22>;
+    };
 };
diff --git a/app/boards/shields/waterfowl/waterfowl.keymap b/app/boards/shields/waterfowl/waterfowl.keymap
index 9583499c..c47f188b 100644
--- a/app/boards/shields/waterfowl/waterfowl.keymap
+++ b/app/boards/shields/waterfowl/waterfowl.keymap
@@ -9,10 +9,10 @@
 #include <dt-bindings/zmk/bt.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
+        default_layer {
 /* QWERTY
  *
  * ,----------------------------------.                      ,----------------------------------.
@@ -26,17 +26,17 @@
  *          |  1  |   | DEL | SPACE | TAB  |            |  ESC  | BS | ENTER |   |  4  |
  *          `-----'   `--------------------'            `--------------------'   `-----'
  */
-			bindings = <
-	&kp Q		&kp W		&kp E		&kp R		&kp T			&kp Y	&kp U		&kp I		&kp O		&kp P
-	&mt LGUI A	&mt LALT S	&mt LCTRL D	&mt LSHFT F	&kp G			&kp H	&mt LSHFT J	&mt LCTRL K	&mt LALT L	&mt LGUI SEMI
-	&kp Z		&kp X		&kp C		&kp V		&kp B			&kp N	&kp M		&kp COMMA	&kp DOT		&kp FSLH
-	&kp N1		&lt 3 DEL	&lt 1 SPACE	&kp TAB		&kp N2			&kp N3	&kp ESC		&kp BSPC	&lt 2 RET	&kp N4
-			>;
+            bindings = <
+    &kp Q       &kp W       &kp E       &kp R       &kp T           &kp Y   &kp U       &kp I       &kp O       &kp P
+    &mt LGUI A  &mt LALT S  &mt LCTRL D &mt LSHFT F &kp G           &kp H   &mt LSHFT J &mt LCTRL K &mt LALT L  &mt LGUI SEMI
+    &kp Z       &kp X       &kp C       &kp V       &kp B           &kp N   &kp M       &kp COMMA   &kp DOT     &kp FSLH
+    &kp N1      &lt 3 DEL   &lt 1 SPACE &kp TAB     &kp N2          &kp N3  &kp ESC     &kp BSPC    &lt 2 RET   &kp N4
+            >;
 
-			sensor-bindings = <&inc_dec_kp PAGE_UP PAGE_DOWN &inc_dec_kp TAB LS(TAB)>;
-		};
+            sensor-bindings = <&inc_dec_kp PAGE_UP PAGE_DOWN &inc_dec_kp TAB LS(TAB)>;
+        };
 
-		navnum_layer {
+        navnum_layer {
 /* NAVNUM
  *
  * ,----------------------------------.                      ,----------------------------------.
@@ -50,17 +50,17 @@
  *          |  1  |   | DEL | SPACE | MO(3)|            |  ESC  | BS | ENTER |   |  4  |
  *          `-----'   `--------------------'            `--------------------'   `-----'
  */
-			bindings = <
-	&trans		&kp PG_UP	&kp UP		&kp PG_DN	&trans					&kp FSLH	&kp N7	&kp N8		&kp N9		&kp MINUS
-	&kp HOME	&kp LEFT	&kp DOWN	&kp RIGHT	&kp END					&kp EQUAL	&kp N4	&kp N5		&kp N6		&kp PLUS
-	&trans		&trans		&kp INS		&trans		&trans					&kp N0		&kp N1	&kp N2		&kp N3		&kp ASTERISK
-	&kp N1		&lt 3 DEL	&lt 1 SPACE	&kp TAB		&kp N2					&kp N3		&kp ESC	&kp BSPC	&lt 2 RET	&kp N4
-			>;
+            bindings = <
+    &trans      &kp PG_UP   &kp UP      &kp PG_DN   &trans                  &kp FSLH    &kp N7  &kp N8      &kp N9      &kp MINUS
+    &kp HOME    &kp LEFT    &kp DOWN    &kp RIGHT   &kp END                 &kp EQUAL   &kp N4  &kp N5      &kp N6      &kp PLUS
+    &trans      &trans      &kp INS     &trans      &trans                  &kp N0      &kp N1  &kp N2      &kp N3      &kp ASTERISK
+    &kp N1      &lt 3 DEL   &lt 1 SPACE &kp TAB     &kp N2                  &kp N3      &kp ESC &kp BSPC    &lt 2 RET   &kp N4
+            >;
 
-			sensor-bindings = <&inc_dec_kp PAGE_UP PAGE_DOWN &inc_dec_kp TAB LS(TAB)>;
-		};
+            sensor-bindings = <&inc_dec_kp PAGE_UP PAGE_DOWN &inc_dec_kp TAB LS(TAB)>;
+        };
 
-		symbol_layer {
+        symbol_layer {
 /* SYM
  *
  * ,----------------------------------.                      ,----------------------------------.
@@ -74,17 +74,17 @@
  *          |  1  |   | DEL | SPACE | TAB  |            |  ESC  | BS | ENTER |   |  4  |
  *          `-----'   `--------------------'            `--------------------'   `-----'
  */
-			bindings = <
-	&kp PRCNT		&kp AT		&kp LBKT	&kp RBKT	&kp NON_US_BSLH			&trans			&trans			&kp CARET			&trans		&trans
-	&kp HASH		&kp EXCL	&kp LPAR	&kp RPAR	&kp PIPE				&kp UNDER		&kp APOS		&kp DOUBLE_QUOTES	&kp TILDE	&kp GRAVE
-	&kp DLLR		&trans		&kp LBRC	&kp RBRC	&kp AMPS				&trans			&trans			&trans				&trans		&trans
-	&kp N1			&lt 3 DEL	&lt 1 SPACE	&kp TAB		&kp N2					&kp N3			&kp ESC			&kp BSPC			&lt 2 RET	&kp N4
-			>;
+            bindings = <
+    &kp PRCNT       &kp AT      &kp LBKT    &kp RBKT    &kp NON_US_BSLH         &trans          &trans          &kp CARET           &trans      &trans
+    &kp HASH        &kp EXCL    &kp LPAR    &kp RPAR    &kp PIPE                &kp UNDER       &kp APOS        &kp DOUBLE_QUOTES   &kp TILDE   &kp GRAVE
+    &kp DLLR        &trans      &kp LBRC    &kp RBRC    &kp AMPS                &trans          &trans          &trans              &trans      &trans
+    &kp N1          &lt 3 DEL   &lt 1 SPACE &kp TAB     &kp N2                  &kp N3          &kp ESC         &kp BSPC            &lt 2 RET   &kp N4
+            >;
 
-			sensor-bindings = <&inc_dec_kp PAGE_UP PAGE_DOWN &inc_dec_kp TAB LS(TAB)>;
-		};
+            sensor-bindings = <&inc_dec_kp PAGE_UP PAGE_DOWN &inc_dec_kp TAB LS(TAB)>;
+        };
 
-		function_layer {
+        function_layer {
 /* FUNC
  *
  * ,----------------------------------.                      ,----------------------------------.
@@ -98,15 +98,15 @@
  *          |  1  |   | DEL | SPACE | TAB  |            |  ESC  | BS | ENTER |   |  4  |
  *          `-----'   `--------------------'            `--------------------'   `-----'
  */
-			bindings = <
-	&trans			&trans			&bt BT_CLR		&trans			&sys_reset			&sys_reset	&kp F7	&kp F8		&kp F9		&kp F11
-	&bt BT_SEL 0	&bt BT_SEL 1	&bt BT_SEL 2	&bt BT_SEL 3	&bt BT_SEL 4		&trans	    &kp F4	&kp F5		&kp F6		&kp F12
-	&trans			&trans			&trans			&trans			&trans				&kp F10	    &kp F1	&kp F2		&kp F3		&kp F13
-	&kp N1			&lt 3 DEL		&lt 1 SPACE		&kp TAB			&kp N2				&kp N3	    &kp ESC	&kp BSPC	&lt 2 RET	&kp N4
-			>;
+            bindings = <
+    &trans          &trans          &bt BT_CLR      &trans          &sys_reset          &sys_reset  &kp F7  &kp F8      &kp F9      &kp F11
+    &bt BT_SEL 0    &bt BT_SEL 1    &bt BT_SEL 2    &bt BT_SEL 3    &bt BT_SEL 4        &trans      &kp F4  &kp F5      &kp F6      &kp F12
+    &trans          &trans          &trans          &trans          &trans              &kp F10     &kp F1  &kp F2      &kp F3      &kp F13
+    &kp N1          &lt 3 DEL       &lt 1 SPACE     &kp TAB         &kp N2              &kp N3      &kp ESC &kp BSPC    &lt 2 RET   &kp N4
+            >;
 
-			sensor-bindings = <&inc_dec_kp PAGE_UP PAGE_DOWN &inc_dec_kp TAB LS(TAB)>;
-		};
+            sensor-bindings = <&inc_dec_kp PAGE_UP PAGE_DOWN &inc_dec_kp TAB LS(TAB)>;
+        };
 
-	};
+    };
 };
\ No newline at end of file
diff --git a/app/boards/shields/waterfowl/waterfowl_left.overlay b/app/boards/shields/waterfowl/waterfowl_left.overlay
index 031936ea..3b9fd42d 100644
--- a/app/boards/shields/waterfowl/waterfowl_left.overlay
+++ b/app/boards/shields/waterfowl/waterfowl_left.overlay
@@ -7,15 +7,15 @@
 #include "waterfowl.dtsi"
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 21 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 20 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 21 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        ;
 };
 
 &left_encoder {
-	status = "okay";
+    status = "okay";
 };
diff --git a/app/boards/shields/waterfowl/waterfowl_right.overlay b/app/boards/shields/waterfowl/waterfowl_right.overlay
index cff0d53c..bf8f3a44 100644
--- a/app/boards/shields/waterfowl/waterfowl_right.overlay
+++ b/app/boards/shields/waterfowl/waterfowl_right.overlay
@@ -7,20 +7,20 @@
 #include "waterfowl.dtsi"
 
 &default_transform {
-	col-offset = <5>;
+    col-offset = <5>;
 };
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 20 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 21 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 21 GPIO_ACTIVE_HIGH>
+        ;
 };
 
 
 &right_encoder {
-	status = "okay";
+    status = "okay";
 };
diff --git a/app/boards/shields/zmk_uno/Kconfig.shield b/app/boards/shields/zmk_uno/Kconfig.shield
index 3f7331c3..958915f5 100644
--- a/app/boards/shields/zmk_uno/Kconfig.shield
+++ b/app/boards/shields/zmk_uno/Kconfig.shield
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_ZMK_UNO
-	def_bool $(shields_list_contains,zmk_uno)
+    def_bool $(shields_list_contains,zmk_uno)
diff --git a/app/boards/shields/zmk_uno/zmk_uno.overlay b/app/boards/shields/zmk_uno/zmk_uno.overlay
index 12b5e2b3..04332911 100644
--- a/app/boards/shields/zmk_uno/zmk_uno.overlay
+++ b/app/boards/shields/zmk_uno/zmk_uno.overlay
@@ -8,172 +8,172 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 &arduino_i2c {
-	status = "okay";
+    status = "okay";
 };
 
 &arduino_spi {
-	status = "okay";
+    status = "okay";
 
-	led_strip: ws2812@0 {
-		compatible = "worldsemi,ws2812-spi";
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
 
-		/* SPI */
-		reg = <0>; /* ignored, but necessary for SPI bindings */
-		spi-max-frequency = <4000000>;
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
 
-		/* WS2812 */
-		chain-length = <7>; /* 4 underglow + 3 per-key LEDs */
-		spi-one-frame = <0x70>;
-		spi-zero-frame = <0x40>;
+        /* WS2812 */
+        chain-length = <7>; /* 4 underglow + 3 per-key LEDs */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
 
-		color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-	};
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
 };
 
 / {
-	chosen {
-		zmk,kscan = &kscan_matrix_comp;
-		zmk,backlight = &backlight;
-		zmk,underglow = &led_strip;
-		zmk,matrix-transform = &matrix_transform;
-	};
+    chosen {
+        zmk,kscan = &kscan_matrix_comp;
+        zmk,backlight = &backlight;
+        zmk,underglow = &led_strip;
+        zmk,matrix-transform = &matrix_transform;
+    };
 
-	// Commented out until we add more powerful power domain support
-	// external_power {
-	// 	compatible = "zmk,ext-power-generic";
-	// 	label = "EXT_POWER";
-	// 	init-delay-ms = <200>;
-	// 	control-gpios = <&arduino_header 1 GPIO_ACTIVE_LOW>;
-	// };
+    // Commented out until we add more powerful power domain support
+    // external_power {
+    //  compatible = "zmk,ext-power-generic";
+    //  label = "EXT_POWER";
+    //  init-delay-ms = <200>;
+    //  control-gpios = <&arduino_header 1 GPIO_ACTIVE_LOW>;
+    // };
 
-	rgb_power {
-		compatible = "zmk,ext-power-generic";
-		label = "EXT_POWER";
-		// label = "RGB_POWER";
-		init-delay-ms = <200>;
-		control-gpios = <&arduino_header 1 GPIO_ACTIVE_LOW>;
-	};
+    rgb_power {
+        compatible = "zmk,ext-power-generic";
+        label = "EXT_POWER";
+        // label = "RGB_POWER";
+        init-delay-ms = <200>;
+        control-gpios = <&arduino_header 1 GPIO_ACTIVE_LOW>;
+    };
 
-	backlight: gpioleds {
-		compatible = "gpio-leds";
-		label = "Backlight LEDs";
-		gpio_led_0 {
-			gpios = <&arduino_header 12 GPIO_ACTIVE_HIGH>;
-			label = "Backlight LED 0";
-		};
-	};
+    backlight: gpioleds {
+        compatible = "gpio-leds";
+        label = "Backlight LEDs";
+        gpio_led_0 {
+            gpios = <&arduino_header 12 GPIO_ACTIVE_HIGH>;
+            label = "Backlight LED 0";
+        };
+    };
 
-	matrix_transform: matrix_transform {
-		compatible = "zmk,matrix-transform";
-		rows = <3>;
-		columns = <4>;
+    matrix_transform: matrix_transform {
+        compatible = "zmk,matrix-transform";
+        rows = <3>;
+        columns = <4>;
 
-		map = <
-		RC(0,0) RC(0,1)
-		RC(1,0) RC(1,1)
-		RC(2,0) RC(2,1) RC(2,2)
-		>;
-	};
+        map = <
+        RC(0,0) RC(0,1)
+        RC(1,0) RC(1,1)
+        RC(2,0) RC(2,1) RC(2,2)
+        >;
+    };
 
-	direct_matrix_transform: direct_matrix_transform {
-		compatible = "zmk,matrix-transform";
-		rows = <3>;
-		columns = <4>;
+    direct_matrix_transform: direct_matrix_transform {
+        compatible = "zmk,matrix-transform";
+        rows = <3>;
+        columns = <4>;
 
-		map = <
-		RC(0,0) RC(0,1)
-		RC(0,2) RC(0,3)
-		RC(1,0) RC(1,1) RC(1,2)
-		>;
-	};
+        map = <
+        RC(0,0) RC(0,1)
+        RC(0,2) RC(0,3)
+        RC(1,0) RC(1,1) RC(1,2)
+        >;
+    };
 
-	kscan_matrix_comp: kscan_matrix_comp {
-		compatible = "zmk,kscan-composite";
-		rows = <1>;
-		columns = <7>;
+    kscan_matrix_comp: kscan_matrix_comp {
+        compatible = "zmk,kscan-composite";
+        rows = <1>;
+        columns = <7>;
 
-		label = "KSCAN_MATRIX_COMP";
+        label = "KSCAN_MATRIX_COMP";
 
-		matrix {
-			kscan = <&kscan_matrix>;
-		};
+        matrix {
+            kscan = <&kscan_matrix>;
+        };
 
-		toggle {
-			kscan = <&kscan_sp3t_toggle>;
-			row-offset = <2>;
-		};
+        toggle {
+            kscan = <&kscan_sp3t_toggle>;
+            row-offset = <2>;
+        };
 
-	};
+    };
 
-	kscan_direct_comp: kscan_direct_comp {
-		compatible = "zmk,kscan-composite";
+    kscan_direct_comp: kscan_direct_comp {
+        compatible = "zmk,kscan-composite";
 
-		label = "KSCAN_DIRECT_COMP";
-		status = "disabled";
+        label = "KSCAN_DIRECT_COMP";
+        status = "disabled";
 
-		matrix {
-			kscan = <&kscan_direct>;
-		};
+        matrix {
+            kscan = <&kscan_direct>;
+        };
 
-		toggle {
-			kscan = <&kscan_sp3t_toggle>;
-			row-offset = <1>;
-		};
+        toggle {
+            kscan = <&kscan_sp3t_toggle>;
+            row-offset = <1>;
+        };
 
-	};
+    };
 
-	kscan_matrix: kscan_matrix {
-		compatible = "zmk,kscan-gpio-matrix";
+    kscan_matrix: kscan_matrix {
+        compatible = "zmk,kscan-gpio-matrix";
 
-		diode-direction = "col2row";
+        diode-direction = "col2row";
 
-		col-gpios
-			= <&arduino_header 10 GPIO_ACTIVE_HIGH>
-			, <&arduino_header 9  GPIO_ACTIVE_HIGH>
-			;
+        col-gpios
+            = <&arduino_header 10 GPIO_ACTIVE_HIGH>
+            , <&arduino_header 9  GPIO_ACTIVE_HIGH>
+            ;
 
-		row-gpios
-			= <&arduino_header 13 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&arduino_header 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
+        row-gpios
+            = <&arduino_header 13 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&arduino_header 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
 
-	};
+    };
 
-	kscan_direct: kscan_direct {
-		compatible = "zmk,kscan-gpio-direct";
-		status = "disabled";
+    kscan_direct: kscan_direct {
+        compatible = "zmk,kscan-gpio-direct";
+        status = "disabled";
 
-		input-gpios
-			= <&arduino_header 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&arduino_header 9  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&arduino_header 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&arduino_header 11 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			;
+        input-gpios
+            = <&arduino_header 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&arduino_header 9  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&arduino_header 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&arduino_header 11 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            ;
 
-	};
+    };
 
-	kscan_sp3t_toggle: kscan_sp3t_toggle {
-		compatible = "zmk,kscan-gpio-direct";
-		toggle-mode;
+    kscan_sp3t_toggle: kscan_sp3t_toggle {
+        compatible = "zmk,kscan-gpio-direct";
+        toggle-mode;
 
-		input-gpios
-			= <&arduino_header 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&arduino_header 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&arduino_header 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			;
-	};
+        input-gpios
+            = <&arduino_header 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&arduino_header 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            , <&arduino_header 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+            ;
+    };
 
-	encoder: encoder {
-		label = "ENCODER";
-		resolution = <4>;
-		compatible = "alps,ec11";
-		a-gpios = <&arduino_header 14 GPIO_PULL_UP>;
-		b-gpios = <&arduino_header 15 GPIO_PULL_UP>;
-	};
+    encoder: encoder {
+        label = "ENCODER";
+        resolution = <4>;
+        compatible = "alps,ec11";
+        a-gpios = <&arduino_header 14 GPIO_PULL_UP>;
+        b-gpios = <&arduino_header 15 GPIO_PULL_UP>;
+    };
 
-	sensors {
-		compatible = "zmk,keymap-sensors";
-		sensors = <&encoder>;
-	};
+    sensors {
+        compatible = "zmk,keymap-sensors";
+        sensors = <&encoder>;
+    };
 
 };
diff --git a/app/boards/shields/zodiark/Kconfig.defconfig b/app/boards/shields/zodiark/Kconfig.defconfig
index c6024694..e7538c41 100644
--- a/app/boards/shields/zodiark/Kconfig.defconfig
+++ b/app/boards/shields/zodiark/Kconfig.defconfig
@@ -4,44 +4,44 @@
 if SHIELD_ZODIARK_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Zodiark"
+    default "Zodiark"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_ZODIARK_LEFT || SHIELD_ZODIARK_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 if ZMK_DISPLAY
 
 config I2C
-	default y
+    default y
 
 config SSD1306
-	default y
+    default y
 
 config SSD1306_REVERSE_MODE
-	default y
+    default y
 
 endif # ZMK_DISPLAY
 
 if LVGL
 
 config LV_Z_VDB_SIZE
-	default 64
+    default 64
 
 config LV_Z_DPI
-	default 148
+    default 148
 
 config LV_Z_BITS_PER_PIXEL
-	default 1
+    default 1
 
 choice LV_COLOR_DEPTH
-	default LV_COLOR_DEPTH_1
+    default LV_COLOR_DEPTH_1
 endchoice
 
 endif # LVGL
diff --git a/app/boards/shields/zodiark/Kconfig.shield b/app/boards/shields/zodiark/Kconfig.shield
index 25e23a14..0eb4e8ad 100644
--- a/app/boards/shields/zodiark/Kconfig.shield
+++ b/app/boards/shields/zodiark/Kconfig.shield
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_ZODIARK_LEFT
-	def_bool $(shields_list_contains,zodiark_left)
+    def_bool $(shields_list_contains,zodiark_left)
 
 config SHIELD_ZODIARK_RIGHT
-	def_bool $(shields_list_contains,zodiark_right)
+    def_bool $(shields_list_contains,zodiark_right)
diff --git a/app/boards/shields/zodiark/zodiark_left.overlay b/app/boards/shields/zodiark/zodiark_left.overlay
index fe55edc6..1f866f78 100644
--- a/app/boards/shields/zodiark/zodiark_left.overlay
+++ b/app/boards/shields/zodiark/zodiark_left.overlay
@@ -7,17 +7,17 @@
 #include "zodiark.dtsi"
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro  2 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  1 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  0 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro  2 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  1 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  0 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        ;
 };
 
 &left_encoder {
-	status = "okay";
+    status = "okay";
 };
diff --git a/app/boards/shields/zodiark/zodiark_right.overlay b/app/boards/shields/zodiark/zodiark_right.overlay
index 3405f59b..998f1e00 100644
--- a/app/boards/shields/zodiark/zodiark_right.overlay
+++ b/app/boards/shields/zodiark/zodiark_right.overlay
@@ -7,21 +7,21 @@
 #include "zodiark.dtsi"
 
 &default_transform {
-	col-offset = <7>;
+    col-offset = <7>;
 };
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 10 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  0 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  1 GPIO_ACTIVE_HIGH>
-		, <&pro_micro  2 GPIO_ACTIVE_HIGH>
-		;
+    col-gpios
+        = <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  0 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  1 GPIO_ACTIVE_HIGH>
+        , <&pro_micro  2 GPIO_ACTIVE_HIGH>
+        ;
 };
 
 &right_encoder {
-	status = "okay";
+    status = "okay";
 };
diff --git a/app/boards/usb_console.dtsi b/app/boards/usb_console.dtsi
index 4ce59408..3cc76ad3 100644
--- a/app/boards/usb_console.dtsi
+++ b/app/boards/usb_console.dtsi
@@ -6,15 +6,15 @@
 
 
 / {
-	chosen {
-		zephyr,console = &cdc_acm_uart;
-	};
+    chosen {
+        zephyr,console = &cdc_acm_uart;
+    };
 };
 
 &usbd {
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
-	};
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };
 
diff --git a/app/cmake/ZephyrBuildConfig.cmake b/app/cmake/ZephyrBuildConfig.cmake
index 931dd7ac..ade34199 100644
--- a/app/cmake/ZephyrBuildConfig.cmake
+++ b/app/cmake/ZephyrBuildConfig.cmake
@@ -14,13 +14,13 @@ get_property(cached_user_config_value CACHE ZMK_CONFIG PROPERTY VALUE)
 
 set(user_config_cli_argument ${cached_user_config_value}) # Either new or old
 if(user_config_cli_argument STREQUAL CACHED_ZMK_CONFIG)
-	# We already have a CACHED_ZMK_CONFIG so there is no new input on the CLI
+    # We already have a CACHED_ZMK_CONFIG so there is no new input on the CLI
   unset(user_config_cli_argument)
 endif()
 
 set(user_config_app_cmake_lists ${ZMK_CONFIG})
 if(cached_user_config_value STREQUAL ZMK_CONFIG)
-	# The app build scripts did not set a default, The ZMK_CONFIG we are
+    # The app build scripts did not set a default, The ZMK_CONFIG we are
   # reading is the cached value from the CLI
   unset(user_config_app_cmake_lists)
 endif()
@@ -29,172 +29,172 @@ if(CACHED_ZMK_CONFIG)
   # Warn the user if it looks like he is trying to change the user_config
   # without cleaning first
   if(user_config_cli_argument)
-	  if(NOT (CACHED_ZMK_CONFIG STREQUAL user_config_cli_argument))
+      if(NOT (CACHED_ZMK_CONFIG STREQUAL user_config_cli_argument))
       message(WARNING "The build directory must be cleaned pristinely when changing user ZMK config")
     endif()
   endif()
 
   set(ZMK_CONFIG ${CACHED_ZMK_CONFIG})
 elseif(user_config_cli_argument)
-	set(ZMK_CONFIG ${user_config_cli_argument})
+    set(ZMK_CONFIG ${user_config_cli_argument})
 
 elseif(DEFINED ENV{ZMK_CONFIG})
-	set(ZMK_CONFIG $ENV{ZMK_CONFIG})
+    set(ZMK_CONFIG $ENV{ZMK_CONFIG})
 
 elseif(user_config_app_cmake_lists)
-	set(ZMK_CONFIG ${user_config_app_cmake_lists})
+    set(ZMK_CONFIG ${user_config_app_cmake_lists})
 endif()
 
 # Store the selected user_config in the cache
 set(CACHED_ZMK_CONFIG ${ZMK_CONFIG} CACHE STRING "Selected user ZMK config")
 
 if (ZMK_CONFIG)
-	set(ENV{ZMK_CONFIG} "${ZMK_CONFIG}")
-	if(EXISTS ${ZMK_CONFIG}/boards)
-		message(STATUS "Adding ZMK config directory as board root: ${ZMK_CONFIG}")
-		list(APPEND BOARD_ROOT ${ZMK_CONFIG})
-	endif()
-	if(EXISTS ${ZMK_CONFIG}/dts)
-		message(STATUS "Adding ZMK config directory as DTS root: ${ZMK_CONFIG}")
-		list(APPEND DTS_ROOT ${ZMK_CONFIG})
-	endif()
+    set(ENV{ZMK_CONFIG} "${ZMK_CONFIG}")
+    if(EXISTS ${ZMK_CONFIG}/boards)
+        message(STATUS "Adding ZMK config directory as board root: ${ZMK_CONFIG}")
+        list(APPEND BOARD_ROOT ${ZMK_CONFIG})
+    endif()
+    if(EXISTS ${ZMK_CONFIG}/dts)
+        message(STATUS "Adding ZMK config directory as DTS root: ${ZMK_CONFIG}")
+        list(APPEND DTS_ROOT ${ZMK_CONFIG})
+    endif()
 endif()
 
 
 if(DEFINED SHIELD)
-	string(REPLACE " " ";" SHIELD_AS_LIST "${SHIELD}")
+    string(REPLACE " " ";" SHIELD_AS_LIST "${SHIELD}")
 endif()
 
 foreach(root ${BOARD_ROOT})
-	set(shield_dir ${root}/boards/shields)
-	# Match the Kconfig.shield files in the shield directories to make sure we are
-	# finding shields, e.g. x_nucleo_iks01a1/Kconfig.shield
-	file(GLOB_RECURSE shields_refs_list ${shield_dir}/*/Kconfig.shield)
-	unset(SHIELD_LIST)
-	foreach(shields_refs ${shields_refs_list})
-		get_filename_component(shield_path ${shields_refs} DIRECTORY)
-		file(GLOB shield_overlays RELATIVE ${shield_path} ${shield_path}/*.overlay)
-		foreach(overlay ${shield_overlays})
-			get_filename_component(shield ${overlay} NAME_WE)
-			list(APPEND SHIELD_LIST ${shield})
-			set(SHIELD_DIR_${shield} ${shield_path})
-		endforeach()
-	endforeach()
+    set(shield_dir ${root}/boards/shields)
+    # Match the Kconfig.shield files in the shield directories to make sure we are
+    # finding shields, e.g. x_nucleo_iks01a1/Kconfig.shield
+    file(GLOB_RECURSE shields_refs_list ${shield_dir}/*/Kconfig.shield)
+    unset(SHIELD_LIST)
+    foreach(shields_refs ${shields_refs_list})
+        get_filename_component(shield_path ${shields_refs} DIRECTORY)
+        file(GLOB shield_overlays RELATIVE ${shield_path} ${shield_path}/*.overlay)
+        foreach(overlay ${shield_overlays})
+            get_filename_component(shield ${overlay} NAME_WE)
+            list(APPEND SHIELD_LIST ${shield})
+            set(SHIELD_DIR_${shield} ${shield_path})
+        endforeach()
+    endforeach()
 
-	if (EXISTS "${root}/boards/${BOARD}.overlay")
-		list(APPEND shield_dts_files "${root}/boards/${BOARD}.overlay")
-	endif()
-	if (NOT DEFINED BOARD_DIR_NAME)
-		find_path(BOARD_DIR
-			NAMES ${BOARD}_defconfig
-			PATHS ${root}/boards/*/*
-			NO_DEFAULT_PATH
-			)
-		if(BOARD_DIR)
-			get_filename_component(BOARD_DIR_NAME ${BOARD_DIR} NAME)
-			list(APPEND KEYMAP_DIRS ${BOARD_DIR})
-		endif()
-	endif()
+    if (EXISTS "${root}/boards/${BOARD}.overlay")
+        list(APPEND shield_dts_files "${root}/boards/${BOARD}.overlay")
+    endif()
+    if (NOT DEFINED BOARD_DIR_NAME)
+        find_path(BOARD_DIR
+            NAMES ${BOARD}_defconfig
+            PATHS ${root}/boards/*/*
+            NO_DEFAULT_PATH
+            )
+        if(BOARD_DIR)
+            get_filename_component(BOARD_DIR_NAME ${BOARD_DIR} NAME)
+            list(APPEND KEYMAP_DIRS ${BOARD_DIR})
+        endif()
+    endif()
 
-	if(DEFINED SHIELD)
-		foreach(s ${SHIELD_AS_LIST})
-			if(NOT ${s} IN_LIST SHIELD_LIST)
-				message(WARNING "Didn't find ${s}")
-				continue()
-			endif()
-			message(STATUS "Adding ${SHIELD_DIR_${s}}")
-			list(APPEND KEYMAP_DIRS ${SHIELD_DIR_${s}})
-			get_filename_component(shield_dir_name ${SHIELD_DIR_${s}} NAME)
-			list(APPEND SHIELD_DIR ${shield_dir_name})
-		endforeach()
-	endif()
+    if(DEFINED SHIELD)
+        foreach(s ${SHIELD_AS_LIST})
+            if(NOT ${s} IN_LIST SHIELD_LIST)
+                message(WARNING "Didn't find ${s}")
+                continue()
+            endif()
+            message(STATUS "Adding ${SHIELD_DIR_${s}}")
+            list(APPEND KEYMAP_DIRS ${SHIELD_DIR_${s}})
+            get_filename_component(shield_dir_name ${SHIELD_DIR_${s}} NAME)
+            list(APPEND SHIELD_DIR ${shield_dir_name})
+        endforeach()
+    endif()
 endforeach()
 
 # Give a shield like `kyria_rev2_left` we want to use `kyria_rev2` and `kyria` as candidate names for
 # overlay/conf/keymap files.
 if(DEFINED SHIELD)
-	foreach(s ${SHIELD_AS_LIST})
-		if (DEFINED $SHIELD_DIR_${s})
-			get_filename_component(shield_dir_name ${SHIELD_DIR_${s}} NAME)
-		endif()
-		string(REPLACE "_" ";" S_PIECES ${s})
-		list(LENGTH S_PIECES S_PIECES_LEN)
-		while(NOT S_PIECES STREQUAL "")
-			list(POP_BACK S_PIECES)
-			list(JOIN S_PIECES "_" s_substr)
-			if ("${s_substr}" STREQUAL "" OR "${s_substr}" STREQUAL "${shield_dir_name}")
-				break()
-			endif()
-			list(APPEND shield_candidate_names ${s_substr})
-		endwhile()
-	endforeach()
+    foreach(s ${SHIELD_AS_LIST})
+        if (DEFINED $SHIELD_DIR_${s})
+            get_filename_component(shield_dir_name ${SHIELD_DIR_${s}} NAME)
+        endif()
+        string(REPLACE "_" ";" S_PIECES ${s})
+        list(LENGTH S_PIECES S_PIECES_LEN)
+        while(NOT S_PIECES STREQUAL "")
+            list(POP_BACK S_PIECES)
+            list(JOIN S_PIECES "_" s_substr)
+            if ("${s_substr}" STREQUAL "" OR "${s_substr}" STREQUAL "${shield_dir_name}")
+                break()
+            endif()
+            list(APPEND shield_candidate_names ${s_substr})
+        endwhile()
+    endforeach()
 endif()
 
 if (ZMK_CONFIG)
-	if (EXISTS ${ZMK_CONFIG})
-		message(STATUS "ZMK Config directory: ${ZMK_CONFIG}")
-		list(PREPEND KEYMAP_DIRS "${ZMK_CONFIG}")
+    if (EXISTS ${ZMK_CONFIG})
+        message(STATUS "ZMK Config directory: ${ZMK_CONFIG}")
+        list(PREPEND KEYMAP_DIRS "${ZMK_CONFIG}")
 
-		if (DEFINED SHIELD)
-			foreach (s ${shield_candidate_names} ${SHIELD_AS_LIST})
-				if (DEFINED ${SHIELD_DIR_${s}})
-					get_filename_component(shield_dir_name ${SHIELD_DIR_${s}} NAME)
-				endif()
-				list(APPEND overlay_candidates "${ZMK_CONFIG}/${s}_${BOARD}.overlay")
-				list(APPEND overlay_candidates "${ZMK_CONFIG}/${s}.overlay")
-				if (NOT "${shield_dir_name}" STREQUAL "${s}")
-					list(APPEND config_candidates "${ZMK_CONFIG}/${shield_dir_name}_${BOARD}.conf")
-					list(APPEND config_candidates "${ZMK_CONFIG}/${shield_dir_name}.conf")
-				endif()
-				list(APPEND config_candidates "${ZMK_CONFIG}/${s}_${BOARD}.conf")
-				list(APPEND config_candidates "${ZMK_CONFIG}/${s}.conf")
-			endforeach()
-		endif()
+        if (DEFINED SHIELD)
+            foreach (s ${shield_candidate_names} ${SHIELD_AS_LIST})
+                if (DEFINED ${SHIELD_DIR_${s}})
+                    get_filename_component(shield_dir_name ${SHIELD_DIR_${s}} NAME)
+                endif()
+                list(APPEND overlay_candidates "${ZMK_CONFIG}/${s}_${BOARD}.overlay")
+                list(APPEND overlay_candidates "${ZMK_CONFIG}/${s}.overlay")
+                if (NOT "${shield_dir_name}" STREQUAL "${s}")
+                    list(APPEND config_candidates "${ZMK_CONFIG}/${shield_dir_name}_${BOARD}.conf")
+                    list(APPEND config_candidates "${ZMK_CONFIG}/${shield_dir_name}.conf")
+                endif()
+                list(APPEND config_candidates "${ZMK_CONFIG}/${s}_${BOARD}.conf")
+                list(APPEND config_candidates "${ZMK_CONFIG}/${s}.conf")
+            endforeach()
+        endif()
 
-		# TODO: Board revisions?
-		list(APPEND overlay_candidates "${ZMK_CONFIG}/${BOARD_DIR_NAME}.overlay")
-		list(APPEND overlay_candidates "${ZMK_CONFIG}/${BOARD}.overlay")
-		list(APPEND overlay_candidates "${ZMK_CONFIG}/default.overlay")
-		list(APPEND config_candidates "${ZMK_CONFIG}/${BOARD_DIR_NAME}.conf")
-		list(APPEND config_candidates "${ZMK_CONFIG}/${BOARD}.conf")
-		list(APPEND config_candidates "${ZMK_CONFIG}/default.conf")
+        # TODO: Board revisions?
+        list(APPEND overlay_candidates "${ZMK_CONFIG}/${BOARD_DIR_NAME}.overlay")
+        list(APPEND overlay_candidates "${ZMK_CONFIG}/${BOARD}.overlay")
+        list(APPEND overlay_candidates "${ZMK_CONFIG}/default.overlay")
+        list(APPEND config_candidates "${ZMK_CONFIG}/${BOARD_DIR_NAME}.conf")
+        list(APPEND config_candidates "${ZMK_CONFIG}/${BOARD}.conf")
+        list(APPEND config_candidates "${ZMK_CONFIG}/default.conf")
 
-		foreach(overlay ${overlay_candidates})
-			if (EXISTS "${overlay}")
-				message(STATUS "ZMK Config devicetree overlay: ${overlay}")
-				list(APPEND shield_dts_files "${overlay}")
-				break()
-			endif()
-		endforeach()
+        foreach(overlay ${overlay_candidates})
+            if (EXISTS "${overlay}")
+                message(STATUS "ZMK Config devicetree overlay: ${overlay}")
+                list(APPEND shield_dts_files "${overlay}")
+                break()
+            endif()
+        endforeach()
 
-		foreach(conf ${config_candidates})
-			if (EXISTS "${conf}")
-				message(STATUS "ZMK Config Kconfig: ${conf}")
-				list(APPEND shield_conf_files "${conf}")
-			endif()
-		endforeach()
-	else()
-		message(WARNING "Unable to locate ZMK config at: ${ZMK_CONFIG}")
-	endif()
+        foreach(conf ${config_candidates})
+            if (EXISTS "${conf}")
+                message(STATUS "ZMK Config Kconfig: ${conf}")
+                list(APPEND shield_conf_files "${conf}")
+            endif()
+        endforeach()
+    else()
+        message(WARNING "Unable to locate ZMK config at: ${ZMK_CONFIG}")
+    endif()
 endif()
 
 
 if(NOT KEYMAP_FILE)
-	foreach(keymap_dir ${KEYMAP_DIRS})
-		foreach(keymap_prefix ${shield_candidate_names} ${SHIELD_AS_LIST} ${SHIELD_DIR} ${BOARD} ${BOARD_DIR_NAME})
-			if (EXISTS ${keymap_dir}/${keymap_prefix}.keymap)
-				set(KEYMAP_FILE "${keymap_dir}/${keymap_prefix}.keymap" CACHE STRING "Selected keymap file")
-				message(STATUS "Using keymap file: ${KEYMAP_FILE}")
-				set(DTC_OVERLAY_FILE ${KEYMAP_FILE})
-				break()
-			endif()
-		endforeach()
-	endforeach()
+    foreach(keymap_dir ${KEYMAP_DIRS})
+        foreach(keymap_prefix ${shield_candidate_names} ${SHIELD_AS_LIST} ${SHIELD_DIR} ${BOARD} ${BOARD_DIR_NAME})
+            if (EXISTS ${keymap_dir}/${keymap_prefix}.keymap)
+                set(KEYMAP_FILE "${keymap_dir}/${keymap_prefix}.keymap" CACHE STRING "Selected keymap file")
+                message(STATUS "Using keymap file: ${KEYMAP_FILE}")
+                set(DTC_OVERLAY_FILE ${KEYMAP_FILE})
+                break()
+            endif()
+        endforeach()
+    endforeach()
 else()
-	message(STATUS "Using keymap file: ${KEYMAP_FILE}")
-	set(DTC_OVERLAY_FILE ${KEYMAP_FILE})
+    message(STATUS "Using keymap file: ${KEYMAP_FILE}")
+    set(DTC_OVERLAY_FILE ${KEYMAP_FILE})
 endif()
 
 if (NOT KEYMAP_FILE)
-	message(WARNING "Failed to locate keymap file!")
+    message(WARNING "Failed to locate keymap file!")
 endif()
diff --git a/app/drivers/display/CMakeLists.txt b/app/drivers/display/CMakeLists.txt
index 13b97193..d5e83c1d 100644
--- a/app/drivers/display/CMakeLists.txt
+++ b/app/drivers/display/CMakeLists.txt
@@ -1,4 +1,4 @@
 # Copyright (c) 2021 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
-zephyr_sources_ifdef(CONFIG_IL0323		il0323.c)
\ No newline at end of file
+zephyr_sources_ifdef(CONFIG_IL0323      il0323.c)
\ No newline at end of file
diff --git a/app/drivers/display/Kconfig.il0323 b/app/drivers/display/Kconfig.il0323
index f39015ef..f3308c16 100644
--- a/app/drivers/display/Kconfig.il0323
+++ b/app/drivers/display/Kconfig.il0323
@@ -4,8 +4,8 @@
 # IL0323 display controller configuration options
 
 config IL0323
-	bool "IL0323 compatible display controller driver"
-	depends on SPI
-	depends on HEAP_MEM_POOL_SIZE != 0
-	help
-	  Enable driver for IL0323 compatible controller.
\ No newline at end of file
+    bool "IL0323 compatible display controller driver"
+    depends on SPI
+    depends on HEAP_MEM_POOL_SIZE != 0
+    help
+      Enable driver for IL0323 compatible controller.
\ No newline at end of file
diff --git a/app/drivers/gpio/Kconfig.595 b/app/drivers/gpio/Kconfig.595
index f43e807b..b4b6bdcc 100644
--- a/app/drivers/gpio/Kconfig.595
+++ b/app/drivers/gpio/Kconfig.595
@@ -6,20 +6,20 @@
 DT_COMPAT_ZMK_GPIO_595 := zmk,gpio-595
 
 menuconfig GPIO_595
-	bool "595 Shift Register SPI driver"
-	default $(dt_compat_enabled,$(DT_COMPAT_ZMK_GPIO_595))
-	depends on SPI
-	select HAS_DTS_GPIO
-	select ZMK_DRIVERS_GPIO
-	help
-	  Enable driver for 595 shift register chip using SPI.
+    bool "595 Shift Register SPI driver"
+    default $(dt_compat_enabled,$(DT_COMPAT_ZMK_GPIO_595))
+    depends on SPI
+    select HAS_DTS_GPIO
+    select ZMK_DRIVERS_GPIO
+    help
+      Enable driver for 595 shift register chip using SPI.
 
 if GPIO_595
 
 config GPIO_595_INIT_PRIORITY
-	int "Init priority"
-	default 75
-	help
-	  Device driver initialization priority.
+    int "Init priority"
+    default 75
+    help
+      Device driver initialization priority.
 
 endif #GPIO_595
diff --git a/app/drivers/gpio/Kconfig.max7318 b/app/drivers/gpio/Kconfig.max7318
index ded7f926..d572b970 100644
--- a/app/drivers/gpio/Kconfig.max7318
+++ b/app/drivers/gpio/Kconfig.max7318
@@ -6,20 +6,20 @@
 DT_COMPAT_MAXIM_MAX7318 := maxim,max7318
 
 menuconfig GPIO_MAX7318
-	bool "MAX7318 I2C-based GPIO chip"
-	default $(dt_compat_enabled,$(DT_COMPAT_MAXIM_MAX7318))
-	depends on I2C
-	select HAS_DTS_GPIO
-	select ZMK_DRIVERS_GPIO
-	help
-	  Enable driver for MAX7318 I2C-based GPIO chip.
+    bool "MAX7318 I2C-based GPIO chip"
+    default $(dt_compat_enabled,$(DT_COMPAT_MAXIM_MAX7318))
+    depends on I2C
+    select HAS_DTS_GPIO
+    select ZMK_DRIVERS_GPIO
+    help
+      Enable driver for MAX7318 I2C-based GPIO chip.
 
 if GPIO_MAX7318
 
 config GPIO_MAX7318_INIT_PRIORITY
-	int "Init priority"
-	default 75
-	help
-	  Device driver initialization priority.
+    int "Init priority"
+    default 75
+    help
+      Device driver initialization priority.
 
 endif #GPIO_MAX7318
diff --git a/app/drivers/kscan/Kconfig b/app/drivers/kscan/Kconfig
index 216651a1..1d165669 100644
--- a/app/drivers/kscan/Kconfig
+++ b/app/drivers/kscan/Kconfig
@@ -8,87 +8,87 @@ DT_COMPAT_ZMK_KSCAN_GPIO_MATRIX := zmk,kscan-gpio-matrix
 DT_COMPAT_ZMK_KSCAN_MOCK := zmk,kscan-mock
 
 config ZMK_KSCAN_COMPOSITE_DRIVER
-	bool
-	default $(dt_compat_enabled,$(DT_COMPAT_ZMK_KSCAN_COMPOSITE))
+    bool
+    default $(dt_compat_enabled,$(DT_COMPAT_ZMK_KSCAN_COMPOSITE))
 
 config ZMK_KSCAN_GPIO_DRIVER
-	bool
-	select GPIO
+    bool
+    select GPIO
 
 config ZMK_KSCAN_GPIO_DEMUX
-	bool
-	default $(dt_compat_enabled,$(DT_COMPAT_ZMK_KSCAN_GPIO_DEMUX))
-	select ZMK_KSCAN_GPIO_DRIVER
+    bool
+    default $(dt_compat_enabled,$(DT_COMPAT_ZMK_KSCAN_GPIO_DEMUX))
+    select ZMK_KSCAN_GPIO_DRIVER
 
 config ZMK_KSCAN_GPIO_DIRECT
-	bool
-	default $(dt_compat_enabled,$(DT_COMPAT_ZMK_KSCAN_GPIO_DIRECT))
-	select ZMK_KSCAN_GPIO_DRIVER
+    bool
+    default $(dt_compat_enabled,$(DT_COMPAT_ZMK_KSCAN_GPIO_DIRECT))
+    select ZMK_KSCAN_GPIO_DRIVER
 
 config ZMK_KSCAN_GPIO_MATRIX
-	bool
-	default $(dt_compat_enabled,$(DT_COMPAT_ZMK_KSCAN_GPIO_MATRIX))
-	select ZMK_KSCAN_GPIO_DRIVER
+    bool
+    default $(dt_compat_enabled,$(DT_COMPAT_ZMK_KSCAN_GPIO_MATRIX))
+    select ZMK_KSCAN_GPIO_DRIVER
 
 if ZMK_KSCAN_GPIO_MATRIX
 
 config ZMK_KSCAN_MATRIX_WAIT_BEFORE_INPUTS
-	int "Ticks to wait before reading inputs after an output set active"
-	default 0
-	help
-	    When iterating over each output to drive it active, read inputs, then set
-		inactive again, some boards may take time for output to propagate to the
-		inputs. In that scenario, set this value to a positive value to configure
-		the number of ticks to wait after setting an output active before reading
-		the inputs for their active state.
+    int "Ticks to wait before reading inputs after an output set active"
+    default 0
+    help
+        When iterating over each output to drive it active, read inputs, then set
+        inactive again, some boards may take time for output to propagate to the
+        inputs. In that scenario, set this value to a positive value to configure
+        the number of ticks to wait after setting an output active before reading
+        the inputs for their active state.
 
 config ZMK_KSCAN_MATRIX_WAIT_BETWEEN_OUTPUTS
     int "Ticks to wait between each output when scanning"
-	default 1 if SOC_RP2040
-	default 0
-	help
-	    When iterating over each output to drive it active, read inputs, then set
-		inactive again, some boards may take time for the previous output to
-		"settle" before reading inputs for the next active output column. In that
-		scenario, set this value to a positive value to configure the number of
-		ticks to wait after reading each column of keys.
+    default 1 if SOC_RP2040
+    default 0
+    help
+        When iterating over each output to drive it active, read inputs, then set
+        inactive again, some boards may take time for the previous output to
+        "settle" before reading inputs for the next active output column. In that
+        scenario, set this value to a positive value to configure the number of
+        ticks to wait after reading each column of keys.
 
 endif # ZMK_KSCAN_GPIO_MATRIX
 
 config ZMK_KSCAN_MOCK_DRIVER
-	bool
-	default $(dt_compat_enabled,$(DT_COMPAT_ZMK_KSCAN_MOCK))
+    bool
+    default $(dt_compat_enabled,$(DT_COMPAT_ZMK_KSCAN_MOCK))
 
 if ZMK_KSCAN_GPIO_DRIVER
 
 config ZMK_KSCAN_MATRIX_POLLING
-	bool "Poll for key event triggers instead of using interrupts on matrix boards."
+    bool "Poll for key event triggers instead of using interrupts on matrix boards."
 
 config ZMK_KSCAN_DIRECT_POLLING
-	bool "Poll for key event triggers instead of using interrupts on direct wired boards."
+    bool "Poll for key event triggers instead of using interrupts on direct wired boards."
 
 config ZMK_KSCAN_DEBOUNCE_PRESS_MS
-	int "Debounce time for key press in milliseconds."
-	default -1
-	help
-		Global debounce time for key press in milliseconds.
-		If this is -1, the debounce time is controlled by the debounce-press-ms
-		Devicetree property, which defaults to 5 ms. Otherwise this overrides the
-		debounce time for all key scan drivers to the chosen value.
+    int "Debounce time for key press in milliseconds."
+    default -1
+    help
+        Global debounce time for key press in milliseconds.
+        If this is -1, the debounce time is controlled by the debounce-press-ms
+        Devicetree property, which defaults to 5 ms. Otherwise this overrides the
+        debounce time for all key scan drivers to the chosen value.
 
 config ZMK_KSCAN_DEBOUNCE_RELEASE_MS
-	int "Debounce time for key release in milliseconds."
-	default -1
-	help
-		Global debounce time for key release in milliseconds.
-		If this is -1, the debounce time is controlled by the debounce-release-ms
-		Devicetree property, which defaults to 5 ms. Otherwise this overrides the
-		debounce time for all key scan drivers to the chosen value.
+    int "Debounce time for key release in milliseconds."
+    default -1
+    help
+        Global debounce time for key release in milliseconds.
+        If this is -1, the debounce time is controlled by the debounce-release-ms
+        Devicetree property, which defaults to 5 ms. Otherwise this overrides the
+        debounce time for all key scan drivers to the chosen value.
 
 endif
 
 config ZMK_KSCAN_INIT_PRIORITY
-	int "Keyboard scan driver init priority"
-	default 40
-	help
-	  Keyboard scan device driver initialization priority.
+    int "Keyboard scan driver init priority"
+    default 40
+    help
+      Keyboard scan device driver initialization priority.
diff --git a/app/drivers/sensor/battery/Kconfig b/app/drivers/sensor/battery/Kconfig
index d7c82bb0..a9d7189e 100644
--- a/app/drivers/sensor/battery/Kconfig
+++ b/app/drivers/sensor/battery/Kconfig
@@ -5,22 +5,22 @@ DT_COMPAT_ZMK_BATTERY_NRF_VDDH := zmk,battery-nrf-vddh
 DT_COMPAT_ZMK_BATTERY_VOLTAGE_DIVIDER := zmk,battery-voltage-divider
 
 config ZMK_BATTERY
-	bool "ZMK battery monitoring"
-	help
-		Enable battery monitoring
+    bool "ZMK battery monitoring"
+    help
+        Enable battery monitoring
 
 config ZMK_BATTERY_NRF_VDDH
-	bool
-	default $(dt_compat_enabled,$(DT_COMPAT_ZMK_BATTERY_NRF_VDDH))
-	select ADC
-	select ZMK_BATTERY
-	help
-		Enable ZMK nRF VDDH voltage driver for battery monitoring.
+    bool
+    default $(dt_compat_enabled,$(DT_COMPAT_ZMK_BATTERY_NRF_VDDH))
+    select ADC
+    select ZMK_BATTERY
+    help
+        Enable ZMK nRF VDDH voltage driver for battery monitoring.
 
 config ZMK_BATTERY_VOLTAGE_DIVIDER
-	bool
-	default $(dt_compat_enabled,$(DT_COMPAT_ZMK_BATTERY_VOLTAGE_DIVIDER))
-	select ADC
-	select ZMK_BATTERY
-	help
-		Enable ZMK battery voltage divider driver for battery monitoring.
+    bool
+    default $(dt_compat_enabled,$(DT_COMPAT_ZMK_BATTERY_VOLTAGE_DIVIDER))
+    select ADC
+    select ZMK_BATTERY
+    help
+        Enable ZMK battery voltage divider driver for battery monitoring.
diff --git a/app/drivers/sensor/ec11/Kconfig b/app/drivers/sensor/ec11/Kconfig
index 6854e530..e86d092a 100644
--- a/app/drivers/sensor/ec11/Kconfig
+++ b/app/drivers/sensor/ec11/Kconfig
@@ -2,49 +2,49 @@
 # SPDX-License-Identifier: MIT
 
 menuconfig EC11
-	bool "EC11 Incremental Encoder Sensor"
-	depends on GPIO
-	help
-	  Enable driver for EC11 incremental encoder sensors.
+    bool "EC11 Incremental Encoder Sensor"
+    depends on GPIO
+    help
+      Enable driver for EC11 incremental encoder sensors.
 
 if EC11
 
 choice
-	prompt "Trigger mode"
-	default EC11_TRIGGER_NONE
-	help
-	  Specify the type of triggering to be used by the driver.
+    prompt "Trigger mode"
+    default EC11_TRIGGER_NONE
+    help
+      Specify the type of triggering to be used by the driver.
 
 config EC11_TRIGGER_NONE
-	bool "No trigger"
+    bool "No trigger"
 
 config EC11_TRIGGER_GLOBAL_THREAD
-	bool "Use global thread"
-	depends on GPIO
-	select EC11_TRIGGER
+    bool "Use global thread"
+    depends on GPIO
+    select EC11_TRIGGER
 
 config EC11_TRIGGER_OWN_THREAD
-	bool "Use own thread"
-	depends on GPIO
-	select EC11_TRIGGER
+    bool "Use own thread"
+    depends on GPIO
+    select EC11_TRIGGER
 
 endchoice
 
 config EC11_TRIGGER
-	bool
+    bool
 
 config EC11_THREAD_PRIORITY
-	int "Thread priority"
-	depends on EC11_TRIGGER_OWN_THREAD
-	default 10
-	help
-	  Priority of thread used by the driver to handle interrupts.
+    int "Thread priority"
+    depends on EC11_TRIGGER_OWN_THREAD
+    default 10
+    help
+      Priority of thread used by the driver to handle interrupts.
 
 config EC11_THREAD_STACK_SIZE
-	int "Thread stack size"
-	depends on EC11_TRIGGER_OWN_THREAD
-	default 1024
-	help
-	  Stack size of thread used by the driver to handle interrupts.
+    int "Thread stack size"
+    depends on EC11_TRIGGER_OWN_THREAD
+    default 1024
+    help
+      Stack size of thread used by the driver to handle interrupts.
 
 endif # EC11
\ No newline at end of file
diff --git a/app/dts/behaviors/backlight.dtsi b/app/dts/behaviors/backlight.dtsi
index f9bd02b8..bebd6dfb 100644
--- a/app/dts/behaviors/backlight.dtsi
+++ b/app/dts/behaviors/backlight.dtsi
@@ -5,11 +5,11 @@
  */
 
  / {
-	behaviors {
-		/omit-if-no-ref/ bl: behavior_backlight {
-			compatible = "zmk,behavior-backlight";
-			label = "BCKLGHT";
-			#binding-cells = <2>;
-		};
-	};
+    behaviors {
+        /omit-if-no-ref/ bl: behavior_backlight {
+            compatible = "zmk,behavior-backlight";
+            label = "BCKLGHT";
+            #binding-cells = <2>;
+        };
+    };
 };
diff --git a/app/dts/behaviors/bluetooth.dtsi b/app/dts/behaviors/bluetooth.dtsi
index 1e9cf21b..a49ff4d6 100644
--- a/app/dts/behaviors/bluetooth.dtsi
+++ b/app/dts/behaviors/bluetooth.dtsi
@@ -5,11 +5,11 @@
  */
 
 / {
-	behaviors {
-		/omit-if-no-ref/ bt: behavior_bluetooth {
-			compatible = "zmk,behavior-bluetooth";
-			label = "BLUETOOTH";
-			#binding-cells = <2>;
-		};
-	};
+    behaviors {
+        /omit-if-no-ref/ bt: behavior_bluetooth {
+            compatible = "zmk,behavior-bluetooth";
+            label = "BLUETOOTH";
+            #binding-cells = <2>;
+        };
+    };
 };
diff --git a/app/dts/behaviors/caps_word.dtsi b/app/dts/behaviors/caps_word.dtsi
index ac04e26b..219300dc 100644
--- a/app/dts/behaviors/caps_word.dtsi
+++ b/app/dts/behaviors/caps_word.dtsi
@@ -7,13 +7,13 @@
 #include <dt-bindings/zmk/keys.h>
 
 / {
-	behaviors {
-		/omit-if-no-ref/ caps_word: behavior_caps_word {
-			compatible = "zmk,behavior-caps-word";
-			label = "CAPS_WORD";
-			#binding-cells = <0>;
-			continue-list = <UNDERSCORE BACKSPACE DELETE>;
-		};
-	};
+    behaviors {
+        /omit-if-no-ref/ caps_word: behavior_caps_word {
+            compatible = "zmk,behavior-caps-word";
+            label = "CAPS_WORD";
+            #binding-cells = <0>;
+            continue-list = <UNDERSCORE BACKSPACE DELETE>;
+        };
+    };
 };
 
diff --git a/app/dts/behaviors/ext_power.dtsi b/app/dts/behaviors/ext_power.dtsi
index 18e824e2..f61170dd 100644
--- a/app/dts/behaviors/ext_power.dtsi
+++ b/app/dts/behaviors/ext_power.dtsi
@@ -5,11 +5,11 @@
  */
 
 / {
-	behaviors {
-		ext_power: behavior_ext_power {
-			compatible = "zmk,behavior-ext-power";
-			label = "EXTPOWER";
-			#binding-cells = <1>;
-		};
-	};
+    behaviors {
+        ext_power: behavior_ext_power {
+            compatible = "zmk,behavior-ext-power";
+            label = "EXTPOWER";
+            #binding-cells = <1>;
+        };
+    };
 };
diff --git a/app/dts/behaviors/gresc.dtsi b/app/dts/behaviors/gresc.dtsi
index 29593880..fa4c685b 100644
--- a/app/dts/behaviors/gresc.dtsi
+++ b/app/dts/behaviors/gresc.dtsi
@@ -7,13 +7,13 @@
 #include <dt-bindings/zmk/keys.h>
 
 / {
-	behaviors {
-		/omit-if-no-ref/ gresc: grave_escape {
-			compatible = "zmk,behavior-mod-morph";
-			label = "GRAVE_ESCAPE";
-			#binding-cells = <0>;
-			bindings = <&kp ESC>, <&kp GRAVE>;
+    behaviors {
+        /omit-if-no-ref/ gresc: grave_escape {
+            compatible = "zmk,behavior-mod-morph";
+            label = "GRAVE_ESCAPE";
+            #binding-cells = <0>;
+            bindings = <&kp ESC>, <&kp GRAVE>;
             mods = <(MOD_LGUI|MOD_LSFT|MOD_RGUI|MOD_RSFT)>;
-		};
-	};
+        };
+    };
 };
diff --git a/app/dts/behaviors/key_press.dtsi b/app/dts/behaviors/key_press.dtsi
index 59a4e12a..b0fc2db1 100644
--- a/app/dts/behaviors/key_press.dtsi
+++ b/app/dts/behaviors/key_press.dtsi
@@ -5,12 +5,12 @@
  */
 
 / {
-	behaviors {
-		/* DEPRECATED: `cp` will be removed in the future */
-		/omit-if-no-ref/ cp: kp: behavior_key_press {
-			compatible = "zmk,behavior-key-press";
-			label = "KEY_PRESS";
-			#binding-cells = <1>;
-		};
-	};
+    behaviors {
+        /* DEPRECATED: `cp` will be removed in the future */
+        /omit-if-no-ref/ cp: kp: behavior_key_press {
+            compatible = "zmk,behavior-key-press";
+            label = "KEY_PRESS";
+            #binding-cells = <1>;
+        };
+    };
 };
diff --git a/app/dts/behaviors/key_repeat.dtsi b/app/dts/behaviors/key_repeat.dtsi
index aa8ffa04..795a77f6 100644
--- a/app/dts/behaviors/key_repeat.dtsi
+++ b/app/dts/behaviors/key_repeat.dtsi
@@ -7,13 +7,13 @@
 #include <dt-bindings/zmk/keys.h>
 
 / {
-	behaviors {
-		/omit-if-no-ref/ key_repeat: behavior_key_repeat {
-			compatible = "zmk,behavior-key-repeat";
-			label = "KEY_REPEAT";
-			#binding-cells = <0>;
-			usage-pages = <HID_USAGE_KEY>;
-		};
-	};
+    behaviors {
+        /omit-if-no-ref/ key_repeat: behavior_key_repeat {
+            compatible = "zmk,behavior-key-repeat";
+            label = "KEY_REPEAT";
+            #binding-cells = <0>;
+            usage-pages = <HID_USAGE_KEY>;
+        };
+    };
 };
 
diff --git a/app/dts/behaviors/key_toggle.dtsi b/app/dts/behaviors/key_toggle.dtsi
index 98001b79..df581014 100644
--- a/app/dts/behaviors/key_toggle.dtsi
+++ b/app/dts/behaviors/key_toggle.dtsi
@@ -5,11 +5,11 @@
  */
 
 / {
-	behaviors {
-		/omit-if-no-ref/ kt: behavior_key_toggle {
-			compatible = "zmk,behavior-key-toggle";
-			label = "KEY_TOGGLE";
-			#binding-cells = <1>;
-		};
-	};
+    behaviors {
+        /omit-if-no-ref/ kt: behavior_key_toggle {
+            compatible = "zmk,behavior-key-toggle";
+            label = "KEY_TOGGLE";
+            #binding-cells = <1>;
+        };
+    };
 };
diff --git a/app/dts/behaviors/layer_tap.dtsi b/app/dts/behaviors/layer_tap.dtsi
index 21fd9d56..1d92245c 100644
--- a/app/dts/behaviors/layer_tap.dtsi
+++ b/app/dts/behaviors/layer_tap.dtsi
@@ -5,14 +5,14 @@
  */
 
 / {
-	behaviors {
-		/omit-if-no-ref/ lt: behavior_layer_tap {
-			compatible = "zmk,behavior-hold-tap";
-			label = "LAYER_TAP";
-			#binding-cells = <2>;
-			flavor = "tap-preferred";
-			tapping-term-ms = <200>;
-			bindings = <&mo>, <&kp>;
-		};
-	};
+    behaviors {
+        /omit-if-no-ref/ lt: behavior_layer_tap {
+            compatible = "zmk,behavior-hold-tap";
+            label = "LAYER_TAP";
+            #binding-cells = <2>;
+            flavor = "tap-preferred";
+            tapping-term-ms = <200>;
+            bindings = <&mo>, <&kp>;
+        };
+    };
 };
diff --git a/app/dts/behaviors/macros.dtsi b/app/dts/behaviors/macros.dtsi
index 76153291..757c046e 100644
--- a/app/dts/behaviors/macros.dtsi
+++ b/app/dts/behaviors/macros.dtsi
@@ -6,49 +6,49 @@
 
 #define ZMK_MACRO_STRINGIFY(x) #x
 #define ZMK_MACRO(name,...) \
-	name: name { \
-			label = ZMK_MACRO_STRINGIFY(ZM_ ## name); \
-			compatible = "zmk,behavior-macro"; \
-			#binding-cells = <0>; \
-			__VA_ARGS__ \
-		};
+    name: name { \
+            label = ZMK_MACRO_STRINGIFY(ZM_ ## name); \
+            compatible = "zmk,behavior-macro"; \
+            #binding-cells = <0>; \
+            __VA_ARGS__ \
+        };
 
  / {
-	behaviors {
-		macro_tap: macro_control_mode_tap {
-			compatible = "zmk,macro-control-mode-tap";
-			label = "MAC_TAP";
-			#binding-cells = <0>;
-		};
+    behaviors {
+        macro_tap: macro_control_mode_tap {
+            compatible = "zmk,macro-control-mode-tap";
+            label = "MAC_TAP";
+            #binding-cells = <0>;
+        };
 
-		macro_press: macro_control_mode_press {
-			compatible = "zmk,macro-control-mode-press";
-			label = "MAC_PRESS";
-			#binding-cells = <0>;
-		};
+        macro_press: macro_control_mode_press {
+            compatible = "zmk,macro-control-mode-press";
+            label = "MAC_PRESS";
+            #binding-cells = <0>;
+        };
 
-		macro_release: macro_control_mode_release {
-			compatible = "zmk,macro-control-mode-release";
-			label = "MAC_REL";
-			#binding-cells = <0>;
-		};
+        macro_release: macro_control_mode_release {
+            compatible = "zmk,macro-control-mode-release";
+            label = "MAC_REL";
+            #binding-cells = <0>;
+        };
 
-		macro_tap_time: macro_control_tap_time {
-			compatible = "zmk,macro-control-tap-time";
-			label = "MAC_TAP_TIME";
-			#binding-cells = <1>;
-		};
+        macro_tap_time: macro_control_tap_time {
+            compatible = "zmk,macro-control-tap-time";
+            label = "MAC_TAP_TIME";
+            #binding-cells = <1>;
+        };
 
-		macro_wait_time: macro_control_wait_time {
-			compatible = "zmk,macro-control-wait-time";
-			label = "MAC_WAIT_TIME";
-			#binding-cells = <1>;
-		};
+        macro_wait_time: macro_control_wait_time {
+            compatible = "zmk,macro-control-wait-time";
+            label = "MAC_WAIT_TIME";
+            #binding-cells = <1>;
+        };
 
-		macro_pause_for_release: macro_pause_for_release {
-			compatible = "zmk,macro-pause-for-release";
-			label = "MAC_WAIT_REL";
-			#binding-cells = <0>;
-		};
-	};
+        macro_pause_for_release: macro_pause_for_release {
+            compatible = "zmk,macro-pause-for-release";
+            label = "MAC_WAIT_REL";
+            #binding-cells = <0>;
+        };
+    };
 };
diff --git a/app/dts/behaviors/mod_tap.dtsi b/app/dts/behaviors/mod_tap.dtsi
index 7a98713c..d441a4f1 100644
--- a/app/dts/behaviors/mod_tap.dtsi
+++ b/app/dts/behaviors/mod_tap.dtsi
@@ -5,14 +5,14 @@
  */
 
 / {
-	behaviors {
-		/omit-if-no-ref/ mt: behavior_mod_tap {
-			compatible = "zmk,behavior-hold-tap";
-			label = "MOD_TAP";
-			#binding-cells = <2>;
-			flavor = "hold-preferred";
-			tapping-term-ms = <200>;
-			bindings = <&kp>, <&kp>;
-		};
-	};
+    behaviors {
+        /omit-if-no-ref/ mt: behavior_mod_tap {
+            compatible = "zmk,behavior-hold-tap";
+            label = "MOD_TAP";
+            #binding-cells = <2>;
+            flavor = "hold-preferred";
+            tapping-term-ms = <200>;
+            bindings = <&kp>, <&kp>;
+        };
+    };
 };
diff --git a/app/dts/behaviors/momentary_layer.dtsi b/app/dts/behaviors/momentary_layer.dtsi
index 2dbd88d9..d1c91232 100644
--- a/app/dts/behaviors/momentary_layer.dtsi
+++ b/app/dts/behaviors/momentary_layer.dtsi
@@ -5,11 +5,11 @@
  */
 
 / {
-	behaviors {
-		/omit-if-no-ref/ mo: behavior_momentary_layer {
-			compatible = "zmk,behavior-momentary-layer";
-			label = "MO";
-			#binding-cells = <1>;
-		};
-	};
+    behaviors {
+        /omit-if-no-ref/ mo: behavior_momentary_layer {
+            compatible = "zmk,behavior-momentary-layer";
+            label = "MO";
+            #binding-cells = <1>;
+        };
+    };
 };
diff --git a/app/dts/behaviors/none.dtsi b/app/dts/behaviors/none.dtsi
index 790f2d61..fc4890c3 100644
--- a/app/dts/behaviors/none.dtsi
+++ b/app/dts/behaviors/none.dtsi
@@ -5,11 +5,11 @@
  */
 
 / {
-	behaviors {
-		/omit-if-no-ref/ none: behavior_none {
-			compatible = "zmk,behavior-none";
-			label = "NONE";
-			#binding-cells = <0>;
-		};
-	};
+    behaviors {
+        /omit-if-no-ref/ none: behavior_none {
+            compatible = "zmk,behavior-none";
+            label = "NONE";
+            #binding-cells = <0>;
+        };
+    };
 };
diff --git a/app/dts/behaviors/reset.dtsi b/app/dts/behaviors/reset.dtsi
index 74a7163b..2e775269 100644
--- a/app/dts/behaviors/reset.dtsi
+++ b/app/dts/behaviors/reset.dtsi
@@ -7,18 +7,18 @@
 #include <dt-bindings/zmk/reset.h>
 
 / {
-	behaviors {
-		sys_reset: behavior_reset {
-			compatible = "zmk,behavior-reset";
-			label = "SYSRESET";
-			#binding-cells = <0>;
-		};
+    behaviors {
+        sys_reset: behavior_reset {
+            compatible = "zmk,behavior-reset";
+            label = "SYSRESET";
+            #binding-cells = <0>;
+        };
 
-		bootloader: behavior_reset_dfu {
-			compatible = "zmk,behavior-reset";
-			label = "BOOTLOAD";
-			type = <RST_UF2>;
-			#binding-cells = <0>;
-		};
-	};
+        bootloader: behavior_reset_dfu {
+            compatible = "zmk,behavior-reset";
+            label = "BOOTLOAD";
+            type = <RST_UF2>;
+            #binding-cells = <0>;
+        };
+    };
 };
diff --git a/app/dts/behaviors/rgb_underglow.dtsi b/app/dts/behaviors/rgb_underglow.dtsi
index 54fe422e..6ffec2e6 100644
--- a/app/dts/behaviors/rgb_underglow.dtsi
+++ b/app/dts/behaviors/rgb_underglow.dtsi
@@ -5,11 +5,11 @@
  */
 
 / {
-	behaviors {
-		rgb_ug: behavior_rgb_underglow {
-			compatible = "zmk,behavior-rgb-underglow";
-			label = "RGB_UG";
-			#binding-cells = <2>;
-		};
-	};
+    behaviors {
+        rgb_ug: behavior_rgb_underglow {
+            compatible = "zmk,behavior-rgb-underglow";
+            label = "RGB_UG";
+            #binding-cells = <2>;
+        };
+    };
 };
diff --git a/app/dts/behaviors/sensor_rotate_key_press.dtsi b/app/dts/behaviors/sensor_rotate_key_press.dtsi
index ed1b4cd0..dc30b798 100644
--- a/app/dts/behaviors/sensor_rotate_key_press.dtsi
+++ b/app/dts/behaviors/sensor_rotate_key_press.dtsi
@@ -5,13 +5,13 @@
  */
 
 / {
-	behaviors {
-		/* DEPRECATED: `inc_dec_cp` will be removed in the future */
-		/omit-if-no-ref/ inc_dec_cp: inc_dec_kp: behavior_sensor_rotate_key_press {
-			compatible = "zmk,behavior-sensor-rotate-var";
-			label = "ENC_KEY_PRESS";
-			#sensor-binding-cells = <2>;
-			bindings = <&kp>, <&kp>;
-		};
-	};
+    behaviors {
+        /* DEPRECATED: `inc_dec_cp` will be removed in the future */
+        /omit-if-no-ref/ inc_dec_cp: inc_dec_kp: behavior_sensor_rotate_key_press {
+            compatible = "zmk,behavior-sensor-rotate-var";
+            label = "ENC_KEY_PRESS";
+            #sensor-binding-cells = <2>;
+            bindings = <&kp>, <&kp>;
+        };
+    };
 };
diff --git a/app/dts/behaviors/sticky_key.dtsi b/app/dts/behaviors/sticky_key.dtsi
index 886d35b7..72a80a90 100644
--- a/app/dts/behaviors/sticky_key.dtsi
+++ b/app/dts/behaviors/sticky_key.dtsi
@@ -5,24 +5,24 @@
  */
 
 / {
-	behaviors {
-		/omit-if-no-ref/ sk: behavior_sticky_key {
-			compatible = "zmk,behavior-sticky-key";
-			label = "STICKY_KEY";
-			#binding-cells = <1>;
-			release-after-ms = <1000>;
-			bindings = <&kp>;
-			ignore-modifiers;
-		};
-		/omit-if-no-ref/ sl: behavior_sticky_layer {
-			compatible = "zmk,behavior-sticky-key";
-			label = "STICKY_LAYER";
-			#binding-cells = <1>;
-			release-after-ms = <1000>;
-			bindings = <&mo>;
-			quick-release;
-		};
-	};
+    behaviors {
+        /omit-if-no-ref/ sk: behavior_sticky_key {
+            compatible = "zmk,behavior-sticky-key";
+            label = "STICKY_KEY";
+            #binding-cells = <1>;
+            release-after-ms = <1000>;
+            bindings = <&kp>;
+            ignore-modifiers;
+        };
+        /omit-if-no-ref/ sl: behavior_sticky_layer {
+            compatible = "zmk,behavior-sticky-key";
+            label = "STICKY_LAYER";
+            #binding-cells = <1>;
+            release-after-ms = <1000>;
+            bindings = <&mo>;
+            quick-release;
+        };
+    };
 
 };
 
diff --git a/app/dts/behaviors/to_layer.dtsi b/app/dts/behaviors/to_layer.dtsi
index fa8f98bd..0ea66fa9 100644
--- a/app/dts/behaviors/to_layer.dtsi
+++ b/app/dts/behaviors/to_layer.dtsi
@@ -5,11 +5,11 @@
  */
 
 / {
-	behaviors {
-		/omit-if-no-ref/ to: behavior_to_layer {
-			compatible = "zmk,behavior-to-layer";
-			label = "TO_LAYER";
-			#binding-cells = <1>;
-		};
-	};
+    behaviors {
+        /omit-if-no-ref/ to: behavior_to_layer {
+            compatible = "zmk,behavior-to-layer";
+            label = "TO_LAYER";
+            #binding-cells = <1>;
+        };
+    };
 };
diff --git a/app/dts/behaviors/toggle_layer.dtsi b/app/dts/behaviors/toggle_layer.dtsi
index ea0b1c19..75730934 100644
--- a/app/dts/behaviors/toggle_layer.dtsi
+++ b/app/dts/behaviors/toggle_layer.dtsi
@@ -5,11 +5,11 @@
  */
 
 / {
-	behaviors {
-		/omit-if-no-ref/ tog: behavior_toggle_layer {
-			compatible = "zmk,behavior-toggle-layer";
-			label = "TOGGLE_LAYER";
-			#binding-cells = <1>;
-		};
-	};
+    behaviors {
+        /omit-if-no-ref/ tog: behavior_toggle_layer {
+            compatible = "zmk,behavior-toggle-layer";
+            label = "TOGGLE_LAYER";
+            #binding-cells = <1>;
+        };
+    };
 };
diff --git a/app/dts/behaviors/transparent.dtsi b/app/dts/behaviors/transparent.dtsi
index 81ebb133..0dfaade2 100644
--- a/app/dts/behaviors/transparent.dtsi
+++ b/app/dts/behaviors/transparent.dtsi
@@ -5,11 +5,11 @@
  */
 
 / {
-	behaviors {
-		/omit-if-no-ref/ trans: behavior_transparent {
-			compatible = "zmk,behavior-transparent";
-			label = "TRANS";
-			#binding-cells = <0>;
-		};
-	};
+    behaviors {
+        /omit-if-no-ref/ trans: behavior_transparent {
+            compatible = "zmk,behavior-transparent";
+            label = "TRANS";
+            #binding-cells = <0>;
+        };
+    };
 };
diff --git a/app/dts/common/arduino_uno_pro_micro_map.dtsi b/app/dts/common/arduino_uno_pro_micro_map.dtsi
index 3f3d64f0..a6b8d792 100644
--- a/app/dts/common/arduino_uno_pro_micro_map.dtsi
+++ b/app/dts/common/arduino_uno_pro_micro_map.dtsi
@@ -7,41 +7,41 @@
 /* This provies a mapping from Arduino Uno to Arduino Pro Micro pins for development */
 
 / {
-	pro_micro_d: connector_d {
-		compatible = "arduino-pro-micro";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map
-			= <0 0 &arduino_header 6 0>		/* D0 */
-			, <1 0 &arduino_header 7 0>		/* D1 */
-			, <2 0 &arduino_header 8 0>		/* D2 */
-			, <3 0 &arduino_header 9 0>		/* D3 */
-			, <4 0 &arduino_header 10 0>		/* D4/A6 */
-			, <5 0 &arduino_header 11 0>		/* D5 */
-			, <6 0 &arduino_header 12 0>		/* D6/A7 */
-			, <7 0 &arduino_header 13 0>		/* D7 */
-			, <8 0 &arduino_header 14 0>		/* D8/A8 */
-			, <9 0 &arduino_header 15 0>		/* D9/A9 */
-			, <10 0 &arduino_header 16 0>		/* D10/A10 */
-			, <16 0 &arduino_header 17 0>	/* D16 */
-			, <14 0 &arduino_header 18 0>	/* D14 */
-			, <15 0 &arduino_header 19 0>	/* D15 */
-			;
-	};
+    pro_micro_d: connector_d {
+        compatible = "arduino-pro-micro";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map
+            = <0 0 &arduino_header 6 0>     /* D0 */
+            , <1 0 &arduino_header 7 0>     /* D1 */
+            , <2 0 &arduino_header 8 0>     /* D2 */
+            , <3 0 &arduino_header 9 0>     /* D3 */
+            , <4 0 &arduino_header 10 0>        /* D4/A6 */
+            , <5 0 &arduino_header 11 0>        /* D5 */
+            , <6 0 &arduino_header 12 0>        /* D6/A7 */
+            , <7 0 &arduino_header 13 0>        /* D7 */
+            , <8 0 &arduino_header 14 0>        /* D8/A8 */
+            , <9 0 &arduino_header 15 0>        /* D9/A9 */
+            , <10 0 &arduino_header 16 0>       /* D10/A10 */
+            , <16 0 &arduino_header 17 0>   /* D16 */
+            , <14 0 &arduino_header 18 0>   /* D14 */
+            , <15 0 &arduino_header 19 0>   /* D15 */
+            ;
+    };
 
-	pro_micro_a: connector_a {
-		compatible = "arduino-pro-micro";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map
-			= <0 0 &arduino_header 0 0>	/* A0 */
-			, <1 0 &arduino_header 1 0>	/* A1 */
-			, <2 0 &arduino_header 2 0>	/* A2 */
-			, <3 0 &arduino_header 3 0>	/* A3 */
-			;
-	};
+    pro_micro_a: connector_a {
+        compatible = "arduino-pro-micro";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map
+            = <0 0 &arduino_header 0 0> /* A0 */
+            , <1 0 &arduino_header 1 0> /* A1 */
+            , <2 0 &arduino_header 2 0> /* A2 */
+            , <3 0 &arduino_header 3 0> /* A3 */
+            ;
+    };
 };
 
 pro_micro_i2c: &arduino_i2c {};
diff --git a/app/include/linker/zmk-events.ld b/app/include/linker/zmk-events.ld
index 3e307f85..0c4bb6e4 100644
--- a/app/include/linker/zmk-events.ld
+++ b/app/include/linker/zmk-events.ld
@@ -6,11 +6,11 @@
 
 #include <zephyr/linker/linker-defs.h>
 
-        	__event_type_start = .; \
-        	KEEP(*(".event_type")); \
-        	__event_type_end = .; \
+            __event_type_start = .; \
+            KEEP(*(".event_type")); \
+            __event_type_end = .; \
 
-        	__event_subscriptions_start = .; \
-        	KEEP(*(".event_subscription")); \
-        	__event_subscriptions_end = .; \
+            __event_subscriptions_start = .; \
+            KEEP(*(".event_subscription")); \
+            __event_subscriptions_end = .; \
 
diff --git a/app/run-test.sh b/app/run-test.sh
index 94438f34..6935f2c8 100755
--- a/app/run-test.sh
+++ b/app/run-test.sh
@@ -4,23 +4,23 @@
 # SPDX-License-Identifier: MIT
 
 if [ -z "$1" ]; then
-	echo "Usage: ./run-test.sh <path to testcase>"
-	exit 1
+    echo "Usage: ./run-test.sh <path to testcase>"
+    exit 1
 fi
 
 path="$1"
 if [ $path = "all" ]; then
-	path="tests"
+    path="tests"
 fi
 
 testcases=$(find $path -name native_posix_64.keymap -exec dirname \{\} \;)
 num_cases=$(echo "$testcases" | wc -l)
 if [ $num_cases -gt 1 ] || [ "$testcases" != "$path" ]; then
-	echo "" > ./build/tests/pass-fail.log
-	echo "$testcases" | xargs -L 1 -P ${J:-4} ./run-test.sh
-	err=$?
-	sort -k2 ./build/tests/pass-fail.log
-	exit $err
+    echo "" > ./build/tests/pass-fail.log
+    echo "$testcases" | xargs -L 1 -P ${J:-4} ./run-test.sh
+    err=$?
+    sort -k2 ./build/tests/pass-fail.log
+    exit $err
 fi
 
 testcase="$path"
@@ -28,19 +28,19 @@ echo "Running $testcase:"
 
 west build -d build/$testcase -b native_posix_64 -- -DZMK_CONFIG="$(pwd)/$testcase" > /dev/null 2>&1
 if [ $? -gt 0 ]; then
-	echo "FAILED: $testcase did not build" | tee -a ./build/tests/pass-fail.log
-	exit 1
+    echo "FAILED: $testcase did not build" | tee -a ./build/tests/pass-fail.log
+    exit 1
 fi
 
 ./build/$testcase/zephyr/zmk.exe | sed -e "s/.*> //" | tee build/$testcase/keycode_events_full.log | sed -n -f $testcase/events.patterns > build/$testcase/keycode_events.log
 diff -auZ $testcase/keycode_events.snapshot build/$testcase/keycode_events.log
 if [ $? -gt 0 ]; then
-	if [ -f $testcase/pending ]; then
-		echo "PENDING: $testcase" | tee -a ./build/tests/pass-fail.log
-		exit 0
-	fi
-	echo "FAILED: $testcase" | tee -a ./build/tests/pass-fail.log
-	exit 1
+    if [ -f $testcase/pending ]; then
+        echo "PENDING: $testcase" | tee -a ./build/tests/pass-fail.log
+        exit 0
+    fi
+    echo "FAILED: $testcase" | tee -a ./build/tests/pass-fail.log
+    exit 1
 fi
 
 echo "PASS: $testcase" | tee -a ./build/tests/pass-fail.log
diff --git a/app/src/split/Kconfig b/app/src/split/Kconfig
index 42cb411c..dbe5f092 100644
--- a/app/src/split/Kconfig
+++ b/app/src/split/Kconfig
@@ -2,21 +2,21 @@
 # SPDX-License-Identifier: MIT
 
 menuconfig ZMK_SPLIT
-	bool "Split keyboard support"
+    bool "Split keyboard support"
 
 if ZMK_SPLIT
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	bool "Split central device"
+    bool "Split central device"
 
 choice ZMK_SPLIT_TRANSPORT
-	prompt "Split transport"
+    prompt "Split transport"
 
 config ZMK_SPLIT_BLE
-	bool "BLE"
-	depends on ZMK_BLE
-	select BT_USER_PHY_UPDATE
-	select BT_AUTO_PHY_UPDATE
+    bool "BLE"
+    depends on ZMK_BLE
+    select BT_USER_PHY_UPDATE
+    select BT_AUTO_PHY_UPDATE
 
 endchoice
 
diff --git a/app/src/split/bluetooth/Kconfig b/app/src/split/bluetooth/Kconfig
index f6976cff..53119d82 100644
--- a/app/src/split/bluetooth/Kconfig
+++ b/app/src/split/bluetooth/Kconfig
@@ -7,55 +7,55 @@ menu "BLE Transport"
 
 # Added for backwards compatibility. New shields/board should set `ZMK_SPLIT_ROLE_CENTRAL` only.
 config ZMK_SPLIT_BLE_ROLE_CENTRAL
-	bool
-	select ZMK_SPLIT_ROLE_CENTRAL
+    bool
+    select ZMK_SPLIT_ROLE_CENTRAL
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	select BT_CENTRAL
-	select BT_GATT_CLIENT
-	select BT_GATT_AUTO_DISCOVER_CCC
+    select BT_CENTRAL
+    select BT_GATT_CLIENT
+    select BT_GATT_AUTO_DISCOVER_CCC
 
 if ZMK_SPLIT_ROLE_CENTRAL
 
 config ZMK_SPLIT_BLE_CENTRAL_POSITION_QUEUE_SIZE
-	int "Max number of key position state events to queue when received from peripherals"
-	default 5
+    int "Max number of key position state events to queue when received from peripherals"
+    default 5
 
 config ZMK_BLE_SPLIT_CENTRAL_SPLIT_RUN_STACK_SIZE
-	int "BLE split central write thread stack size"
-	default 512
+    int "BLE split central write thread stack size"
+    default 512
 
 config ZMK_BLE_SPLIT_CENTRAL_SPLIT_RUN_QUEUE_SIZE
-	int "Max number of behavior run events to queue to send to the peripheral(s)"
-	default 5
+    int "Max number of behavior run events to queue to send to the peripheral(s)"
+    default 5
 
 endif # ZMK_SPLIT_ROLE_CENTRAL
 
 if !ZMK_SPLIT_ROLE_CENTRAL
 
 config ZMK_SPLIT_BLE_PERIPHERAL_STACK_SIZE
-	int "BLE split peripheral notify thread stack size"
-	default 650
+    int "BLE split peripheral notify thread stack size"
+    default 650
 
 config ZMK_SPLIT_BLE_PERIPHERAL_PRIORITY
-	int "BLE split peripheral notify thread priority"
-	default 5
+    int "BLE split peripheral notify thread priority"
+    default 5
 
 config ZMK_SPLIT_BLE_PERIPHERAL_POSITION_QUEUE_SIZE
-	int "Max number of key position state events to queue to send to the central"
-	default 10
+    int "Max number of key position state events to queue to send to the central"
+    default 10
 
 config ZMK_USB
-	default n
+    default n
 
 config BT_MAX_PAIRED
-	default 1
+    default 1
 
 config BT_MAX_CONN
-	default 1
+    default 1
 
 config BT_PERIPHERAL_PREF_MAX_INT
-	default 6
+    default 6
 
 #!ZMK_SPLIT_ROLE_CENTRAL
 endif
@@ -71,10 +71,10 @@ if ZMK_BLE
 if ZMK_SPLIT_BLE && ZMK_SPLIT_ROLE_CENTRAL
 
 config BT_MAX_CONN
-	default 6
+    default 6
 
 config BT_MAX_PAIRED
-	default 6
+    default 6
 
 #ZMK_SPLIT_BLE && ZMK_SPLIT_ROLE_CENTRAL
 endif
@@ -82,10 +82,10 @@ endif
 if !ZMK_SPLIT_BLE
 
 config BT_MAX_CONN
-	default 5
+    default 5
 
 config BT_MAX_PAIRED
-	default 5
+    default 5
 
 #!ZMK_SPLIT_BLE
 endif
diff --git a/app/tests/backlight/basic/native_posix_64.keymap b/app/tests/backlight/basic/native_posix_64.keymap
index 185dbf7c..dfb08fef 100644
--- a/app/tests/backlight/basic/native_posix_64.keymap
+++ b/app/tests/backlight/basic/native_posix_64.keymap
@@ -1,30 +1,30 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		/* BL_INC */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_INC */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_DEC */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* BL_DEC */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* BL_OFF */
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_RELEASE(1,1,10)
-		/* BL_OFF */
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_RELEASE(1,1,10)
-		/* BL_ON */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		/* BL_ON */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+    events = <
+        /* BL_INC */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_INC */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_DEC */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* BL_DEC */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* BL_OFF */
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_RELEASE(1,1,10)
+        /* BL_OFF */
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_RELEASE(1,1,10)
+        /* BL_ON */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        /* BL_ON */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
diff --git a/app/tests/backlight/behavior_keymap.dtsi b/app/tests/backlight/behavior_keymap.dtsi
index 26869272..771072ac 100644
--- a/app/tests/backlight/behavior_keymap.dtsi
+++ b/app/tests/backlight/behavior_keymap.dtsi
@@ -4,31 +4,31 @@
 #include <dt-bindings/zmk/backlight.h>
 
 / {
-	chosen {
-		zmk,backlight = &backlight;
-	};
+    chosen {
+        zmk,backlight = &backlight;
+    };
 
-	backlight: leds {
-		compatible = "gpio-leds";
-		led_0 {
-			gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
-			label = "Backlight LED 0";
-		};
-		led_1 {
-			gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
-			label = "Backlight LED 1";
-		};
-	};
+    backlight: leds {
+        compatible = "gpio-leds";
+        led_0 {
+            gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
+            label = "Backlight LED 0";
+        };
+        led_1 {
+            gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
+            label = "Backlight LED 1";
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&bl BL_INC &bl BL_DEC
-				&bl BL_ON  &bl BL_OFF
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &bl BL_INC &bl BL_DEC
+                &bl BL_ON  &bl BL_OFF
+            >;
+        };
+    };
 };
diff --git a/app/tests/backlight/config-brt/native_posix_64.keymap b/app/tests/backlight/config-brt/native_posix_64.keymap
index 6617c9f6..cbb6c93f 100644
--- a/app/tests/backlight/config-brt/native_posix_64.keymap
+++ b/app/tests/backlight/config-brt/native_posix_64.keymap
@@ -1,12 +1,12 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		/* BL_INC */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_DEC */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    events = <
+        /* BL_INC */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_DEC */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
diff --git a/app/tests/backlight/config-on/native_posix_64.keymap b/app/tests/backlight/config-on/native_posix_64.keymap
index a95ccd93..1a8de928 100644
--- a/app/tests/backlight/config-on/native_posix_64.keymap
+++ b/app/tests/backlight/config-on/native_posix_64.keymap
@@ -1,12 +1,12 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		/* BL_ON */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		/* BL_OFF */
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_RELEASE(1,1,10)
-	>;
+    events = <
+        /* BL_ON */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        /* BL_OFF */
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_RELEASE(1,1,10)
+    >;
 };
diff --git a/app/tests/backlight/config-step/native_posix_64.keymap b/app/tests/backlight/config-step/native_posix_64.keymap
index 96fbe96a..70614459 100644
--- a/app/tests/backlight/config-step/native_posix_64.keymap
+++ b/app/tests/backlight/config-step/native_posix_64.keymap
@@ -1,36 +1,36 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		/* BL_INC */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_INC */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_INC */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_DEC */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* BL_DEC */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* BL_DEC */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* BL_DEC */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* BL_DEC */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* BL_INC */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_INC */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        /* BL_INC */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_INC */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_INC */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_DEC */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* BL_DEC */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* BL_DEC */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* BL_DEC */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* BL_DEC */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* BL_INC */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_INC */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
diff --git a/app/tests/backlight/cycle/native_posix_64.keymap b/app/tests/backlight/cycle/native_posix_64.keymap
index a2f3c830..00615e35 100644
--- a/app/tests/backlight/cycle/native_posix_64.keymap
+++ b/app/tests/backlight/cycle/native_posix_64.keymap
@@ -4,75 +4,75 @@
 #include <dt-bindings/zmk/backlight.h>
 
 / {
-	chosen {
-		zmk,backlight = &backlight;
-	};
+    chosen {
+        zmk,backlight = &backlight;
+    };
 
-	backlight: leds {
-		compatible = "gpio-leds";
-		led_0 {
-			gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
-			label = "Backlight LED 0";
-		};
-		led_1 {
-			gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
-			label = "Backlight LED 1";
-		};
-	};
+    backlight: leds {
+        compatible = "gpio-leds";
+        led_0 {
+            gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
+            label = "Backlight LED 0";
+        };
+        led_1 {
+            gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
+            label = "Backlight LED 1";
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&bl BL_CYCLE &none
-				&none        &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &bl BL_CYCLE &none
+                &none        &none
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		/* BL_CYCLE */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_CYCLE */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_CYCLE */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_CYCLE */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_CYCLE */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_CYCLE */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_CYCLE */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_CYCLE */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_CYCLE */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_CYCLE */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_CYCLE */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_CYCLE */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_CYCLE */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        /* BL_CYCLE */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_CYCLE */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_CYCLE */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_CYCLE */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_CYCLE */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_CYCLE */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_CYCLE */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_CYCLE */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_CYCLE */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_CYCLE */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_CYCLE */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_CYCLE */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_CYCLE */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
diff --git a/app/tests/backlight/low-brightness/native_posix_64.keymap b/app/tests/backlight/low-brightness/native_posix_64.keymap
index 3b01f700..a151e0f6 100644
--- a/app/tests/backlight/low-brightness/native_posix_64.keymap
+++ b/app/tests/backlight/low-brightness/native_posix_64.keymap
@@ -1,39 +1,39 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		/* BL_DEC */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* BL_DEC */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* BL_ON */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		/* BL_OFF */
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_RELEASE(1,1,10)
-		/* BL_INC */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_INC */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* BL_OFF */
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_RELEASE(1,1,10)
-		/* BL_DEC */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* BL_DEC */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* BL_DEC */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* BL_INC */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        /* BL_DEC */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* BL_DEC */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* BL_ON */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        /* BL_OFF */
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_RELEASE(1,1,10)
+        /* BL_INC */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_INC */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* BL_OFF */
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_RELEASE(1,1,10)
+        /* BL_DEC */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* BL_DEC */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* BL_DEC */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* BL_INC */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
diff --git a/app/tests/caps-word/behavior_keymap.dtsi b/app/tests/caps-word/behavior_keymap.dtsi
index 04653bec..855406fc 100644
--- a/app/tests/caps-word/behavior_keymap.dtsi
+++ b/app/tests/caps-word/behavior_keymap.dtsi
@@ -3,15 +3,15 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label = "Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label = "Default keymap";
 
-		default_layer {
-			bindings = <
-				&caps_word &kp A
-				&kp N6 &kp MINUS
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &caps_word &kp A
+                &kp N6 &kp MINUS
+            >;
+        };
+    };
 };
diff --git a/app/tests/caps-word/continue-with-modifiers/native_posix_64.keymap b/app/tests/caps-word/continue-with-modifiers/native_posix_64.keymap
index 3053d5df..bbbdac10 100644
--- a/app/tests/caps-word/continue-with-modifiers/native_posix_64.keymap
+++ b/app/tests/caps-word/continue-with-modifiers/native_posix_64.keymap
@@ -4,30 +4,30 @@
 #include "../behavior_keymap.dtsi"
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label = "Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label = "Default keymap";
 
-		default_layer {
-			bindings = <
-			&caps_word &kp A
-			&kp LSHFT &kp MINUS
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+            &caps_word &kp A
+            &kp LSHFT &kp MINUS
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-	ZMK_MOCK_PRESS(0,0,10)
-	ZMK_MOCK_RELEASE(0,0,10)
-	ZMK_MOCK_PRESS(0,1,10)
-	ZMK_MOCK_RELEASE(0,1,10)
-	ZMK_MOCK_PRESS(1,0,10)
-	ZMK_MOCK_PRESS(1,1,10)
-	ZMK_MOCK_RELEASE(1,1,10)
-	ZMK_MOCK_RELEASE(1,0,10)
-	ZMK_MOCK_PRESS(0,1,10)
-	ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    events = <
+    ZMK_MOCK_PRESS(0,0,10)
+    ZMK_MOCK_RELEASE(0,0,10)
+    ZMK_MOCK_PRESS(0,1,10)
+    ZMK_MOCK_RELEASE(0,1,10)
+    ZMK_MOCK_PRESS(1,0,10)
+    ZMK_MOCK_PRESS(1,1,10)
+    ZMK_MOCK_RELEASE(1,1,10)
+    ZMK_MOCK_RELEASE(1,0,10)
+    ZMK_MOCK_PRESS(0,1,10)
+    ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/caps-word/continue-with-non-alpha-continue-list-item/native_posix_64.keymap b/app/tests/caps-word/continue-with-non-alpha-continue-list-item/native_posix_64.keymap
index 68c3249f..08b173bd 100644
--- a/app/tests/caps-word/continue-with-non-alpha-continue-list-item/native_posix_64.keymap
+++ b/app/tests/caps-word/continue-with-non-alpha-continue-list-item/native_posix_64.keymap
@@ -4,18 +4,18 @@
 #include "../behavior_keymap.dtsi"
 
 &caps_word {
-	continue-list = <UNDERSCORE MINUS>;
+    continue-list = <UNDERSCORE MINUS>;
 };
 
 &kscan {
-	events = <
-	ZMK_MOCK_PRESS(0,0,10)
-	ZMK_MOCK_RELEASE(0,0,10)
-	ZMK_MOCK_PRESS(0,1,10)
-	ZMK_MOCK_RELEASE(0,1,10)
-	ZMK_MOCK_PRESS(1,1,10)
-	ZMK_MOCK_RELEASE(1,1,10)
-	ZMK_MOCK_PRESS(0,1,10)
-	ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    events = <
+    ZMK_MOCK_PRESS(0,0,10)
+    ZMK_MOCK_RELEASE(0,0,10)
+    ZMK_MOCK_PRESS(0,1,10)
+    ZMK_MOCK_RELEASE(0,1,10)
+    ZMK_MOCK_PRESS(1,1,10)
+    ZMK_MOCK_RELEASE(1,1,10)
+    ZMK_MOCK_PRESS(0,1,10)
+    ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/caps-word/continue-with-non-modified-numeric-usage-id/native_posix_64.keymap b/app/tests/caps-word/continue-with-non-modified-numeric-usage-id/native_posix_64.keymap
index 40a4d4a9..cde97c84 100644
--- a/app/tests/caps-word/continue-with-non-modified-numeric-usage-id/native_posix_64.keymap
+++ b/app/tests/caps-word/continue-with-non-modified-numeric-usage-id/native_posix_64.keymap
@@ -4,18 +4,18 @@
 #include "../behavior_keymap.dtsi"
 
 &caps_word {
-	continue-list = <UNDERSCORE MINUS>;
+    continue-list = <UNDERSCORE MINUS>;
 };
 
 &kscan {
-	events = <
-	ZMK_MOCK_PRESS(0,0,10)
-	ZMK_MOCK_RELEASE(0,0,10)
-	ZMK_MOCK_PRESS(0,1,10)
-	ZMK_MOCK_RELEASE(0,1,10)
-	ZMK_MOCK_PRESS(1,0,10)
-	ZMK_MOCK_RELEASE(1,0,10)
-	ZMK_MOCK_PRESS(0,1,10)
-	ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    events = <
+    ZMK_MOCK_PRESS(0,0,10)
+    ZMK_MOCK_RELEASE(0,0,10)
+    ZMK_MOCK_PRESS(0,1,10)
+    ZMK_MOCK_RELEASE(0,1,10)
+    ZMK_MOCK_PRESS(1,0,10)
+    ZMK_MOCK_RELEASE(1,0,10)
+    ZMK_MOCK_PRESS(0,1,10)
+    ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/caps-word/deactivate-by-non-alpha-non-continuation/native_posix_64.keymap b/app/tests/caps-word/deactivate-by-non-alpha-non-continuation/native_posix_64.keymap
index 4219e354..3fbb020b 100644
--- a/app/tests/caps-word/deactivate-by-non-alpha-non-continuation/native_posix_64.keymap
+++ b/app/tests/caps-word/deactivate-by-non-alpha-non-continuation/native_posix_64.keymap
@@ -4,14 +4,14 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-	ZMK_MOCK_PRESS(0,0,10)
-	ZMK_MOCK_RELEASE(0,0,10)
-	ZMK_MOCK_PRESS(0,1,10)
-	ZMK_MOCK_RELEASE(0,1,10)
-	ZMK_MOCK_PRESS(1,1,10)
-	ZMK_MOCK_RELEASE(1,1,10)
-	ZMK_MOCK_PRESS(0,1,10)
-	ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    events = <
+    ZMK_MOCK_PRESS(0,0,10)
+    ZMK_MOCK_RELEASE(0,0,10)
+    ZMK_MOCK_PRESS(0,1,10)
+    ZMK_MOCK_RELEASE(0,1,10)
+    ZMK_MOCK_PRESS(1,1,10)
+    ZMK_MOCK_RELEASE(1,1,10)
+    ZMK_MOCK_PRESS(0,1,10)
+    ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/caps-word/deactivate-by-second-press/native_posix.keymap b/app/tests/caps-word/deactivate-by-second-press/native_posix.keymap
index 05f13fed..121a827c 100644
--- a/app/tests/caps-word/deactivate-by-second-press/native_posix.keymap
+++ b/app/tests/caps-word/deactivate-by-second-press/native_posix.keymap
@@ -4,14 +4,14 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-	ZMK_MOCK_PRESS(0,0,10)
-	ZMK_MOCK_RELEASE(0,0,10)
-	ZMK_MOCK_PRESS(0,1,10)
-	ZMK_MOCK_RELEASE(0,1,10)
-	ZMK_MOCK_PRESS(0,0,10)
-	ZMK_MOCK_RELEASE(0,0,10)
-	ZMK_MOCK_PRESS(0,1,10)
-	ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    events = <
+    ZMK_MOCK_PRESS(0,0,10)
+    ZMK_MOCK_RELEASE(0,0,10)
+    ZMK_MOCK_PRESS(0,1,10)
+    ZMK_MOCK_RELEASE(0,1,10)
+    ZMK_MOCK_PRESS(0,0,10)
+    ZMK_MOCK_RELEASE(0,0,10)
+    ZMK_MOCK_PRESS(0,1,10)
+    ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/caps-word/deactivate-by-second-press/native_posix_64.keymap b/app/tests/caps-word/deactivate-by-second-press/native_posix_64.keymap
index e0695564..b8ae4ee0 100644
--- a/app/tests/caps-word/deactivate-by-second-press/native_posix_64.keymap
+++ b/app/tests/caps-word/deactivate-by-second-press/native_posix_64.keymap
@@ -4,14 +4,14 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-	ZMK_MOCK_PRESS(0,0,10000)
-	ZMK_MOCK_RELEASE(0,0,10)
-	ZMK_MOCK_PRESS(0,1,30)
-	ZMK_MOCK_RELEASE(0,1,30)
-	ZMK_MOCK_PRESS(0,0,10)
-	ZMK_MOCK_RELEASE(0,0,30)
-	ZMK_MOCK_PRESS(0,1,30)
-	ZMK_MOCK_RELEASE(0,1,1000)
-	>;
+    events = <
+    ZMK_MOCK_PRESS(0,0,10000)
+    ZMK_MOCK_RELEASE(0,0,10)
+    ZMK_MOCK_PRESS(0,1,30)
+    ZMK_MOCK_RELEASE(0,1,30)
+    ZMK_MOCK_PRESS(0,0,10)
+    ZMK_MOCK_RELEASE(0,0,30)
+    ZMK_MOCK_PRESS(0,1,30)
+    ZMK_MOCK_RELEASE(0,1,1000)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/combo/combos-and-holdtaps-0/native_posix_64.keymap b/app/tests/combo/combos-and-holdtaps-0/native_posix_64.keymap
index a02f6c64..e6754b71 100644
--- a/app/tests/combo/combos-and-holdtaps-0/native_posix_64.keymap
+++ b/app/tests/combo/combos-and-holdtaps-0/native_posix_64.keymap
@@ -3,7 +3,7 @@
 #include <dt-bindings/zmk/kscan-mock.h>
 
 &mt {
-	flavor = "hold-preferred";
+    flavor = "hold-preferred";
 };
 
 /*
@@ -12,36 +12,36 @@ and combos is wrong. Hold-taps need to process key position events
 first so the decision to hold or tap can be made.
 */
 / {
-	combos {
-		compatible = "zmk,combos";
+    combos {
+        compatible = "zmk,combos";
 
-		combo_two {
-			timeout-ms = <100>;
-			key-positions = <1 2>;
-			bindings = <&kp Y>;
-		};
-	};
+        combo_two {
+            timeout-ms = <100>;
+            key-positions = <1 2>;
+            bindings = <&kp Y>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&mt LEFT_CONTROL A &kp B
-				&kp C &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &mt LEFT_CONTROL A &kp B
+                &kp C &none
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(0,2,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,2,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(0,2,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,2,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/combo/combos-and-holdtaps-1/native_posix_64.keymap b/app/tests/combo/combos-and-holdtaps-1/native_posix_64.keymap
index 325da627..95382432 100644
--- a/app/tests/combo/combos-and-holdtaps-1/native_posix_64.keymap
+++ b/app/tests/combo/combos-and-holdtaps-1/native_posix_64.keymap
@@ -3,40 +3,40 @@
 #include <dt-bindings/zmk/kscan-mock.h>
 
 &mt {
-	flavor = "hold-preferred";
+    flavor = "hold-preferred";
 };
 
 /* this test checks if hold-taps can be part of a combo */
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_two {
-			timeout-ms = <100>;
-			key-positions = <0 1>;
-			bindings = <&kp Y>;
-		};
-	};
+    combos {
+        compatible = "zmk,combos";
+        combo_two {
+            timeout-ms = <100>;
+            key-positions = <0 1>;
+            bindings = <&kp Y>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&mt LEFT_CONTROL A &kp B
-				&kp C &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &mt LEFT_CONTROL A &kp B
+                &kp C &none
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(0,2,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,2,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(0,2,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,2,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/combo/combos-and-holdtaps-2/native_posix_64.keymap b/app/tests/combo/combos-and-holdtaps-2/native_posix_64.keymap
index 7a789808..d6d187e2 100644
--- a/app/tests/combo/combos-and-holdtaps-2/native_posix_64.keymap
+++ b/app/tests/combo/combos-and-holdtaps-2/native_posix_64.keymap
@@ -3,43 +3,43 @@
 #include <dt-bindings/zmk/kscan-mock.h>
 
 &mt {
-	flavor = "hold-preferred";
+    flavor = "hold-preferred";
 };
 
 /* This test verifies that hold-tap keys can observe
  * events which were released from combos.
  */
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_one {
-			timeout-ms = <100>;
-			key-positions = <0 2>;
-			bindings = <&kp Y>;
-		};
-		combo_two {
-			timeout-ms = <100>;
-			key-positions = <1 3>;
-			bindings = <&kp Z>;
-		};
-	};
+    combos {
+        compatible = "zmk,combos";
+        combo_one {
+            timeout-ms = <100>;
+            key-positions = <0 2>;
+            bindings = <&kp Y>;
+        };
+        combo_two {
+            timeout-ms = <100>;
+            key-positions = <1 3>;
+            bindings = <&kp Z>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label = "Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label = "Default keymap";
 
-		default_layer {
-			bindings = <
-			&mt LEFT_CONTROL A &mt RIGHT_CONTROL B
-			&none &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+            &mt LEFT_CONTROL A &mt RIGHT_CONTROL B
+            &none &none
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-	ZMK_MOCK_PRESS(0,0,0)
-	ZMK_MOCK_PRESS(0,1,300)
-	>;
+    events = <
+    ZMK_MOCK_PRESS(0,0,0)
+    ZMK_MOCK_PRESS(0,1,300)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/combo/combos-and-holdtaps-3/native_posix_64.keymap b/app/tests/combo/combos-and-holdtaps-3/native_posix_64.keymap
index d4053793..f1c7eee7 100644
--- a/app/tests/combo/combos-and-holdtaps-3/native_posix_64.keymap
+++ b/app/tests/combo/combos-and-holdtaps-3/native_posix_64.keymap
@@ -3,38 +3,38 @@
 #include <dt-bindings/zmk/kscan-mock.h>
 
 &mt {
-	flavor = "hold-preferred";
+    flavor = "hold-preferred";
 };
 
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_one {
-			timeout-ms = <40>;
-			key-positions = <0 1>;
-			bindings = <&kp X>;
-		};
-	};
+    combos {
+        compatible = "zmk,combos";
+        combo_one {
+            timeout-ms = <40>;
+            key-positions = <0 1>;
+            bindings = <&kp X>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label = "Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label = "Default keymap";
 
-		default_layer {
-			bindings = <
-			&kp A         &kp B
-			&mt RSHFT RET &kp C
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+            &kp A         &kp B
+            &mt RSHFT RET &kp C
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-	ZMK_MOCK_PRESS(1,0,10)
-	ZMK_MOCK_PRESS(0,1,10)
-	ZMK_MOCK_PRESS(1,1,10)
-	ZMK_MOCK_RELEASE(0,1,50)
-	ZMK_MOCK_RELEASE(1,1,50)
-	>;
+    events = <
+    ZMK_MOCK_PRESS(1,0,10)
+    ZMK_MOCK_PRESS(0,1,10)
+    ZMK_MOCK_PRESS(1,1,10)
+    ZMK_MOCK_RELEASE(0,1,50)
+    ZMK_MOCK_RELEASE(1,1,50)
+    >;
 };
diff --git a/app/tests/combo/combos-and-holdtaps-4/native_posix_64.keymap b/app/tests/combo/combos-and-holdtaps-4/native_posix_64.keymap
index ba6cecc6..134b77df 100644
--- a/app/tests/combo/combos-and-holdtaps-4/native_posix_64.keymap
+++ b/app/tests/combo/combos-and-holdtaps-4/native_posix_64.keymap
@@ -5,14 +5,14 @@
 
 #define ZMK_COMBO(name, combo_bindings, keypos, combo_term) \
 / { \
-	combos { \
-		compatible = "zmk,combos"; \
-		combo_ ## name { \
-			key-positions = <keypos>; \
-			bindings = <combo_bindings>; \
-			timeout-ms = <combo_term>; \
-		}; \
-	}; \
+    combos { \
+        compatible = "zmk,combos"; \
+        combo_ ## name { \
+            key-positions = <keypos>; \
+            bindings = <combo_bindings>; \
+            timeout-ms = <combo_term>; \
+        }; \
+    }; \
 };
 
 ZMK_COMBO(qmark, &kp QMARK,     0 3, 30)
@@ -20,27 +20,27 @@ ZMK_COMBO(dllr,  &kp DLLR,      1 3, 50)
 ZMK_COMBO(tilde, &kp TILDE,     3 4, 50)
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label = "Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label = "Default keymap";
 
-		default_layer {
-			bindings = <
-			&none         &none
-			&kp A         &mt LSHFT T
-			&none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+            &none         &none
+            &kp A         &mt LSHFT T
+            &none
+            >;
+        };
+    };
 };
 
 &kscan {
-	rows = <3>;
-	columns = <2>;
-	events = <
-	ZMK_MOCK_PRESS(1,1,500)
-	ZMK_MOCK_PRESS(1,0,100)
-	ZMK_MOCK_RELEASE(1,0,500)
-	ZMK_MOCK_RELEASE(1,1,0)
-	>;
+    rows = <3>;
+    columns = <2>;
+    events = <
+    ZMK_MOCK_PRESS(1,1,500)
+    ZMK_MOCK_PRESS(1,0,100)
+    ZMK_MOCK_RELEASE(1,0,500)
+    ZMK_MOCK_RELEASE(1,1,0)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/combo/layer-filter-0/native_posix_64.keymap b/app/tests/combo/layer-filter-0/native_posix_64.keymap
index 33712822..8d94872b 100644
--- a/app/tests/combo/layer-filter-0/native_posix_64.keymap
+++ b/app/tests/combo/layer-filter-0/native_posix_64.keymap
@@ -6,73 +6,73 @@
 #define TIMEOUT (60*60*1000)
 
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_one {
-			timeout-ms = <TIMEOUT>;
-			key-positions = <0 1>;
-			bindings = <&kp X>;
-			layers = <0>;
-		};
+    combos {
+        compatible = "zmk,combos";
+        combo_one {
+            timeout-ms = <TIMEOUT>;
+            key-positions = <0 1>;
+            bindings = <&kp X>;
+            layers = <0>;
+        };
 
-		combo_two {
-			timeout-ms = <TIMEOUT>;
-			key-positions = <0 1>;
-			bindings = <&kp Y>;
-			layers = <1>;
-		};
+        combo_two {
+            timeout-ms = <TIMEOUT>;
+            key-positions = <0 1>;
+            bindings = <&kp Y>;
+            layers = <1>;
+        };
 
-		combo_three {
-			timeout-ms = <TIMEOUT>;
-			key-positions = <0 2>;
-			bindings = <&kp Z>;
-		};
-	};
+        combo_three {
+            timeout-ms = <TIMEOUT>;
+            key-positions = <0 2>;
+            bindings = <&kp Z>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp A &kp B
-				&kp C &tog 1
-			>;
-		};
+        default_layer {
+            bindings = <
+                &kp A &kp B
+                &kp C &tog 1
+            >;
+        };
 
-		filtered_layer {
-			bindings = <
-				&kp A &kp B
-				&kp C &tog 0
-			>;
-		};
-	};
+        filtered_layer {
+            bindings = <
+                &kp A &kp B
+                &kp C &tog 0
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		/* Combo One */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* Combo Three */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(1,1,10)
-		/* Toggle Layer */
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_RELEASE(1,1,10)
-		/* Combo Two */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* Combo Three */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(1,1,10)
-	>;
+    events = <
+        /* Combo One */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* Combo Three */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(1,1,10)
+        /* Toggle Layer */
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_RELEASE(1,1,10)
+        /* Combo Two */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* Combo Three */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(1,1,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/combo/layer-filter-1/native_posix_64.keymap b/app/tests/combo/layer-filter-1/native_posix_64.keymap
index 8eb5e9eb..96eccea4 100644
--- a/app/tests/combo/layer-filter-1/native_posix_64.keymap
+++ b/app/tests/combo/layer-filter-1/native_posix_64.keymap
@@ -6,35 +6,35 @@
 #define TIMEOUT (60*60*1000)
 
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_one {
-			timeout-ms = <TIMEOUT>;
-			key-positions = <0 1>;
-			bindings = <&kp X>;
-			layers = <1>;
-		};
-	};
+    combos {
+        compatible = "zmk,combos";
+        combo_one {
+            timeout-ms = <TIMEOUT>;
+            key-positions = <0 1>;
+            bindings = <&kp X>;
+            layers = <1>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp A &kp B
-				&kp C &tog 1
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp A &kp B
+                &kp C &tog 1
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		/* Combo One */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    events = <
+        /* Combo One */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/combo/multiple-timeouts/native_posix_64.keymap b/app/tests/combo/multiple-timeouts/native_posix_64.keymap
index 87d21be1..d2176390 100644
--- a/app/tests/combo/multiple-timeouts/native_posix_64.keymap
+++ b/app/tests/combo/multiple-timeouts/native_posix_64.keymap
@@ -3,38 +3,38 @@
 #include <dt-bindings/zmk/kscan-mock.h>
 
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_one {
-			timeout-ms = <30>;
-			key-positions = <0 1>;
-			bindings = <&kp C>;
-		};
-		combo_two {
-			timeout-ms = <120>;
-			key-positions = <0 1 2>;
-			bindings = <&kp C>;
-		};
-	};
+    combos {
+        compatible = "zmk,combos";
+        combo_one {
+            timeout-ms = <30>;
+            key-positions = <0 1>;
+            bindings = <&kp C>;
+        };
+        combo_two {
+            timeout-ms = <120>;
+            key-positions = <0 1 2>;
+            bindings = <&kp C>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp A &kp B
-				&none &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp A &kp B
+                &none &none
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,100)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,100)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/combo/overlapping-combos-0/native_posix_64.keymap b/app/tests/combo/overlapping-combos-0/native_posix_64.keymap
index 8b7b4196..e8284665 100644
--- a/app/tests/combo/overlapping-combos-0/native_posix_64.keymap
+++ b/app/tests/combo/overlapping-combos-0/native_posix_64.keymap
@@ -3,7 +3,7 @@
 #include <dt-bindings/zmk/kscan-mock.h>
 
 /*
-	combo 0 timeout inf
+    combo 0 timeout inf
     combo 01 timeout inf
     combo 0123 timeout inf
     press 012 in any combination, release any of those keys
@@ -14,104 +14,104 @@
 #define TIMEOUT (60*60*1000)
 
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_one {
-			timeout-ms = <TIMEOUT>;
-			key-positions = <0 1 2>;
-			bindings = <&kp X>;
-		};
+    combos {
+        compatible = "zmk,combos";
+        combo_one {
+            timeout-ms = <TIMEOUT>;
+            key-positions = <0 1 2>;
+            bindings = <&kp X>;
+        };
 
-		combo_two {
-			timeout-ms = <TIMEOUT>;
-			key-positions = <0 2>;
-			bindings = <&kp Y>;
-		};
+        combo_two {
+            timeout-ms = <TIMEOUT>;
+            key-positions = <0 2>;
+            bindings = <&kp Y>;
+        };
 
-		combo_three {
-			timeout-ms = <TIMEOUT>;
-			key-positions = <1>;
-			bindings = <&kp Z>;
-		};
-	};
+        combo_three {
+            timeout-ms = <TIMEOUT>;
+            key-positions = <1>;
+            bindings = <&kp Z>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp A &kp B
-				&kp C &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp A &kp B
+                &kp C &none
+            >;
+        };
+    };
 };
 &kscan {
-	events = <
-		/* all permutations of combo one press, combo triggered by release */
-		/* while debugging these, you may want to set the release_timer to a high number */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(0,2,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,2,10)
+    events = <
+        /* all permutations of combo one press, combo triggered by release */
+        /* while debugging these, you may want to set the release_timer to a high number */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(0,2,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,2,10)
 
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,2,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,2,10)
-		ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,2,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,2,10)
+        ZMK_MOCK_RELEASE(0,1,10)
 
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,2,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,2,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,2,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,2,10)
 
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(0,2,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,2,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(0,2,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,2,10)
+        ZMK_MOCK_RELEASE(0,0,10)
 
-		ZMK_MOCK_PRESS(0,2,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,2,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_PRESS(0,2,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,2,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
 
-		ZMK_MOCK_PRESS(0,2,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,2,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,2,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,2,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
 
-		/* all permutations of combo two press and release, combo triggered by release */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,2,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,2,10)
+        /* all permutations of combo two press and release, combo triggered by release */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,2,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,2,10)
 
-		ZMK_MOCK_PRESS(0,2,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,2,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,2,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,2,10)
+        ZMK_MOCK_RELEASE(0,0,10)
 
-		ZMK_MOCK_PRESS(0,2,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,2,10)
+        ZMK_MOCK_PRESS(0,2,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,2,10)
 
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,2,10)
-		ZMK_MOCK_RELEASE(0,2,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,2,10)
+        ZMK_MOCK_RELEASE(0,2,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/combo/overlapping-combos-1/native_posix_64.keymap b/app/tests/combo/overlapping-combos-1/native_posix_64.keymap
index 45737882..a695a388 100644
--- a/app/tests/combo/overlapping-combos-1/native_posix_64.keymap
+++ b/app/tests/combo/overlapping-combos-1/native_posix_64.keymap
@@ -9,57 +9,57 @@
     expected outcome: AB after 100ms
 */
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_two {
-			timeout-ms = <50>;
-			key-positions = <0 1>;
-			bindings = <&kp Y>;
-		};
+    combos {
+        compatible = "zmk,combos";
+        combo_two {
+            timeout-ms = <50>;
+            key-positions = <0 1>;
+            bindings = <&kp Y>;
+        };
 
-		combo_three {
-			timeout-ms = <100>;
-			key-positions = <0 1 2>;
-			bindings = <&kp X>;
-		};
-	};
+        combo_three {
+            timeout-ms = <100>;
+            key-positions = <0 1 2>;
+            bindings = <&kp X>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp A &kp B
-				&kp C &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp A &kp B
+                &kp C &none
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		/* if you're debugging these, remember that the timer can be triggered between
-		  events while stepping through code. */
-		/* all permutations of combo two press and release, combo triggered by timeout */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,100)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
+    events = <
+        /* if you're debugging these, remember that the timer can be triggered between
+          events while stepping through code. */
+        /* all permutations of combo two press and release, combo triggered by timeout */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,100)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
 
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(0,0,100)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(0,0,100)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
 
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(0,0,100)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(0,0,100)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
 
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,100)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,100)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/combo/overlapping-combos-2/native_posix_64.keymap b/app/tests/combo/overlapping-combos-2/native_posix_64.keymap
index ba547dc2..6bf0e710 100644
--- a/app/tests/combo/overlapping-combos-2/native_posix_64.keymap
+++ b/app/tests/combo/overlapping-combos-2/native_posix_64.keymap
@@ -9,44 +9,44 @@
     expected: combo 01 after 100ms, immediately followed by key 2.
  */
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_two {
-			timeout-ms = <100>;
-			key-positions = <0 1>;
-			bindings = <&kp Y>;
-		};
+    combos {
+        compatible = "zmk,combos";
+        combo_two {
+            timeout-ms = <100>;
+            key-positions = <0 1>;
+            bindings = <&kp Y>;
+        };
 
-		combo_four {
-			timeout-ms = <100>;
-			key-positions = <0 1 2 3>;
-			bindings = <&kp W>;
-		};
+        combo_four {
+            timeout-ms = <100>;
+            key-positions = <0 1 2 3>;
+            bindings = <&kp W>;
+        };
 
-	};
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp A &kp B
-				&kp C &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp A &kp B
+                &kp C &none
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		/* if you're debugging these, remember that the timer can be triggered between
-		  events while stepping through code. */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(0,2,100)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,2,100)
-	>;
+    events = <
+        /* if you're debugging these, remember that the timer can be triggered between
+          events while stepping through code. */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(0,2,100)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,2,100)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/combo/overlapping-combos-3/native_posix_64.keymap b/app/tests/combo/overlapping-combos-3/native_posix_64.keymap
index 0da394b5..0a2f5ee1 100644
--- a/app/tests/combo/overlapping-combos-3/native_posix_64.keymap
+++ b/app/tests/combo/overlapping-combos-3/native_posix_64.keymap
@@ -9,45 +9,45 @@
     expected: key pos 0 followed by combo 12
  */
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_two {
-			timeout-ms = <100>;
-			key-positions = <1 2>;
-			bindings = <&kp Y>;
-		};
+    combos {
+        compatible = "zmk,combos";
+        combo_two {
+            timeout-ms = <100>;
+            key-positions = <1 2>;
+            bindings = <&kp Y>;
+        };
 
 
-		combo_four {
-			timeout-ms = <100>;
-			key-positions = <0 1 2 3>;
-			bindings = <&kp W>;
-		};
+        combo_four {
+            timeout-ms = <100>;
+            key-positions = <0 1 2 3>;
+            bindings = <&kp W>;
+        };
 
-	};
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp A &kp B
-				&kp C &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp A &kp B
+                &kp C &none
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		/* if you're debugging these, remember that the timer can be triggered between
-		  events while stepping through code. */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(0,2,100)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,2,100)
-	>;
+    events = <
+        /* if you're debugging these, remember that the timer can be triggered between
+          events while stepping through code. */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(0,2,100)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,2,100)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/combo/partially-overlapping-combos/native_posix_64.keymap b/app/tests/combo/partially-overlapping-combos/native_posix_64.keymap
index f9537344..900c4af3 100644
--- a/app/tests/combo/partially-overlapping-combos/native_posix_64.keymap
+++ b/app/tests/combo/partially-overlapping-combos/native_posix_64.keymap
@@ -3,82 +3,82 @@
 #include <dt-bindings/zmk/kscan-mock.h>
 
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_one {
-			timeout-ms = <30>;
-			key-positions = <0 1>;
-			bindings = <&kp X>;
-		};
+    combos {
+        compatible = "zmk,combos";
+        combo_one {
+            timeout-ms = <30>;
+            key-positions = <0 1>;
+            bindings = <&kp X>;
+        };
 
-		combo_two {
-			timeout-ms = <30>;
-			key-positions = <0 2>;
-			bindings = <&kp Y>;
-		};
+        combo_two {
+            timeout-ms = <30>;
+            key-positions = <0 2>;
+            bindings = <&kp Y>;
+        };
 
-		combo_three {
-			timeout-ms = <30>;
-			key-positions = <3>;
-			bindings = <&kp Z>;
-		};
-	};
+        combo_three {
+            timeout-ms = <30>;
+            key-positions = <3>;
+            bindings = <&kp Z>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp A &kp B
-				&kp C &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp A &kp B
+                &kp C &none
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		/* all permutations of combo one press and release */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
+    events = <
+        /* all permutations of combo one press and release */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
 
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
 
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
 
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
 
-		/* all permutations of combo two press and release */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,2,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,2,10)
+        /* all permutations of combo two press and release */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,2,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,2,10)
 
-		ZMK_MOCK_PRESS(0,2,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,2,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,2,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,2,10)
+        ZMK_MOCK_RELEASE(0,0,10)
 
-		ZMK_MOCK_PRESS(0,2,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,2,10)
+        ZMK_MOCK_PRESS(0,2,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,2,10)
 
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,2,10)
-		ZMK_MOCK_RELEASE(0,2,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,2,10)
+        ZMK_MOCK_RELEASE(0,2,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
diff --git a/app/tests/combo/press-release-long-combo-complete/native_posix_64.keymap b/app/tests/combo/press-release-long-combo-complete/native_posix_64.keymap
index 2a71ad32..dac0bd5c 100644
--- a/app/tests/combo/press-release-long-combo-complete/native_posix_64.keymap
+++ b/app/tests/combo/press-release-long-combo-complete/native_posix_64.keymap
@@ -3,37 +3,37 @@
 #include <dt-bindings/zmk/kscan-mock.h>
 
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_one {
-			timeout-ms = <80>;
-			key-positions = <0 1 2 3>;
-			bindings = <&kp Z>;
-		};
-	};
+    combos {
+        compatible = "zmk,combos";
+        combo_one {
+            timeout-ms = <80>;
+            key-positions = <0 1 2 3>;
+            bindings = <&kp Z>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp A &kp B
-				&kp C &kp D
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp A &kp B
+                &kp C &kp D
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,100)
-		ZMK_MOCK_RELEASE(1,0,100)
-		ZMK_MOCK_RELEASE(0,1,100)
-		ZMK_MOCK_RELEASE(1,1,100)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,100)
+        ZMK_MOCK_RELEASE(1,0,100)
+        ZMK_MOCK_RELEASE(0,1,100)
+        ZMK_MOCK_RELEASE(1,1,100)
+    >;
 };
diff --git a/app/tests/combo/press-release-long-combo-incomplete/native_posix_64.keymap b/app/tests/combo/press-release-long-combo-incomplete/native_posix_64.keymap
index c6202365..19bad1d0 100644
--- a/app/tests/combo/press-release-long-combo-incomplete/native_posix_64.keymap
+++ b/app/tests/combo/press-release-long-combo-incomplete/native_posix_64.keymap
@@ -3,33 +3,33 @@
 #include <dt-bindings/zmk/kscan-mock.h>
 
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_one {
-			timeout-ms = <80>;
-			key-positions = <0 1 2 3>;
-			bindings = <&kp Z>;
-		};
-	};
+    combos {
+        compatible = "zmk,combos";
+        combo_one {
+            timeout-ms = <80>;
+            key-positions = <0 1 2 3>;
+            bindings = <&kp Z>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp A &kp B
-				&kp C &kp D
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp A &kp B
+                &kp C &kp D
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,100)
-		ZMK_MOCK_RELEASE(1,1,100)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,100)
+        ZMK_MOCK_RELEASE(1,1,100)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/combo/press-release-long-combo-wrong-last-key/native_posix_64.keymap b/app/tests/combo/press-release-long-combo-wrong-last-key/native_posix_64.keymap
index b8117187..2eb6271e 100644
--- a/app/tests/combo/press-release-long-combo-wrong-last-key/native_posix_64.keymap
+++ b/app/tests/combo/press-release-long-combo-wrong-last-key/native_posix_64.keymap
@@ -3,35 +3,35 @@
 #include <dt-bindings/zmk/kscan-mock.h>
 
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_one {
-			timeout-ms = <80>;
-			key-positions = <0 1 2>;
-			bindings = <&kp Z>;
-		};
-	};
+    combos {
+        compatible = "zmk,combos";
+        combo_one {
+            timeout-ms = <80>;
+            key-positions = <0 1 2>;
+            bindings = <&kp Z>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp A &kp B
-				&kp C &kp D
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp A &kp B
+                &kp C &kp D
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_RELEASE(1,1,100)
-		ZMK_MOCK_RELEASE(0,1,100)
-		ZMK_MOCK_RELEASE(0,0,100)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_RELEASE(1,1,100)
+        ZMK_MOCK_RELEASE(0,1,100)
+        ZMK_MOCK_RELEASE(0,0,100)
+    >;
 };
diff --git a/app/tests/combo/press-release/native_posix_64.keymap b/app/tests/combo/press-release/native_posix_64.keymap
index 8d81f35b..6bd432f9 100644
--- a/app/tests/combo/press-release/native_posix_64.keymap
+++ b/app/tests/combo/press-release/native_posix_64.keymap
@@ -3,49 +3,49 @@
 #include <dt-bindings/zmk/kscan-mock.h>
 
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_one {
-			timeout-ms = <30>;
-			key-positions = <0 1>;
-			bindings = <&kp C>;
-		};
-	};
+    combos {
+        compatible = "zmk,combos";
+        combo_one {
+            timeout-ms = <30>;
+            key-positions = <0 1>;
+            bindings = <&kp C>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp A &kp B
-				&none &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp A &kp B
+                &none &none
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		/* all different combinations of press and release order */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
+    events = <
+        /* all different combinations of press and release order */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
 
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
 
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
 
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/combo/press-timeout/native_posix_64.keymap b/app/tests/combo/press-timeout/native_posix_64.keymap
index 497cf1aa..6ca6487b 100644
--- a/app/tests/combo/press-timeout/native_posix_64.keymap
+++ b/app/tests/combo/press-timeout/native_posix_64.keymap
@@ -3,33 +3,33 @@
 #include <dt-bindings/zmk/kscan-mock.h>
 
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_one {
-			timeout-ms = <30>;
-			key-positions = <0 1>;
-			bindings = <&kp C>;
-		};
-	};
+    combos {
+        compatible = "zmk,combos";
+        combo_one {
+            timeout-ms = <30>;
+            key-positions = <0 1>;
+            bindings = <&kp C>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp A &kp B
-				&none &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp A &kp B
+                &none &none
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,100)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,100)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/combo/press1-press2-release1-release2/native_posix_64.keymap b/app/tests/combo/press1-press2-release1-release2/native_posix_64.keymap
index cf7e79f7..9a395a41 100644
--- a/app/tests/combo/press1-press2-release1-release2/native_posix_64.keymap
+++ b/app/tests/combo/press1-press2-release1-release2/native_posix_64.keymap
@@ -3,43 +3,43 @@
 #include <dt-bindings/zmk/kscan-mock.h>
 
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_one {
-			timeout-ms = <30>;
-			key-positions = <0 1>;
-			bindings = <&kp C>;
-		};
+    combos {
+        compatible = "zmk,combos";
+        combo_one {
+            timeout-ms = <30>;
+            key-positions = <0 1>;
+            bindings = <&kp C>;
+        };
 
-		combo_two {
-			timeout-ms = <30>;
-			key-positions = <2 3>;
-			bindings = <&kp D>;
-		};
-	};
+        combo_two {
+            timeout-ms = <30>;
+            key-positions = <2 3>;
+            bindings = <&kp D>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp A &kp B
-				&kp Z &kp Y
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp A &kp B
+                &kp Z &kp Y
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(1,1,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(1,1,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/combo/press1-press2-release2-release1/native_posix_64.keymap b/app/tests/combo/press1-press2-release2-release1/native_posix_64.keymap
index 0c55eb47..86ca3931 100644
--- a/app/tests/combo/press1-press2-release2-release1/native_posix_64.keymap
+++ b/app/tests/combo/press1-press2-release2-release1/native_posix_64.keymap
@@ -3,44 +3,44 @@
 #include <dt-bindings/zmk/kscan-mock.h>
 
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_one {
-			timeout-ms = <30>;
-			key-positions = <0 1>;
-			bindings = <&kp C>;
-		};
+    combos {
+        compatible = "zmk,combos";
+        combo_one {
+            timeout-ms = <30>;
+            key-positions = <0 1>;
+            bindings = <&kp C>;
+        };
 
-		combo_two {
-			timeout-ms = <30>;
-			key-positions = <2 3>;
-			bindings = <&kp D>;
-		};
-	};
+        combo_two {
+            timeout-ms = <30>;
+            key-positions = <2 3>;
+            bindings = <&kp D>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp A &kp B
-				&kp Z &kp Y
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp A &kp B
+                &kp Z &kp Y
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_PRESS(1,1,10)
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(1,1,10)
 
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(1,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-	>;
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(1,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/combo/press1-release1-press2-release2/native_posix_64.keymap b/app/tests/combo/press1-release1-press2-release2/native_posix_64.keymap
index 248d6e75..65089578 100644
--- a/app/tests/combo/press1-release1-press2-release2/native_posix_64.keymap
+++ b/app/tests/combo/press1-release1-press2-release2/native_posix_64.keymap
@@ -3,44 +3,44 @@
 #include <dt-bindings/zmk/kscan-mock.h>
 
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_one {
-			timeout-ms = <30>;
-			key-positions = <0 1>;
-			bindings = <&kp C>;
-		};
+    combos {
+        compatible = "zmk,combos";
+        combo_one {
+            timeout-ms = <30>;
+            key-positions = <0 1>;
+            bindings = <&kp C>;
+        };
 
-		combo_two {
-			timeout-ms = <30>;
-			key-positions = <2 3>;
-			bindings = <&kp D>;
-		};
-	};
+        combo_two {
+            timeout-ms = <30>;
+            key-positions = <2 3>;
+            bindings = <&kp D>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp A &kp B
-				&kp Z &kp Y
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp A &kp B
+                &kp Z &kp Y
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
 
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(1,1,10)
-	>;
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(1,1,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/combo/slowrelease-disabled/native_posix_64.keymap b/app/tests/combo/slowrelease-disabled/native_posix_64.keymap
index 5af94d45..832e9705 100644
--- a/app/tests/combo/slowrelease-disabled/native_posix_64.keymap
+++ b/app/tests/combo/slowrelease-disabled/native_posix_64.keymap
@@ -3,36 +3,36 @@
 #include <dt-bindings/zmk/kscan-mock.h>
 
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_one {
-			timeout-ms = <30>;
-			key-positions = <0 1>;
-			bindings = <&kp C>;
-			/* no slow-release! */
-		};
-	};
+    combos {
+        compatible = "zmk,combos";
+        combo_one {
+            timeout-ms = <30>;
+            key-positions = <0 1>;
+            bindings = <&kp C>;
+            /* no slow-release! */
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label = "Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label = "Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp A &kp B
-				&kp D &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp A &kp B
+                &kp D &none
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10) /* this should release the combo */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10) /* this should release the combo */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/combo/slowrelease-enabled/native_posix_64.keymap b/app/tests/combo/slowrelease-enabled/native_posix_64.keymap
index 88351bea..7fdb012e 100644
--- a/app/tests/combo/slowrelease-enabled/native_posix_64.keymap
+++ b/app/tests/combo/slowrelease-enabled/native_posix_64.keymap
@@ -3,36 +3,36 @@
 #include <dt-bindings/zmk/kscan-mock.h>
 
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_one {
-			timeout-ms = <30>;
-			key-positions = <0 1>;
-			bindings = <&kp C>;
-			slow-release;
-		};
-	};
+    combos {
+        compatible = "zmk,combos";
+        combo_one {
+            timeout-ms = <30>;
+            key-positions = <0 1>;
+            bindings = <&kp C>;
+            slow-release;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp A &kp B
-				&kp D &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp A &kp B
+                &kp D &none
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10) /* this should not release the combo yet */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10) /* this should not release the combo yet */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/gresc/gresc-press-release/native_posix_64.keymap b/app/tests/gresc/gresc-press-release/native_posix_64.keymap
index 4b658a73..5e3fac42 100644
--- a/app/tests/gresc/gresc-press-release/native_posix_64.keymap
+++ b/app/tests/gresc/gresc-press-release/native_posix_64.keymap
@@ -3,47 +3,47 @@
 #include <dt-bindings/zmk/kscan-mock.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&gresc         &none
-				&kp LEFT_SHIFT &kp LEFT_GUI
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &gresc         &none
+                &kp LEFT_SHIFT &kp LEFT_GUI
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		/* esc */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+    events = <
+        /* esc */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
 
-		/* ~ */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
+        /* ~ */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
 
-		/* LGUI+` */
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(1,1,10)
+        /* LGUI+` */
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(1,1,10)
 
-		/* ~ */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+        /* ~ */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
 
-		/* LGUI+` */
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(1,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+        /* LGUI+` */
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(1,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/gresc/gresc-two-instances/native_posix_64.keymap b/app/tests/gresc/gresc-two-instances/native_posix_64.keymap
index 78b8ebcb..18f94da5 100644
--- a/app/tests/gresc/gresc-two-instances/native_posix_64.keymap
+++ b/app/tests/gresc/gresc-two-instances/native_posix_64.keymap
@@ -11,33 +11,33 @@ The first gresc that is released releases the key.
 */
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&gresc         &gresc
-				&kp LEFT_SHIFT &kp LEFT_GUI
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &gresc         &gresc
+                &kp LEFT_SHIFT &kp LEFT_GUI
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		/* esc */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10) /* the second gresc is ignored */
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10) /* the second gresc is ignored */
+    events = <
+        /* esc */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10) /* the second gresc is ignored */
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10) /* the second gresc is ignored */
 
-		/* ~ */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(0,0,10)  /* the second gresc is ignored */
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)  /* the second gresc is ignored */
-	>;
+        /* ~ */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(0,0,10)  /* the second gresc is ignored */
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)  /* the second gresc is ignored */
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/balanced/1-dn-up/native_posix_64.keymap b/app/tests/hold-tap/balanced/1-dn-up/native_posix_64.keymap
index 38c8668c..5b725bb1 100644
--- a/app/tests/hold-tap/balanced/1-dn-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/1-dn-up/native_posix_64.keymap
@@ -4,8 +4,8 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/balanced/2-dn-timer-up/native_posix_64.keymap b/app/tests/hold-tap/balanced/2-dn-timer-up/native_posix_64.keymap
index b5834e06..bb20a323 100644
--- a/app/tests/hold-tap/balanced/2-dn-timer-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/2-dn-timer-up/native_posix_64.keymap
@@ -4,8 +4,8 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,500)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,500)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix_64.keymap b/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix_64.keymap
index a540353b..3a696af7 100644
--- a/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,1,10) /*ctrl*/
-		ZMK_MOCK_PRESS(0,0,100)  /*mt f-shift */
-		ZMK_MOCK_RELEASE(1,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,1,10) /*ctrl*/
+        ZMK_MOCK_PRESS(0,0,100)  /*mt f-shift */
+        ZMK_MOCK_RELEASE(1,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix_64.keymap b/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
index 76bb2fa3..5704ca4b 100644
--- a/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,1,10) /*ctrl*/
-		ZMK_MOCK_PRESS(0,0,50)  /*mt f-shift */
-		ZMK_MOCK_RELEASE(1,1,300)
-		/*timer*/
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,1,10) /*ctrl*/
+        ZMK_MOCK_PRESS(0,0,50)  /*mt f-shift */
+        ZMK_MOCK_RELEASE(1,1,300)
+        /*timer*/
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix_64.keymap b/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix_64.keymap
index 882f33aa..df066fb0 100644
--- a/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10) /*d*/
-		ZMK_MOCK_PRESS(0,0,100)  /*mt f-shift */
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,0,10) /*d*/
+        ZMK_MOCK_PRESS(0,0,100)  /*mt f-shift */
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap b/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
index 0fc0b848..34645ad4 100644
--- a/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10) /* d */
-		ZMK_MOCK_PRESS(0,0,100) /* mt f-shift */
-		ZMK_MOCK_RELEASE(1,0,400)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,0,10) /* d */
+        ZMK_MOCK_PRESS(0,0,100) /* mt f-shift */
+        ZMK_MOCK_RELEASE(1,0,400)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix_64.keymap b/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
index 5d0fcbfb..9c108d32 100644
--- a/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,200)
-		ZMK_MOCK_PRESS(0,1,200)
-		/* timer fires */
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,200)
+        ZMK_MOCK_PRESS(0,1,200)
+        /* timer fires */
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap b/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
index fca60ba8..9fd7cbf0 100644
--- a/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,200)
-		ZMK_MOCK_PRESS(1,0,200)
-		/* timer fires */
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,200)
+        ZMK_MOCK_PRESS(1,0,200)
+        /* timer fires */
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap b/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
index 5d0af9ca..f586b978 100644
--- a/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,100)
-		ZMK_MOCK_PRESS(1,0,100)
-		ZMK_MOCK_RELEASE(1,0,200)
-		/* timer fires */
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,100)
+        ZMK_MOCK_PRESS(1,0,100)
+        ZMK_MOCK_RELEASE(1,0,200)
+        /* timer fires */
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix_64.keymap b/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix_64.keymap
index 6b138352..3a5eab10 100644
--- a/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* timer */
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* timer */
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap b/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
index 301ef0ac..cc7412f7 100644
--- a/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,100)
-		ZMK_MOCK_PRESS(1,0,100)
-		ZMK_MOCK_RELEASE(0,0,200)
-		/* timer fires */
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,100)
+        ZMK_MOCK_PRESS(1,0,100)
+        ZMK_MOCK_RELEASE(0,0,200)
+        /* timer fires */
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/balanced/5-quick-tap/native_posix_64.keymap b/app/tests/hold-tap/balanced/5-quick-tap/native_posix_64.keymap
index d895df02..bd431ceb 100644
--- a/app/tests/hold-tap/balanced/5-quick-tap/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/5-quick-tap/native_posix_64.keymap
@@ -5,10 +5,10 @@
 
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/balanced/6-retro-tap/native_posix_64.keymap b/app/tests/hold-tap/balanced/6-retro-tap/native_posix_64.keymap
index 832ea7ef..51995f8d 100644
--- a/app/tests/hold-tap/balanced/6-retro-tap/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/6-retro-tap/native_posix_64.keymap
@@ -3,43 +3,43 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	behaviors {
-		ht_bal: behavior_balanced {
-			compatible = "zmk,behavior-hold-tap";
-			label = "MOD_TAP";
-			#binding-cells = <2>;
-			flavor = "balanced";
-			tapping_term_ms = <300>;
-			bindings = <&kp>, <&kp>;
-			retro-tap;
-		};
-	};
+    behaviors {
+        ht_bal: behavior_balanced {
+            compatible = "zmk,behavior-hold-tap";
+            label = "MOD_TAP";
+            #binding-cells = <2>;
+            flavor = "balanced";
+            tapping_term_ms = <300>;
+            bindings = <&kp>, <&kp>;
+            retro-tap;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&ht_bal LEFT_SHIFT F &none
-				&kp D &none>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &ht_bal LEFT_SHIFT F &none
+                &kp D &none>;
+        };
+    };
 };
 
 
 &kscan {
-	events = <
-		/* tap */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* retro tap */
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* hold  */
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        /* tap */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* retro tap */
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* hold  */
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/balanced/7-positional/2-dn-timer-up/native_posix_64.keymap b/app/tests/hold-tap/balanced/7-positional/2-dn-timer-up/native_posix_64.keymap
index b5834e06..bb20a323 100644
--- a/app/tests/hold-tap/balanced/7-positional/2-dn-timer-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/7-positional/2-dn-timer-up/native_posix_64.keymap
@@ -4,8 +4,8 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,500)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,500)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/balanced/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix_64.keymap b/app/tests/hold-tap/balanced/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix_64.keymap
index 7560a05a..9ee237d3 100644
--- a/app/tests/hold-tap/balanced/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,200)
-		ZMK_MOCK_PRESS(1,1,200) // non trigger key
-		/* timer fires */
-		ZMK_MOCK_RELEASE(1,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,200)
+        ZMK_MOCK_PRESS(1,1,200) // non trigger key
+        /* timer fires */
+        ZMK_MOCK_RELEASE(1,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/balanced/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix_64.keymap b/app/tests/hold-tap/balanced/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix_64.keymap
index b915a6a9..f2f2f8bd 100644
--- a/app/tests/hold-tap/balanced/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,200)
-		ZMK_MOCK_PRESS(1,0,200) // trigger key
-		/* timer fires */
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,200)
+        ZMK_MOCK_PRESS(1,0,200) // trigger key
+        /* timer fires */
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/balanced/7-positional/behavior_keymap.dtsi b/app/tests/hold-tap/balanced/7-positional/behavior_keymap.dtsi
index 5657644d..c750f8e3 100644
--- a/app/tests/hold-tap/balanced/7-positional/behavior_keymap.dtsi
+++ b/app/tests/hold-tap/balanced/7-positional/behavior_keymap.dtsi
@@ -3,27 +3,27 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	behaviors {
-		ht_bal: behavior_hold_tap_balanced {
-			compatible = "zmk,behavior-hold-tap";
-			label = "HOLD_TAP_BALANCED";
-			#binding-cells = <2>;
-			flavor = "balanced";
-			tapping-term-ms = <300>;
-			quick-tap-ms = <200>;
-			bindings = <&kp>, <&kp>;
+    behaviors {
+        ht_bal: behavior_hold_tap_balanced {
+            compatible = "zmk,behavior-hold-tap";
+            label = "HOLD_TAP_BALANCED";
+            #binding-cells = <2>;
+            flavor = "balanced";
+            tapping-term-ms = <300>;
+            quick-tap-ms = <200>;
+            bindings = <&kp>, <&kp>;
             hold-trigger-key-positions = <2>;
-		};
-	};
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&ht_bal LEFT_SHIFT F      &ht_bal LEFT_CONTROL J
-				&kp D      &kp E>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &ht_bal LEFT_SHIFT F      &ht_bal LEFT_CONTROL J
+                &kp D      &kp E>;
+        };
+    };
 };
diff --git a/app/tests/hold-tap/balanced/7-positional/on-release-no-trigger/native_posix_64.keymap b/app/tests/hold-tap/balanced/7-positional/on-release-no-trigger/native_posix_64.keymap
index 942d5ae4..8c24dc34 100644
--- a/app/tests/hold-tap/balanced/7-positional/on-release-no-trigger/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/7-positional/on-release-no-trigger/native_posix_64.keymap
@@ -6,12 +6,12 @@
 &ht_bal { hold-trigger-on-release; };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)  // mod 1
-		ZMK_MOCK_PRESS(0,1,10)  // mod 2
-		ZMK_MOCK_PRESS(1,1,10)  // not trigger position
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)  // mod 1
+        ZMK_MOCK_PRESS(0,1,10)  // mod 2
+        ZMK_MOCK_PRESS(1,1,10)  // not trigger position
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
diff --git a/app/tests/hold-tap/balanced/7-positional/on-release-trigger/native_posix_64.keymap b/app/tests/hold-tap/balanced/7-positional/on-release-trigger/native_posix_64.keymap
index 677a2534..1db5f20e 100644
--- a/app/tests/hold-tap/balanced/7-positional/on-release-trigger/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/7-positional/on-release-trigger/native_posix_64.keymap
@@ -6,12 +6,12 @@
 &ht_bal { hold-trigger-on-release; };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)  // mod 1
-		ZMK_MOCK_PRESS(0,1,10)  // mod 2
-		ZMK_MOCK_PRESS(1,0,10)  // trigger position
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)  // mod 1
+        ZMK_MOCK_PRESS(0,1,10)  // mod 2
+        ZMK_MOCK_PRESS(1,0,10)  // trigger position
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
diff --git a/app/tests/hold-tap/balanced/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix_64.keymap b/app/tests/hold-tap/balanced/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix_64.keymap
index a6ac1507..78404536 100644
--- a/app/tests/hold-tap/balanced/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix_64.keymap
@@ -4,13 +4,13 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10) // trigger key
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(1,1,400) // not trigger key
-		/* timer fires */
-		ZMK_MOCK_RELEASE(1,1,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,0,10) // trigger key
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(1,1,400) // not trigger key
+        /* timer fires */
+        ZMK_MOCK_RELEASE(1,1,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/balanced/8-global-quick-tap/1-basic/native_posix_64.keymap b/app/tests/hold-tap/balanced/8-global-quick-tap/1-basic/native_posix_64.keymap
index 9965c9b3..5af001f6 100644
--- a/app/tests/hold-tap/balanced/8-global-quick-tap/1-basic/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/8-global-quick-tap/1-basic/native_posix_64.keymap
@@ -4,22 +4,22 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		/* tap */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* normal quick tap */
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_RELEASE(0,0,400)
-		/* hold */
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,400)
-		/* global quick tap */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        /* tap */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* normal quick tap */
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_RELEASE(0,0,400)
+        /* hold */
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,400)
+        /* global quick tap */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
diff --git a/app/tests/hold-tap/balanced/8-global-quick-tap/2-double-hold/native_posix_64.keymap b/app/tests/hold-tap/balanced/8-global-quick-tap/2-double-hold/native_posix_64.keymap
index 37c37f55..69d691ce 100644
--- a/app/tests/hold-tap/balanced/8-global-quick-tap/2-double-hold/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/8-global-quick-tap/2-double-hold/native_posix_64.keymap
@@ -4,17 +4,17 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		/* hold the first mod tap */
-		ZMK_MOCK_PRESS(0,0,400)
-		/* hold the second mod tap */
-		ZMK_MOCK_PRESS(0,1,400)
-		/* press the normal key */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
+    events = <
+        /* hold the first mod tap */
+        ZMK_MOCK_PRESS(0,0,400)
+        /* hold the second mod tap */
+        ZMK_MOCK_PRESS(0,1,400)
+        /* press the normal key */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
 
-		/* release the hold taps */
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-	>;
+        /* release the hold taps */
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
diff --git a/app/tests/hold-tap/balanced/8-global-quick-tap/behavior_keymap.dtsi b/app/tests/hold-tap/balanced/8-global-quick-tap/behavior_keymap.dtsi
index 0966ce0d..ef8efd43 100644
--- a/app/tests/hold-tap/balanced/8-global-quick-tap/behavior_keymap.dtsi
+++ b/app/tests/hold-tap/balanced/8-global-quick-tap/behavior_keymap.dtsi
@@ -3,27 +3,27 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	behaviors {
-		ht_bal: behavior_balanced {
-			compatible = "zmk,behavior-hold-tap";
-			label = "MOD_TAP";
-			#binding-cells = <2>;
-			flavor = "balanced";
-			tapping-term-ms = <300>;
-			quick-tap-ms = <300>;
-			bindings = <&kp>, <&kp>;
-			global-quick-tap;
-		};
-	};
+    behaviors {
+        ht_bal: behavior_balanced {
+            compatible = "zmk,behavior-hold-tap";
+            label = "MOD_TAP";
+            #binding-cells = <2>;
+            flavor = "balanced";
+            tapping-term-ms = <300>;
+            quick-tap-ms = <300>;
+            bindings = <&kp>, <&kp>;
+            global-quick-tap;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&ht_bal LEFT_SHIFT F &ht_bal LEFT_CONTROL C
-				&kp D &none>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &ht_bal LEFT_SHIFT F &ht_bal LEFT_CONTROL C
+                &kp D &none>;
+        };
+    };
 };
diff --git a/app/tests/hold-tap/balanced/behavior_keymap.dtsi b/app/tests/hold-tap/balanced/behavior_keymap.dtsi
index d62be888..9f338ebc 100644
--- a/app/tests/hold-tap/balanced/behavior_keymap.dtsi
+++ b/app/tests/hold-tap/balanced/behavior_keymap.dtsi
@@ -3,26 +3,26 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	behaviors {
-		ht_bal: behavior_hold_tap_balanced {
-			compatible = "zmk,behavior-hold-tap";
-			label = "HOLD_TAP_BALANCED";
-			#binding-cells = <2>;
-			flavor = "balanced";
-			tapping-term-ms = <300>;
-			quick-tap-ms = <200>;
-			bindings = <&kp>, <&kp>;
-		};
-	};
+    behaviors {
+        ht_bal: behavior_hold_tap_balanced {
+            compatible = "zmk,behavior-hold-tap";
+            label = "HOLD_TAP_BALANCED";
+            #binding-cells = <2>;
+            flavor = "balanced";
+            tapping-term-ms = <300>;
+            quick-tap-ms = <200>;
+            bindings = <&kp>, <&kp>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&ht_bal LEFT_SHIFT F &ht_bal LEFT_CONTROL J
-				&kp D &kp RIGHT_CONTROL>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &ht_bal LEFT_SHIFT F &ht_bal LEFT_CONTROL J
+                &kp D &kp RIGHT_CONTROL>;
+        };
+    };
 };
diff --git a/app/tests/hold-tap/balanced/many-nested/native_posix_64.keymap b/app/tests/hold-tap/balanced/many-nested/native_posix_64.keymap
index 6d016501..4bac8b83 100644
--- a/app/tests/hold-tap/balanced/many-nested/native_posix_64.keymap
+++ b/app/tests/hold-tap/balanced/many-nested/native_posix_64.keymap
@@ -3,39 +3,39 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	behaviors {
-		ht_bal: behavior_hold_tap_balanced {
-			compatible = "zmk,behavior-hold-tap";
-			label = "HOLD_TAP_BALANCED";
-			#binding-cells = <2>;
-			flavor = "balanced";
-			tapping-term-ms = <300>;
-			bindings = <&kp>, <&kp>;
-		};
-	};
+    behaviors {
+        ht_bal: behavior_hold_tap_balanced {
+            compatible = "zmk,behavior-hold-tap";
+            label = "HOLD_TAP_BALANCED";
+            #binding-cells = <2>;
+            flavor = "balanced";
+            tapping-term-ms = <300>;
+            bindings = <&kp>, <&kp>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&ht_bal LEFT_SHIFT F &ht_bal LEFT_CONTROL J
-				&ht_bal LEFT_GUI H &ht_bal LEFT_ALT L
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &ht_bal LEFT_SHIFT F &ht_bal LEFT_CONTROL J
+                &ht_bal LEFT_GUI H &ht_bal LEFT_ALT L
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-	 	ZMK_MOCK_PRESS(0,0,100)
-		ZMK_MOCK_PRESS(0,1,100)
-		ZMK_MOCK_PRESS(1,0,100)
-		ZMK_MOCK_PRESS(1,1,100)
-		ZMK_MOCK_RELEASE(0,0,100)
-		ZMK_MOCK_RELEASE(0,1,100)
-		ZMK_MOCK_RELEASE(1,0,100)
-		ZMK_MOCK_RELEASE(1,1,100)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,100)
+        ZMK_MOCK_PRESS(0,1,100)
+        ZMK_MOCK_PRESS(1,0,100)
+        ZMK_MOCK_PRESS(1,1,100)
+        ZMK_MOCK_RELEASE(0,0,100)
+        ZMK_MOCK_RELEASE(0,1,100)
+        ZMK_MOCK_RELEASE(1,0,100)
+        ZMK_MOCK_RELEASE(1,1,100)
+    >;
 };
diff --git a/app/tests/hold-tap/hold-preferred/1-dn-up/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/1-dn-up/native_posix_64.keymap
index 38c8668c..5b725bb1 100644
--- a/app/tests/hold-tap/hold-preferred/1-dn-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/1-dn-up/native_posix_64.keymap
@@ -4,8 +4,8 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix_64.keymap
index b5834e06..bb20a323 100644
--- a/app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix_64.keymap
@@ -4,8 +4,8 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,500)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,500)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix_64.keymap
index a540353b..3a696af7 100644
--- a/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,1,10) /*ctrl*/
-		ZMK_MOCK_PRESS(0,0,100)  /*mt f-shift */
-		ZMK_MOCK_RELEASE(1,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,1,10) /*ctrl*/
+        ZMK_MOCK_PRESS(0,0,100)  /*mt f-shift */
+        ZMK_MOCK_RELEASE(1,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
index 76bb2fa3..5704ca4b 100644
--- a/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,1,10) /*ctrl*/
-		ZMK_MOCK_PRESS(0,0,50)  /*mt f-shift */
-		ZMK_MOCK_RELEASE(1,1,300)
-		/*timer*/
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,1,10) /*ctrl*/
+        ZMK_MOCK_PRESS(0,0,50)  /*mt f-shift */
+        ZMK_MOCK_RELEASE(1,1,300)
+        /*timer*/
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix_64.keymap
index 882f33aa..df066fb0 100644
--- a/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10) /*d*/
-		ZMK_MOCK_PRESS(0,0,100)  /*mt f-shift */
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,0,10) /*d*/
+        ZMK_MOCK_PRESS(0,0,100)  /*mt f-shift */
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
index 0fc0b848..34645ad4 100644
--- a/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10) /* d */
-		ZMK_MOCK_PRESS(0,0,100) /* mt f-shift */
-		ZMK_MOCK_RELEASE(1,0,400)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,0,10) /* d */
+        ZMK_MOCK_PRESS(0,0,100) /* mt f-shift */
+        ZMK_MOCK_RELEASE(1,0,400)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
index 5d0fcbfb..9c108d32 100644
--- a/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,200)
-		ZMK_MOCK_PRESS(0,1,200)
-		/* timer fires */
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,200)
+        ZMK_MOCK_PRESS(0,1,200)
+        /* timer fires */
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
index fca60ba8..9fd7cbf0 100644
--- a/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,200)
-		ZMK_MOCK_PRESS(1,0,200)
-		/* timer fires */
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,200)
+        ZMK_MOCK_PRESS(1,0,200)
+        /* timer fires */
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
index 5d0af9ca..f586b978 100644
--- a/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,100)
-		ZMK_MOCK_PRESS(1,0,100)
-		ZMK_MOCK_RELEASE(1,0,200)
-		/* timer fires */
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,100)
+        ZMK_MOCK_PRESS(1,0,100)
+        ZMK_MOCK_RELEASE(1,0,200)
+        /* timer fires */
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix_64.keymap
index 6b138352..3a5eab10 100644
--- a/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* timer */
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* timer */
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
index 301ef0ac..cc7412f7 100644
--- a/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,100)
-		ZMK_MOCK_PRESS(1,0,100)
-		ZMK_MOCK_RELEASE(0,0,200)
-		/* timer fires */
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,100)
+        ZMK_MOCK_PRESS(1,0,100)
+        ZMK_MOCK_RELEASE(0,0,200)
+        /* timer fires */
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/hold-preferred/5-quick-tap/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/5-quick-tap/native_posix_64.keymap
index d895df02..bd431ceb 100644
--- a/app/tests/hold-tap/hold-preferred/5-quick-tap/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/5-quick-tap/native_posix_64.keymap
@@ -5,10 +5,10 @@
 
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/hold-preferred/6-retro-tap/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/6-retro-tap/native_posix_64.keymap
index dc96ee8b..8dbc7d82 100644
--- a/app/tests/hold-tap/hold-preferred/6-retro-tap/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/6-retro-tap/native_posix_64.keymap
@@ -3,43 +3,43 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	behaviors {
-		hp: behavior_hold_preferred {
-			compatible = "zmk,behavior-hold-tap";
-			label = "MOD_TAP";
-			#binding-cells = <2>;
-			flavor = "hold-preferred";
-			tapping_term_ms = <300>;
-			bindings = <&kp>, <&kp>;
-			retro-tap;
-		};
-	};
+    behaviors {
+        hp: behavior_hold_preferred {
+            compatible = "zmk,behavior-hold-tap";
+            label = "MOD_TAP";
+            #binding-cells = <2>;
+            flavor = "hold-preferred";
+            tapping_term_ms = <300>;
+            bindings = <&kp>, <&kp>;
+            retro-tap;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&hp LEFT_SHIFT F &none
-				&kp D &none>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &hp LEFT_SHIFT F &none
+                &kp D &none>;
+        };
+    };
 };
 
 
 &kscan {
-	events = <
-		/* tap */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* retro tap */
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* hold  */
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        /* tap */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* retro tap */
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* hold  */
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/hold-preferred/7-positional/2-dn-timer-up/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/7-positional/2-dn-timer-up/native_posix_64.keymap
index b5834e06..bb20a323 100644
--- a/app/tests/hold-tap/hold-preferred/7-positional/2-dn-timer-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/7-positional/2-dn-timer-up/native_posix_64.keymap
@@ -4,8 +4,8 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,500)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,500)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/hold-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix_64.keymap
index 7560a05a..9ee237d3 100644
--- a/app/tests/hold-tap/hold-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,200)
-		ZMK_MOCK_PRESS(1,1,200) // non trigger key
-		/* timer fires */
-		ZMK_MOCK_RELEASE(1,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,200)
+        ZMK_MOCK_PRESS(1,1,200) // non trigger key
+        /* timer fires */
+        ZMK_MOCK_RELEASE(1,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/hold-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix_64.keymap
index b915a6a9..f2f2f8bd 100644
--- a/app/tests/hold-tap/hold-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,200)
-		ZMK_MOCK_PRESS(1,0,200) // trigger key
-		/* timer fires */
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,200)
+        ZMK_MOCK_PRESS(1,0,200) // trigger key
+        /* timer fires */
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/hold-preferred/7-positional/behavior_keymap.dtsi b/app/tests/hold-tap/hold-preferred/7-positional/behavior_keymap.dtsi
index bf681004..71f3aba5 100644
--- a/app/tests/hold-tap/hold-preferred/7-positional/behavior_keymap.dtsi
+++ b/app/tests/hold-tap/hold-preferred/7-positional/behavior_keymap.dtsi
@@ -3,27 +3,27 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	behaviors {
-		ht_hold: behavior_hold_hold_tap {
-			compatible = "zmk,behavior-hold-tap";
-			label = "hold_hold_tap";
-			#binding-cells = <2>;
-			flavor = "hold-preferred";
-			tapping-term-ms = <300>;
-			quick-tap-ms = <200>;
-			bindings = <&kp>, <&kp>;
+    behaviors {
+        ht_hold: behavior_hold_hold_tap {
+            compatible = "zmk,behavior-hold-tap";
+            label = "hold_hold_tap";
+            #binding-cells = <2>;
+            flavor = "hold-preferred";
+            tapping-term-ms = <300>;
+            quick-tap-ms = <200>;
+            bindings = <&kp>, <&kp>;
             hold-trigger-key-positions = <2>;
-		};
-	};
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&ht_hold LEFT_SHIFT F      &ht_hold LEFT_CONTROL J
-				&kp D      &kp E>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &ht_hold LEFT_SHIFT F      &ht_hold LEFT_CONTROL J
+                &kp D      &kp E>;
+        };
+    };
 };
diff --git a/app/tests/hold-tap/hold-preferred/7-positional/on-release-no-trigger/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/7-positional/on-release-no-trigger/native_posix_64.keymap
index b48332ff..f35b73ba 100644
--- a/app/tests/hold-tap/hold-preferred/7-positional/on-release-no-trigger/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/7-positional/on-release-no-trigger/native_posix_64.keymap
@@ -6,12 +6,12 @@
 &ht_hold { hold-trigger-on-release; };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)  // mod 1
-		ZMK_MOCK_PRESS(0,1,10)  // mod 2
-		ZMK_MOCK_PRESS(1,1,10)  // not trigger position
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)  // mod 1
+        ZMK_MOCK_PRESS(0,1,10)  // mod 2
+        ZMK_MOCK_PRESS(1,1,10)  // not trigger position
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
diff --git a/app/tests/hold-tap/hold-preferred/7-positional/on-release-trigger/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/7-positional/on-release-trigger/native_posix_64.keymap
index 77398582..0b4eb320 100644
--- a/app/tests/hold-tap/hold-preferred/7-positional/on-release-trigger/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/7-positional/on-release-trigger/native_posix_64.keymap
@@ -6,12 +6,12 @@
 &ht_hold { hold-trigger-on-release; };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)  // mod 1
-		ZMK_MOCK_PRESS(0,1,10)  // mod 2
-		ZMK_MOCK_PRESS(1,0,10)  // trigger position
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)  // mod 1
+        ZMK_MOCK_PRESS(0,1,10)  // mod 2
+        ZMK_MOCK_PRESS(1,0,10)  // trigger position
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
diff --git a/app/tests/hold-tap/hold-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix_64.keymap
index a6ac1507..78404536 100644
--- a/app/tests/hold-tap/hold-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix_64.keymap
@@ -4,13 +4,13 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10) // trigger key
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(1,1,400) // not trigger key
-		/* timer fires */
-		ZMK_MOCK_RELEASE(1,1,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,0,10) // trigger key
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(1,1,400) // not trigger key
+        /* timer fires */
+        ZMK_MOCK_RELEASE(1,1,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/hold-preferred/8-global-quick-tap/1-basic/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/8-global-quick-tap/1-basic/native_posix_64.keymap
index 13a58c3e..e28eb4c3 100644
--- a/app/tests/hold-tap/hold-preferred/8-global-quick-tap/1-basic/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/8-global-quick-tap/1-basic/native_posix_64.keymap
@@ -4,22 +4,22 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		/* tap */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* normal quick tap */
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_RELEASE(0,0,400)
-		/* hold */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,400)
-		/* global quick tap */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        /* tap */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* normal quick tap */
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_RELEASE(0,0,400)
+        /* hold */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,400)
+        /* global quick tap */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
diff --git a/app/tests/hold-tap/hold-preferred/8-global-quick-tap/2-double-hold/native_posix_64.keymap b/app/tests/hold-tap/hold-preferred/8-global-quick-tap/2-double-hold/native_posix_64.keymap
index 37c37f55..69d691ce 100644
--- a/app/tests/hold-tap/hold-preferred/8-global-quick-tap/2-double-hold/native_posix_64.keymap
+++ b/app/tests/hold-tap/hold-preferred/8-global-quick-tap/2-double-hold/native_posix_64.keymap
@@ -4,17 +4,17 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		/* hold the first mod tap */
-		ZMK_MOCK_PRESS(0,0,400)
-		/* hold the second mod tap */
-		ZMK_MOCK_PRESS(0,1,400)
-		/* press the normal key */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
+    events = <
+        /* hold the first mod tap */
+        ZMK_MOCK_PRESS(0,0,400)
+        /* hold the second mod tap */
+        ZMK_MOCK_PRESS(0,1,400)
+        /* press the normal key */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
 
-		/* release the hold taps */
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-	>;
+        /* release the hold taps */
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
diff --git a/app/tests/hold-tap/hold-preferred/8-global-quick-tap/behavior_keymap.dtsi b/app/tests/hold-tap/hold-preferred/8-global-quick-tap/behavior_keymap.dtsi
index fee3361e..392a5f83 100644
--- a/app/tests/hold-tap/hold-preferred/8-global-quick-tap/behavior_keymap.dtsi
+++ b/app/tests/hold-tap/hold-preferred/8-global-quick-tap/behavior_keymap.dtsi
@@ -3,27 +3,27 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	behaviors {
-		hp: behavior_hold_preferred {
-			compatible = "zmk,behavior-hold-tap";
-			label = "MOD_TAP";
-			#binding-cells = <2>;
-			flavor = "hold-preferred";
-			tapping-term-ms = <300>;
-			quick-tap-ms = <300>;
-			bindings = <&kp>, <&kp>;
-			global-quick-tap;
-		};
-	};
+    behaviors {
+        hp: behavior_hold_preferred {
+            compatible = "zmk,behavior-hold-tap";
+            label = "MOD_TAP";
+            #binding-cells = <2>;
+            flavor = "hold-preferred";
+            tapping-term-ms = <300>;
+            quick-tap-ms = <300>;
+            bindings = <&kp>, <&kp>;
+            global-quick-tap;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&hp LEFT_SHIFT F &hp LEFT_CONTROL G
-				&kp D &none>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &hp LEFT_SHIFT F &hp LEFT_CONTROL G
+                &kp D &none>;
+        };
+    };
 };
diff --git a/app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi b/app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi
index 41c84e1e..da6b8362 100644
--- a/app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi
+++ b/app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi
@@ -5,26 +5,26 @@
 
 
 / {
-	behaviors {
-		ht_hold: behavior_hold_hold_tap {
-			compatible = "zmk,behavior-hold-tap";
-			label = "hold_hold_tap";
-			#binding-cells = <2>;
-			flavor = "hold-preferred";
-			tapping-term-ms = <300>;
-			quick-tap-ms = <200>;
-			bindings = <&kp>, <&kp>;
-		};
-	};
+    behaviors {
+        ht_hold: behavior_hold_hold_tap {
+            compatible = "zmk,behavior-hold-tap";
+            label = "hold_hold_tap";
+            #binding-cells = <2>;
+            flavor = "hold-preferred";
+            tapping-term-ms = <300>;
+            quick-tap-ms = <200>;
+            bindings = <&kp>, <&kp>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&ht_hold LEFT_SHIFT F &ht_hold LEFT_CONTROL J
-				&kp D &kp RIGHT_CONTROL>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &ht_hold LEFT_SHIFT F &ht_hold LEFT_CONTROL J
+                &kp D &kp RIGHT_CONTROL>;
+        };
+    };
 };
diff --git a/app/tests/hold-tap/tap-preferred/1-dn-up/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/1-dn-up/native_posix_64.keymap
index 38c8668c..5b725bb1 100644
--- a/app/tests/hold-tap/tap-preferred/1-dn-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/1-dn-up/native_posix_64.keymap
@@ -4,8 +4,8 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix_64.keymap
index b5834e06..bb20a323 100644
--- a/app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix_64.keymap
@@ -4,8 +4,8 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,500)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,500)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix_64.keymap
index a540353b..3a696af7 100644
--- a/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,1,10) /*ctrl*/
-		ZMK_MOCK_PRESS(0,0,100)  /*mt f-shift */
-		ZMK_MOCK_RELEASE(1,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,1,10) /*ctrl*/
+        ZMK_MOCK_PRESS(0,0,100)  /*mt f-shift */
+        ZMK_MOCK_RELEASE(1,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
index 76bb2fa3..5704ca4b 100644
--- a/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,1,10) /*ctrl*/
-		ZMK_MOCK_PRESS(0,0,50)  /*mt f-shift */
-		ZMK_MOCK_RELEASE(1,1,300)
-		/*timer*/
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,1,10) /*ctrl*/
+        ZMK_MOCK_PRESS(0,0,50)  /*mt f-shift */
+        ZMK_MOCK_RELEASE(1,1,300)
+        /*timer*/
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix_64.keymap
index 882f33aa..df066fb0 100644
--- a/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10) /*d*/
-		ZMK_MOCK_PRESS(0,0,100)  /*mt f-shift */
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,0,10) /*d*/
+        ZMK_MOCK_PRESS(0,0,100)  /*mt f-shift */
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
index 0fc0b848..34645ad4 100644
--- a/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10) /* d */
-		ZMK_MOCK_PRESS(0,0,100) /* mt f-shift */
-		ZMK_MOCK_RELEASE(1,0,400)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,0,10) /* d */
+        ZMK_MOCK_PRESS(0,0,100) /* mt f-shift */
+        ZMK_MOCK_RELEASE(1,0,400)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
index 5d0fcbfb..9c108d32 100644
--- a/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,200)
-		ZMK_MOCK_PRESS(0,1,200)
-		/* timer fires */
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,200)
+        ZMK_MOCK_PRESS(0,1,200)
+        /* timer fires */
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
index fca60ba8..9fd7cbf0 100644
--- a/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,200)
-		ZMK_MOCK_PRESS(1,0,200)
-		/* timer fires */
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,200)
+        ZMK_MOCK_PRESS(1,0,200)
+        /* timer fires */
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
index 5d0af9ca..f586b978 100644
--- a/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,100)
-		ZMK_MOCK_PRESS(1,0,100)
-		ZMK_MOCK_RELEASE(1,0,200)
-		/* timer fires */
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,100)
+        ZMK_MOCK_PRESS(1,0,100)
+        ZMK_MOCK_RELEASE(1,0,200)
+        /* timer fires */
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix_64.keymap
index 6b138352..3a5eab10 100644
--- a/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* timer */
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* timer */
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
index 301ef0ac..cc7412f7 100644
--- a/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,100)
-		ZMK_MOCK_PRESS(1,0,100)
-		ZMK_MOCK_RELEASE(0,0,200)
-		/* timer fires */
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,100)
+        ZMK_MOCK_PRESS(1,0,100)
+        ZMK_MOCK_RELEASE(0,0,200)
+        /* timer fires */
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-preferred/5-quick-tap/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/5-quick-tap/native_posix_64.keymap
index d895df02..bd431ceb 100644
--- a/app/tests/hold-tap/tap-preferred/5-quick-tap/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/5-quick-tap/native_posix_64.keymap
@@ -5,10 +5,10 @@
 
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-preferred/6-nested-timeouts/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/6-nested-timeouts/native_posix_64.keymap
index b733e3a2..500d2670 100644
--- a/app/tests/hold-tap/tap-preferred/6-nested-timeouts/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/6-nested-timeouts/native_posix_64.keymap
@@ -9,45 +9,45 @@
 */
 
 / {
-	behaviors {
-		tp_short: short_tap {
-			compatible = "zmk,behavior-hold-tap";
-			label = "MOD_TAP_SHORT";
-			#binding-cells = <2>;
-			flavor = "tap-preferred";
-			tapping-term-ms = <100>;
-			quick-tap-ms = <200>;
-			bindings = <&kp>, <&kp>;
-		};
-		tp_long: long_tap {
-			compatible = "zmk,behavior-hold-tap";
-			label = "MOD_TAP_LONG";
-			#binding-cells = <2>;
-			flavor = "tap-preferred";
-			tapping-term-ms = <200>;
-			quick-tap-ms = <200>;
-			bindings = <&kp>, <&kp>;
-		};
-	};
+    behaviors {
+        tp_short: short_tap {
+            compatible = "zmk,behavior-hold-tap";
+            label = "MOD_TAP_SHORT";
+            #binding-cells = <2>;
+            flavor = "tap-preferred";
+            tapping-term-ms = <100>;
+            quick-tap-ms = <200>;
+            bindings = <&kp>, <&kp>;
+        };
+        tp_long: long_tap {
+            compatible = "zmk,behavior-hold-tap";
+            label = "MOD_TAP_LONG";
+            #binding-cells = <2>;
+            flavor = "tap-preferred";
+            tapping-term-ms = <200>;
+            quick-tap-ms = <200>;
+            bindings = <&kp>, <&kp>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&tp_long LEFT_SHIFT F &tp_short LEFT_CONTROL J
-				&kp D &kp RIGHT_CONTROL>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &tp_long LEFT_SHIFT F &tp_short LEFT_CONTROL J
+                &kp D &kp RIGHT_CONTROL>;
+        };
+    };
 };
 
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,20)
-		ZMK_MOCK_PRESS(0,1,20)
-		ZMK_MOCK_RELEASE(0,1,200)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,20)
+        ZMK_MOCK_PRESS(0,1,20)
+        ZMK_MOCK_RELEASE(0,1,200)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-preferred/7-positional/2-dn-timer-up/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/7-positional/2-dn-timer-up/native_posix_64.keymap
index b5834e06..bb20a323 100644
--- a/app/tests/hold-tap/tap-preferred/7-positional/2-dn-timer-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/7-positional/2-dn-timer-up/native_posix_64.keymap
@@ -4,8 +4,8 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,500)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,500)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix_64.keymap
index 7560a05a..9ee237d3 100644
--- a/app/tests/hold-tap/tap-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,200)
-		ZMK_MOCK_PRESS(1,1,200) // non trigger key
-		/* timer fires */
-		ZMK_MOCK_RELEASE(1,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,200)
+        ZMK_MOCK_PRESS(1,1,200) // non trigger key
+        /* timer fires */
+        ZMK_MOCK_RELEASE(1,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix_64.keymap
index b915a6a9..f2f2f8bd 100644
--- a/app/tests/hold-tap/tap-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,200)
-		ZMK_MOCK_PRESS(1,0,200) // trigger key
-		/* timer fires */
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,200)
+        ZMK_MOCK_PRESS(1,0,200) // trigger key
+        /* timer fires */
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-preferred/7-positional/behavior_keymap.dtsi b/app/tests/hold-tap/tap-preferred/7-positional/behavior_keymap.dtsi
index e4be8d15..79a88eb2 100644
--- a/app/tests/hold-tap/tap-preferred/7-positional/behavior_keymap.dtsi
+++ b/app/tests/hold-tap/tap-preferred/7-positional/behavior_keymap.dtsi
@@ -3,27 +3,27 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	behaviors {
-		tp: behavior_tap_preferred {
-			compatible = "zmk,behavior-hold-tap";
-			label = "MOD_TAP";
-			#binding-cells = <2>;
-			flavor = "tap-preferred";
-			tapping-term-ms = <300>;
-			quick-tap-ms = <200>;
-			bindings = <&kp>, <&kp>;
+    behaviors {
+        tp: behavior_tap_preferred {
+            compatible = "zmk,behavior-hold-tap";
+            label = "MOD_TAP";
+            #binding-cells = <2>;
+            flavor = "tap-preferred";
+            tapping-term-ms = <300>;
+            quick-tap-ms = <200>;
+            bindings = <&kp>, <&kp>;
             hold-trigger-key-positions = <2>;
-		};
-	};
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&tp LEFT_SHIFT F      &tp LEFT_CONTROL J
-				&kp D      &kp E>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &tp LEFT_SHIFT F      &tp LEFT_CONTROL J
+                &kp D      &kp E>;
+        };
+    };
 };
diff --git a/app/tests/hold-tap/tap-preferred/7-positional/on-release-no-trigger/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/7-positional/on-release-no-trigger/native_posix_64.keymap
index 504318f7..179b64ee 100644
--- a/app/tests/hold-tap/tap-preferred/7-positional/on-release-no-trigger/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/7-positional/on-release-no-trigger/native_posix_64.keymap
@@ -6,12 +6,12 @@
 &tp { hold-trigger-on-release; };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)  // mod 1
-		ZMK_MOCK_PRESS(0,1,10)  // mod 2
-		ZMK_MOCK_PRESS(1,1,10)  // not trigger position
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)  // mod 1
+        ZMK_MOCK_PRESS(0,1,10)  // mod 2
+        ZMK_MOCK_PRESS(1,1,10)  // not trigger position
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
diff --git a/app/tests/hold-tap/tap-preferred/7-positional/on-release-trigger/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/7-positional/on-release-trigger/native_posix_64.keymap
index 7061eee7..e926b45c 100644
--- a/app/tests/hold-tap/tap-preferred/7-positional/on-release-trigger/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/7-positional/on-release-trigger/native_posix_64.keymap
@@ -6,12 +6,12 @@
 &tp { hold-trigger-on-release; };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)  // mod 1
-		ZMK_MOCK_PRESS(0,1,10)  // mod 2
-		ZMK_MOCK_PRESS(1,0,10)  // trigger position
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)  // mod 1
+        ZMK_MOCK_PRESS(0,1,10)  // mod 2
+        ZMK_MOCK_PRESS(1,0,10)  // trigger position
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
diff --git a/app/tests/hold-tap/tap-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix_64.keymap
index a6ac1507..78404536 100644
--- a/app/tests/hold-tap/tap-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix_64.keymap
@@ -4,13 +4,13 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10) // trigger key
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(1,1,400) // not trigger key
-		/* timer fires */
-		ZMK_MOCK_RELEASE(1,1,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,0,10) // trigger key
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(1,1,400) // not trigger key
+        /* timer fires */
+        ZMK_MOCK_RELEASE(1,1,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-preferred/8-global-quick-tap/1-basic/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/8-global-quick-tap/1-basic/native_posix_64.keymap
index 9965c9b3..5af001f6 100644
--- a/app/tests/hold-tap/tap-preferred/8-global-quick-tap/1-basic/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/8-global-quick-tap/1-basic/native_posix_64.keymap
@@ -4,22 +4,22 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		/* tap */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* normal quick tap */
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_RELEASE(0,0,400)
-		/* hold */
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,400)
-		/* global quick tap */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        /* tap */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* normal quick tap */
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_RELEASE(0,0,400)
+        /* hold */
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,400)
+        /* global quick tap */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
diff --git a/app/tests/hold-tap/tap-preferred/8-global-quick-tap/2-double-hold/native_posix_64.keymap b/app/tests/hold-tap/tap-preferred/8-global-quick-tap/2-double-hold/native_posix_64.keymap
index 37c37f55..69d691ce 100644
--- a/app/tests/hold-tap/tap-preferred/8-global-quick-tap/2-double-hold/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-preferred/8-global-quick-tap/2-double-hold/native_posix_64.keymap
@@ -4,17 +4,17 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		/* hold the first mod tap */
-		ZMK_MOCK_PRESS(0,0,400)
-		/* hold the second mod tap */
-		ZMK_MOCK_PRESS(0,1,400)
-		/* press the normal key */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
+    events = <
+        /* hold the first mod tap */
+        ZMK_MOCK_PRESS(0,0,400)
+        /* hold the second mod tap */
+        ZMK_MOCK_PRESS(0,1,400)
+        /* press the normal key */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
 
-		/* release the hold taps */
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-	>;
+        /* release the hold taps */
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
diff --git a/app/tests/hold-tap/tap-preferred/8-global-quick-tap/behavior_keymap.dtsi b/app/tests/hold-tap/tap-preferred/8-global-quick-tap/behavior_keymap.dtsi
index 4771ab75..02362ef2 100644
--- a/app/tests/hold-tap/tap-preferred/8-global-quick-tap/behavior_keymap.dtsi
+++ b/app/tests/hold-tap/tap-preferred/8-global-quick-tap/behavior_keymap.dtsi
@@ -3,27 +3,27 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	behaviors {
-		tp: behavior_tap_preferred {
-			compatible = "zmk,behavior-hold-tap";
-			label = "MOD_TAP";
-			#binding-cells = <2>;
-			flavor = "tap-preferred";
-			tapping-term-ms = <300>;
-			quick-tap-ms = <300>;
-			bindings = <&kp>, <&kp>;
-			global-quick-tap;
-		};
-	};
+    behaviors {
+        tp: behavior_tap_preferred {
+            compatible = "zmk,behavior-hold-tap";
+            label = "MOD_TAP";
+            #binding-cells = <2>;
+            flavor = "tap-preferred";
+            tapping-term-ms = <300>;
+            quick-tap-ms = <300>;
+            bindings = <&kp>, <&kp>;
+            global-quick-tap;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&tp LEFT_SHIFT F &tp LEFT_CONTROL C
-				&kp D &none>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &tp LEFT_SHIFT F &tp LEFT_CONTROL C
+                &kp D &none>;
+        };
+    };
 };
diff --git a/app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi b/app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi
index cdeb9596..df307740 100644
--- a/app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi
+++ b/app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi
@@ -3,26 +3,26 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	behaviors {
-		tp: behavior_tap_preferred {
-			compatible = "zmk,behavior-hold-tap";
-			label = "MOD_TAP";
-			#binding-cells = <2>;
-			flavor = "tap-preferred";
-			tapping-term-ms = <300>;
-			quick-tap-ms = <200>;
-			bindings = <&kp>, <&kp>;
-		};
-	};
+    behaviors {
+        tp: behavior_tap_preferred {
+            compatible = "zmk,behavior-hold-tap";
+            label = "MOD_TAP";
+            #binding-cells = <2>;
+            flavor = "tap-preferred";
+            tapping-term-ms = <300>;
+            quick-tap-ms = <200>;
+            bindings = <&kp>, <&kp>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&tp LEFT_SHIFT F &tp LEFT_CONTROL J
-				&kp D &kp RIGHT_CONTROL>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &tp LEFT_SHIFT F &tp LEFT_CONTROL J
+                &kp D &kp RIGHT_CONTROL>;
+        };
+    };
 };
diff --git a/app/tests/hold-tap/tap-unless-interrupted/1-dn-up/native_posix_64.keymap b/app/tests/hold-tap/tap-unless-interrupted/1-dn-up/native_posix_64.keymap
index 38c8668c..5b725bb1 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/1-dn-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/1-dn-up/native_posix_64.keymap
@@ -4,8 +4,8 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-unless-interrupted/2-dn-timer-up/native_posix_64.keymap b/app/tests/hold-tap/tap-unless-interrupted/2-dn-timer-up/native_posix_64.keymap
index b5834e06..bb20a323 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/2-dn-timer-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/2-dn-timer-up/native_posix_64.keymap
@@ -4,8 +4,8 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,500)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,500)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-unless-interrupted/3a-moddn-dn-modup-up/native_posix_64.keymap b/app/tests/hold-tap/tap-unless-interrupted/3a-moddn-dn-modup-up/native_posix_64.keymap
index a540353b..3a696af7 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/3a-moddn-dn-modup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/3a-moddn-dn-modup-up/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,1,10) /*ctrl*/
-		ZMK_MOCK_PRESS(0,0,100)  /*mt f-shift */
-		ZMK_MOCK_RELEASE(1,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,1,10) /*ctrl*/
+        ZMK_MOCK_PRESS(0,0,100)  /*mt f-shift */
+        ZMK_MOCK_RELEASE(1,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-unless-interrupted/3b-moddn-dn-modup-timer-up/native_posix_64.keymap b/app/tests/hold-tap/tap-unless-interrupted/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
index 76bb2fa3..5704ca4b 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,1,10) /*ctrl*/
-		ZMK_MOCK_PRESS(0,0,50)  /*mt f-shift */
-		ZMK_MOCK_RELEASE(1,1,300)
-		/*timer*/
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,1,10) /*ctrl*/
+        ZMK_MOCK_PRESS(0,0,50)  /*mt f-shift */
+        ZMK_MOCK_RELEASE(1,1,300)
+        /*timer*/
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-unless-interrupted/3c-kcdn-dn-kcup-up/native_posix_64.keymap b/app/tests/hold-tap/tap-unless-interrupted/3c-kcdn-dn-kcup-up/native_posix_64.keymap
index 882f33aa..df066fb0 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/3c-kcdn-dn-kcup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/3c-kcdn-dn-kcup-up/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10) /*d*/
-		ZMK_MOCK_PRESS(0,0,100)  /*mt f-shift */
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,0,10) /*d*/
+        ZMK_MOCK_PRESS(0,0,100)  /*mt f-shift */
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-unless-interrupted/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap b/app/tests/hold-tap/tap-unless-interrupted/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
index 0fc0b848..34645ad4 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10) /* d */
-		ZMK_MOCK_PRESS(0,0,100) /* mt f-shift */
-		ZMK_MOCK_RELEASE(1,0,400)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,0,10) /* d */
+        ZMK_MOCK_PRESS(0,0,100) /* mt f-shift */
+        ZMK_MOCK_RELEASE(1,0,400)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-unless-interrupted/4a-dn-htdn-timer-htup-up/native_posix_64.keymap b/app/tests/hold-tap/tap-unless-interrupted/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
index 5d0fcbfb..9c108d32 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,200)
-		ZMK_MOCK_PRESS(0,1,200)
-		/* timer fires */
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,200)
+        ZMK_MOCK_PRESS(0,1,200)
+        /* timer fires */
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-unless-interrupted/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap b/app/tests/hold-tap/tap-unless-interrupted/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
index fca60ba8..9fd7cbf0 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,200)
-		ZMK_MOCK_PRESS(1,0,200)
-		/* timer fires */
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,200)
+        ZMK_MOCK_PRESS(1,0,200)
+        /* timer fires */
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-unless-interrupted/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap b/app/tests/hold-tap/tap-unless-interrupted/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
index 5d0af9ca..f586b978 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,100)
-		ZMK_MOCK_PRESS(1,0,100)
-		ZMK_MOCK_RELEASE(1,0,200)
-		/* timer fires */
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,100)
+        ZMK_MOCK_PRESS(1,0,100)
+        ZMK_MOCK_RELEASE(1,0,200)
+        /* timer fires */
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-unless-interrupted/4c-dn-kcdn-kcup-up/native_posix_64.keymap b/app/tests/hold-tap/tap-unless-interrupted/4c-dn-kcdn-kcup-up/native_posix_64.keymap
index 6b138352..3a5eab10 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/4c-dn-kcdn-kcup-up/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/4c-dn-kcdn-kcup-up/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* timer */
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* timer */
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-unless-interrupted/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap b/app/tests/hold-tap/tap-unless-interrupted/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
index 301ef0ac..cc7412f7 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
@@ -4,11 +4,11 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,100)
-		ZMK_MOCK_PRESS(1,0,100)
-		ZMK_MOCK_RELEASE(0,0,200)
-		/* timer fires */
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,100)
+        ZMK_MOCK_PRESS(1,0,100)
+        ZMK_MOCK_RELEASE(0,0,200)
+        /* timer fires */
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-unless-interrupted/5-quick-tap/native_posix_64.keymap b/app/tests/hold-tap/tap-unless-interrupted/5-quick-tap/native_posix_64.keymap
index d895df02..bd431ceb 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/5-quick-tap/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/5-quick-tap/native_posix_64.keymap
@@ -5,10 +5,10 @@
 
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/hold-tap/tap-unless-interrupted/6-global-quick-tap/1-basic/native_posix_64.keymap b/app/tests/hold-tap/tap-unless-interrupted/6-global-quick-tap/1-basic/native_posix_64.keymap
index 9965c9b3..5af001f6 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/6-global-quick-tap/1-basic/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/6-global-quick-tap/1-basic/native_posix_64.keymap
@@ -4,22 +4,22 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		/* tap */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* normal quick tap */
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_RELEASE(0,0,400)
-		/* hold */
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,400)
-		/* global quick tap */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        /* tap */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* normal quick tap */
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_RELEASE(0,0,400)
+        /* hold */
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,400)
+        /* global quick tap */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
diff --git a/app/tests/hold-tap/tap-unless-interrupted/6-global-quick-tap/2-double-hold/native_posix_64.keymap b/app/tests/hold-tap/tap-unless-interrupted/6-global-quick-tap/2-double-hold/native_posix_64.keymap
index 37c37f55..69d691ce 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/6-global-quick-tap/2-double-hold/native_posix_64.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/6-global-quick-tap/2-double-hold/native_posix_64.keymap
@@ -4,17 +4,17 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		/* hold the first mod tap */
-		ZMK_MOCK_PRESS(0,0,400)
-		/* hold the second mod tap */
-		ZMK_MOCK_PRESS(0,1,400)
-		/* press the normal key */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
+    events = <
+        /* hold the first mod tap */
+        ZMK_MOCK_PRESS(0,0,400)
+        /* hold the second mod tap */
+        ZMK_MOCK_PRESS(0,1,400)
+        /* press the normal key */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
 
-		/* release the hold taps */
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-	>;
+        /* release the hold taps */
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
diff --git a/app/tests/hold-tap/tap-unless-interrupted/6-global-quick-tap/behavior_keymap.dtsi b/app/tests/hold-tap/tap-unless-interrupted/6-global-quick-tap/behavior_keymap.dtsi
index 6ca7ac72..029a8128 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/6-global-quick-tap/behavior_keymap.dtsi
+++ b/app/tests/hold-tap/tap-unless-interrupted/6-global-quick-tap/behavior_keymap.dtsi
@@ -3,27 +3,27 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	behaviors {
-		ht_tui: behavior_hold_tap_tap_unless_interrupted {
-			compatible = "zmk,behavior-hold-tap";
-			label = "hold_tap_tap_unless_interrupted";
-			#binding-cells = <2>;
-			flavor = "tap-unless-interrupted";
-			tapping-term-ms = <300>;
-			quick-tap-ms = <300>;
-			bindings = <&kp>, <&kp>;
-			global-quick-tap;
-		};
-	};
+    behaviors {
+        ht_tui: behavior_hold_tap_tap_unless_interrupted {
+            compatible = "zmk,behavior-hold-tap";
+            label = "hold_tap_tap_unless_interrupted";
+            #binding-cells = <2>;
+            flavor = "tap-unless-interrupted";
+            tapping-term-ms = <300>;
+            quick-tap-ms = <300>;
+            bindings = <&kp>, <&kp>;
+            global-quick-tap;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&ht_tui LEFT_SHIFT F      &ht_tui LEFT_CONTROL J
-				&kp D      &kp RIGHT_CONTROL>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &ht_tui LEFT_SHIFT F      &ht_tui LEFT_CONTROL J
+                &kp D      &kp RIGHT_CONTROL>;
+        };
+    };
 };
diff --git a/app/tests/hold-tap/tap-unless-interrupted/behavior_keymap.dtsi b/app/tests/hold-tap/tap-unless-interrupted/behavior_keymap.dtsi
index 18f68d63..b24de6dd 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/behavior_keymap.dtsi
+++ b/app/tests/hold-tap/tap-unless-interrupted/behavior_keymap.dtsi
@@ -5,26 +5,26 @@
 
 
 / {
-	behaviors {
-		ht_tui: behavior_hold_tap_tap_unless_interrupted {
-			compatible = "zmk,behavior-hold-tap";
-			label = "hold_tap_tap_unless_interrupted";
-			#binding-cells = <2>;
-			flavor = "tap-unless-interrupted";
-			tapping-term-ms = <300>;
-			quick-tap-ms = <200>;
-			bindings = <&kp>, <&kp>;
-		};
-	};
+    behaviors {
+        ht_tui: behavior_hold_tap_tap_unless_interrupted {
+            compatible = "zmk,behavior-hold-tap";
+            label = "hold_tap_tap_unless_interrupted";
+            #binding-cells = <2>;
+            flavor = "tap-unless-interrupted";
+            tapping-term-ms = <300>;
+            quick-tap-ms = <200>;
+            bindings = <&kp>, <&kp>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&ht_tui LEFT_SHIFT F      &ht_tui LEFT_CONTROL J
-				&kp D      &kp RIGHT_CONTROL>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &ht_tui LEFT_SHIFT F      &ht_tui LEFT_CONTROL J
+                &kp D      &kp RIGHT_CONTROL>;
+        };
+    };
 };
diff --git a/app/tests/key-repeat/behavior_keymap.dtsi b/app/tests/key-repeat/behavior_keymap.dtsi
index 24902fc6..c8e2d9c4 100644
--- a/app/tests/key-repeat/behavior_keymap.dtsi
+++ b/app/tests/key-repeat/behavior_keymap.dtsi
@@ -3,15 +3,15 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label = "Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label = "Default keymap";
 
-		default_layer {
-			bindings = <
-			&key_repeat &kp A
-			&kp LCTRL &kp C_VOL_UP
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+            &key_repeat &kp A
+            &kp LCTRL &kp C_VOL_UP
+            >;
+        };
+    };
 };
diff --git a/app/tests/key-repeat/ignore-other-usage-page-events/native_posix_64.keymap b/app/tests/key-repeat/ignore-other-usage-page-events/native_posix_64.keymap
index b042e8e0..e4687573 100644
--- a/app/tests/key-repeat/ignore-other-usage-page-events/native_posix_64.keymap
+++ b/app/tests/key-repeat/ignore-other-usage-page-events/native_posix_64.keymap
@@ -4,12 +4,12 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-	ZMK_MOCK_PRESS(0,1,10)
-	ZMK_MOCK_RELEASE(0,1,10)
-	ZMK_MOCK_PRESS(1,1,10)
-	ZMK_MOCK_RELEASE(1,1,10)
-	ZMK_MOCK_PRESS(0,0,10)
-	ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+    ZMK_MOCK_PRESS(0,1,10)
+    ZMK_MOCK_RELEASE(0,1,10)
+    ZMK_MOCK_PRESS(1,1,10)
+    ZMK_MOCK_RELEASE(1,1,10)
+    ZMK_MOCK_PRESS(0,0,10)
+    ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/key-repeat/press-and-release-after-key-usage/native_posix.keymap b/app/tests/key-repeat/press-and-release-after-key-usage/native_posix.keymap
index 98c8f6f8..9078f304 100644
--- a/app/tests/key-repeat/press-and-release-after-key-usage/native_posix.keymap
+++ b/app/tests/key-repeat/press-and-release-after-key-usage/native_posix.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-	ZMK_MOCK_PRESS(0,1,10)
-	ZMK_MOCK_RELEASE(0,1,10)
-	ZMK_MOCK_PRESS(0,0,10)
-	ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+    ZMK_MOCK_PRESS(0,1,10)
+    ZMK_MOCK_RELEASE(0,1,10)
+    ZMK_MOCK_PRESS(0,0,10)
+    ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/key-repeat/press-and-release-after-key-usage/native_posix_64.keymap b/app/tests/key-repeat/press-and-release-after-key-usage/native_posix_64.keymap
index 42f6514b..1d27770b 100644
--- a/app/tests/key-repeat/press-and-release-after-key-usage/native_posix_64.keymap
+++ b/app/tests/key-repeat/press-and-release-after-key-usage/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-	ZMK_MOCK_PRESS(0,1,9000)
-	ZMK_MOCK_RELEASE(0,1,30)
-	ZMK_MOCK_PRESS(0,0,30)
-	ZMK_MOCK_RELEASE(0,0,3000)
-	>;
+    events = <
+    ZMK_MOCK_PRESS(0,1,9000)
+    ZMK_MOCK_RELEASE(0,1,30)
+    ZMK_MOCK_PRESS(0,0,30)
+    ZMK_MOCK_RELEASE(0,0,3000)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/key-repeat/press-and-release-with-explicit-modifiers/native_posix_64.keymap b/app/tests/key-repeat/press-and-release-with-explicit-modifiers/native_posix_64.keymap
index ab9622e4..109aed5a 100644
--- a/app/tests/key-repeat/press-and-release-with-explicit-modifiers/native_posix_64.keymap
+++ b/app/tests/key-repeat/press-and-release-with-explicit-modifiers/native_posix_64.keymap
@@ -4,12 +4,12 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-	ZMK_MOCK_PRESS(1,0,10)
-	ZMK_MOCK_PRESS(0,1,10)
-	ZMK_MOCK_RELEASE(0,1,10)
-	ZMK_MOCK_RELEASE(1,0,10)
-	ZMK_MOCK_PRESS(0,0,10)
-	ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+    ZMK_MOCK_PRESS(1,0,10)
+    ZMK_MOCK_PRESS(0,1,10)
+    ZMK_MOCK_RELEASE(0,1,10)
+    ZMK_MOCK_RELEASE(1,0,10)
+    ZMK_MOCK_PRESS(0,0,10)
+    ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/key-repeat/send-nothing-if-no-keys-pressed-yet/native_posix_64.keymap b/app/tests/key-repeat/send-nothing-if-no-keys-pressed-yet/native_posix_64.keymap
index 9ff64468..0d2d0f6c 100644
--- a/app/tests/key-repeat/send-nothing-if-no-keys-pressed-yet/native_posix_64.keymap
+++ b/app/tests/key-repeat/send-nothing-if-no-keys-pressed-yet/native_posix_64.keymap
@@ -4,8 +4,8 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-	ZMK_MOCK_PRESS(0,0,10)
-	ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+    ZMK_MOCK_PRESS(0,0,10)
+    ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/keypress/behavior_keymap.dtsi b/app/tests/keypress/behavior_keymap.dtsi
index f0c5d0c2..52f9421c 100644
--- a/app/tests/keypress/behavior_keymap.dtsi
+++ b/app/tests/keypress/behavior_keymap.dtsi
@@ -3,15 +3,15 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp B &none
-				&none &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp B &none
+                &none &none
+            >;
+        };
+    };
 };
diff --git a/app/tests/keypress/kp-press-release/native_posix_64.keymap b/app/tests/keypress/kp-press-release/native_posix_64.keymap
index c8e744ee..a414f34b 100644
--- a/app/tests/keypress/kp-press-release/native_posix_64.keymap
+++ b/app/tests/keypress/kp-press-release/native_posix_64.keymap
@@ -1,8 +1,8 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/keytoggle/behavior_keymap.dtsi b/app/tests/keytoggle/behavior_keymap.dtsi
index 32712a8d..45d48164 100644
--- a/app/tests/keytoggle/behavior_keymap.dtsi
+++ b/app/tests/keytoggle/behavior_keymap.dtsi
@@ -3,15 +3,15 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kt B &none
-				&none &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kt B &none
+                &none &none
+            >;
+        };
+    };
 };
diff --git a/app/tests/keytoggle/kt-alt-tab/native_posix_64.keymap b/app/tests/keytoggle/kt-alt-tab/native_posix_64.keymap
index f4d03429..4f70b591 100644
--- a/app/tests/keytoggle/kt-alt-tab/native_posix_64.keymap
+++ b/app/tests/keytoggle/kt-alt-tab/native_posix_64.keymap
@@ -3,46 +3,46 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 &kscan {
-	events = <
+    events = <
     /* Toggle LALT on */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
     /* Tap TAB twice */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
     /* Toggle LSHFT on */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
     /* Tap TAB once */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
     /* Toggle LALT off */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
     /* Tap A */
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_RELEASE(1,1,10)
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_RELEASE(1,1,10)
     /* Toggle LSHFT off */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
     /* Tap A */
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_RELEASE(1,1,10)
-	>;
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_RELEASE(1,1,10)
+    >;
 };
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kt LALT &kp TAB
-				&kt LSHFT &kp A
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kt LALT &kp TAB
+                &kt LSHFT &kp A
+            >;
+        };
+    };
 };
\ No newline at end of file
diff --git a/app/tests/keytoggle/kt-modded-alpha/native_posix_64.keymap b/app/tests/keytoggle/kt-modded-alpha/native_posix_64.keymap
index 0a4ad4ae..b07f297f 100644
--- a/app/tests/keytoggle/kt-modded-alpha/native_posix_64.keymap
+++ b/app/tests/keytoggle/kt-modded-alpha/native_posix_64.keymap
@@ -3,36 +3,36 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 &kscan {
-	events = <
+    events = <
     /* Toggle LS(A) on */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
     /* Toggle LS(A) off */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
     /* Press A */
-		ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
     /* Toggle LS(A) on */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
     /* Toggle LS(A) off */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
     /* Release A */
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kt LS(A) &trans
-				&kp A &trans
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kt LS(A) &trans
+                &kp A &trans
+            >;
+        };
+    };
 };
\ No newline at end of file
diff --git a/app/tests/keytoggle/kt-press-release-nkro/native_posix_64.keymap b/app/tests/keytoggle/kt-press-release-nkro/native_posix_64.keymap
index e25d4b18..5c2d2028 100644
--- a/app/tests/keytoggle/kt-press-release-nkro/native_posix_64.keymap
+++ b/app/tests/keytoggle/kt-press-release-nkro/native_posix_64.keymap
@@ -1,10 +1,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/keytoggle/kt-press-release/native_posix_64.keymap b/app/tests/keytoggle/kt-press-release/native_posix_64.keymap
index e25d4b18..5c2d2028 100644
--- a/app/tests/keytoggle/kt-press-release/native_posix_64.keymap
+++ b/app/tests/keytoggle/kt-press-release/native_posix_64.keymap
@@ -1,10 +1,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/macros/basic/native_posix_64.keymap b/app/tests/macros/basic/native_posix_64.keymap
index a2812792..a34ba99f 100644
--- a/app/tests/macros/basic/native_posix_64.keymap
+++ b/app/tests/macros/basic/native_posix_64.keymap
@@ -10,5 +10,5 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,1000)>;
+    events = <ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,1000)>;
 };
\ No newline at end of file
diff --git a/app/tests/macros/behavior_keymap.dtsi b/app/tests/macros/behavior_keymap.dtsi
index 7399cd5b..90322e42 100644
--- a/app/tests/macros/behavior_keymap.dtsi
+++ b/app/tests/macros/behavior_keymap.dtsi
@@ -9,60 +9,60 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	macros {
-		ZMK_MACRO(abc_macro,
-			wait-ms = <10>;
-			tap-ms = <50>;
-			bindings = <&kp A &kp B &kp C>;
-		)
+    macros {
+        ZMK_MACRO(abc_macro,
+            wait-ms = <10>;
+            tap-ms = <50>;
+            bindings = <&kp A &kp B &kp C>;
+        )
 
-		ZMK_MACRO(hold_shift_macro,
-			bindings
-				= <&macro_press &kp LSHFT>
-				, <&macro_tap>
-				, <&kp D &kp O &kp G>
-				, <&macro_release &kp LSHFT>
-				;
-		)
+        ZMK_MACRO(hold_shift_macro,
+            bindings
+                = <&macro_press &kp LSHFT>
+                , <&macro_tap>
+                , <&kp D &kp O &kp G>
+                , <&macro_release &kp LSHFT>
+                ;
+        )
 
-		ZMK_MACRO(custom_timing,
-			bindings
-				= <&macro_wait_time 50>
-				, <&kp A>
-				, <&macro_tap_time 20>
-				, <&kp B &kp C>
-				;
-		)
+        ZMK_MACRO(custom_timing,
+            bindings
+                = <&macro_wait_time 50>
+                , <&kp A>
+                , <&macro_tap_time 20>
+                , <&kp B &kp C>
+                ;
+        )
 
-		ZMK_MACRO(dual_sequence_macro,
-			wait-ms = <10>;
-			tap-ms = <40>;
-			bindings
-				= <&macro_press &kp LALT>
-				, <&macro_tap>
-				, <&kp TAB>
-				, <&macro_pause_for_release>
-				, <&macro_release &kp LALT>
-				;
-		)
-	};
+        ZMK_MACRO(dual_sequence_macro,
+            wait-ms = <10>;
+            tap-ms = <40>;
+            bindings
+                = <&macro_press &kp LALT>
+                , <&macro_tap>
+                , <&kp TAB>
+                , <&macro_pause_for_release>
+                , <&macro_release &kp LALT>
+                ;
+        )
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&abc_macro &mo 1
-				&hold_shift_macro &custom_timing>;
-		};
+        default_layer {
+            bindings = <
+                &abc_macro &mo 1
+                &hold_shift_macro &custom_timing>;
+        };
 
-		extra_layer {
-			bindings = <
-				&dual_sequence_macro &trans
-				&kp TAB &none>;
+        extra_layer {
+            bindings = <
+                &dual_sequence_macro &trans
+                &kp TAB &none>;
 
-		};
+        };
 
-	};
+    };
 };
diff --git a/app/tests/macros/mo-plus-modifier-from-hold-tap/native_posix_64.keymap b/app/tests/macros/mo-plus-modifier-from-hold-tap/native_posix_64.keymap
index e6ef4f49..bdf89abf 100644
--- a/app/tests/macros/mo-plus-modifier-from-hold-tap/native_posix_64.keymap
+++ b/app/tests/macros/mo-plus-modifier-from-hold-tap/native_posix_64.keymap
@@ -9,19 +9,19 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	macros {
-		ZMK_MACRO(
-			mo_mod_macro,
-			wait-ms = <0>;
-			tap-ms = <20>;
-			bindings
-				= <&macro_press &mo 1 &kp LSHFT>
-				, <&macro_pause_for_release>
-				, <&macro_release &mo 1 &kp LSHFT>;
-		)
-	};
+    macros {
+        ZMK_MACRO(
+            mo_mod_macro,
+            wait-ms = <0>;
+            tap-ms = <20>;
+            bindings
+                = <&macro_press &mo 1 &kp LSHFT>
+                , <&macro_pause_for_release>
+                , <&macro_release &mo 1 &kp LSHFT>;
+        )
+    };
 
-	behaviors {
+    behaviors {
         mth: macro_tap_hold {
             compatible = "zmk,behavior-hold-tap";
             label = "MACRO_TAP_HOLD";
@@ -30,28 +30,28 @@
             tapping-term-ms = <200>;
             bindings = <&mo_mod_macro>, <&kp>;
         };
-	};
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&mth 0 TAB &kp A
-				&kp B &kp C>;
-		};
+        default_layer {
+            bindings = <
+                &mth 0 TAB &kp A
+                &kp B &kp C>;
+        };
 
-		extra_layer {
-			bindings = <
-				&kp D &kp E
-				&kp F &kp G>;
+        extra_layer {
+            bindings = <
+                &kp D &kp E
+                &kp F &kp G>;
 
-		};
+        };
 
-	};
+    };
 };
 
 &kscan {
-	events = <ZMK_MOCK_PRESS(0,0,20) ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_RELEASE(0,1,10) ZMK_MOCK_RELEASE(0,0,1000)>;
+    events = <ZMK_MOCK_PRESS(0,0,20) ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_RELEASE(0,1,10) ZMK_MOCK_RELEASE(0,0,1000)>;
 };
\ No newline at end of file
diff --git a/app/tests/macros/mo-plus-modifier-macro/native_posix_64.keymap b/app/tests/macros/mo-plus-modifier-macro/native_posix_64.keymap
index c5cde5b4..4cc60bf5 100644
--- a/app/tests/macros/mo-plus-modifier-macro/native_posix_64.keymap
+++ b/app/tests/macros/mo-plus-modifier-macro/native_posix_64.keymap
@@ -9,38 +9,38 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	macros {
-		ZMK_MACRO(
-			mo_mod_macro,
-			wait-ms = <0>;
-			tap-ms = <20>;
-			bindings
-				= <&macro_press &mo 1 &kp LSHFT>
-				, <&macro_pause_for_release>
-				, <&macro_release &mo 1 &kp LSHFT>;
-		)
-	};
+    macros {
+        ZMK_MACRO(
+            mo_mod_macro,
+            wait-ms = <0>;
+            tap-ms = <20>;
+            bindings
+                = <&macro_press &mo 1 &kp LSHFT>
+                , <&macro_pause_for_release>
+                , <&macro_release &mo 1 &kp LSHFT>;
+        )
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&mo_mod_macro &kp A
-				&kp B &kp C>;
-		};
+        default_layer {
+            bindings = <
+                &mo_mod_macro &kp A
+                &kp B &kp C>;
+        };
 
-		extra_layer {
-			bindings = <
-				&kp D &kp E
-				&kp F &kp G>;
+        extra_layer {
+            bindings = <
+                &kp D &kp E
+                &kp F &kp G>;
 
-		};
+        };
 
-	};
+    };
 };
 
 &kscan {
-	events = <ZMK_MOCK_PRESS(0,0,20) ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_RELEASE(0,1,10) ZMK_MOCK_RELEASE(0,0,1000)>;
+    events = <ZMK_MOCK_PRESS(0,0,20) ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_RELEASE(0,1,10) ZMK_MOCK_RELEASE(0,0,1000)>;
 };
\ No newline at end of file
diff --git a/app/tests/macros/press-mid-macro/native_posix_64.keymap b/app/tests/macros/press-mid-macro/native_posix_64.keymap
index b8ae76f1..8010a8e7 100644
--- a/app/tests/macros/press-mid-macro/native_posix_64.keymap
+++ b/app/tests/macros/press-mid-macro/native_posix_64.keymap
@@ -10,5 +10,5 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,1) ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_RELEASE(0,1,1000)>;
+    events = <ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,1) ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_RELEASE(0,1,1000)>;
 };
\ No newline at end of file
diff --git a/app/tests/macros/press-release/native_posix_64.keymap b/app/tests/macros/press-release/native_posix_64.keymap
index 25467126..75333333 100644
--- a/app/tests/macros/press-release/native_posix_64.keymap
+++ b/app/tests/macros/press-release/native_posix_64.keymap
@@ -10,5 +10,5 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <ZMK_MOCK_PRESS(1,0,10) ZMK_MOCK_RELEASE(1,0,1000)>;
+    events = <ZMK_MOCK_PRESS(1,0,10) ZMK_MOCK_RELEASE(1,0,1000)>;
 };
\ No newline at end of file
diff --git a/app/tests/macros/timing-override/native_posix_64.keymap b/app/tests/macros/timing-override/native_posix_64.keymap
index 343926a7..e5d35e88 100644
--- a/app/tests/macros/timing-override/native_posix_64.keymap
+++ b/app/tests/macros/timing-override/native_posix_64.keymap
@@ -10,5 +10,5 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <ZMK_MOCK_PRESS(1,1,10) ZMK_MOCK_RELEASE(1,1,750)>;
+    events = <ZMK_MOCK_PRESS(1,1,10) ZMK_MOCK_RELEASE(1,1,750)>;
 };
\ No newline at end of file
diff --git a/app/tests/macros/wait-macro-release/native_posix_64.keymap b/app/tests/macros/wait-macro-release/native_posix_64.keymap
index 6dabaeca..394e4a88 100644
--- a/app/tests/macros/wait-macro-release/native_posix_64.keymap
+++ b/app/tests/macros/wait-macro-release/native_posix_64.keymap
@@ -10,5 +10,5 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_PRESS(0,0,400) ZMK_MOCK_PRESS(1,0,400) ZMK_MOCK_RELEASE(1,0,10) ZMK_MOCK_RELEASE(0,0,1000) ZMK_MOCK_RELEASE(0,1,1000)>;
+    events = <ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_PRESS(0,0,400) ZMK_MOCK_PRESS(1,0,400) ZMK_MOCK_RELEASE(1,0,10) ZMK_MOCK_RELEASE(0,0,1000) ZMK_MOCK_RELEASE(0,1,1000)>;
 };
\ No newline at end of file
diff --git a/app/tests/mod-morph/1-no-morph/native_posix_64.keymap b/app/tests/mod-morph/1-no-morph/native_posix_64.keymap
index fb939de5..916aa569 100644
--- a/app/tests/mod-morph/1-no-morph/native_posix_64.keymap
+++ b/app/tests/mod-morph/1-no-morph/native_posix_64.keymap
@@ -4,8 +4,8 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
diff --git a/app/tests/mod-morph/2a-masked-morph/native_posix_64.keymap b/app/tests/mod-morph/2a-masked-morph/native_posix_64.keymap
index 9ad50202..ec0591e5 100644
--- a/app/tests/mod-morph/2a-masked-morph/native_posix_64.keymap
+++ b/app/tests/mod-morph/2a-masked-morph/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
diff --git a/app/tests/mod-morph/2b-masked-morph-implicit-overwrite/native_posix_64.keymap b/app/tests/mod-morph/2b-masked-morph-implicit-overwrite/native_posix_64.keymap
index 74de8588..66fb1ed0 100644
--- a/app/tests/mod-morph/2b-masked-morph-implicit-overwrite/native_posix_64.keymap
+++ b/app/tests/mod-morph/2b-masked-morph-implicit-overwrite/native_posix_64.keymap
@@ -13,25 +13,25 @@
         };
     };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp LEFT_ALT &mod_morph
-				&kp LEFT_SHIFT &kp RIGHT_SHIFT
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp LEFT_ALT &mod_morph
+                &kp LEFT_SHIFT &kp RIGHT_SHIFT
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
 
diff --git a/app/tests/mod-morph/2c-masked-morph-and-explicit-mods/native_posix_64.keymap b/app/tests/mod-morph/2c-masked-morph-and-explicit-mods/native_posix_64.keymap
index d5406e19..de1368bd 100644
--- a/app/tests/mod-morph/2c-masked-morph-and-explicit-mods/native_posix_64.keymap
+++ b/app/tests/mod-morph/2c-masked-morph-and-explicit-mods/native_posix_64.keymap
@@ -4,12 +4,12 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
diff --git a/app/tests/mod-morph/2d-masked-morph-into-hold-tap-tap/native_posix_64.keymap b/app/tests/mod-morph/2d-masked-morph-into-hold-tap-tap/native_posix_64.keymap
index 7071e8cd..9b7f4fe1 100644
--- a/app/tests/mod-morph/2d-masked-morph-into-hold-tap-tap/native_posix_64.keymap
+++ b/app/tests/mod-morph/2d-masked-morph-into-hold-tap-tap/native_posix_64.keymap
@@ -3,13 +3,13 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 &kscan {
-	events = <
+    events = <
         /* Shift + tap &mod_morph --> expect B (but get Shift + B) */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
 
 / {
@@ -24,22 +24,22 @@
 
     };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp LEFT_SHIFT &mod_morph
-				&kp C &none
-			>;
-		};
+        default_layer {
+            bindings = <
+                &kp LEFT_SHIFT &mod_morph
+                &kp C &none
+            >;
+        };
 
         second_layer {
-			bindings = <
-				&trans &trans
-				&kp D &trans
-			>;
-		};
-	};
+            bindings = <
+                &trans &trans
+                &kp D &trans
+            >;
+        };
+    };
 };
diff --git a/app/tests/mod-morph/2e-masked-morph-into-hold-tap-hold/native_posix_64.keymap b/app/tests/mod-morph/2e-masked-morph-into-hold-tap-hold/native_posix_64.keymap
index 96c2f270..e0c1d1e5 100644
--- a/app/tests/mod-morph/2e-masked-morph-into-hold-tap-hold/native_posix_64.keymap
+++ b/app/tests/mod-morph/2e-masked-morph-into-hold-tap-hold/native_posix_64.keymap
@@ -3,15 +3,15 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 &kscan {
-	events = <
+    events = <
         /* Shift + hold &mod_morph --> expect and get D (no shift) */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,200)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,200)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
 
 / {
@@ -26,22 +26,22 @@
 
     };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp LEFT_SHIFT &mod_morph
-				&kp C &none
-			>;
-		};
+        default_layer {
+            bindings = <
+                &kp LEFT_SHIFT &mod_morph
+                &kp C &none
+            >;
+        };
 
         second_layer {
-			bindings = <
-				&trans &trans
-				&kp D &trans
-			>;
-		};
-	};
+            bindings = <
+                &trans &trans
+                &kp D &trans
+            >;
+        };
+    };
 };
diff --git a/app/tests/mod-morph/3-unmasked-morph/native_posix_64.keymap b/app/tests/mod-morph/3-unmasked-morph/native_posix_64.keymap
index a82d3ea7..a20c04d5 100644
--- a/app/tests/mod-morph/3-unmasked-morph/native_posix_64.keymap
+++ b/app/tests/mod-morph/3-unmasked-morph/native_posix_64.keymap
@@ -14,24 +14,24 @@
         };
     };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp LEFT_ALT &mod_morph
-				&kp LEFT_SHIFT &kp RIGHT_SHIFT
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp LEFT_ALT &mod_morph
+                &kp LEFT_SHIFT &kp RIGHT_SHIFT
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
diff --git a/app/tests/mod-morph/behavior_keymap.dtsi b/app/tests/mod-morph/behavior_keymap.dtsi
index 09720d8d..2f880540 100644
--- a/app/tests/mod-morph/behavior_keymap.dtsi
+++ b/app/tests/mod-morph/behavior_keymap.dtsi
@@ -9,15 +9,15 @@
         };
     };
 
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp LEFT_ALT &mod_morph
-				&kp LEFT_SHIFT &kp RIGHT_SHIFT
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp LEFT_ALT &mod_morph
+                &kp LEFT_SHIFT &kp RIGHT_SHIFT
+            >;
+        };
+    };
 };
diff --git a/app/tests/modifiers/explicit/kp-hyper-dn-a-dn-a-up-hyper-up/native_posix_64.keymap b/app/tests/modifiers/explicit/kp-hyper-dn-a-dn-a-up-hyper-up/native_posix_64.keymap
index dbb2df5c..621945a8 100644
--- a/app/tests/modifiers/explicit/kp-hyper-dn-a-dn-a-up-hyper-up/native_posix_64.keymap
+++ b/app/tests/modifiers/explicit/kp-hyper-dn-a-dn-a-up-hyper-up/native_posix_64.keymap
@@ -4,25 +4,25 @@
 
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
 
-	>;
+    >;
 };
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp LS(LA(LG(LEFT_CONTROL))) &kp LEFT_CONTROL
-				&kp A &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp LS(LA(LG(LEFT_CONTROL))) &kp LEFT_CONTROL
+                &kp A &none
+            >;
+        };
+    };
 };
diff --git a/app/tests/modifiers/explicit/kp-lctl-dn-lctl-dn-lctl-up-lctl-up/native_posix_64.keymap b/app/tests/modifiers/explicit/kp-lctl-dn-lctl-dn-lctl-up-lctl-up/native_posix_64.keymap
index b01c6257..d68f8921 100644
--- a/app/tests/modifiers/explicit/kp-lctl-dn-lctl-dn-lctl-up-lctl-up/native_posix_64.keymap
+++ b/app/tests/modifiers/explicit/kp-lctl-dn-lctl-dn-lctl-up-lctl-up/native_posix_64.keymap
@@ -4,24 +4,24 @@
 
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp LEFT_CONTROL &kp LEFT_CONTROL
-				&kp LEFT_SHIFT &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp LEFT_CONTROL &kp LEFT_CONTROL
+                &kp LEFT_SHIFT &none
+            >;
+        };
+    };
 };
diff --git a/app/tests/modifiers/explicit/kp-lctl-dn-lctl-up/native_posix_64.keymap b/app/tests/modifiers/explicit/kp-lctl-dn-lctl-up/native_posix_64.keymap
index 89930328..c2d12eb2 100644
--- a/app/tests/modifiers/explicit/kp-lctl-dn-lctl-up/native_posix_64.keymap
+++ b/app/tests/modifiers/explicit/kp-lctl-dn-lctl-up/native_posix_64.keymap
@@ -4,22 +4,22 @@
 
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp LEFT_CONTROL &kp LEFT_CONTROL
-				&kp LEFT_SHIFT &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp LEFT_CONTROL &kp LEFT_CONTROL
+                &kp LEFT_SHIFT &none
+            >;
+        };
+    };
 };
diff --git a/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lctl-up-lsft-up/native_posix_64.keymap b/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lctl-up-lsft-up/native_posix_64.keymap
index acd55e83..7be62b94 100644
--- a/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lctl-up-lsft-up/native_posix_64.keymap
+++ b/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lctl-up-lsft-up/native_posix_64.keymap
@@ -4,24 +4,24 @@
 
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp LEFT_CONTROL &kp LEFT_CONTROL
-				&kp LEFT_SHIFT &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp LEFT_CONTROL &kp LEFT_CONTROL
+                &kp LEFT_SHIFT &none
+            >;
+        };
+    };
 };
diff --git a/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lsft-up-lctl-up/native_posix_64.keymap b/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lsft-up-lctl-up/native_posix_64.keymap
index 7e1865a0..8d1d773e 100644
--- a/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lsft-up-lctl-up/native_posix_64.keymap
+++ b/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lsft-up-lctl-up/native_posix_64.keymap
@@ -4,25 +4,25 @@
 
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
 
-	>;
+    >;
 };
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp LEFT_CONTROL &kp LEFT_CONTROL
-				&kp LEFT_SHIFT &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp LEFT_CONTROL &kp LEFT_CONTROL
+                &kp LEFT_SHIFT &none
+            >;
+        };
+    };
 };
diff --git a/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod1-up-mod2-up/native_posix_64.keymap b/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod1-up-mod2-up/native_posix_64.keymap
index e175d60e..87101d83 100644
--- a/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod1-up-mod2-up/native_posix_64.keymap
+++ b/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod1-up-mod2-up/native_posix_64.keymap
@@ -4,24 +4,24 @@
 
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp LC(A) &kp LS(B)
-				&kp LEFT_CONTROL &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp LC(A) &kp LS(B)
+                &kp LEFT_CONTROL &none
+            >;
+        };
+    };
 };
diff --git a/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod2-up-mod1-up/native_posix_64.keymap b/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod2-up-mod1-up/native_posix_64.keymap
index 8c4534f4..6b40fef1 100644
--- a/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod2-up-mod1-up/native_posix_64.keymap
+++ b/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod2-up-mod1-up/native_posix_64.keymap
@@ -4,24 +4,24 @@
 
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp LC(A) &kp LS(B)
-				&none &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp LC(A) &kp LS(B)
+                &none &none
+            >;
+        };
+    };
 };
diff --git a/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-lctl-up-mod-up/native_posix_64.keymap b/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-lctl-up-mod-up/native_posix_64.keymap
index e82182c4..4b2ca139 100644
--- a/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-lctl-up-mod-up/native_posix_64.keymap
+++ b/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-lctl-up-mod-up/native_posix_64.keymap
@@ -4,24 +4,24 @@
 
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp LC(A) &kp LS(B)
-				&kp LEFT_CONTROL &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp LC(A) &kp LS(B)
+                &kp LEFT_CONTROL &none
+            >;
+        };
+    };
 };
diff --git a/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-mod-up-lctl-up/native_posix_64.keymap b/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-mod-up-lctl-up/native_posix_64.keymap
index a36b85d2..a2564762 100644
--- a/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-mod-up-lctl-up/native_posix_64.keymap
+++ b/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-mod-up-lctl-up/native_posix_64.keymap
@@ -4,24 +4,24 @@
 
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp LC(A) &kp LS(B)
-				&kp LEFT_CONTROL &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp LC(A) &kp LS(B)
+                &kp LEFT_CONTROL &none
+            >;
+        };
+    };
 };
diff --git a/app/tests/momentary-layer/1-normal/native_posix_64.keymap b/app/tests/momentary-layer/1-normal/native_posix_64.keymap
index ed0e8ad1..387a1322 100644
--- a/app/tests/momentary-layer/1-normal/native_posix_64.keymap
+++ b/app/tests/momentary-layer/1-normal/native_posix_64.keymap
@@ -4,29 +4,29 @@
 #include "../behavior_keymap.dtsi"
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp B &mo 1
-				&none &none>;
-		};
+        default_layer {
+            bindings = <
+                &kp B &mo 1
+                &none &none>;
+        };
 
-		layer_1 {
-			bindings = <
-				&kp C &trans
-				&none &none>;
-		};
-	};
+        layer_1 {
+            bindings = <
+                &kp C &trans
+                &none &none>;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/momentary-layer/2-early-key-release/native_posix_64.keymap b/app/tests/momentary-layer/2-early-key-release/native_posix_64.keymap
index 9311fdee..776fc761 100644
--- a/app/tests/momentary-layer/2-early-key-release/native_posix_64.keymap
+++ b/app/tests/momentary-layer/2-early-key-release/native_posix_64.keymap
@@ -4,29 +4,29 @@
 #include "../behavior_keymap.dtsi"
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp B &mo 1
-				&none &none>;
-		};
+        default_layer {
+            bindings = <
+                &kp B &mo 1
+                &none &none>;
+        };
 
-		layer_1 {
-			bindings = <
-				&kp C &none
-				&none &none>;
-		};
-	};
+        layer_1 {
+            bindings = <
+                &kp C &none
+                &none &none>;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/momentary-layer/3-covered/native_posix_64.keymap b/app/tests/momentary-layer/3-covered/native_posix_64.keymap
index 62ae301d..a7939d9e 100644
--- a/app/tests/momentary-layer/3-covered/native_posix_64.keymap
+++ b/app/tests/momentary-layer/3-covered/native_posix_64.keymap
@@ -7,27 +7,27 @@ this test verifies that the correct key is released when a layer is enabled "on
 and the original key is "covered".
 */
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&trans &mo 1
-				&trans &trans>;
-		};
+        default_layer {
+            bindings = <
+                &trans &mo 1
+                &trans &trans>;
+        };
 
-		layer_1 {
-			bindings = <
-				&trans &kp A
-				&trans &trans>;
-		};
-	};
+        layer_1 {
+            bindings = <
+                &trans &kp A
+                &trans &trans>;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
diff --git a/app/tests/momentary-layer/4-nested/native_posix_64.keymap b/app/tests/momentary-layer/4-nested/native_posix_64.keymap
index fd376d00..1f4f0aea 100644
--- a/app/tests/momentary-layer/4-nested/native_posix_64.keymap
+++ b/app/tests/momentary-layer/4-nested/native_posix_64.keymap
@@ -3,37 +3,37 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&none &mo 1
-				&none &none>;
-		};
+        default_layer {
+            bindings = <
+                &none &mo 1
+                &none &none>;
+        };
 
-		layer_1 {
-			bindings = <
-				&mo 2 &none
-				&none &none>;
-		};
+        layer_1 {
+            bindings = <
+                &mo 2 &none
+                &none &none>;
+        };
 
-		layer_2 {
-			bindings = <
-				&none &none
-				&kp B &none>;
-		};
-	};
+        layer_2 {
+            bindings = <
+                &none &none
+                &kp B &none>;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/momentary-layer/5-nested-early-key-release/native_posix_64.keymap b/app/tests/momentary-layer/5-nested-early-key-release/native_posix_64.keymap
index c467aea3..4c8f7890 100644
--- a/app/tests/momentary-layer/5-nested-early-key-release/native_posix_64.keymap
+++ b/app/tests/momentary-layer/5-nested-early-key-release/native_posix_64.keymap
@@ -3,37 +3,37 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&none &mo 1
-				&none &none>;
-		};
+        default_layer {
+            bindings = <
+                &none &mo 1
+                &none &none>;
+        };
 
-		layer_1 {
-			bindings = <
-				&mo 2 &none
-				&none &none>;
-		};
+        layer_1 {
+            bindings = <
+                &mo 2 &none
+                &none &none>;
+        };
 
-		layer_2 {
-			bindings = <
-				&none &none
-				&kp B &none>;
-		};
-	};
+        layer_2 {
+            bindings = <
+                &none &none
+                &kp B &none>;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/momentary-layer/behavior_keymap.dtsi b/app/tests/momentary-layer/behavior_keymap.dtsi
index 40bc31ec..63127a39 100644
--- a/app/tests/momentary-layer/behavior_keymap.dtsi
+++ b/app/tests/momentary-layer/behavior_keymap.dtsi
@@ -3,20 +3,20 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp B &mo 1
-				&trans &trans>;
-		};
+        default_layer {
+            bindings = <
+                &kp B &mo 1
+                &trans &trans>;
+        };
 
-		layer_1 {
-			bindings = <
-				&kp C_NEXT &trans
-				&trans &trans>;
-		};
-	};
+        layer_1 {
+            bindings = <
+                &kp C_NEXT &trans
+                &trans &trans>;
+        };
+    };
 };
diff --git a/app/tests/none/behavior_keymap.dtsi b/app/tests/none/behavior_keymap.dtsi
index 40d863c1..7a4c099b 100644
--- a/app/tests/none/behavior_keymap.dtsi
+++ b/app/tests/none/behavior_keymap.dtsi
@@ -3,20 +3,20 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&none &mo 1
-				&kp A &none>;
-		};
+        default_layer {
+            bindings = <
+                &none &mo 1
+                &kp A &none>;
+        };
 
-		lower_layer {
-			bindings = <
-				&none &trans
-				&none  &kp A>;
-		};
-	};
+        lower_layer {
+            bindings = <
+                &none &trans
+                &none  &kp A>;
+        };
+    };
 };
diff --git a/app/tests/none/layered/native_posix_64.keymap b/app/tests/none/layered/native_posix_64.keymap
index 597ca2db..b1e84c30 100644
--- a/app/tests/none/layered/native_posix_64.keymap
+++ b/app/tests/none/layered/native_posix_64.keymap
@@ -4,5 +4,5 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_PRESS(1,0,10) ZMK_MOCK_RELEASE(1,0,10) ZMK_MOCK_RELEASE(0,1,10)>;
+    events = <ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_PRESS(1,0,10) ZMK_MOCK_RELEASE(1,0,10) ZMK_MOCK_RELEASE(0,1,10)>;
 };
\ No newline at end of file
diff --git a/app/tests/none/normal/native_posix.keymap b/app/tests/none/normal/native_posix.keymap
index cbeb61dc..502f7ccc 100644
--- a/app/tests/none/normal/native_posix.keymap
+++ b/app/tests/none/normal/native_posix.keymap
@@ -4,5 +4,5 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,10)>;
+    events = <ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,10)>;
 };
\ No newline at end of file
diff --git a/app/tests/none/normal/native_posix_64.keymap b/app/tests/none/normal/native_posix_64.keymap
index cbeb61dc..502f7ccc 100644
--- a/app/tests/none/normal/native_posix_64.keymap
+++ b/app/tests/none/normal/native_posix_64.keymap
@@ -4,5 +4,5 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,10)>;
+    events = <ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,10)>;
 };
\ No newline at end of file
diff --git a/app/tests/sticky-keys/1-os-dn-up/native_posix_64.keymap b/app/tests/sticky-keys/1-os-dn-up/native_posix_64.keymap
index 230e9566..f9612928 100644
--- a/app/tests/sticky-keys/1-os-dn-up/native_posix_64.keymap
+++ b/app/tests/sticky-keys/1-os-dn-up/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,1200)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,1200)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/sticky-keys/10-callum-mods-quick-release/native_posix_64.keymap b/app/tests/sticky-keys/10-callum-mods-quick-release/native_posix_64.keymap
index 5c1c2264..bc541824 100644
--- a/app/tests/sticky-keys/10-callum-mods-quick-release/native_posix_64.keymap
+++ b/app/tests/sticky-keys/10-callum-mods-quick-release/native_posix_64.keymap
@@ -3,38 +3,38 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 &sk {
-	quick-release;
+    quick-release;
 };
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&sk LEFT_CONTROL &kp A
-				&sk LEFT_SHIFT &sk LEFT_ALT>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &sk LEFT_CONTROL &kp A
+                &sk LEFT_SHIFT &sk LEFT_ALT>;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		/* tap sk LEFT_CONTROL */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* tap sk LEFT_SHIFT */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		/* tap sk LEFT_ALT */
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_RELEASE(1,1,10)
-		/* tap A */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* tap A (no sticky keys anymore) */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    events = <
+        /* tap sk LEFT_CONTROL */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* tap sk LEFT_SHIFT */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        /* tap sk LEFT_ALT */
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_RELEASE(1,1,10)
+        /* tap A */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* tap A (no sticky keys anymore) */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
diff --git a/app/tests/sticky-keys/10-callum-mods/native_posix_64.keymap b/app/tests/sticky-keys/10-callum-mods/native_posix_64.keymap
index 79567de9..9121b188 100644
--- a/app/tests/sticky-keys/10-callum-mods/native_posix_64.keymap
+++ b/app/tests/sticky-keys/10-callum-mods/native_posix_64.keymap
@@ -3,41 +3,41 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&sk E &sl 1
-				&kp A &kp B>;
-		};
+        default_layer {
+            bindings = <
+                &sk E &sl 1
+                &kp A &kp B>;
+        };
 
-		lower_layer {
-			bindings = <
-				&sk LEFT_CONTROL &kp X
-				&sk LEFT_SHIFT &kp Z>;
-		};
-	};
+        lower_layer {
+            bindings = <
+                &sk LEFT_CONTROL &kp X
+                &sk LEFT_SHIFT &kp Z>;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		/* press sl lower_layer */
-		ZMK_MOCK_PRESS(0,1,10)
-		/* tap sk LEFT_CONTROL */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* tap sk LEFT_SHIFT */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		/* release sl lower_layer */
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* tap A (with left control and left shift enabled) */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		/* tap A (no sticky keys anymore) */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+    events = <
+        /* press sl lower_layer */
+        ZMK_MOCK_PRESS(0,1,10)
+        /* tap sk LEFT_CONTROL */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* tap sk LEFT_SHIFT */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        /* release sl lower_layer */
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* tap A (with left control and left shift enabled) */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        /* tap A (no sticky keys anymore) */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/sticky-keys/10-sl-sl-kp/native_posix_64.keymap b/app/tests/sticky-keys/10-sl-sl-kp/native_posix_64.keymap
index e89faa93..23ceeeb6 100644
--- a/app/tests/sticky-keys/10-sl-sl-kp/native_posix_64.keymap
+++ b/app/tests/sticky-keys/10-sl-sl-kp/native_posix_64.keymap
@@ -8,58 +8,58 @@
 */
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&sl 1 &kp A
-				&none &none>;
-		};
+        default_layer {
+            bindings = <
+                &sl 1 &kp A
+                &none &none>;
+        };
 
-		layer_1 {
-			bindings = <
-				&sl 2 &none
-				&none &none>;
-		};
+        layer_1 {
+            bindings = <
+                &sl 2 &none
+                &none &none>;
+        };
 
-		layer_2 {
-			bindings = <
-				&none &kp NUM_1
-				&none &none>;
-		};
-	};
+        layer_2 {
+            bindings = <
+                &none &kp NUM_1
+                &none &none>;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		/* press sl 1 */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* press sl 2 */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* press 1 */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* press A */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
+    events = <
+        /* press sl 1 */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* press sl 2 */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* press 1 */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* press A */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
 
-		/* repeat test to check if cleanup is done correctly */
-		/* press sl 1 */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* press sl 2 */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* press 1 */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* press A */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
+        /* repeat test to check if cleanup is done correctly */
+        /* press sl 1 */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* press sl 2 */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* press 1 */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* press A */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
 
-	>;
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup-quick-release/native_posix_64.keymap b/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup-quick-release/native_posix_64.keymap
index f52a6bec..131e7069 100644
--- a/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup-quick-release/native_posix_64.keymap
+++ b/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup-quick-release/native_posix_64.keymap
@@ -4,23 +4,23 @@
 #include "../behavior_keymap.dtsi"
 
 &sk {
-	quick-release;
+    quick-release;
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		/* second key is pressed shortly after the first. It should not be capitalized. */
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(1,1,10)
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        /* second key is pressed shortly after the first. It should not be capitalized. */
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(1,1,10)
 
-		/* repeat test to check if cleanup is done correctly */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+        /* repeat test to check if cleanup is done correctly */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup/native_posix_64.keymap b/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup/native_posix_64.keymap
index 63aca99b..4a0c50c8 100644
--- a/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup/native_posix_64.keymap
+++ b/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup/native_posix_64.keymap
@@ -4,16 +4,16 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
 
-		/* repeat test to check if cleanup is done correctly */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+        /* repeat test to check if cleanup is done correctly */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/sticky-keys/2-sl-dn-up-kcdn-kcup/native_posix_64.keymap b/app/tests/sticky-keys/2-sl-dn-up-kcdn-kcup/native_posix_64.keymap
index 18d09ebc..39020751 100644
--- a/app/tests/sticky-keys/2-sl-dn-up-kcdn-kcup/native_posix_64.keymap
+++ b/app/tests/sticky-keys/2-sl-dn-up-kcdn-kcup/native_posix_64.keymap
@@ -8,45 +8,45 @@
 */
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&sk E &sl 1
-				&kp A &kp B>;
-		};
+        default_layer {
+            bindings = <
+                &sk E &sl 1
+                &kp A &kp B>;
+        };
 
-		lower_layer {
-			bindings = <
-				&sk LEFT_CONTROL &kp X
-				&kp Y  &kp Z>;
-		};
-	};
+        lower_layer {
+            bindings = <
+                &sk LEFT_CONTROL &kp X
+                &kp Y  &kp Z>;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		/* press sl 1 */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* press X */
-		ZMK_MOCK_PRESS(0,1,10)
-		/* press A */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(1,0,10)
+    events = <
+        /* press sl 1 */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* press X */
+        ZMK_MOCK_PRESS(0,1,10)
+        /* press A */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(1,0,10)
 
-		/* repeat test to check if cleanup is done correctly */
-		/* press sl 1 */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* press X */
-		ZMK_MOCK_PRESS(0,1,10)
-		/* press Y */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+        /* repeat test to check if cleanup is done correctly */
+        /* press sl 1 */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* press X */
+        ZMK_MOCK_PRESS(0,1,10)
+        /* press Y */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/sticky-keys/3a-os-dn-kcdn-kcup-up/native_posix_64.keymap b/app/tests/sticky-keys/3a-os-dn-kcdn-kcup-up/native_posix_64.keymap
index 47600269..c635dade 100644
--- a/app/tests/sticky-keys/3a-os-dn-kcdn-kcup-up/native_posix_64.keymap
+++ b/app/tests/sticky-keys/3a-os-dn-kcdn-kcup-up/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/sticky-keys/3b-os-dn-kcdn-up-kcup/native_posix_64.keymap b/app/tests/sticky-keys/3b-os-dn-kcdn-up-kcup/native_posix_64.keymap
index 2fb661a7..e629d270 100644
--- a/app/tests/sticky-keys/3b-os-dn-kcdn-up-kcup/native_posix_64.keymap
+++ b/app/tests/sticky-keys/3b-os-dn-kcdn-up-kcup/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/sticky-keys/4-os-dn-up-kcdn-timer-kcup/native_posix_64.keymap b/app/tests/sticky-keys/4-os-dn-up-kcdn-timer-kcup/native_posix_64.keymap
index 92fd1e0a..2404a582 100644
--- a/app/tests/sticky-keys/4-os-dn-up-kcdn-timer-kcup/native_posix_64.keymap
+++ b/app/tests/sticky-keys/4-os-dn-up-kcdn-timer-kcup/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,800)
-		ZMK_MOCK_PRESS(1,0,400)
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,800)
+        ZMK_MOCK_PRESS(1,0,400)
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/sticky-keys/5-os-kcdn-dn-kcup-up/native_posix_64.keymap b/app/tests/sticky-keys/5-os-kcdn-dn-kcup-up/native_posix_64.keymap
index 1daa6c4f..7cf04b7d 100644
--- a/app/tests/sticky-keys/5-os-kcdn-dn-kcup-up/native_posix_64.keymap
+++ b/app/tests/sticky-keys/5-os-kcdn-dn-kcup-up/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		ZMK_MOCK_RELEASE(0,0,1100)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        ZMK_MOCK_RELEASE(0,0,1100)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/sticky-keys/7-os-dn-up-kc1dn-kc2dn-kc1up-kc2up/native_posix_64.keymap b/app/tests/sticky-keys/7-os-dn-up-kc1dn-kc2dn-kc1up-kc2up/native_posix_64.keymap
index 1be65a5b..a22d0a5a 100644
--- a/app/tests/sticky-keys/7-os-dn-up-kc1dn-kc2dn-kc1up-kc2up/native_posix_64.keymap
+++ b/app/tests/sticky-keys/7-os-dn-up-kc1dn-kc2dn-kc1up-kc2up/native_posix_64.keymap
@@ -4,12 +4,12 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_RELEASE(1,0,100)
-		ZMK_MOCK_RELEASE(1,1,100)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_RELEASE(1,0,100)
+        ZMK_MOCK_RELEASE(1,1,100)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/sticky-keys/8-lsk-osk-combination-quick-release/native_posix_64.keymap b/app/tests/sticky-keys/8-lsk-osk-combination-quick-release/native_posix_64.keymap
index 6d88a9ea..4da4ad98 100644
--- a/app/tests/sticky-keys/8-lsk-osk-combination-quick-release/native_posix_64.keymap
+++ b/app/tests/sticky-keys/8-lsk-osk-combination-quick-release/native_posix_64.keymap
@@ -3,54 +3,54 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 &sk {
-	quick-release;
+    quick-release;
 };
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&sk LEFT_SHIFT &sl 1
-				&kp A &kp B>;
-		};
+        default_layer {
+            bindings = <
+                &sk LEFT_SHIFT &sl 1
+                &kp A &kp B>;
+        };
 
-		lower_layer {
-			bindings = <
-				&sk LEFT_CONTROL &kp X
-				&kp Y  &kp Z>;
-		};
-	};
+        lower_layer {
+            bindings = <
+                &sk LEFT_CONTROL &kp X
+                &kp Y  &kp Z>;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		/* tap sl lower_layer */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* tap sk LEFT_CONTROL */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* tap A */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		/* tap B */
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_RELEASE(1,1,10)
+    events = <
+        /* tap sl lower_layer */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* tap sk LEFT_CONTROL */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* tap A */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        /* tap B */
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_RELEASE(1,1,10)
 
-		/* tap sk LEFT_SHIFT */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* tap sl lower_layer */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* tap Y */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-		/* tap B */
-		ZMK_MOCK_PRESS(1,1,10)
-		ZMK_MOCK_RELEASE(1,1,10)
-	>;
+        /* tap sk LEFT_SHIFT */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* tap sl lower_layer */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* tap Y */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+        /* tap B */
+        ZMK_MOCK_PRESS(1,1,10)
+        ZMK_MOCK_RELEASE(1,1,10)
+    >;
 };
diff --git a/app/tests/sticky-keys/8-lsk-osk-combination/native_posix_64.keymap b/app/tests/sticky-keys/8-lsk-osk-combination/native_posix_64.keymap
index a90bb32e..d9c49014 100644
--- a/app/tests/sticky-keys/8-lsk-osk-combination/native_posix_64.keymap
+++ b/app/tests/sticky-keys/8-lsk-osk-combination/native_posix_64.keymap
@@ -3,45 +3,45 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&sk E &sl 1
-				&kp A &kp B>;
-		};
+        default_layer {
+            bindings = <
+                &sk E &sl 1
+                &kp A &kp B>;
+        };
 
-		lower_layer {
-			bindings = <
-				&sk LEFT_CONTROL &kp X
-				&kp Y  &kp Z>;
-		};
-	};
+        lower_layer {
+            bindings = <
+                &sk LEFT_CONTROL &kp X
+                &kp Y  &kp Z>;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		/* tap sl lower_layer */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* tap sk LEFT_CONTROL */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* tap A */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
+    events = <
+        /* tap sl lower_layer */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* tap sk LEFT_CONTROL */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* tap A */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
 
-		/* repeat */
-		/* tap sl */
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-		/* tap sk */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* tap A */
-		ZMK_MOCK_PRESS(1,0,10)
-		ZMK_MOCK_RELEASE(1,0,10)
-	>;
+        /* repeat */
+        /* tap sl */
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+        /* tap sk */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* tap A */
+        ZMK_MOCK_PRESS(1,0,10)
+        ZMK_MOCK_RELEASE(1,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/sticky-keys/9-sk-dn-up-dn-up/native_posix_64.keymap b/app/tests/sticky-keys/9-sk-dn-up-dn-up/native_posix_64.keymap
index f811f7e9..74678256 100644
--- a/app/tests/sticky-keys/9-sk-dn-up-dn-up/native_posix_64.keymap
+++ b/app/tests/sticky-keys/9-sk-dn-up-dn-up/native_posix_64.keymap
@@ -3,25 +3,25 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&sk LEFT_SHIFT &none
-				&none &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &sk LEFT_SHIFT &none
+                &none &none
+            >;
+        };
+    };
 };
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* the sticky key is pressed again, so the previous one must be cancelled */
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,1200)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* the sticky key is pressed again, so the previous one must be cancelled */
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,1200)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/sticky-keys/behavior_keymap.dtsi b/app/tests/sticky-keys/behavior_keymap.dtsi
index f1277009..9322cb14 100644
--- a/app/tests/sticky-keys/behavior_keymap.dtsi
+++ b/app/tests/sticky-keys/behavior_keymap.dtsi
@@ -3,20 +3,20 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&sk E &mo 1
-				&kp A &kp B>;
-		};
+        default_layer {
+            bindings = <
+                &sk E &mo 1
+                &kp A &kp B>;
+        };
 
-		lower_layer {
-			bindings = <
-				&sk LEFT_CONTROL &kp X
-				&kp Y  &kp Z>;
-		};
-	};
+        lower_layer {
+            bindings = <
+                &sk LEFT_CONTROL &kp X
+                &kp Y  &kp Z>;
+        };
+    };
 };
diff --git a/app/tests/tap-dance/1a-tap1/native_posix_64.keymap b/app/tests/tap-dance/1a-tap1/native_posix_64.keymap
index 1e5dff06..4e65cfa1 100644
--- a/app/tests/tap-dance/1a-tap1/native_posix_64.keymap
+++ b/app/tests/tap-dance/1a-tap1/native_posix_64.keymap
@@ -4,8 +4,8 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,200)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,200)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/tap-dance/1b-tap2/native_posix_64.keymap b/app/tests/tap-dance/1b-tap2/native_posix_64.keymap
index 5674c4ea..47fa8c33 100644
--- a/app/tests/tap-dance/1b-tap2/native_posix_64.keymap
+++ b/app/tests/tap-dance/1b-tap2/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+    events = <
         ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,200)
-	>;
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,200)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/tap-dance/1c-tap3/native_posix_64.keymap b/app/tests/tap-dance/1c-tap3/native_posix_64.keymap
index 142b8236..6b01dfff 100644
--- a/app/tests/tap-dance/1c-tap3/native_posix_64.keymap
+++ b/app/tests/tap-dance/1c-tap3/native_posix_64.keymap
@@ -4,12 +4,12 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+    events = <
         ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
         ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,200)
-	>;
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,200)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/tap-dance/2a-hold1/native_posix_64.keymap b/app/tests/tap-dance/2a-hold1/native_posix_64.keymap
index bcfc21d2..c16f875b 100644
--- a/app/tests/tap-dance/2a-hold1/native_posix_64.keymap
+++ b/app/tests/tap-dance/2a-hold1/native_posix_64.keymap
@@ -4,8 +4,8 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,400)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/tap-dance/2b-hold2/native_posix_64.keymap b/app/tests/tap-dance/2b-hold2/native_posix_64.keymap
index 6691437e..49948886 100644
--- a/app/tests/tap-dance/2b-hold2/native_posix_64.keymap
+++ b/app/tests/tap-dance/2b-hold2/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
         ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/tap-dance/2c-hold3/native_posix_64.keymap b/app/tests/tap-dance/2c-hold3/native_posix_64.keymap
index 942ecfc0..7bedd650 100644
--- a/app/tests/tap-dance/2c-hold3/native_posix_64.keymap
+++ b/app/tests/tap-dance/2c-hold3/native_posix_64.keymap
@@ -4,12 +4,12 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+    events = <
         ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
         ZMK_MOCK_PRESS(0,0,400)
-		ZMK_MOCK_RELEASE(0,0,10)
-	>;
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/tap-dance/3a-tap-int-mid/native_posix_64.keymap b/app/tests/tap-dance/3a-tap-int-mid/native_posix_64.keymap
index 8a62430c..903b9a88 100644
--- a/app/tests/tap-dance/3a-tap-int-mid/native_posix_64.keymap
+++ b/app/tests/tap-dance/3a-tap-int-mid/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10)
+    events = <
+        ZMK_MOCK_PRESS(1,0,10)
         ZMK_MOCK_PRESS(0,1,10)
         ZMK_MOCK_RELEASE(0,1,10)
         ZMK_MOCK_RELEASE(1,0,10)
-	>;
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/tap-dance/3b-tap-int-seq/native_posix_64.keymap b/app/tests/tap-dance/3b-tap-int-seq/native_posix_64.keymap
index 4a76bdb0..7d10b715 100644
--- a/app/tests/tap-dance/3b-tap-int-seq/native_posix_64.keymap
+++ b/app/tests/tap-dance/3b-tap-int-seq/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10)
+    events = <
+        ZMK_MOCK_PRESS(1,0,10)
         ZMK_MOCK_PRESS(0,1,10)
         ZMK_MOCK_RELEASE(1,0,10)
         ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/tap-dance/3c-tap-int-after/native_posix_64.keymap b/app/tests/tap-dance/3c-tap-int-after/native_posix_64.keymap
index e1b6d979..571a877f 100644
--- a/app/tests/tap-dance/3c-tap-int-after/native_posix_64.keymap
+++ b/app/tests/tap-dance/3c-tap-int-after/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10)
+    events = <
+        ZMK_MOCK_PRESS(1,0,10)
         ZMK_MOCK_RELEASE(1,0,10)
         ZMK_MOCK_PRESS(0,1,10)
         ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/tap-dance/3d-hold-int-mid/native_posix_64.keymap b/app/tests/tap-dance/3d-hold-int-mid/native_posix_64.keymap
index 55a98d36..0220977a 100644
--- a/app/tests/tap-dance/3d-hold-int-mid/native_posix_64.keymap
+++ b/app/tests/tap-dance/3d-hold-int-mid/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,400)
+    events = <
+        ZMK_MOCK_PRESS(0,0,400)
         ZMK_MOCK_PRESS(0,1,10)
         ZMK_MOCK_RELEASE(0,1,10)
         ZMK_MOCK_RELEASE(0,0,10)
-	>;
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/tap-dance/3e-hold-int-seq/native_posix_64.keymap b/app/tests/tap-dance/3e-hold-int-seq/native_posix_64.keymap
index b31e92dc..58595291 100644
--- a/app/tests/tap-dance/3e-hold-int-seq/native_posix_64.keymap
+++ b/app/tests/tap-dance/3e-hold-int-seq/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,400)
+    events = <
+        ZMK_MOCK_PRESS(0,0,400)
         ZMK_MOCK_PRESS(0,1,10)
         ZMK_MOCK_RELEASE(0,0,10)
         ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/tap-dance/3f-hold-int-after/native_posix_64.keymap b/app/tests/tap-dance/3f-hold-int-after/native_posix_64.keymap
index 6397fbb3..78770b13 100644
--- a/app/tests/tap-dance/3f-hold-int-after/native_posix_64.keymap
+++ b/app/tests/tap-dance/3f-hold-int-after/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,400)
+    events = <
+        ZMK_MOCK_PRESS(0,0,400)
         ZMK_MOCK_RELEASE(0,0,10)
         ZMK_MOCK_PRESS(0,1,10)
         ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/tap-dance/4a-single/native_posix_64.keymap b/app/tests/tap-dance/4a-single/native_posix_64.keymap
index 348a6827..d473a7d2 100644
--- a/app/tests/tap-dance/4a-single/native_posix_64.keymap
+++ b/app/tests/tap-dance/4a-single/native_posix_64.keymap
@@ -4,8 +4,8 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,1,10)
-		ZMK_MOCK_RELEASE(0,1,10)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/tap-dance/5a-tdint-mid/native_posix_64.keymap b/app/tests/tap-dance/5a-tdint-mid/native_posix_64.keymap
index 2188fd02..79bdf2f7 100644
--- a/app/tests/tap-dance/5a-tdint-mid/native_posix_64.keymap
+++ b/app/tests/tap-dance/5a-tdint-mid/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10)
+    events = <
+        ZMK_MOCK_PRESS(1,0,10)
         ZMK_MOCK_PRESS(1,1,10)
         ZMK_MOCK_RELEASE(1,1,10)
         ZMK_MOCK_RELEASE(1,0,200)
-	>;
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/tap-dance/5b-tdint-seq/native_posix_64.keymap b/app/tests/tap-dance/5b-tdint-seq/native_posix_64.keymap
index 320b7199..012d932d 100644
--- a/app/tests/tap-dance/5b-tdint-seq/native_posix_64.keymap
+++ b/app/tests/tap-dance/5b-tdint-seq/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10)
+    events = <
+        ZMK_MOCK_PRESS(1,0,10)
         ZMK_MOCK_PRESS(1,1,10)
         ZMK_MOCK_RELEASE(1,0,10)
         ZMK_MOCK_RELEASE(1,1,200)
-	>;
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/tap-dance/5c-tdint-after/native_posix_64.keymap b/app/tests/tap-dance/5c-tdint-after/native_posix_64.keymap
index 17e538bd..fea96a56 100644
--- a/app/tests/tap-dance/5c-tdint-after/native_posix_64.keymap
+++ b/app/tests/tap-dance/5c-tdint-after/native_posix_64.keymap
@@ -4,10 +4,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10)
+    events = <
+        ZMK_MOCK_PRESS(1,0,10)
         ZMK_MOCK_RELEASE(1,0,10)
         ZMK_MOCK_PRESS(1,1,10)
         ZMK_MOCK_RELEASE(1,1,200)
-	>;
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/tap-dance/5d-tdint-multiple/native_posix_64.keymap b/app/tests/tap-dance/5d-tdint-multiple/native_posix_64.keymap
index 150f6d05..f98be05f 100644
--- a/app/tests/tap-dance/5d-tdint-multiple/native_posix_64.keymap
+++ b/app/tests/tap-dance/5d-tdint-multiple/native_posix_64.keymap
@@ -4,12 +4,12 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(1,0,10)
+    events = <
+        ZMK_MOCK_PRESS(1,0,10)
         ZMK_MOCK_RELEASE(1,0,10)
         ZMK_MOCK_PRESS(1,1,10)
         ZMK_MOCK_RELEASE(1,1,10)
         ZMK_MOCK_PRESS(1,0,10)
         ZMK_MOCK_RELEASE(1,0,200)
-	>;
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/tap-dance/6-combo-tap2/native_posix_64.keymap b/app/tests/tap-dance/6-combo-tap2/native_posix_64.keymap
index 72b6744a..a8a82fd9 100644
--- a/app/tests/tap-dance/6-combo-tap2/native_posix_64.keymap
+++ b/app/tests/tap-dance/6-combo-tap2/native_posix_64.keymap
@@ -4,14 +4,14 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-	ZMK_MOCK_PRESS(0,0,10)
-	ZMK_MOCK_PRESS(0,1,10)
-	ZMK_MOCK_RELEASE(0,0,10)
-	ZMK_MOCK_RELEASE(0,1,10)
-	ZMK_MOCK_PRESS(0,0,10)
-	ZMK_MOCK_PRESS(0,1,10)
-	ZMK_MOCK_RELEASE(0,0,10)
-	ZMK_MOCK_RELEASE(0,1,200)
-	>;
+    events = <
+    ZMK_MOCK_PRESS(0,0,10)
+    ZMK_MOCK_PRESS(0,1,10)
+    ZMK_MOCK_RELEASE(0,0,10)
+    ZMK_MOCK_RELEASE(0,1,10)
+    ZMK_MOCK_PRESS(0,0,10)
+    ZMK_MOCK_PRESS(0,1,10)
+    ZMK_MOCK_RELEASE(0,0,10)
+    ZMK_MOCK_RELEASE(0,1,200)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/to-layer/behavior_keymap.dtsi b/app/tests/to-layer/behavior_keymap.dtsi
index 81e7e809..663e897d 100644
--- a/app/tests/to-layer/behavior_keymap.dtsi
+++ b/app/tests/to-layer/behavior_keymap.dtsi
@@ -3,20 +3,20 @@
 #include <dt-bindings/zmk/kscan-mock.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&to 0  &to 1
-				&kp A &kp S>;
-		};
+        default_layer {
+            bindings = <
+                &to 0  &to 1
+                &kp A &kp S>;
+        };
 
-		second_layer {
-			bindings = <
-				&to 0 &to 1
-				&kp J  &kp K>;
-		};
-	};
+        second_layer {
+            bindings = <
+                &to 0 &to 1
+                &kp J  &kp K>;
+        };
+    };
 };
diff --git a/app/tests/to-layer/normal/native_posix_64.keymap b/app/tests/to-layer/normal/native_posix_64.keymap
index 056341f7..4cb23809 100644
--- a/app/tests/to-layer/normal/native_posix_64.keymap
+++ b/app/tests/to-layer/normal/native_posix_64.keymap
@@ -11,19 +11,19 @@
 // To layer 0 -- does nothing
 
 &kscan {
-	events = <ZMK_MOCK_PRESS(1,1,10)
-			  ZMK_MOCK_RELEASE(1,1,10)
-			  ZMK_MOCK_PRESS(0,1,10)
-			  ZMK_MOCK_RELEASE(0,1,10)
-			  ZMK_MOCK_PRESS(1,1,10)
-			  ZMK_MOCK_RELEASE(1,1,10)
-			  ZMK_MOCK_PRESS(0,0,10)
-			  ZMK_MOCK_RELEASE(0,0,10)
-			  ZMK_MOCK_PRESS(1,1,10)
-			  ZMK_MOCK_RELEASE(1,1,10)
-			  ZMK_MOCK_PRESS(0,0,10)
-			  ZMK_MOCK_RELEASE(0,0,10)
-			  ZMK_MOCK_PRESS(0,1,10)
-			  ZMK_MOCK_RELEASE(0,1,10)
-			>;
+    events = <ZMK_MOCK_PRESS(1,1,10)
+              ZMK_MOCK_RELEASE(1,1,10)
+              ZMK_MOCK_PRESS(0,1,10)
+              ZMK_MOCK_RELEASE(0,1,10)
+              ZMK_MOCK_PRESS(1,1,10)
+              ZMK_MOCK_RELEASE(1,1,10)
+              ZMK_MOCK_PRESS(0,0,10)
+              ZMK_MOCK_RELEASE(0,0,10)
+              ZMK_MOCK_PRESS(1,1,10)
+              ZMK_MOCK_RELEASE(1,1,10)
+              ZMK_MOCK_PRESS(0,0,10)
+              ZMK_MOCK_RELEASE(0,0,10)
+              ZMK_MOCK_PRESS(0,1,10)
+              ZMK_MOCK_RELEASE(0,1,10)
+            >;
 };
\ No newline at end of file
diff --git a/app/tests/toggle-layer/behavior_keymap.dtsi b/app/tests/toggle-layer/behavior_keymap.dtsi
index b9c0d4a4..1ecf8599 100644
--- a/app/tests/toggle-layer/behavior_keymap.dtsi
+++ b/app/tests/toggle-layer/behavior_keymap.dtsi
@@ -3,26 +3,26 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp B &tog 1
-				&kp D &kp G>;
-		};
+        default_layer {
+            bindings = <
+                &kp B &tog 1
+                &kp D &kp G>;
+        };
 
-		lower_layer {
-			bindings = <
-				&kp C_NEXT &trans
-				&kp L  &kp J>;
-		};
+        lower_layer {
+            bindings = <
+                &kp C_NEXT &trans
+                &kp L  &kp J>;
+        };
 
-		raise_layer {
-			bindings = <
-				&kp W &kp U
-				&kp X  &kp M>;
-		};
-	};
+        raise_layer {
+            bindings = <
+                &kp W &kp U
+                &kp X  &kp M>;
+        };
+    };
 };
diff --git a/app/tests/toggle-layer/early-key-release/native_posix_64.keymap b/app/tests/toggle-layer/early-key-release/native_posix_64.keymap
index 6c293390..0a0c88ea 100644
--- a/app/tests/toggle-layer/early-key-release/native_posix_64.keymap
+++ b/app/tests/toggle-layer/early-key-release/native_posix_64.keymap
@@ -4,6 +4,6 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_RELEASE(0,0,10) ZMK_MOCK_RELEASE(0,1,10)
-		ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,10)>;
+    events = <ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_RELEASE(0,0,10) ZMK_MOCK_RELEASE(0,1,10)
+        ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,10)>;
 };
\ No newline at end of file
diff --git a/app/tests/toggle-layer/normal/native_posix_64.keymap b/app/tests/toggle-layer/normal/native_posix_64.keymap
index 9df9d649..97bdd179 100644
--- a/app/tests/toggle-layer/normal/native_posix_64.keymap
+++ b/app/tests/toggle-layer/normal/native_posix_64.keymap
@@ -4,5 +4,5 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_RELEASE(0,1,10) ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,10)>;
+    events = <ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_RELEASE(0,1,10) ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,10)>;
 };
\ No newline at end of file
diff --git a/app/tests/transparent/behavior_keymap.dtsi b/app/tests/transparent/behavior_keymap.dtsi
index 2a7e783a..dd5ded90 100644
--- a/app/tests/transparent/behavior_keymap.dtsi
+++ b/app/tests/transparent/behavior_keymap.dtsi
@@ -3,20 +3,20 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&trans &mo 1
-				&kp A &none>;
-		};
+        default_layer {
+            bindings = <
+                &trans &mo 1
+                &kp A &none>;
+        };
 
-		lower_layer {
-			bindings = <
-				&trans &trans
-				&trans  &kp A>;
-		};
-	};
+        lower_layer {
+            bindings = <
+                &trans &trans
+                &trans  &kp A>;
+        };
+    };
 };
diff --git a/app/tests/transparent/layered/native_posix_64.keymap b/app/tests/transparent/layered/native_posix_64.keymap
index 597ca2db..b1e84c30 100644
--- a/app/tests/transparent/layered/native_posix_64.keymap
+++ b/app/tests/transparent/layered/native_posix_64.keymap
@@ -4,5 +4,5 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_PRESS(1,0,10) ZMK_MOCK_RELEASE(1,0,10) ZMK_MOCK_RELEASE(0,1,10)>;
+    events = <ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_PRESS(1,0,10) ZMK_MOCK_RELEASE(1,0,10) ZMK_MOCK_RELEASE(0,1,10)>;
 };
\ No newline at end of file
diff --git a/app/tests/transparent/normal/native_posix_64.keymap b/app/tests/transparent/normal/native_posix_64.keymap
index cbeb61dc..502f7ccc 100644
--- a/app/tests/transparent/normal/native_posix_64.keymap
+++ b/app/tests/transparent/normal/native_posix_64.keymap
@@ -4,5 +4,5 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,10)>;
+    events = <ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,10)>;
 };
\ No newline at end of file
diff --git a/app/tests/wpm/1-single_keypress/native_posix_64.keymap b/app/tests/wpm/1-single_keypress/native_posix_64.keymap
index 2aa52c16..2b113409 100644
--- a/app/tests/wpm/1-single_keypress/native_posix_64.keymap
+++ b/app/tests/wpm/1-single_keypress/native_posix_64.keymap
@@ -1,10 +1,10 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		/* Wait for the worker to trigger and reset after 5 seconds, followed by a 0 at 6 seconds */
-		ZMK_MOCK_PRESS(0,0,6000)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        /* Wait for the worker to trigger and reset after 5 seconds, followed by a 0 at 6 seconds */
+        ZMK_MOCK_PRESS(0,0,6000)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/wpm/2-multiple_keypress/native_posix_64.keymap b/app/tests/wpm/2-multiple_keypress/native_posix_64.keymap
index 3cfab946..869a5208 100644
--- a/app/tests/wpm/2-multiple_keypress/native_posix_64.keymap
+++ b/app/tests/wpm/2-multiple_keypress/native_posix_64.keymap
@@ -1,15 +1,15 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <
-		ZMK_MOCK_PRESS(0,0,10)
-		ZMK_MOCK_RELEASE(0,0,10)
-		//1st WPM worker call - 12wpm - 1 key press in 1 second
-		ZMK_MOCK_PRESS(0,0,1000)
-		ZMK_MOCK_RELEASE(0,0,10)
-		// 2nd WPM worker call - 12wpm - 2 key press in 2 second
-		// note there is no event for this as WPM hasn't changed
-		// 3rd WPM worker call - 8wpm - 2 key press in 3 seconds
-		ZMK_MOCK_PRESS(0,0,2000)
-	>;
+    events = <
+        ZMK_MOCK_PRESS(0,0,10)
+        ZMK_MOCK_RELEASE(0,0,10)
+        //1st WPM worker call - 12wpm - 1 key press in 1 second
+        ZMK_MOCK_PRESS(0,0,1000)
+        ZMK_MOCK_RELEASE(0,0,10)
+        // 2nd WPM worker call - 12wpm - 2 key press in 2 second
+        // note there is no event for this as WPM hasn't changed
+        // 3rd WPM worker call - 8wpm - 2 key press in 3 seconds
+        ZMK_MOCK_PRESS(0,0,2000)
+    >;
 };
\ No newline at end of file
diff --git a/app/tests/wpm/behavior_keymap.dtsi b/app/tests/wpm/behavior_keymap.dtsi
index f0c5d0c2..52f9421c 100644
--- a/app/tests/wpm/behavior_keymap.dtsi
+++ b/app/tests/wpm/behavior_keymap.dtsi
@@ -3,15 +3,15 @@
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
 
-		default_layer {
-			bindings = <
-				&kp B &none
-				&none &none
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &kp B &none
+                &none &none
+            >;
+        };
+    };
 };
diff --git a/docs/blog/2020-10-03-bootloader-fix.md b/docs/blog/2020-10-03-bootloader-fix.md
index 8a9fd7f8..ec1d7b0b 100644
--- a/docs/blog/2020-10-03-bootloader-fix.md
+++ b/docs/blog/2020-10-03-bootloader-fix.md
@@ -175,19 +175,19 @@ do is shift back the settings area and code space `0xC000` bytes. We'll apply
 this to all of the `.dts` files for the boards that were affected by this issue.
 
 ```diff
-		code_partition: partition@26000 {
-			label = "code_partition";
--			reg = <0x00026000 0x000d2000>;
-+			reg = <0x00026000 0x000c6000>;
-		};
+        code_partition: partition@26000 {
+            label = "code_partition";
+-           reg = <0x00026000 0x000d2000>;
++           reg = <0x00026000 0x000c6000>;
+        };
 
 
--		storage_partition: partition@f8000 {
-+		storage_partition: partition@ec000 {
-			label = "storage";
--			reg = <0x000f8000 0x00008000>;
-+			reg = <0x000ec000 0x00008000>;
-		};
+-       storage_partition: partition@f8000 {
++       storage_partition: partition@ec000 {
+            label = "storage";
+-           reg = <0x000f8000 0x00008000>;
++           reg = <0x000ec000 0x00008000>;
+        };
 ```
 
 And with those changes, we should no longer run into this issue! In the process
diff --git a/docs/docs/behaviors/hold-tap.md b/docs/docs/behaviors/hold-tap.md
index f267e4a4..f0096606 100644
--- a/docs/docs/behaviors/hold-tap.md
+++ b/docs/docs/behaviors/hold-tap.md
@@ -57,14 +57,14 @@ For example, the following hold-tap configuration enables `global-quick-tap` wit
 
 ```
 gqt: global-quick-tap {
-	compatible = "zmk,behavior-hold-tap";
-	label = "GLOBAL_QUICK_TAP";
-	#binding-cells = <2>;
-	flavor = "tap-preferred";
-	tapping-term-ms = <200>;
-	quick-tap-ms = <125>;
-	global-quick-tap;
-	bindings = <&kp>, <&kp>;
+    compatible = "zmk,behavior-hold-tap";
+    label = "GLOBAL_QUICK_TAP";
+    #binding-cells = <2>;
+    flavor = "tap-preferred";
+    tapping-term-ms = <200>;
+    quick-tap-ms = <125>;
+    global-quick-tap;
+    bindings = <&kp>, <&kp>;
 };
 ```
 
@@ -80,7 +80,7 @@ For example, if you press `&mt LEFT_SHIFT A` and then release it without pressin
 
 ```
 &mt {
-	retro-tap;
+    retro-tap;
 };
 ```
 
@@ -101,28 +101,28 @@ See the following example, which uses a hold-tap behavior definition, configured
 #include <behaviors.dtsi>
 
 / {
-	behaviors {
-		pht: positional_hold_tap {
-			compatible = "zmk,behavior-hold-tap";
-			label = "POSITIONAL_HOLD_TAP";
-			#binding-cells = <2>;
-			flavor = "hold-preferred";
-			tapping-term-ms = <400>;
-			quick-tap-ms = <200>;
-			bindings = <&kp>, <&kp>;
-			hold-trigger-key-positions = <1>;    // <---[[the W key]]
-		};
-	};
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
-		default_layer {
-			bindings = <
-				//  position 0         position 1       position 2
-				&pht LEFT_SHIFT Q        &kp W            &kp E
-			>;
-		};
-	};
+    behaviors {
+        pht: positional_hold_tap {
+            compatible = "zmk,behavior-hold-tap";
+            label = "POSITIONAL_HOLD_TAP";
+            #binding-cells = <2>;
+            flavor = "hold-preferred";
+            tapping-term-ms = <400>;
+            quick-tap-ms = <200>;
+            bindings = <&kp>, <&kp>;
+            hold-trigger-key-positions = <1>;    // <---[[the W key]]
+        };
+    };
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
+        default_layer {
+            bindings = <
+                //  position 0         position 1       position 2
+                &pht LEFT_SHIFT Q        &kp W            &kp E
+            >;
+        };
+    };
 };
 ```
 
@@ -154,28 +154,28 @@ The following are suggested hold-tap configurations that work well with home row
 #include <behaviors.dtsi>
 
 / {
-	behaviors {
-		lh_pht: left_hand_positional_hold_tap {
-			compatible = "zmk,behavior-hold-tap";
-			label = "LEFT_POSITIONAL_HOLD_TAP";
-			#binding-cells = <2>;
-			flavor = "tap-unless-interrupted";
-			tapping-term-ms = <100>;                        // <---[[produces tap if held longer than tapping-term-ms]]
-			quick-tap-ms = <200>;
-			bindings = <&kp>, <&kp>;
-			hold-trigger-key-positions = <5 6 7 8 9 10>;    // <---[[right-hand keys]]
-		};
-	};
+    behaviors {
+        lh_pht: left_hand_positional_hold_tap {
+            compatible = "zmk,behavior-hold-tap";
+            label = "LEFT_POSITIONAL_HOLD_TAP";
+            #binding-cells = <2>;
+            flavor = "tap-unless-interrupted";
+            tapping-term-ms = <100>;                        // <---[[produces tap if held longer than tapping-term-ms]]
+            quick-tap-ms = <200>;
+            bindings = <&kp>, <&kp>;
+            hold-trigger-key-positions = <5 6 7 8 9 10>;    // <---[[right-hand keys]]
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		default_layer {
-			bindings = <
-				// position 0     pos 1             pos 2             pos 3             pos 4    pos 5    pos 6    pos 7    pos 8    pos 9    pos 10
-				&lh_pht LSFT A    &lh_pht LGUI S    &lh_pht LALT D    &lh_pht LCTL F    &kp G    &kp H    &kp I    &kp J    &kp K    &kp L    &kp SEMI
-			>;
-		};
-	};
+    keymap {
+        compatible = "zmk,keymap";
+        default_layer {
+            bindings = <
+                // position 0     pos 1             pos 2             pos 3             pos 4    pos 5    pos 6    pos 7    pos 8    pos 9    pos 10
+                &lh_pht LSFT A    &lh_pht LGUI S    &lh_pht LALT D    &lh_pht LCTL F    &kp G    &kp H    &kp I    &kp J    &kp K    &kp L    &kp SEMI
+            >;
+        };
+    };
 };
 ```
 
@@ -186,26 +186,26 @@ The following are suggested hold-tap configurations that work well with home row
 #include <dt-bindings/zmk/keys.h>
 
 / {
-	behaviors {
-		hm: homerow_mods {
-			compatible = "zmk,behavior-hold-tap";
-			label = "HOMEROW_MODS";
-			#binding-cells = <2>;
-			tapping-term-ms = <150>;
-			quick-tap-ms = <0>;
-			flavor = "tap-preferred";
-			bindings = <&kp>, <&kp>;
-		};
-	};
+    behaviors {
+        hm: homerow_mods {
+            compatible = "zmk,behavior-hold-tap";
+            label = "HOMEROW_MODS";
+            #binding-cells = <2>;
+            tapping-term-ms = <150>;
+            quick-tap-ms = <0>;
+            flavor = "tap-preferred";
+            bindings = <&kp>, <&kp>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		default_layer {
-			bindings = <
-	            &hm LCTRL A &hm LGUI S &hm LALT D &hm LSHIFT F
-			>;
-		};
-	};
+    keymap {
+        compatible = "zmk,keymap";
+        default_layer {
+            bindings = <
+                &hm LCTRL A &hm LGUI S &hm LALT D &hm LSHIFT F
+            >;
+        };
+    };
 };
 ```
 
@@ -216,26 +216,26 @@ The following are suggested hold-tap configurations that work well with home row
 #include <dt-bindings/zmk/keys.h>
 
 / {
-	behaviors {
-		bhm: balanced_homerow_mods {
-			compatible = "zmk,behavior-hold-tap";
-			label = "HOMEROW_MODS";
-			#binding-cells = <2>;
-			tapping-term-ms = <200>;    // <---[[moderate duration]]
-			quick-tap-ms = <0>;
-			flavor = "balanced";
-			bindings = <&kp>, <&kp>;
-		};
-	};
+    behaviors {
+        bhm: balanced_homerow_mods {
+            compatible = "zmk,behavior-hold-tap";
+            label = "HOMEROW_MODS";
+            #binding-cells = <2>;
+            tapping-term-ms = <200>;    // <---[[moderate duration]]
+            quick-tap-ms = <0>;
+            flavor = "balanced";
+            bindings = <&kp>, <&kp>;
+        };
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
-		default_layer {
-			bindings = <
-	            &bhm LCTRL A &bhm LGUI S &bhm LALT D &bhm LSHIFT F
-			>;
-		};
-	};
+    keymap {
+        compatible = "zmk,keymap";
+        default_layer {
+            bindings = <
+                &bhm LCTRL A &bhm LGUI S &bhm LALT D &bhm LSHIFT F
+            >;
+        };
+    };
 };
 ```
 
@@ -264,14 +264,14 @@ A popular method of implementing Autoshift in ZMK involves a C-preprocessor macr
         };
     };
 
-	keymap {
-		compatible = "zmk,keymap";
-		default_layer {
-			bindings = <
-	            AS(Q) AS(W) AS(E) AS(R) AS(T) AS(Y) // Autoshift applied for QWERTY keys
-			>;
-		};
-	};
+    keymap {
+        compatible = "zmk,keymap";
+        default_layer {
+            bindings = <
+                AS(Q) AS(W) AS(E) AS(R) AS(T) AS(Y) // Autoshift applied for QWERTY keys
+            >;
+        };
+    };
 };
 ```
 
@@ -300,14 +300,14 @@ This hold-tap example implements a [momentary-layer](layers.md/#momentary-layer)
     };
 
     keymap {
-		compatible = "zmk,keymap";
-		default_layer {
-			bindings = <
-				&mo_tog 2 1     // &mo 2 on hold, &tog 1 on tap
-				MO_TOG(3)       // &mo 3 on hold, &tog 3 on tap
-			>;
-		};
-	};
+        compatible = "zmk,keymap";
+        default_layer {
+            bindings = <
+                &mo_tog 2 1     // &mo 2 on hold, &tog 1 on tap
+                MO_TOG(3)       // &mo 3 on hold, &tog 3 on tap
+            >;
+        };
+    };
 };
 ```
 
diff --git a/docs/docs/behaviors/layers.md b/docs/docs/behaviors/layers.md
index 0818aaae..cf793089 100644
--- a/docs/docs/behaviors/layers.md
+++ b/docs/docs/behaviors/layers.md
@@ -105,29 +105,29 @@ Example:
 #define NONE 0
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
-			bindings = <
+        default_layer {
+            bindings = <
                 &tog NAVI       &kp KP_DIVIDE   &kp KP_MULTIPLY &kp KP_MINUS
                 &kp NUMBER_7    &kp NUMBER_8    &kp NUMBER_9    &kp KP_PLUS
                 &kp NUMBER_4    &kp NUMBER_5    &kp NUMBER_6    &kp KP_PLUS
                 &kp NUMBER_1    &kp NUMBER_2    &kp NUMBER_3    &kp RETURN
                 &kp NUMBER_0    &kp NUMBER_0    &kp DOT         &kp RETURN
-			>;
-		};
+            >;
+        };
 
-		nav_layer {
-			bindings = <
+        nav_layer {
+            bindings = <
                 &tog NAVI       &kp KP_DIVIDE   &kp KP_MULTIPLY &kp KP_MINUS
                 &kp HOME        &kp UP          &kp PAGE_UP     &kp KP_PLUS
                 &kp LEFT        &none           &kp RIGHT       &kp KP_PLUS
                 &kp END         &kp DOWN        &kp PAGE_DOWN   &kp RETURN
                 &kp INSERT      &kp INSERT      &kp DEL         &kp RETURN
             >;
-		};
-	};
+        };
+    };
 };
 ```
 
diff --git a/docs/docs/behaviors/tap-dance.md b/docs/docs/behaviors/tap-dance.md
index 65d5e765..c68b51dc 100644
--- a/docs/docs/behaviors/tap-dance.md
+++ b/docs/docs/behaviors/tap-dance.md
@@ -42,25 +42,25 @@ This example configures a tap-dance named `td0` that outputs the number of times
 #include <dt-bindings/zmk/keys.h>
 
 / {
-	behaviors {
-		td0: tap_dance_0 {
+    behaviors {
+        td0: tap_dance_0 {
             compatible = "zmk,behavior-tap-dance";
             label = "TAP_DANCE_0";
             #binding-cells = <0>;
             tapping-term-ms = <200>;
             bindings = <&kp N1>, <&kp N2>, <&kp N3>;
         };
-	};
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
-			bindings = <
-	            &td0
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &td0
+            >;
+        };
+    };
 };
 ```
 
@@ -83,25 +83,25 @@ This example configures a mod-tap inside a tap-dance named `td_mt` that outputs
 #include <dt-bindings/zmk/keys.h>
 
 / {
-	behaviors {
-		td_mt: tap_dance_mod_tap {
+    behaviors {
+        td_mt: tap_dance_mod_tap {
             compatible = "zmk,behavior-tap-dance";
             label = "TAP_DANCE_MOD_TAP";
             #binding-cells = <0>;
             tapping-term-ms = <200>;
             bindings = <&mt LSHIFT CAPSLOCK>, <&kp LCTRL>;
         };
-	};
+    };
 
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
-			bindings = <
-	            &td_mt
-			>;
-		};
-	};
+        default_layer {
+            bindings = <
+                &td_mt
+            >;
+        };
+    };
 };
 ```
 
diff --git a/docs/docs/config/index.md b/docs/docs/config/index.md
index 51fd45b7..1ff1bfa0 100644
--- a/docs/docs/config/index.md
+++ b/docs/docs/config/index.md
@@ -116,14 +116,14 @@ Devicetree files look like this:
 
 ```devicetree
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
-	};
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
+    };
 };
 ```
 
@@ -167,9 +167,9 @@ If the node you want to edit doesn't have a label, you can also write a new tree
 
 ```devicetree
 / {
-	kscan {
-		debounce-press-ms = <0>;
-	};
+    kscan {
+        debounce-press-ms = <0>;
+    };
 };
 ```
 
@@ -244,7 +244,7 @@ Example:
 some-gpios =
     <&gpio0 0 GPIO_ACTIVE_HIGH>,
     <&gpio0 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-	;
+    ;
 ```
 
 #### path
diff --git a/docs/docs/development/new-behavior.md b/docs/docs/development/new-behavior.md
index 6d026f2b..0d70aa3b 100644
--- a/docs/docs/development/new-behavior.md
+++ b/docs/docs/development/new-behavior.md
@@ -367,15 +367,15 @@ For the purpose of this section, we will discuss the structure of `app/dts/behav
 #include <dt-bindings/zmk/keys.h>
 
 / {
-	behaviors {
-		/omit-if-no-ref/ gresc: grave_escape {
-			compatible = "zmk,behavior-mod-morph";
-			label = "GRAVE_ESCAPE";
-			#binding-cells = <0>;
-			bindings = <&kp ESC>, <&kp GRAVE>;
+    behaviors {
+        /omit-if-no-ref/ gresc: grave_escape {
+            compatible = "zmk,behavior-mod-morph";
+            label = "GRAVE_ESCAPE";
+            #binding-cells = <0>;
+            bindings = <&kp ESC>, <&kp GRAVE>;
             mods = <(MOD_LGUI|MOD_LSFT|MOD_RGUI|MOD_RSFT)>;
-		};
-	};
+        };
+    };
 };
 ```
 
diff --git a/docs/docs/development/new-shield.md b/docs/docs/development/new-shield.md
index 62d71f03..18616923 100644
--- a/docs/docs/development/new-shield.md
+++ b/docs/docs/development/new-shield.md
@@ -55,7 +55,7 @@ The `Kconfig.shield` file defines any additional Kconfig settings that may be re
 
 ```
 config SHIELD_MY_BOARD
-	def_bool $(shields_list_contains,my_board)
+    def_bool $(shields_list_contains,my_board)
 ```
 
 This will make sure that a new configuration value named `SHIELD_MY_BOARD` is set to true whenever `my_board` is used as the shield name, either as the `SHIELD` variable [in a local build](build-flash.md) or in your `build.yaml` file [when using Github Actions](../customization). Note that this configuration value will be used in `Kconfig.defconfig` to set other properties about your shield, so make sure that they match.
@@ -64,10 +64,10 @@ This will make sure that a new configuration value named `SHIELD_MY_BOARD` is se
 
 ```
 config SHIELD_MY_BOARD_LEFT
-	def_bool $(shields_list_contains,my_board_left)
+    def_bool $(shields_list_contains,my_board_left)
 
 config SHIELD_MY_BOARD_RIGHT
-	def_bool $(shields_list_contains,my_board_right)
+    def_bool $(shields_list_contains,my_board_right)
 ```
 
 ### Kconfig.defconfig
@@ -87,7 +87,7 @@ The keyboard name must be less than or equal to 16 characters in length, otherwi
 if SHIELD_MY_BOARD
 
 config ZMK_KEYBOARD_NAME
-	default "My Board"
+    default "My Board"
 
 endif
 ```
@@ -101,17 +101,17 @@ Finally, you'll want to turn on the split option for both sides. This can all be
 if SHIELD_MY_BOARD_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "My Board"
+    default "My Board"
 
 config ZMK_SPLIT_ROLE_CENTRAL
-	default y
+    default y
 
 endif
 
 if SHIELD_MY_BOARD_LEFT || SHIELD_MY_BOARD_RIGHT
 
 config ZMK_SPLIT
-	default y
+    default y
 
 endif
 ```
@@ -134,13 +134,13 @@ this might look something like:
 
 ```
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+    };
 
-	kscan0: kscan_0 {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan_0 {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
         diode-direction = "col2row";
 
         col-gpios
@@ -149,12 +149,12 @@ this might look something like:
             , <&pro_micro 16 GPIO_ACTIVE_HIGH>
             ;
 
-		row-gpios
-			= <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        row-gpios
+            = <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
             , <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
-	};
+            ;
+    };
 };
 ```
 
@@ -174,43 +174,43 @@ For `col2row` directed boards like the iris, the shared .dtsi file may look like
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <16>;
-		rows = <4>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <16>;
+        rows = <4>;
 // | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  |                 | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |
 // | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |                 | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |
 // | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |                 | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |
 // | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 | SW25 |   | SW25 | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 |
 //                      | SW29 | SW28 | SW27 | SW26 |   | SW26 | SW27 | SW28 | SW29 |
-		map = <
+        map = <
 RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)                 RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11)
 RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)                 RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11)
 RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)                 RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)
 RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,2) RC(4,9) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11)
-                        		RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC(4,8)
-		>;
-	};
+                                RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC(4,8)
+        >;
+    };
 
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
 
-		diode-direction = "col2row";
-		row-gpios
-			= <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row A from the schematic file
-			, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row B from the schematic file
-			, <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row C from the schematic file
-			, <&pro_micro 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row D from the schematic file
-			, <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row E from the schematic file
-			;
+        diode-direction = "col2row";
+        row-gpios
+            = <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row A from the schematic file
+            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row B from the schematic file
+            , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row C from the schematic file
+            , <&pro_micro 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row D from the schematic file
+            , <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row E from the schematic file
+            ;
 
-	};
+    };
 };
 ```
 
@@ -230,14 +230,14 @@ This is exemplified with the iris .overlay files.
 #include "iris.dtsi" // Notice that the main dtsi files are included in the overlay.
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 19 GPIO_ACTIVE_HIGH> // col1 in the schematic
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH> // col2 in the schematic
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH> // col3 in the schematic
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH> // col4 in the schematic
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH> // col5 in the schematic
-		, <&pro_micro 10 GPIO_ACTIVE_HIGH> // col6 in the schematic
-		;
+    col-gpios
+        = <&pro_micro 19 GPIO_ACTIVE_HIGH> // col1 in the schematic
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH> // col2 in the schematic
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH> // col3 in the schematic
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH> // col4 in the schematic
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH> // col5 in the schematic
+        , <&pro_micro 10 GPIO_ACTIVE_HIGH> // col6 in the schematic
+        ;
 };
 ```
 
@@ -247,18 +247,18 @@ This is exemplified with the iris .overlay files.
 #include "iris.dtsi"
 
 &default_transform { // The matrix transform for this board is 6 columns over because the left half is 6 columns wide according to the matrix.
-	col-offset = <6>;
+    col-offset = <6>;
 };
 
 &kscan0 {
-	col-gpios
-		= <&pro_micro 10 GPIO_ACTIVE_HIGH> // col6 in the schematic
-		, <&pro_micro 16 GPIO_ACTIVE_HIGH> // col5 in the schematic
-		, <&pro_micro 14 GPIO_ACTIVE_HIGH> // col4 in the schematic
-		, <&pro_micro 15 GPIO_ACTIVE_HIGH> // col3 in the schematic
-		, <&pro_micro 18 GPIO_ACTIVE_HIGH>  // col2 in the schematic
-		, <&pro_micro 19 GPIO_ACTIVE_HIGH>  // col1 in the schematic
-		;
+    col-gpios
+        = <&pro_micro 10 GPIO_ACTIVE_HIGH> // col6 in the schematic
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH> // col5 in the schematic
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH> // col4 in the schematic
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH> // col3 in the schematic
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>  // col2 in the schematic
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>  // col1 in the schematic
+        ;
 };
 
 ```
@@ -316,28 +316,28 @@ Here is an example for the [nice60](https://github.com/Nicell/nice60), which use
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
+    chosen {
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
 
-	default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <8>;
-		rows = <8>;
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <8>;
+        rows = <8>;
 // | MX1  | MX2  | MX3  | MX4  | MX5  | MX6  | MX7  | MX8  | MX9  | MX10 | MX11 | MX12 | MX13 |    MX14     |
 // |   MX15   | MX16 | MX17 | MX18 | MX19 | MX20 | MX21 | MX22 | MX23 | MX34 | MX25 | MX26 | MX27 |  MX28   |
 // |    MX29    | MX30 | MX31 | MX32 | MX33 | MX34 | MX35 | MX36 | MX37 | MX38 | MX39 | MX40 |     MX41     |
 // |     MX42      | MX43 | MX44 | MX45 | MX46 | MX47 | MX48 | MX49 | MX50 | MX51 | MX52 |       MX53       |
 // |  MX54  |  MX55  |  MX56  |                  MX57                   |  MX58  |  MX59  |  MX60  |  MX61  |
-		map = <
+        map = <
 RC(3,0)  RC(2,0) RC(1,0) RC(0,0) RC(1,1) RC(0,1) RC(0,2) RC(1,3) RC(0,3) RC(1,4) RC(0,4) RC(0,5) RC(1,6)     RC(1,7)
 RC(4,0)    RC(4,1) RC(3,1) RC(2,1) RC(2,2) RC(1,2) RC(2,3) RC(3,4) RC(2,4) RC(2,5) RC(1,5) RC(2,6) RC(2,7)   RC(3,7)
 RC(5,0)     RC(5,1) RC(5,2) RC(4,2) RC(3,2) RC(4,3) RC(3,3) RC(4,4) RC(4,5) RC(3,5) RC(4,6) RC(3,6)          RC(4,7)
 RC(6,0)       RC(6,1) RC(6,2) RC(6,3) RC(5,3) RC(6,4) RC(5,4) RC(6,5) RC(5,5) RC(6,6) RC(5,6)                RC(5,7)
 RC(7,0)    RC(7,1)   RC(7,2)                     RC(7,3)                    RC(7,5)    RC(7,6)    RC(6,7)    RC(7,7)
-		>;
-	};
+        >;
+    };
 ```
 
 Some important things to note:
@@ -433,13 +433,13 @@ In your device tree file you will need to add the following lines to define the
 
 ```
 left_encoder: encoder_left {
-		compatible = "alps,ec11";
-		label = "LEFT_ENCODER";
-		a-gpios = <PIN_A (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		b-gpios = <PIN_B (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		resolution = <4>;
-		status = "disabled";
-	};
+        compatible = "alps,ec11";
+        label = "LEFT_ENCODER";
+        a-gpios = <PIN_A (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        b-gpios = <PIN_B (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        resolution = <4>;
+        status = "disabled";
+    };
 ```
 
 Here you will have to replace PIN_A and PIN_B with the appropriate pins that your PCB utilizes for the encoder(s). For keyboards that use the Pro Micro or any of the Pro Micro replacements, Sparkfun's [Pro Micro Hookup Guide](https://learn.sparkfun.com/tutorials/pro-micro--fio-v3-hookup-guide/hardware-overview-pro-micro) has a pinout diagram that can be useful to determine the right pins. Reference either the blue numbers labeled "Arduino" (digital pins) or the green numbers labeled "Analog" (analog pins). For pins that are labeled as both digital and analog, refer to your specific board's .dtsi file to determine how you should refer to that pin.
@@ -450,9 +450,9 @@ Once you have defined the encoder sensors, you will have to add them to the list
 
 ```
 sensors {
-		compatible = "zmk,keymap-sensors";
-		sensors = <&left_encoder &right_encoder>;
-	};
+        compatible = "zmk,keymap-sensors";
+        sensors = <&left_encoder &right_encoder>;
+    };
 ```
 
 In this example, a left_encoder and right_encoder are both added. Additional encoders can be added with spaces separating each, and the order they are added here determines the order in which you define their behavior in your keymap.
@@ -463,7 +463,7 @@ Add the following lines to your overlay file(s) to enable the encoder:
 
 ```
 &left_encoder {
-	status = "okay";
+    status = "okay";
 };
 ```
 
diff --git a/docs/docs/features/backlight.md b/docs/docs/features/backlight.md
index 03d206f1..717361a2 100644
--- a/docs/docs/features/backlight.md
+++ b/docs/docs/features/backlight.md
@@ -62,9 +62,9 @@ Then you have to add the following lines to your `.dts` file:
 
 ```
 &pwm0 {
-	status = "okay";
-	ch0-pin = <45>;
-	/* ch0-inverted; */
+    status = "okay";
+    ch0-pin = <45>;
+    /* ch0-inverted; */
 };
 ```
 
@@ -84,7 +84,7 @@ Then you have to add the following lines inside the root devicetree node on the
         label = "Backlight LEDs";
         pwm_led_0 {
             pwms = <&pwm0 45>;
-        	label = "Backlight LED 0";
+            label = "Backlight LED 0";
         };
     };
 };
@@ -129,9 +129,9 @@ Then add the following lines to your `.overlay` file:
 
 ```
 &pwm0 {
-	status = "okay";
-	ch0-pin = <45>;
-	/* ch0-inverted; */
+    status = "okay";
+    ch0-pin = <45>;
+    /* ch0-inverted; */
 };
 ```
 
@@ -151,7 +151,7 @@ Then you have to add the following lines inside the root devicetree node on the
         label = "Backlight LEDs";
         pwm_led_0 {
             pwms = <&pwm0 45>;
-        	label = "Backlight LED 0";
+            label = "Backlight LED 0";
         };
     };
 };
@@ -182,7 +182,7 @@ Optionally, on Pro Micro compatible shields you can add a LED GPIO node to your
         label = "Backlight LEDs";
         gpio_led_0 {
             gpios = <&pro_micro 20 GPIO_ACTIVE_HIGH>;
-        	label = "Backlight LED 0";
+            label = "Backlight LED 0";
         };
     };
 };
@@ -201,10 +201,10 @@ In order to do that, first you need to enable PWM for each pin:
 
 ```
 &pwm0 {
-	status = "okay";
-	ch0-pin = <45>; /* LED 0 */
-	ch1-pin = <46>; /* LED 1 */
-	ch2-pin = <47>; /* LED 2 */
+    status = "okay";
+    ch0-pin = <45>; /* LED 0 */
+    ch1-pin = <46>; /* LED 1 */
+    ch2-pin = <47>; /* LED 2 */
     ...
 };
 ```
diff --git a/docs/docs/features/combos.md b/docs/docs/features/combos.md
index 09191896..44313cc1 100644
--- a/docs/docs/features/combos.md
+++ b/docs/docs/features/combos.md
@@ -12,14 +12,14 @@ Combos configured in your `.keymap` file, but are separate from the `keymap` nod
 
 ```
 / {
-	combos {
-		compatible = "zmk,combos";
-		combo_esc {
-			timeout-ms = <50>;
-			key-positions = <0 1>;
-			bindings = <&kp ESC>;
-		};
-	};
+    combos {
+        compatible = "zmk,combos";
+        combo_esc {
+            timeout-ms = <50>;
+            key-positions = <0 1>;
+            bindings = <&kp ESC>;
+        };
+    };
 };
 ```
 
diff --git a/docs/docs/features/keymaps.md b/docs/docs/features/keymaps.md
index 6d4e5f2c..93c2c825 100644
--- a/docs/docs/features/keymaps.md
+++ b/docs/docs/features/keymaps.md
@@ -113,10 +113,10 @@ Nested under the devicetree root, is the keymap node. The node _name_ itself is
 
 ```
     keymap {
-		compatible = "zmk,keymap";
+        compatible = "zmk,keymap";
 
         // Layer nodes go here!
-	};
+    };
 ```
 
 ### Layers
diff --git a/docs/docs/features/underglow.md b/docs/docs/features/underglow.md
index c1dc68d3..00d3aa0a 100644
--- a/docs/docs/features/underglow.md
+++ b/docs/docs/features/underglow.md
@@ -60,18 +60,18 @@ Here's an example on a definition that uses P0.06:
 #include <dt-bindings/led/led.h>
 
 &pinctrl {
-	spi3_default: spi3_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-		};
-	};
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
 
-	spi3_sleep: spi3_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-			low-power-enable;
-		};
-	};
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
 };
 
 &spi3 {
@@ -149,9 +149,9 @@ Once you have your `led_strip` properly defined you need to add it to the root d
 
 ```
 / {
-	chosen {
-		zmk,underglow = &led_strip;
-	};
+    chosen {
+        zmk,underglow = &led_strip;
+    };
 };
 ```
 
diff --git a/docs/docs/keymap-example-file.md b/docs/docs/keymap-example-file.md
index cb20cb6d..d8d201af 100644
--- a/docs/docs/keymap-example-file.md
+++ b/docs/docs/keymap-example-file.md
@@ -3,24 +3,24 @@
 #include <dt-bindings/zmk/keys.h>
 
 / {
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
+        default_layer {
 // --------------------------------------------------------------------------------------------------------------------------------------------------------------------
 // |   ESC   |    Q    |    W    |    E    |    R    |    T    |                                          |    Y    |    U    |    I    |    O    |    P    |    \    |
 // |   TAB   |    A    |    S    |    D    |    F    |    G    |                                          |    H    |    J    |    K    |    L    |    ;    |    '    |
 // |  SHIFT  |    Z    |    X    |    C    |    V    |    B    | CTRL+A  | CTRL+C  |  |  CTRL+V |  CTRL+X |    N    |    M    |    ,    |    .    |    /    |  R CTRL |
 //                               |   GUI   |   DEL   | RETURN  |  SPACE  | ESCAPE  |  |  RETURN |  SPACE  |   TAB   |   BSPC  |  R ALT  |
-			bindings = <
+            bindings = <
     &kp ESC    &kp Q    &kp W    &kp E     &kp R     &kp T                                                 &kp Y     &kp U     &kp I     &kp O     &kp P    &kp BSLH
     &kp TAB    &kp A    &kp S    &kp D     &kp F     &kp G                                                 &kp H     &kp J     &kp K     &kp L     &kp SEMI &kp SQT
     &kp LSHIFT &kp Z    &kp X    &kp C     &kp V     &kp B      &kp LC(A) &kp LC(C)    &kp LC(V) &kp LC(X) &kp N     &kp M     &kp COMMA &kp DOT   &kp FSLH &kp RCTRL
                                  &kp LGUI  &kp DEL   &kp RET    &kp SPACE &kp ESC      &kp RET   &kp SPACE &kp TAB   &kp BSPC  &kp RALT
-			>;
+            >;
 
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_UP PG_DN>;
-		};
-	};
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_UP PG_DN>;
+        };
+    };
 };
 ```
diff --git a/docs/docs/keymap-example.md b/docs/docs/keymap-example.md
index 9d751f59..47d1c06b 100644
--- a/docs/docs/keymap-example.md
+++ b/docs/docs/keymap-example.md
@@ -1,21 +1,21 @@
 ```
-	keymap {
-		compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-		default_layer {
+        default_layer {
 // --------------------------------------------------------------------------------------------------------------------------------------------------------------------
 // |   ESC   |    Q    |    W    |    E    |    R    |    T    |                                          |    Y    |    U    |    I    |    O    |    P    |    \    |
 // |   TAB   |    A    |    S    |    D    |    F    |    G    |                                          |    H    |    J    |    K    |    L    |    ;    |    '    |
 // |  SHIFT  |    Z    |    X    |    C    |    V    |    B    | CTRL+A  | CTRL+C  |  |  CTRL+V |  CTRL+X |    N    |    M    |    ,    |    .    |    /    |  R CTRL |
 //                               |   GUI   |   DEL   | RETURN  |  SPACE  | ESCAPE  |  |  RETURN |  SPACE  |   TAB   |   BSPC  |  R ALT  |
-			bindings = <
+            bindings = <
     &kp ESC    &kp Q    &kp W    &kp E     &kp R     &kp T                                                 &kp Y     &kp U     &kp I     &kp O     &kp P    &kp BSLH
     &kp TAB    &kp A    &kp S    &kp D     &kp F     &kp G                                                 &kp H     &kp J     &kp K     &kp L     &kp SEMI &kp SQT
     &kp LSHIFT &kp Z    &kp X    &kp C     &kp V     &kp B      &kp LC(A) &kp LC(C)    &kp LC(V) &kp LC(X) &kp N     &kp M     &kp COMMA &kp DOT   &kp FSLH &kp RCTRL
                                  &kp LGUI  &kp DEL   &kp RET    &kp SPACE &kp ESC      &kp RET   &kp SPACE &kp TAB   &kp BSPC  &kp RALT
-			>;
+            >;
 
-			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_UP PG_DN>;
-		};
-	};
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_UP PG_DN>;
+        };
+    };
 ```