24 files changed, 235 insertions, 235 deletions

diff --git a/drivers/haptic/DRV2605L.c b/drivers/haptic/DRV2605L.c
index 728554b01..c40731913 100644
--- a/drivers/haptic/DRV2605L.c
+++ b/drivers/haptic/DRV2605L.c
@@ -115,15 +115,13 @@ void DRV_init(void) {
 }
 
 void DRV_rtp_init(void) {
-  DRV_write(DRV_GO, 0x00);
-  DRV_write(DRV_RTP_INPUT, 20); //20 is the lowest value I've found where haptics can still be felt. 
-  DRV_write(DRV_MODE, 0x05); 
-  DRV_write(DRV_GO, 0x01);
+    DRV_write(DRV_GO, 0x00);
+    DRV_write(DRV_RTP_INPUT, 20);  // 20 is the lowest value I've found where haptics can still be felt.
+    DRV_write(DRV_MODE, 0x05);
+    DRV_write(DRV_GO, 0x01);
 }
 
-void DRV_amplitude(uint8_t amplitude) {
-  DRV_write(DRV_RTP_INPUT, amplitude);
-}
+void DRV_amplitude(uint8_t amplitude) { DRV_write(DRV_RTP_INPUT, amplitude); }
 
 void DRV_pulse(uint8_t sequence) {
     DRV_write(DRV_GO, 0x00);
diff --git a/drivers/haptic/haptic.c b/drivers/haptic/haptic.c
index 989970bee..2ce279b75 100644
--- a/drivers/haptic/haptic.c
+++ b/drivers/haptic/haptic.c
@@ -169,12 +169,12 @@ void haptic_set_mode(uint8_t mode) {
 }
 
 void haptic_set_amplitude(uint8_t amp) {
-  haptic_config.amplitude = amp;
-  eeconfig_update_haptic(haptic_config.raw);
-  xprintf("haptic_config.amplitude = %u\n", haptic_config.amplitude);
-  #ifdef DRV2605L
-  DRV_amplitude(amp);
-  #endif
+    haptic_config.amplitude = amp;
+    eeconfig_update_haptic(haptic_config.raw);
+    xprintf("haptic_config.amplitude = %u\n", haptic_config.amplitude);
+#ifdef DRV2605L
+    DRV_amplitude(amp);
+#endif
 }
 
 void haptic_set_buzz(uint8_t buzz) {
@@ -211,52 +211,50 @@ uint8_t haptic_get_dwell(void) {
 }
 
 void haptic_enable_continuous(void) {
-  haptic_config.cont        = 1;
-  xprintf("haptic_config.cont = %u\n", haptic_config.cont);
-  eeconfig_update_haptic(haptic_config.raw);
-  #ifdef DRV2605L
-  DRV_rtp_init();
-  #endif
+    haptic_config.cont = 1;
+    xprintf("haptic_config.cont = %u\n", haptic_config.cont);
+    eeconfig_update_haptic(haptic_config.raw);
+#ifdef DRV2605L
+    DRV_rtp_init();
+#endif
 }
 
 void haptic_disable_continuous(void) {
-  haptic_config.cont        = 0;
-  xprintf("haptic_config.cont = %u\n", haptic_config.cont);
-  eeconfig_update_haptic(haptic_config.raw);
-  #ifdef DRV2605L
-  DRV_write(DRV_MODE,0x00); 
-  #endif
+    haptic_config.cont = 0;
+    xprintf("haptic_config.cont = %u\n", haptic_config.cont);
+    eeconfig_update_haptic(haptic_config.raw);
+#ifdef DRV2605L
+    DRV_write(DRV_MODE, 0x00);
+#endif
 }
 
 void haptic_toggle_continuous(void) {
 #ifdef DRV2605L
-if (haptic_config.cont) {
-  haptic_disable_continuous();
-  } else {
-    haptic_enable_continuous();
-  }
-  eeconfig_update_haptic(haptic_config.raw);
+    if (haptic_config.cont) {
+        haptic_disable_continuous();
+    } else {
+        haptic_enable_continuous();
+    }
+    eeconfig_update_haptic(haptic_config.raw);
 #endif
 }
 
-
 void haptic_cont_increase(void) {
-  uint8_t amp = haptic_config.amplitude + 10;
-  if (haptic_config.amplitude >= 120) {
-    amp = 120;
-  }
-  haptic_set_amplitude(amp);
+    uint8_t amp = haptic_config.amplitude + 10;
+    if (haptic_config.amplitude >= 120) {
+        amp = 120;
+    }
+    haptic_set_amplitude(amp);
 }
 
 void haptic_cont_decrease(void) {
-  uint8_t amp = haptic_config.amplitude - 10;
-  if (haptic_config.amplitude < 20) {
-    amp = 20;
-  }
-  haptic_set_amplitude(amp);
+    uint8_t amp = haptic_config.amplitude - 10;
+    if (haptic_config.amplitude < 20) {
+        amp = 20;
+    }
+    haptic_set_amplitude(amp);
 }
 
-
 void haptic_play(void) {
 #ifdef DRV2605L
     uint8_t play_eff = 0;
@@ -269,7 +267,6 @@ void haptic_play(void) {
 }
 
 bool process_haptic(uint16_t keycode, keyrecord_t *record) {
-
     if (keycode == HPT_ON && record->event.pressed) {
         haptic_enable();
     }
@@ -300,16 +297,16 @@ bool process_haptic(uint16_t keycode, keyrecord_t *record) {
     if (keycode == HPT_DWLD && record->event.pressed) {
         haptic_dwell_decrease();
     }
-    if (keycode == HPT_CONT && record->event.pressed) { 
-        haptic_toggle_continuous(); 
+    if (keycode == HPT_CONT && record->event.pressed) {
+        haptic_toggle_continuous();
     }
-    if (keycode == HPT_CONI && record->event.pressed) { 
-        haptic_cont_increase(); 
+    if (keycode == HPT_CONI && record->event.pressed) {
+        haptic_cont_increase();
     }
-    if (keycode == HPT_COND && record->event.pressed) { 
-        haptic_cont_decrease(); 
+    if (keycode == HPT_COND && record->event.pressed) {
+        haptic_cont_decrease();
     }
-      
+
     if (haptic_config.enable) {
         if (record->event.pressed) {
             // keypress
diff --git a/drivers/haptic/haptic.h b/drivers/haptic/haptic.h
index 2f6eb31fc..5d3bd1c31 100644
--- a/drivers/haptic/haptic.h
+++ b/drivers/haptic/haptic.h
@@ -34,14 +34,14 @@
 typedef union {
     uint32_t raw;
     struct {
-        bool     enable    :1;
-        uint8_t  feedback  :2;
-        uint8_t  mode      :7;
-        bool     buzz      :1;
-        uint8_t  dwell     :7;
-        bool     cont      :1;
-        uint8_t  amplitude :8;
-        uint16_t reserved  :7; 
+        bool     enable : 1;
+        uint8_t  feedback : 2;
+        uint8_t  mode : 7;
+        bool     buzz : 1;
+        uint8_t  dwell : 7;
+        bool     cont : 1;
+        uint8_t  amplitude : 8;
+        uint16_t reserved : 7;
     };
 } haptic_config_t;
 
diff --git a/quantum/backlight/backlight_avr.c b/quantum/backlight/backlight_avr.c
index 648a37adf..edda6ea0b 100644
--- a/quantum/backlight/backlight_avr.c
+++ b/quantum/backlight/backlight_avr.c
@@ -191,7 +191,7 @@ void backlight_off(pin_t backlight_pin) {
 
 #        define FOR_EACH_LED(x)                                 \
             for (uint8_t i = 0; i < BACKLIGHT_LED_COUNT; i++) { \
-                pin_t backlight_pin = backlight_pins[i];      \
+                pin_t backlight_pin = backlight_pins[i];        \
                 { x }                                           \
             }
 
diff --git a/quantum/config_common.h b/quantum/config_common.h
index f42df6357..c1c1d4bd4 100644
--- a/quantum/config_common.h
+++ b/quantum/config_common.h
@@ -303,25 +303,26 @@
                 UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \
                 sei();                              \
             } while (0)
-#   elif (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__))
-#      define SERIAL_UART_BAUD 115200
-#      define SERIAL_UART_DATA UDR1
-       /* UBRR should result in ~16 and set UCSR1A = _BV(U2X1) as per rn42 documentation. HC05 needs baudrate configured accordingly */
-#      define SERIAL_UART_UBRR (F_CPU / (8UL * SERIAL_UART_BAUD) - 1)
-#      define SERIAL_UART_RXD_VECT USART1_RX_vect
-#      define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1))
-#      define SERIAL_UART_INIT() do {               \
-            UCSR1A = _BV(U2X1);                     \
-            /* baud rate */                         \
-            UBRR1L = SERIAL_UART_UBRR;              \
-            /* baud rate */                         \
-            UBRR1H = SERIAL_UART_UBRR >> 8;         \
-            /* enable TX */                         \
-            UCSR1B = _BV(TXEN1);                    \
-            /* 8-bit data */                        \
-            UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);     \
-            sei();                                  \
-        } while(0)
+#    elif (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__))
+#        define SERIAL_UART_BAUD 115200
+#        define SERIAL_UART_DATA UDR1
+/* UBRR should result in ~16 and set UCSR1A = _BV(U2X1) as per rn42 documentation. HC05 needs baudrate configured accordingly */
+#        define SERIAL_UART_UBRR (F_CPU / (8UL * SERIAL_UART_BAUD) - 1)
+#        define SERIAL_UART_RXD_VECT USART1_RX_vect
+#        define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1))
+#        define SERIAL_UART_INIT()                  \
+            do {                                    \
+                UCSR1A = _BV(U2X1);                 \
+                /* baud rate */                     \
+                UBRR1L = SERIAL_UART_UBRR;          \
+                /* baud rate */                     \
+                UBRR1H = SERIAL_UART_UBRR >> 8;     \
+                /* enable TX */                     \
+                UCSR1B = _BV(TXEN1);                \
+                /* 8-bit data */                    \
+                UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \
+                sei();                              \
+            } while (0)
 #    else
 #        error "USART configuration is needed."
 #    endif
diff --git a/quantum/dip_switch.c b/quantum/dip_switch.c
index 3b5a8dadc..ab74222d1 100644
--- a/quantum/dip_switch.c
+++ b/quantum/dip_switch.c
@@ -21,40 +21,33 @@
 // for memcpy
 #include <string.h>
 
-
 #if !defined(DIP_SWITCH_PINS)
-#   error "No DIP switch pads defined by DIP_SWITCH_PINS"
+#    error "No DIP switch pads defined by DIP_SWITCH_PINS"
 #endif
 
-#define NUMBER_OF_DIP_SWITCHES (sizeof(dip_switch_pad)/sizeof(pin_t))
-static pin_t dip_switch_pad[] = DIP_SWITCH_PINS;
-static bool dip_switch_state[NUMBER_OF_DIP_SWITCHES] = { 0 };
-static bool last_dip_switch_state[NUMBER_OF_DIP_SWITCHES] = { 0 };
-
+#define NUMBER_OF_DIP_SWITCHES (sizeof(dip_switch_pad) / sizeof(pin_t))
+static pin_t dip_switch_pad[]                              = DIP_SWITCH_PINS;
+static bool  dip_switch_state[NUMBER_OF_DIP_SWITCHES]      = {0};
+static bool  last_dip_switch_state[NUMBER_OF_DIP_SWITCHES] = {0};
 
-__attribute__((weak))
-void dip_switch_update_user(uint8_t index, bool active) {}
+__attribute__((weak)) void dip_switch_update_user(uint8_t index, bool active) {}
 
-__attribute__((weak))
-void dip_switch_update_kb(uint8_t index, bool active) { dip_switch_update_user(index, active); }
+__attribute__((weak)) void dip_switch_update_kb(uint8_t index, bool active) { dip_switch_update_user(index, active); }
 
-__attribute__((weak))
-void dip_switch_update_mask_user(uint32_t state) {}
+__attribute__((weak)) void dip_switch_update_mask_user(uint32_t state) {}
 
-__attribute__((weak))
-void dip_switch_update_mask_kb(uint32_t state) { dip_switch_update_mask_user(state); }
+__attribute__((weak)) void dip_switch_update_mask_kb(uint32_t state) { dip_switch_update_mask_user(state); }
 
 void dip_switch_init(void) {
-  for (uint8_t i = 0; i < NUMBER_OF_DIP_SWITCHES; i++) {
-    setPinInputHigh(dip_switch_pad[i]);
-  }
-  dip_switch_read(true);
+    for (uint8_t i = 0; i < NUMBER_OF_DIP_SWITCHES; i++) {
+        setPinInputHigh(dip_switch_pad[i]);
+    }
+    dip_switch_read(true);
 }
 
-
 void dip_switch_read(bool forced) {
-    bool has_dip_state_changed = false;
-    uint32_t dip_switch_mask = 0;
+    bool     has_dip_state_changed = false;
+    uint32_t dip_switch_mask       = 0;
 
     for (uint8_t i = 0; i < NUMBER_OF_DIP_SWITCHES; i++) {
         dip_switch_state[i] = !readPin(dip_switch_pad[i]);
diff --git a/quantum/encoder.c b/quantum/encoder.c
index e86a0045c..4aeb3d0cd 100644
--- a/quantum/encoder.c
+++ b/quantum/encoder.c
@@ -37,8 +37,8 @@ static pin_t encoders_pad_b[] = ENCODERS_PAD_B;
 
 static int8_t encoder_LUT[] = {0, -1, 1, 0, 1, 0, 0, -1, -1, 0, 0, 1, 0, 1, -1, 0};
 
-static uint8_t encoder_state[NUMBER_OF_ENCODERS] = {0};
-static int8_t encoder_pulses[NUMBER_OF_ENCODERS] = {0};
+static uint8_t encoder_state[NUMBER_OF_ENCODERS]  = {0};
+static int8_t  encoder_pulses[NUMBER_OF_ENCODERS] = {0};
 
 #ifdef SPLIT_KEYBOARD
 // right half encoders come over as second set of encoders
@@ -84,7 +84,7 @@ static void encoder_update(int8_t index, uint8_t state) {
         encoder_value[index]++;
         encoder_update_kb(index, true);
     }
-    if (encoder_pulses[index] <= -ENCODER_RESOLUTION) { // direction is arbitrary here, but this clockwise
+    if (encoder_pulses[index] <= -ENCODER_RESOLUTION) {  // direction is arbitrary here, but this clockwise
         encoder_value[index]--;
         encoder_update_kb(index, false);
     }
@@ -109,7 +109,7 @@ void encoder_state_raw(uint8_t* slave_state) { memcpy(slave_state, &encoder_valu
 void encoder_update_raw(uint8_t* slave_state) {
     for (int i = 0; i < NUMBER_OF_ENCODERS; i++) {
         uint8_t index = i + thatHand;
-        int8_t delta = slave_state[i] - encoder_value[index];
+        int8_t  delta = slave_state[i] - encoder_value[index];
         while (delta > 0) {
             delta--;
             encoder_value[index]++;
diff --git a/quantum/keymap_extras/keymap_italian.h b/quantum/keymap_extras/keymap_italian.h
index a8c03b884..063700aa0 100644
--- a/quantum/keymap_extras/keymap_italian.h
+++ b/quantum/keymap_extras/keymap_italian.h
@@ -78,36 +78,36 @@
 #define IT_MINS KC_SLSH  // - and _
 
 // shifted characters
-#define IT_DEGR LSFT(IT_AACC) // °
-#define IT_EXLM LSFT(KC_1) // !
-#define IT_DQOT LSFT(KC_2) // "
-#define IT_STRL LSFT(KC_3) // £
-#define IT_DLR  LSFT(KC_4) // $
-#define IT_PERC LSFT(KC_5) // %
-#define IT_AMPR LSFT(KC_6) // &
-#define IT_SLSH LSFT(KC_7) // /
-#define IT_LPRN LSFT(KC_8) // (
-#define IT_RPRN LSFT(KC_9) // )
-#define IT_EQL  LSFT(KC_0) // =
-#define IT_QST  LSFT(IT_APOS) // ?
-#define IT_CRC  LSFT(IT_IACC) // ^
-#define IT_ASTR LSFT(IT_PLUS) // *
-#define IT_MORE LSFT(IT_LESS) // >
-#define IT_COLN LSFT(IT_DOT) // :
-#define IT_SCLN LSFT(IT_COMM) // ;
-#define IT_UNDS LSFT(IT_MINS) // _
+#define IT_DEGR LSFT(IT_AACC)  // °
+#define IT_EXLM LSFT(KC_1)     // !
+#define IT_DQOT LSFT(KC_2)     // "
+#define IT_STRL LSFT(KC_3)     // £
+#define IT_DLR LSFT(KC_4)      // $
+#define IT_PERC LSFT(KC_5)     // %
+#define IT_AMPR LSFT(KC_6)     // &
+#define IT_SLSH LSFT(KC_7)     // /
+#define IT_LPRN LSFT(KC_8)     // (
+#define IT_RPRN LSFT(KC_9)     // )
+#define IT_EQL LSFT(KC_0)      // =
+#define IT_QST LSFT(IT_APOS)   // ?
+#define IT_CRC LSFT(IT_IACC)   // ^
+#define IT_ASTR LSFT(IT_PLUS)  // *
+#define IT_MORE LSFT(IT_LESS)  // >
+#define IT_COLN LSFT(IT_DOT)   // :
+#define IT_SCLN LSFT(IT_COMM)  // ;
+#define IT_UNDS LSFT(IT_MINS)  // _
 
 // Alt Gr-ed characters
-#define IT_LCBR ALGR(KC_7) // {
-#define IT_LBRC ALGR(IT_EACC) // [
-#define IT_RBRC ALGR(IT_PLUS) // ]
-#define IT_RCBR ALGR(KC_0) // }
-#define IT_AT   ALGR(IT_OACC)   // @
-#define IT_EURO ALGR(KC_E)              // €
-#define IT_PIPE LSFT(IT_BSLS)   // |
-#define IT_SHRP ALGR(IT_AACC)   // #
+#define IT_LCBR ALGR(KC_7)     // {
+#define IT_LBRC ALGR(IT_EACC)  // [
+#define IT_RBRC ALGR(IT_PLUS)  // ]
+#define IT_RCBR ALGR(KC_0)     // }
+#define IT_AT ALGR(IT_OACC)    // @
+#define IT_EURO ALGR(KC_E)     // €
+#define IT_PIPE LSFT(IT_BSLS)  // |
+#define IT_SHRP ALGR(IT_AACC)  // #
 
 // Deprecated
-#define IT_X_PLUS       X_RBRACKET      // #
+#define IT_X_PLUS X_RBRACKET  // #
 
 #endif
diff --git a/quantum/keymap_extras/keymap_italian_osx_ansi.h b/quantum/keymap_extras/keymap_italian_osx_ansi.h
index 2b7160ff3..fa12d05dc 100644
--- a/quantum/keymap_extras/keymap_italian_osx_ansi.h
+++ b/quantum/keymap_extras/keymap_italian_osx_ansi.h
@@ -65,7 +65,7 @@
 #define IT_COMM KC_COMM  // , and  ;
 #define IT_APOS KC_MINS  // ' and  ?
 #define IT_BSLS KC_NUBS  // \ and  |
-#define IT_LESS KC_GRV // < and  >
+#define IT_LESS KC_GRV   // < and  >
 #define IT_MINS KC_SLSH  // - and  _
 
 // accented vowels (regular, with shift, with option, with option and shift)
@@ -77,37 +77,37 @@
 #define IT_IACC KC_EQL   // ì, ^, ˆ, ±
 
 // shifted characters
-#define IT_EXLM LSFT(KC_1)  // !
-#define IT_DQOT LSFT(KC_2)  // "
-#define IT_STRL LSFT(KC_3)  // £
-#define IT_DLR LSFT(KC_4)   // $
-#define IT_PERC LSFT(KC_5)  // %
-#define IT_AMPR LSFT(KC_6)  // &
-#define IT_SLSH LSFT(KC_7)  // /
-#define IT_LPRN LSFT(KC_8)  // (
-#define IT_RPRN LSFT(KC_9)  // )
-#define IT_EQL LSFT(KC_0)   // =
-#define IT_DEGR LSFT(IT_AACC) // °
-#define IT_QST LSFT(IT_APOS)  // ?
-#define IT_CRC LSFT(IT_IACC)  // ^
-#define IT_ASTR LSFT(IT_PLUS) // *
-#define IT_MORE LSFT(IT_LESS) // >
-#define IT_COLN LSFT(IT_DOT)  // :
-#define IT_SCLN LSFT(IT_COMM) // ;
-#define IT_UNDS LSFT(IT_MINS) // _
-#define IT_LCBR LSFT(IT_LBRC) // {
-#define IT_RCBR LSFT(IT_RBRC) // }
-#define IT_PIPE LSFT(IT_BSLS) // |
+#define IT_EXLM LSFT(KC_1)     // !
+#define IT_DQOT LSFT(KC_2)     // "
+#define IT_STRL LSFT(KC_3)     // £
+#define IT_DLR LSFT(KC_4)      // $
+#define IT_PERC LSFT(KC_5)     // %
+#define IT_AMPR LSFT(KC_6)     // &
+#define IT_SLSH LSFT(KC_7)     // /
+#define IT_LPRN LSFT(KC_8)     // (
+#define IT_RPRN LSFT(KC_9)     // )
+#define IT_EQL LSFT(KC_0)      // =
+#define IT_DEGR LSFT(IT_AACC)  // °
+#define IT_QST LSFT(IT_APOS)   // ?
+#define IT_CRC LSFT(IT_IACC)   // ^
+#define IT_ASTR LSFT(IT_PLUS)  // *
+#define IT_MORE LSFT(IT_LESS)  // >
+#define IT_COLN LSFT(IT_DOT)   // :
+#define IT_SCLN LSFT(IT_COMM)  // ;
+#define IT_UNDS LSFT(IT_MINS)  // _
+#define IT_LCBR LSFT(IT_LBRC)  // {
+#define IT_RCBR LSFT(IT_RBRC)  // }
+#define IT_PIPE LSFT(IT_BSLS)  // |
 
 // Alt -ed characters
-#define IT_LBRC LALT(IT_EACC)  // [
-#define IT_RBRC LALT(IT_PLUS)  // ]
-#define IT_AT LALT(IT_OACC)    // @
-#define IT_EURO LALT(KC_E)     // €
-#define IT_SHRP LALT(IT_AACC ) // #
-#define IT_ACUT LALT(KC_8)     // ´
-#define IT_GRAVE LALT(KC_9)    // `
-#define IT_TILDE LALT(KC_5)    // ~
+#define IT_LBRC LALT(IT_EACC)        // [
+#define IT_RBRC LALT(IT_PLUS)        // ]
+#define IT_AT LALT(IT_OACC)          // @
+#define IT_EURO LALT(KC_E)           // €
+#define IT_SHRP LALT(IT_AACC)        // #
+#define IT_ACUT LALT(KC_8)           // ´
+#define IT_GRAVE LALT(KC_9)          // `
+#define IT_TILDE LALT(KC_5)          // ~
 #define IT_PLMN LALT(LSFT(IT_IACC))  // ±
 
 #endif
diff --git a/quantum/keymap_extras/keymap_italian_osx_iso.h b/quantum/keymap_extras/keymap_italian_osx_iso.h
index 5c920014a..a9b36f16e 100644
--- a/quantum/keymap_extras/keymap_italian_osx_iso.h
+++ b/quantum/keymap_extras/keymap_italian_osx_iso.h
@@ -65,7 +65,7 @@
 #define IT_COMM KC_COMM  // , and  ;
 #define IT_APOS KC_MINS  // ' and  ?
 #define IT_BSLS KC_GRV   // \ and  |
-#define IT_LESS KC_NUBS// < and  >
+#define IT_LESS KC_NUBS  // < and  >
 #define IT_MINS KC_SLSH  // - and  _
 
 // accented vowels (regular, with shift, with option, with option and shift)
@@ -77,37 +77,37 @@
 #define IT_IACC KC_EQL   // ì, ^, ˆ, ±
 
 // shifted characters
-#define IT_EXLM LSFT(KC_1)  // !
-#define IT_DQOT LSFT(KC_2)  // "
-#define IT_STRL LSFT(KC_3)  // £
-#define IT_DLR LSFT(KC_4)   // $
-#define IT_PERC LSFT(KC_5)  // %
-#define IT_AMPR LSFT(KC_6)  // &
-#define IT_SLSH LSFT(KC_7)  // /
-#define IT_LPRN LSFT(KC_8)  // (
-#define IT_RPRN LSFT(KC_9)  // )
-#define IT_EQL LSFT(KC_0)   // =
-#define IT_DEGR LSFT(IT_AACC) // °
-#define IT_QST LSFT(IT_APOS)  // ?
-#define IT_CRC LSFT(IT_IACC)  // ^
-#define IT_ASTR LSFT(IT_PLUS) // *
-#define IT_MORE LSFT(IT_LESS) // >
-#define IT_COLN LSFT(IT_DOT)  // :
-#define IT_SCLN LSFT(IT_COMM) // ;
-#define IT_UNDS LSFT(IT_MINS) // _
-#define IT_LCBR LSFT(IT_LBRC) // {
-#define IT_RCBR LSFT(IT_RBRC) // }
-#define IT_PIPE LSFT(IT_BSLS) // |
+#define IT_EXLM LSFT(KC_1)     // !
+#define IT_DQOT LSFT(KC_2)     // "
+#define IT_STRL LSFT(KC_3)     // £
+#define IT_DLR LSFT(KC_4)      // $
+#define IT_PERC LSFT(KC_5)     // %
+#define IT_AMPR LSFT(KC_6)     // &
+#define IT_SLSH LSFT(KC_7)     // /
+#define IT_LPRN LSFT(KC_8)     // (
+#define IT_RPRN LSFT(KC_9)     // )
+#define IT_EQL LSFT(KC_0)      // =
+#define IT_DEGR LSFT(IT_AACC)  // °
+#define IT_QST LSFT(IT_APOS)   // ?
+#define IT_CRC LSFT(IT_IACC)   // ^
+#define IT_ASTR LSFT(IT_PLUS)  // *
+#define IT_MORE LSFT(IT_LESS)  // >
+#define IT_COLN LSFT(IT_DOT)   // :
+#define IT_SCLN LSFT(IT_COMM)  // ;
+#define IT_UNDS LSFT(IT_MINS)  // _
+#define IT_LCBR LSFT(IT_LBRC)  // {
+#define IT_RCBR LSFT(IT_RBRC)  // }
+#define IT_PIPE LSFT(IT_BSLS)  // |
 
 // Alt -ed characters
-#define IT_LBRC LALT(IT_EACC)  // [
-#define IT_RBRC LALT(IT_PLUS)  // ]
-#define IT_AT LALT(IT_OACC)    // @
-#define IT_EURO LALT(KC_E)     // €
-#define IT_SHRP LALT(IT_AACC ) // #
-#define IT_ACUT LALT(KC_8)     // ´
-#define IT_GRAVE LALT(KC_9)    // `
-#define IT_TILDE LALT(KC_5)    // ~
+#define IT_LBRC LALT(IT_EACC)        // [
+#define IT_RBRC LALT(IT_PLUS)        // ]
+#define IT_AT LALT(IT_OACC)          // @
+#define IT_EURO LALT(KC_E)           // €
+#define IT_SHRP LALT(IT_AACC)        // #
+#define IT_ACUT LALT(KC_8)           // ´
+#define IT_GRAVE LALT(KC_9)          // `
+#define IT_TILDE LALT(KC_5)          // ~
 #define IT_PLMN LALT(LSFT(IT_IACC))  // ±
 
 #endif
diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h
index 8f3f3ff3c..09ceef74d 100644
--- a/quantum/process_keycode/process_tap_dance.h
+++ b/quantum/process_keycode/process_tap_dance.h
@@ -63,10 +63,10 @@ typedef struct {
         { .fn = {qk_tap_dance_pair_on_each_tap, qk_tap_dance_pair_finished, qk_tap_dance_pair_reset}, .user_data = (void *)&((qk_tap_dance_pair_t){kc1, kc2}), }
 
 #    define ACTION_TAP_DANCE_DUAL_ROLE(kc, layer) \
-        { .fn = { qk_tap_dance_dual_role_on_each_tap, qk_tap_dance_dual_role_finished, qk_tap_dance_dual_role_reset }, .user_data = (void *)&((qk_tap_dance_dual_role_t) { kc, layer, layer_move }),  }
+        { .fn = {qk_tap_dance_dual_role_on_each_tap, qk_tap_dance_dual_role_finished, qk_tap_dance_dual_role_reset}, .user_data = (void *)&((qk_tap_dance_dual_role_t){kc, layer, layer_move}), }
 
 #    define ACTION_TAP_DANCE_LAYER_TOGGLE(kc, layer) \
-        { .fn = { NULL, qk_tap_dance_dual_role_finished, qk_tap_dance_dual_role_reset }, .user_data = (void *)&((qk_tap_dance_dual_role_t) { kc, layer, layer_invert }), }
+        { .fn = {NULL, qk_tap_dance_dual_role_finished, qk_tap_dance_dual_role_reset}, .user_data = (void *)&((qk_tap_dance_dual_role_t){kc, layer, layer_invert}), }
 
 #    define ACTION_TAP_DANCE_LAYER_MOVE(kc, layer) ACTION_TAP_DANCE_DUAL_ROLE(kc, layer)
 
@@ -79,8 +79,6 @@ typedef struct {
 #    define ACTION_TAP_DANCE_FN_ADVANCED_TIME(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, tap_specific_tapping_term) \
         { .fn = {user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset}, .user_data = NULL, .custom_tapping_term = tap_specific_tapping_term, }
 
-
-
 extern qk_tap_dance_action_t tap_dance_actions[];
 
 /* To be used internally */
diff --git a/quantum/quantum.c b/quantum/quantum.c
index c27c3aba6..2e5e6376b 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -1116,7 +1116,7 @@ __attribute__((weak)) void led_set(uint8_t usb_led) {
 #endif
 
     led_set_kb(usb_led);
-    led_update_kb((led_t) usb_led);
+    led_update_kb((led_t)usb_led);
 }
 
 //------------------------------------------------------------------------------
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 7988c5878..6beab65a3 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -146,14 +146,13 @@ extern layer_state_t layer_state;
 #endif
 
 #ifdef DIP_SWITCH_ENABLE
-    #include "dip_switch.h"
+#    include "dip_switch.h"
 #endif
 
 #ifdef DYNAMIC_MACRO_ENABLE
-    #include "process_dynamic_macro.h"
+#    include "process_dynamic_macro.h"
 #endif
 
-
 // Function substitutions to ease GPIO manipulation
 #if defined(__AVR__)
 typedef uint8_t pin_t;
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 51a7e290f..66a3c66e8 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -771,4 +771,4 @@ enum quantum_keycodes {
 #define DM_PLY1 DYN_MACRO_PLAY1
 #define DM_PLY2 DYN_MACRO_PLAY2
 
-#endif // QUANTUM_KEYCODES_H
+#endif  // QUANTUM_KEYCODES_H
diff --git a/quantum/rgblight.c b/quantum/rgblight.c
index 80f276139..7949bb688 100644
--- a/quantum/rgblight.c
+++ b/quantum/rgblight.c
@@ -919,7 +919,7 @@ void rgblight_effect_snake(animation_status_t *anim) {
         ledp->g        = 0;
         ledp->b        = 0;
 #    ifdef RGBW
-        ledp->w        = 0;
+        ledp->w = 0;
 #    endif
         for (j = 0; j < RGBLIGHT_EFFECT_SNAKE_LENGTH; j++) {
             k = pos + j * increment;
diff --git a/quantum/stm32/chconf.h b/quantum/stm32/chconf.h
index f7b1b077d..6b691950a 100644
--- a/quantum/stm32/chconf.h
+++ b/quantum/stm32/chconf.h
@@ -419,34 +419,39 @@
  * @note    It is invoked from within @p chThdInit() and implicitly from all
  *          the threads creation APIs.
  */
-#    define CH_CFG_THREAD_INIT_HOOK(tp) \
-        { /* Add threads initialization code here.*/ }
+#    define CH_CFG_THREAD_INIT_HOOK(tp)              \
+        { /* Add threads initialization code here.*/ \
+        }
 
 /**
  * @brief   Threads finalization hook.
  * @details User finalization code added to the @p chThdExit() API.
  */
-#    define CH_CFG_THREAD_EXIT_HOOK(tp) \
-        { /* Add threads finalization code here.*/ }
+#    define CH_CFG_THREAD_EXIT_HOOK(tp)            \
+        { /* Add threads finalization code here.*/ \
+        }
 
 /**
  * @brief   Context switch hook.
  * @details This hook is invoked just before switching between threads.
  */
 #    define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) \
-        { /* Context switch code here.*/ }
+        { /* Context switch code here.*/         \
+        }
 
 /**
  * @brief   ISR enter hook.
  */
 #    define CH_CFG_IRQ_PROLOGUE_HOOK() \
-        { /* IRQ prologue code here.*/ }
+        { /* IRQ prologue code here.*/ \
+        }
 
 /**
  * @brief   ISR exit hook.
  */
 #    define CH_CFG_IRQ_EPILOGUE_HOOK() \
-        { /* IRQ epilogue code here.*/ }
+        { /* IRQ epilogue code here.*/ \
+        }
 
 /**
  * @brief   Idle thread enter hook.
@@ -455,7 +460,8 @@
  * @note    This macro can be used to activate a power saving mode.
  */
 #    define CH_CFG_IDLE_ENTER_HOOK() \
-        { /* Idle-enter code here.*/ }
+        { /* Idle-enter code here.*/ \
+        }
 
 /**
  * @brief   Idle thread leave hook.
@@ -464,22 +470,25 @@
  * @note    This macro can be used to deactivate a power saving mode.
  */
 #    define CH_CFG_IDLE_LEAVE_HOOK() \
-        { /* Idle-leave code here.*/ }
+        { /* Idle-leave code here.*/ \
+        }
 
 /**
  * @brief   Idle Loop hook.
  * @details This hook is continuously invoked by the idle thread loop.
  */
 #    define CH_CFG_IDLE_LOOP_HOOK() \
-        { /* Idle loop code here.*/ }
+        { /* Idle loop code here.*/ \
+        }
 
 /**
  * @brief   System tick event hook.
  * @details This hook is invoked in the system tick handler immediately
  *          after processing the virtual timers queue.
  */
-#    define CH_CFG_SYSTEM_TICK_HOOK() \
-        { /* System tick event code here.*/ }
+#    define CH_CFG_SYSTEM_TICK_HOOK()       \
+        { /* System tick event code here.*/ \
+        }
 
 /**
  * @brief   System halt hook.
@@ -487,7 +496,8 @@
  *          the system is halted.
  */
 #    define CH_CFG_SYSTEM_HALT_HOOK(reason) \
-        { /* System halt code here.*/ }
+        { /* System halt code here.*/       \
+        }
 
 /**
  * @brief   Trace hook.
@@ -495,7 +505,8 @@
  *          trace buffer.
  */
 #    define CH_CFG_TRACE_HOOK(tep) \
-        { /* Trace code here.*/ }
+        { /* Trace code here.*/    \
+        }
 
 /** @} */
 
diff --git a/tmk_core/common/arm_atsam/suspend.c b/tmk_core/common/arm_atsam/suspend.c
index 2dad00570..d1077be4c 100644
--- a/tmk_core/common/arm_atsam/suspend.c
+++ b/tmk_core/common/arm_atsam/suspend.c
@@ -7,7 +7,8 @@
  *
  * FIXME: needs doc
  */
-void suspend_idle(uint8_t time) { /* Note: Not used anywhere currently */ }
+void suspend_idle(uint8_t time) { /* Note: Not used anywhere currently */
+}
 
 /** \brief Run user level Power down
  *
diff --git a/tmk_core/common/eeconfig.c b/tmk_core/common/eeconfig.c
index 72f198d6c..7cec4bd7d 100644
--- a/tmk_core/common/eeconfig.c
+++ b/tmk_core/common/eeconfig.c
@@ -51,10 +51,10 @@ void eeconfig_init_quantum(void) {
     // TODO: Remove once ARM has a way to configure EECONFIG_HANDEDNESS
     //        within the emulated eeprom via dfu-util or another tool
 #if defined INIT_EE_HANDS_LEFT
-    #pragma message "Faking EE_HANDS for left hand"
+#    pragma message "Faking EE_HANDS for left hand"
     eeprom_update_byte(EECONFIG_HANDEDNESS, 1);
 #elif defined INIT_EE_HANDS_RIGHT
-    #pragma message "Faking EE_HANDS for right hand"
+#    pragma message "Faking EE_HANDS for right hand"
     eeprom_update_byte(EECONFIG_HANDEDNESS, 0);
 #endif
 
diff --git a/tmk_core/common/host.c b/tmk_core/common/host.c
index 713b0d945..e7d92cfac 100644
--- a/tmk_core/common/host.c
+++ b/tmk_core/common/host.c
@@ -41,7 +41,7 @@ uint8_t host_keyboard_leds(void) {
 }
 
 led_t host_keyboard_led_state(void) {
-    if (!driver) return (led_t) {0};
+    if (!driver) return (led_t){0};
     return (led_t)((*driver->keyboard_leds)());
 }
 
diff --git a/tmk_core/common/led.h b/tmk_core/common/led.h
index daf974bed..990282862 100644
--- a/tmk_core/common/led.h
+++ b/tmk_core/common/led.h
@@ -36,11 +36,11 @@ extern "C" {
 typedef union {
     uint8_t raw;
     struct {
-        bool num_lock    : 1;
-        bool caps_lock   : 1;
-        bool scroll_lock : 1;
-        bool compose     : 1;
-        bool kana        : 1;
+        bool    num_lock : 1;
+        bool    caps_lock : 1;
+        bool    scroll_lock : 1;
+        bool    compose : 1;
+        bool    kana : 1;
         uint8_t reserved : 3;
     };
 } led_t;
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_protocol_hid.h b/tmk_core/protocol/arm_atsam/usb/usb_protocol_hid.h
index 2f8a39bdd..fb97f63ce 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_protocol_hid.h
+++ b/tmk_core/protocol/arm_atsam/usb/usb_protocol_hid.h
@@ -186,9 +186,10 @@ COMPILER_PACK_RESET()
 #define USB_HID_COUNTRY_UK 32                 // UK
 #define USB_HID_COUNTRY_US 33                 // US
 #define USB_HID_COUNTRY_YUGOSLAVIA 34         // Yugoslavia
-#define USB_HID_COUNTRY_TURKISH_F 35          // Turkish-F
-                                              //! @}
-                                              //! @}
+#define USB_HID_COUNTRY_TURKISH_F \
+    35  // Turkish-F
+        //! @}
+        //! @}
 //! @}
 
 //! \name HID KEYS values
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index f7bfa20b2..b90bcd037 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -310,7 +310,7 @@ static void usb_event_cb(USBDriver *usbp, usbevent_t event) {
         case USB_EVENT_SUSPEND:
 #ifdef SLEEP_LED_ENABLE
             sleep_led_enable();
-#endif      /* SLEEP_LED_ENABLE */
+#endif /* SLEEP_LED_ENABLE */
             /* Falls into.*/
         case USB_EVENT_UNCONFIGURED:
             /* Falls into.*/
@@ -453,9 +453,9 @@ static bool usb_request_hook_cb(USBDriver *usbp) {
 #ifdef NKRO_ENABLE
                             keymap_config.nkro = !!keyboard_protocol;
                             if (!keymap_config.nkro && keyboard_idle) {
-#else                           /* NKRO_ENABLE */
+#else  /* NKRO_ENABLE */
                             if (keyboard_idle) {
-#endif                          /* NKRO_ENABLE */
+#endif /* NKRO_ENABLE */
                                 /* arm the idle timer if boot protocol & idle */
                                 osalSysLockFromISR();
                                 chVTSetI(&keyboard_idle_timer, 4 * MS2ST(keyboard_idle), keyboard_idle_timer_cb, (void *)usbp);
diff --git a/tmk_core/protocol/iwrap/iwrap.c b/tmk_core/protocol/iwrap/iwrap.c
index 05e632da3..4d0ca5756 100644
--- a/tmk_core/protocol/iwrap/iwrap.c
+++ b/tmk_core/protocol/iwrap/iwrap.c
@@ -320,7 +320,8 @@ static void send_mouse(report_mouse_t *report) {
 #endif
 }
 
-static void send_system(uint16_t data) { /* not supported */ }
+static void send_system(uint16_t data) { /* not supported */
+}
 
 static void send_consumer(uint16_t data) {
 #ifdef EXTRAKEY_ENABLE
diff --git a/tmk_core/protocol/lufa/adafruit_ble.cpp b/tmk_core/protocol/lufa/adafruit_ble.cpp
index 505794a80..7b3ffdef7 100644
--- a/tmk_core/protocol/lufa/adafruit_ble.cpp
+++ b/tmk_core/protocol/lufa/adafruit_ble.cpp
@@ -31,9 +31,9 @@
 #define ConnectionUpdateInterval 1000 /* milliseconds */
 
 #ifdef SAMPLE_BATTERY
-#ifndef BATTERY_LEVEL_PIN
-#    define BATTERY_LEVEL_PIN 7
-#endif
+#    ifndef BATTERY_LEVEL_PIN
+#        define BATTERY_LEVEL_PIN 7
+#    endif
 #endif
 
 static struct {