diff --git a/keyboards/handwired/bluepill/bluepill.h b/keyboards/handwired/bluepill/bluepill.h
index 9d2f1a08f33..e9c07c70842 100644
--- a/keyboards/handwired/bluepill/bluepill.h
+++ b/keyboards/handwired/bluepill/bluepill.h
@@ -5,53 +5,53 @@
 #include "led.h"
 
 /*  ANSI LAYOUT
-    ESC| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10| F11| F12| PSC| PGU| PGD
-    GRA| 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  | 9  | 0  | '  | ¡  |   BCKS  | DEL
-    TAB| Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  | `  | +  |         | HOM
-    CAP| A  | S  | D  | F  | G  | H  | J  | K  | L  | Ñ  | ´  | Ç  |   ENTER | END
-    LSI| (<)| Z  | X  | C  | V  | B  | N  | M  | ,  | .  | -  |   RSHIF | UP | FNL
-    LCT| WIN| ALT|               ESPACE             | ALG| FN | RCT| LEF| DOW| RIG
+  ESC| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10| F11| F12| PSC| PGU| PGD
+  GRA| 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  | 9  | 0  | '  | ¡  |   BCKS  | DEL
+  TAB| Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  | `  | +  |         | HOM
+  CAP| A  | S  | D  | F  | G  | H  | J  | K  | L  | Ñ  | ´  | Ç  |   ENTER | END
+  LSI| (<)| Z  | X  | C  | V  | B  | N  | M  | ,  | .  | -  |   RSHIF | UP | FNL
+  LCT| WIN| ALT|               ESPACE             | ALG| FN | RCT| LEF| DOW| RIG
 */
 
 #define KEYMAP_SEVENTY_ANSI( \
-      K00, K01, K02, K03,   K04,   K05,   K06, K07,   K08,   K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-      K10, K11, K12, K13,   K14,   K15,   K16, K17,   K18,   K19, K1A, K1B, K1C,    K1D,   K1E, \
-      K20, K21, K22, K23,   K24,   K25,   K26, K27,   K28,   K29, K2A, K2B, K2C,           K2D, \
-      K30, K31, K32, K33,   K34,   K35,   K36, K37,   K38,   K39, K3A, K3B, K3C,      K3D, K3E, \
-      K40, K41, K42, K43,   K44,   K45,   K46, K47,   K48,   K49, K4A, K4B,      K4C, K4D, K4E, \
-      K50, K51, K52,                      K53,               K54, K55, K56, K57, K58, K59 \
+  K00, K01, K02, K03,   K04,   K05,   K06, K07,   K08,   K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+  K10, K11, K12, K13,   K14,   K15,   K16, K17,   K18,   K19, K1A, K1B, K1C,    K1D,   K1E, \
+  K20, K21, K22, K23,   K24,   K25,   K26, K27,   K28,   K29, K2A, K2B, K2C,           K2D, \
+  K30, K31, K32, K33,   K34,   K35,   K36, K37,   K38,   K39, K3A, K3B, K3C,      K3D, K3E, \
+  K40, K41, K42, K43,   K44,   K45,   K46, K47,   K48,   K49, K4A, K4B,      K4C, K4D, K4E, \
+  K50, K51, K52,                      K53,               K54, K55, K56, K57, K58, K59 \
 ) { \
-    { K00, K01, K02, K03,   K04,   K05,   K06, K07,   K08,  K09, K0A, K0B, K0C, K0D, K0F }, \
-    { K10, K11, K12, K13,   K14,   K15,   K16, K17,   K18,  K19, K1A, K1B, K1C, K0E, K1E }, \
-    { K20, K21, K22, K23,   K24,   K25,   K26, K27,   K28,  K29, K2A, K2B, K2C, K1D, K2D }, \
-    { K30, K31, K32, K33,   K34,   K35,   K36, K37,   K38,  K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, K43,   K44,   K45,   K46, K47,   K48,  K49, K4A, K4B, K4C, K4D, K4E }, \
-    { K50, K51, K52, KC_NO, KC_NO, KC_NO, K53, KC_NO, KC_NO,K54, K55, K56, K57, K58, K59 } \
+  { K00, K01, K02, K03,   K04,   K05,   K06, K07,   K08,  K09, K0A, K0B, K0C, K0D, K0F }, \
+  { K10, K11, K12, K13,   K14,   K15,   K16, K17,   K18,  K19, K1A, K1B, K1C, K0E, K1E }, \
+  { K20, K21, K22, K23,   K24,   K25,   K26, K27,   K28,  K29, K2A, K2B, K2C, K1D, K2D }, \
+  { K30, K31, K32, K33,   K34,   K35,   K36, K37,   K38,  K39, K3A, K3B, K3C, K3D, K3E }, \
+  { K40, K41, K42, K43,   K44,   K45,   K46, K47,   K48,  K49, K4A, K4B, K4C, K4D, K4E }, \
+  { K50, K51, K52, KC_NO, KC_NO, KC_NO, K53, KC_NO, KC_NO,K54, K55, K56, K57, K58, K59 } \
 }
 
 /*  ISO LAYOUT
-    ESC| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10| F11| F12| PSC| PGU| PGD
-    GRA| 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  | 9  | 0  | '  | ¡  |   BCKS  | DEL
-    TAB| Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  | `  | +  |         | HOM
-    CAP| A  | S  | D  | F  | G  | H  | J  | K  | L  | Ñ  | ´  | Ç  |   ENTER | END
-    LSI| <  | Z  | X  | C  | V  | B  | N  | M  | ,  | .  | -  |   RSHIF | UP | FNL
-    LCT| WIN| ALT|               ESPACE             | ALG| FN | RCT| LEF| DOW| RIG
+  ESC| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10| F11| F12| PSC| PGU| PGD
+  GRA| 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  | 9  | 0  | '  | ¡  |   BCKS  | DEL
+  TAB| Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  | `  | +  |         | HOM
+  CAP| A  | S  | D  | F  | G  | H  | J  | K  | L  | Ñ  | ´  | Ç  |   ENTER | END
+  LSI| <  | Z  | X  | C  | V  | B  | N  | M  | ,  | .  | -  |   RSHIF | UP | FNL
+  LCT| WIN| ALT|               ESPACE             | ALG| FN | RCT| LEF| DOW| RIG
 */
 
 #define KEYMAP_SEVENTY_ISO( \
-      K00, K01, K02, K03,   K04,   K05,   K06, K07,   K08,   K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-      K10, K11, K12, K13,   K14,   K15,   K16, K17,   K18,   K19, K1A, K1B, K1C,    K1D,   K1E, \
-      K20, K21, K22, K23,   K24,   K25,   K26, K27,   K28,   K29, K2A, K2B, K2C,           K2D, \
-      K30, K31, K32, K33,   K34,   K35,   K36, K37,   K38,   K39, K3A, K3B, K3C,      K3D, K3E, \
-      K40, K41, K42, K43,   K44,   K45,   K46, K47,   K48,   K49, K4A, K4B,      K4C, K4D, K4E, \
-      K50, K51, K52,                      K53,               K54, K55, K56, K57, K58, K59 \
+  K00, K01, K02, K03,   K04,   K05,   K06, K07,   K08,   K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+  K10, K11, K12, K13,   K14,   K15,   K16, K17,   K18,   K19, K1A, K1B, K1C,    K1D,   K1E, \
+  K20, K21, K22, K23,   K24,   K25,   K26, K27,   K28,   K29, K2A, K2B, K2C,           K2D, \
+  K30, K31, K32, K33,   K34,   K35,   K36, K37,   K38,   K39, K3A, K3B, K3C,      K3D, K3E, \
+  K40, K41, K42, K43,   K44,   K45,   K46, K47,   K48,   K49, K4A, K4B,      K4C, K4D, K4E, \
+  K50, K51, K52,                      K53,               K54, K55, K56, K57, K58, K59 \
 ) { \
-    { K00, K01, K02, K03,   K04,   K05,   K06, K07,   K08,  K09, K0A, K0B, K0C, K0D, K0F }, \
-    { K10, K11, K12, K13,   K14,   K15,   K16, K17,   K18,  K19, K1A, K1B, K1C, K0E, K1E }, \
-    { K20, K21, K22, K23,   K24,   K25,   K26, K27,   K28,  K29, K2A, K2B, K2C, K1D, K2D }, \
-    { K30, K31, K32, K33,   K34,   K35,   K36, K37,   K38,  K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, K43,   K44,   K45,   K46, K47,   K48,  K49, K4A, K4B, K4C, K4D, K4E }, \
-    { K50, K51, K52, KC_NO, KC_NO, KC_NO, K53, KC_NO, KC_NO,K54, K55, K56, K57, K58, K59 } \
+  { K00, K01, K02, K03,   K04,   K05,   K06, K07,   K08,  K09, K0A, K0B, K0C, K0D, K0F }, \
+  { K10, K11, K12, K13,   K14,   K15,   K16, K17,   K18,  K19, K1A, K1B, K1C, K0E, K1E }, \
+  { K20, K21, K22, K23,   K24,   K25,   K26, K27,   K28,  K29, K2A, K2B, K2C, K1D, K2D }, \
+  { K30, K31, K32, K33,   K34,   K35,   K36, K37,   K38,  K39, K3A, K3B, K3C, K3D, K3E }, \
+  { K40, K41, K42, K43,   K44,   K45,   K46, K47,   K48,  K49, K4A, K4B, K4C, K4D, K4E }, \
+  { K50, K51, K52, KC_NO, KC_NO, KC_NO, K53, KC_NO, KC_NO,K54, K55, K56, K57, K58, K59 } \
 }
 
 #endif /* KEYBOARDS_CHIBIOS_TEST_CHIBIOS_TEST_H_ */
\ No newline at end of file
diff --git a/keyboards/handwired/bluepill/bluepill70/led.c b/keyboards/handwired/bluepill/bluepill70/led.c
index d28c1750b26..5c557bbee1f 100644
--- a/keyboards/handwired/bluepill/bluepill70/led.c
+++ b/keyboards/handwired/bluepill/bluepill70/led.c
@@ -19,23 +19,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "led.h"
 
 
-void led_set(uint8_t usb_led)
-{
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-    	/* generic STM32F103C8T6 board */
-#ifdef BOARD_GENERIC_STM32_F103
-        palClearPad(GPIOC, 13);
-#endif
-    } else {
-    	/* generic STM32F103C8T6 board */
-#ifdef BOARD_GENERIC_STM32_F103
-    	palSetPad(GPIOC, 13);
-#endif
-    }
+void led_set(uint8_t usb_led){
+  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+    /* generic STM32F103C8T6 board */
+    #ifdef BOARD_GENERIC_STM32_F103
+      palClearPad(GPIOC, 13);
+    #endif
+  } else {
+    /* generic STM32F103C8T6 board */
+    #ifdef BOARD_GENERIC_STM32_F103
+      palSetPad(GPIOC, 13);
+    #endif
+  }
 }
 
-
-
 // inline void gh60_caps_led_off(void)     { DDRB &= ~(1<<2); PORTB &= ~(1<<2); }
 
 // inline void gh60_caps_led_on(void)      { DDRB |=  (1<<2); PORTB &= ~(1<<2); }
\ No newline at end of file
diff --git a/keyboards/handwired/bluepill/bluepill70/matrix.c b/keyboards/handwired/bluepill/bluepill70/matrix.c
index 9ab56551115..57f4522de21 100644
--- a/keyboards/handwired/bluepill/bluepill70/matrix.c
+++ b/keyboards/handwired/bluepill/bluepill70/matrix.c
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "matrix.h"
 #include "wait.h"
 
-
 //#include "pwm.c"
 
 #ifndef DEBOUNCE
@@ -44,17 +43,12 @@ static void init_cols(void);
 static void unselect_rows(void);
 static void select_row(uint8_t row);
 
-
-inline
-uint8_t matrix_rows(void)
-{
-    return MATRIX_ROWS;
+inline uint8_t matrix_rows(void){
+  return MATRIX_ROWS;
 }
 
-inline
-uint8_t matrix_cols(void)
-{
-    return MATRIX_COLS;
+inline uint8_t matrix_cols(void){
+  return MATRIX_COLS;
 }
 
 /* generic STM32F103C8T6 board */
@@ -66,79 +60,70 @@ uint8_t matrix_cols(void)
 
 void matrix_init(void)
 {
-    // initialize row and col
+  // initialize row and col
+  unselect_rows();
+  init_cols();
+  // initialize matrix state: all keys off
+  for (uint8_t i=0; i < MATRIX_ROWS; i++) {
+    matrix[i] = 0;
+    matrix_debouncing[i] = 0;
+  }
+  //debug
+  debug_matrix = true;
+  LED_ON();
+  wait_ms(500);
+  LED_OFF();
+}
+
+uint8_t matrix_scan(void){
+  for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+    select_row(i);
+    wait_us(30);  // without this wait read unstable value.
+    matrix_row_t cols = read_cols();
+    if (matrix_debouncing[i] != cols) {
+      matrix_debouncing[i] = cols;
+      if (debouncing) {
+        debug("bounce!: "); debug_hex(debouncing); debug("\n");
+      }
+    debouncing = DEBOUNCE;
+    }
     unselect_rows();
-    init_cols();
+  }
 
-    // initialize matrix state: all keys off
-    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
-        matrix[i] = 0;
-        matrix_debouncing[i] = 0;
+  if (debouncing) {
+    if (--debouncing) {
+      wait_ms(1);
+    } else {
+      for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        matrix[i] = matrix_debouncing[i];
+      }
     }
+  }
 
-    //debug
-    debug_matrix = true;
-    LED_ON();
-    wait_ms(500);
-    LED_OFF();
+  return 1;
 }
 
-uint8_t matrix_scan(void)
-{
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        select_row(i);
-        wait_us(30);  // without this wait read unstable value.
-        matrix_row_t cols = read_cols();
-        if (matrix_debouncing[i] != cols) {
-            matrix_debouncing[i] = cols;
-            if (debouncing) {
-                debug("bounce!: "); debug_hex(debouncing); debug("\n");
-            }
-            debouncing = DEBOUNCE;
-        }
-        unselect_rows();
-    }
-
-    if (debouncing) {
-        if (--debouncing) {
-            wait_ms(1);
-        } else {
-            for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-                matrix[i] = matrix_debouncing[i];
-            }
-        }
-    }
-
-    return 1;
+inline bool matrix_is_on(uint8_t row, uint8_t col){
+  return (matrix[row] & ((matrix_row_t)1<<col));
 }
 
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & ((matrix_row_t)1<<col));
+inline matrix_row_t matrix_get_row(uint8_t row){
+  return matrix[row];
 }
 
-inline
-matrix_row_t matrix_get_row(uint8_t row)
-{
-    return matrix[row];
-}
-
-void matrix_print(void)
-{
-    print("\nr/c 0123456789ABCDEF\n");
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse16(matrix_get_row(row));
-        print("\n");
-    }
+void matrix_print(void){
+  print("\nr/c 0123456789ABCDEF\n");
+  for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+    phex(row); print(": ");
+    pbin_reverse16(matrix_get_row(row));
+    print("\n");
+  }
 }
 
 /* Column pin configuration
  */
 //  Modified by Xydane
-static void  init_cols(void)
-{
+static void  init_cols(void){
   palSetPadMode(GPIOA, 5, PAL_MODE_INPUT_PULLUP);
   palSetPadMode(GPIOA, 15, PAL_MODE_INPUT_PULLUP);
   palSetPadMode(GPIOA, 10, PAL_MODE_INPUT_PULLUP);
@@ -158,8 +143,7 @@ static void  init_cols(void)
 
 /* Returns status of switches(1:on, 0:off) */
 //  Modified by Xydane
-static matrix_row_t read_cols(void)
-{
+static matrix_row_t read_cols(void){
   return ((palReadPad(GPIOA, 5)==PAL_HIGH) ? 0 : (1<<0))
     | ((palReadPad(GPIOA, 15)==PAL_HIGH) ? 0 : (1<<1))
     | ((palReadPad(GPIOA, 10)==PAL_HIGH) ? 0 : (1<<2))
@@ -180,8 +164,7 @@ static matrix_row_t read_cols(void)
 /* Row pin configuration
  */
 //  Modified by Xydane
-static void unselect_rows(void)
-{
+static void unselect_rows(void){
   palSetPadMode(GPIOB, 9, PAL_MODE_INPUT);
   palSetPadMode(GPIOB, 8, PAL_MODE_INPUT);
   palSetPadMode(GPIOB, 7, PAL_MODE_INPUT);
@@ -191,10 +174,9 @@ static void unselect_rows(void)
 }
 
 //  Modified by Xydane
-static void select_row(uint8_t row)
-{
-    (void)row;
-    switch (row) {
+static void select_row(uint8_t row){
+  (void)row;
+  switch (row) {
     case 0:
       palSetPadMode(GPIOB, 9, PAL_MODE_OUTPUT_PUSHPULL);
       palClearPad(GPIOB, 9);
@@ -219,5 +201,5 @@ static void select_row(uint8_t row)
       palSetPadMode(GPIOA, 4, PAL_MODE_OUTPUT_PUSHPULL);
       palClearPad(GPIOA, 4);
       break;
-    }
+  }
 }
diff --git a/keyboards/handwired/bluepill/config.h b/keyboards/handwired/bluepill/config.h
index eb98dcdd26e..77611a21342 100644
--- a/keyboards/handwired/bluepill/config.h
+++ b/keyboards/handwired/bluepill/config.h
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* key combination for command */
 #define IS_COMMAND() ( \
-    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
+  keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
 )
 
 /* Backlighting include */
diff --git a/keyboards/handwired/bluepill/keymaps/default/keymap.c b/keyboards/handwired/bluepill/keymaps/default/keymap.c
index 1c3aac39c33..11836950fcd 100644
--- a/keyboards/handwired/bluepill/keymaps/default/keymap.c
+++ b/keyboards/handwired/bluepill/keymaps/default/keymap.c
@@ -52,25 +52,25 @@ KC_GRAVE, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,
 };
 
 const uint16_t PROGMEM fn_actions[] = {
-    [0] = ACTION_LAYER_MOMENTARY(1),  // to Fn overlay
-    [1] = ACTION_LAYER_TOGGLE(2),  // to Fn overlay
+  [0] = ACTION_LAYER_MOMENTARY(1),  // to Fn overlay
+  [1] = ACTION_LAYER_TOGGLE(2),  // to Fn overlay
 };
 
 /* Layer based ilumination, set min value to 0xFFF */
 uint32_t layer_state_set_user(uint32_t state) {
-    switch (biton32(state)) {
-    case _FNONE:
-      palSetPad(GPIOA, 0);  //OFF Color A
-      palClearPad(GPIOA, 1); //ON Color B
-        break;
-    case _FNTWO:
-      palClearPad(GPIOA, 0); //ON Color A
-      palClearPad(GPIOA, 1);  //ON Color B
-        break;
-    default: //  for any other layers, or the default layer
-      palClearPad(GPIOA, 0); //ON Color A
-      palSetPad(GPIOA, 1);  //OFF Color B
-        break;
-    }
+  switch (biton32(state)) {
+  case _FNONE:
+    palSetPad(GPIOA, 0);  //OFF Color A
+    palClearPad(GPIOA, 1); //ON Color B
+    break;
+  case _FNTWO:
+    palClearPad(GPIOA, 0); //ON Color A
+    palClearPad(GPIOA, 1);  //ON Color B
+    break;
+  default: //  for any other layers, or the default layer
+    palClearPad(GPIOA, 0); //ON Color A
+    palSetPad(GPIOA, 1);  //OFF Color B
+    break;
+  }
   return state;
 }
\ No newline at end of file
diff --git a/keyboards/handwired/bluepill/keymaps/iso/keymap.c b/keyboards/handwired/bluepill/keymaps/iso/keymap.c
index 1aaecf7a00d..35a5685212e 100644
--- a/keyboards/handwired/bluepill/keymaps/iso/keymap.c
+++ b/keyboards/handwired/bluepill/keymaps/iso/keymap.c
@@ -25,20 +25,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Highly Modified by Xydane
 const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NORMAL] = KEYMAP_SEVENTY_ISO(
-  KC_ESC,	KC_F1,  KC_F2, 	KC_F3, 	KC_F4, 	KC_F5, 	KC_F6,	KC_F7,	KC_F8,	KC_F9,	KC_F10,	KC_F11,	 KC_F12, KC_PSCREEN,KC_HOME, KC_END, \
-KC_GRAVE,	KC_1,	  KC_2,	  KC_3, 	KC_4, 	KC_5, 	KC_6,	  KC_7,	  KC_8,	  KC_9,	  KC_0,	  KC_MINS, KC_EQL,	KC_BSPC, KC_DELETE, \
-  KC_TAB,	KC_Q,	  KC_W,	  KC_E, 	KC_R, 	KC_T, 	KC_Y,	  KC_U,	  KC_I,	  KC_O,	  KC_P,	  KC_LBRC, KC_RBRC,				 	 KC_PGUP, \
- KC_CAPS,	KC_A,	  KC_S,	  KC_D, 	KC_F, 	KC_G, 	KC_H,	  KC_J, 	KC_K,	  KC_L,	  KC_SCLN,KC_QUOT, KC_NUHS,	  KC_ENT,KC_PGDOWN, \
- KC_LSPO, KC_NUBS,KC_Z,	  KC_X, 	KC_C, 	KC_V, 	KC_B,	  KC_N,	  KC_M,	  KC_COMM,KC_DOT,	KC_SLSH, KC_RSPC,KC_UP,	 F(1), \
- KC_LCTL, KC_LGUI,KC_LALT,                 		    KC_SPC,          				KC_RALT,F(0),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ),
+  KC_ESC, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12, KC_PSCREEN,KC_HOME, KC_END, \
+KC_GRAVE, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL,  KC_BSPC, KC_DELETE, \
+  KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,          KC_PGUP, \
+ KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT, KC_NUHS,   KC_ENT,KC_PGDOWN, \
+ KC_LSPO, KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH, KC_RSPC,KC_UP,  F(1), \
+ KC_LCTL, KC_LGUI,KC_LALT,                        KC_SPC,                 KC_RALT,F(0),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ),
         
   [_FNONE] = KEYMAP_SEVENTY_ISO(
   KC_TRNS, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, KC_TRNS,KC_MUTE,KC_VOLD,KC_VOLU, KC_TRNS,KC_TRNS,KC_NLCK, KC_CALC, KC_TRNS,KC_TRNS,KC_TRNS, \
-  KC_TRNS,	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_P7,	 KC_P8,	 KC_P9,	 KC_TRNS, KC_TRNS, KC_TRNS,	KC_TRNS,KC_TRNS, \
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_P4,	 KC_P5,	 KC_P6,	 KC_PPLS, KC_TRNS, KC_TRNS,				 	KC_TRNS, \
-  KC_TRNS,	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_P1,	 KC_P2,	 KC_P3,	 KC_PAST, KC_TRNS, KC_TRNS,	KC_TRNS,KC_TRNS, \
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_P0,  KC_PDOT,KC_PENT, KC_PSLS, 	KC_TRNS,KC_TRNS,KC_TRNS, \
-  KC_TRNS, KC_TRNS, KC_TRNS,                 	KC_TRNS,          					    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS ),
+  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_P7,  KC_P8,  KC_P9,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, \
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_P4,   KC_P5,  KC_P6,  KC_PPLS, KC_TRNS, KC_TRNS,         KC_TRNS, \
+  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_P1,  KC_P2,  KC_P3,  KC_PAST, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, \
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_P0,  KC_PDOT,KC_PENT, KC_PSLS,   KC_TRNS,KC_TRNS,KC_TRNS, \
+  KC_TRNS, KC_TRNS, KC_TRNS,                  KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS ),
 
   [_FNTWO] = KEYMAP_SEVENTY_ISO(
   KC_TRNS, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, KC_TRNS,KC_MUTE,KC_VOLD,KC_VOLU, KC_TRNS,KC_TRNS,KC_NLCK, KC_CALC, KC_TRNS,KC_TRNS,KC_TRNS, \
@@ -50,25 +50,25 @@ KC_GRAVE,	KC_1,	  KC_2,	  KC_3, 	KC_4, 	KC_5, 	KC_6,	  KC_7,	  KC_8,	  KC_9,	  K
 };
 
 const uint16_t PROGMEM fn_actions[] = {
-    [0] = ACTION_LAYER_MOMENTARY(1),  // to Fn overlay
-    [1] = ACTION_LAYER_TOGGLE(2),  // to Fn overlay
+  [0] = ACTION_LAYER_MOMENTARY(1),  // to Fn overlay
+  [1] = ACTION_LAYER_TOGGLE(2),  // to Fn overlay
 };
 
 /* Layer based ilumination, set min value to 0xFFF */
 uint32_t layer_state_set_user(uint32_t state) {
-    switch (biton32(state)) {
-    case _FNONE:
-      palSetPad(GPIOA, 0);  //OFF Color A
-      palClearPad(GPIOA, 1); //ON Color B
-        break;
-    case _FNTWO:
-      palClearPad(GPIOA, 0); //ON Color A
-      palClearPad(GPIOA, 1);  //ON Color B
-        break;
-    default: //  for any other layers, or the default layer
-      palClearPad(GPIOA, 0); //ON Color A
-      palSetPad(GPIOA, 1);  //OFF Color B
-        break;
+  switch (biton32(state)) {
+  case _FNONE:
+    palSetPad(GPIOA, 0);  //OFF Color A
+    palClearPad(GPIOA, 1); //ON Color B
+    break;
+  case _FNTWO:
+    palClearPad(GPIOA, 0); //ON Color A
+    palClearPad(GPIOA, 1);  //ON Color B
+    break;
+  default: //  for any other layers, or the default layer
+    palClearPad(GPIOA, 0); //ON Color A
+    palSetPad(GPIOA, 1);  //OFF Color B
+    break;
     }
   return state;
 }
\ No newline at end of file