diff --git a/config/defines.dtsi b/config/defines.dtsi
index ac5fc83..9c95430 100644
--- a/config/defines.dtsi
+++ b/config/defines.dtsi
@@ -19,18 +19,18 @@
 // default
 #define DEF_R		&hm LGUI R
 #define DEF_S		&hm LALT S
-#define DEF_T		&hm LSFT T
+#define DEF_N		&hm LSFT N
+#define DEF_T		&hm LCTL T
 #define DEF_H		&hm LCTL H
-#define DEF_N		&hm LCTL N
-#define DEF_A		&hm LSFT A
+#define DEF_E		&hm LSFT E
 #define DEF_I		&hm LALT I
-#define DEF_O		&hm LGUI O
+#define DEF_A		&hm LGUI A
 
 #define DEF_COMMA   &mm_com_sem
 #define DEF_DOT     &mm_dot_col
 
-#define DEF_TOG_MIC &kp F23
-#define DEF_SHA_SCR &kp F24
+#define DEF_TOG_MIC &kp F21
+#define DEF_SHA_SCR &kp F22
 #define DEF_UNDO    &kp LC(Z)
 #define DEF_REDO    &kp LC(Y)
 #define DEF_BACK_WD &kp LC(BSPC)
@@ -93,7 +93,6 @@
 #define MIS_CAD     &kp LC(LA(DEL))
 #define MIS_BRI_DN  &kp C_BRI_DN
 #define MIS_BRI_UP  &kp C_BRI_UP
-#define MIS_MUT_MIC &kp F9
 #define MIS_BITWAR  &kp LC(LS(L))
 #define MIS_GENERAT &kp LC(LS(N9))
 #define MIS_SLEEP   &kp F10
@@ -107,7 +106,7 @@
 #define UK_PIPE     PIPE2
 #define UK_BSLH     &kp NUBS
 #define UK_POUND    HASH 
-#define UK_EURO     &kp LC(LA(N4)) 
+#define UK_EURO     &kp LC(LA(N4))
 
 // other
 #define XXXXXXXXXX	&none
diff --git a/config/wasfoora.keymap b/config/wasfoora.keymap
index 3cdf402..0943d30 100644
--- a/config/wasfoora.keymap
+++ b/config/wasfoora.keymap
@@ -37,11 +37,11 @@
 		DEF_layer {
             label = "Default";
             bindings = <
-				XXXXXXXXXX	&kp C		&kp G		&kp D		&kp K				&kp J		&kp L		&kp U		&kp Y		XXXXXXXXXX
-				DEF_R		DEF_S		DEF_T		DEF_H		&kp P				&kp V		DEF_N		DEF_A		DEF_I		DEF_O
-							&kp B		&kp W		&kp F										&kp M		DEF_COMMA	DEF_DOT
+				XXXXXXXXXX	&kp C		&kp L		&kp F		&kp P				&kp K		&kp Y		&kp O		&kp U		XXXXXXXXXX
+				DEF_R		DEF_S		DEF_N		DEF_T		&kp B				&kp J		DEF_H		DEF_E		DEF_I		DEF_A
+							&kp W		&kp M		&kp G										&kp D		DEF_COMMA	DEF_DOT
 
-													&kp F21		&lt NAV SPACE		&lt NUM E	&kp F22
+													&kp F23		&lt NAV SPACE		&lt NUM SFT	&kp F24
 			>;
 		};