diff --git a/config/corne.keymap b/config/corne.keymap
index 03ea014..3f7a6da 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -32,16 +32,16 @@
         Print_Screen {
             bindings = <&kp RC(PRINTSCREEN)>;
             key-positions = <6 7>;
-            timeout-ms = <250>;
+            timeout-ms = <200>;
         };
 
-        F17_Key {
+        F17_PiMenue {
             bindings = <&kp F17>;
             key-positions = <17 29>;
             timeout-ms = <350>;
         };
 
-        F19_Key {
+        F19_PiMenue {
             bindings = <&kp F19>;
             key-positions = <17 5>;
             timeout-ms = <350>;
@@ -58,35 +58,11 @@
             timeout-ms = <200>;
         };
 
-        Arrow_Layer_R {
-            bindings = <&mo 3>;
-            key-positions = <40 41>;
-            timeout-ms = <350>;
-        };
-
-        Symbols_R {
-            bindings = <&mo 2>;
-            key-positions = <39 40>;
-            timeout-ms = <350>;
-        };
-
         bluetooth_Layer {
             bindings = <&mo 1>;
             key-positions = <6 7 8 9>;
         };
 
-        Win_Key_R {
-            bindings = <&kp LEFT_WIN>;
-            key-positions = <30 40 39>;
-            timeout-ms = <350>;
-        };
-
-        Home_Key_R {
-            bindings = <&kp HOME>;
-            key-positions = <40 30>;
-            timeout-ms = <200>;
-        };
-
         Backspace {
             bindings = <&kp BACKSPACE>;
             key-positions = <0 1>;
@@ -117,11 +93,6 @@
             key-positions = <3 16>;
         };
 
-        S_Asterisk {
-            bindings = <&kp ASTERISK>;
-            key-positions = <4 17>;
-        };
-
         Language {
             bindings = <&kp F18>;
             key-positions = <16 17>;
@@ -162,11 +133,6 @@
             key-positions = <2 4>;
         };
 
-        Test {
-            bindings = <&kp EXCL>;
-            key-positions = <13 14>;
-        };
-
         Colon {
             bindings = <&kp COLON>;
             key-positions = <3 1>;
@@ -234,10 +200,10 @@
 
             display-name = "Base";
             bindings = <
-&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            &hmr LEFT_SHIFT J  &hmr LCTRL K  &hmr LEFT_ALT L  &hmr LEFT_WIN SEMICOLON  &kp SQT
-&kp LSHFT  &kp Z  &kp X  &mt LEFT_ALT C  &kp V      &kp B      &mt HOME N       &kp M              &kp COMMA     &kp DOT          &kp FSLH                 &mt F1 RET
-                         &mo 4           &kp SPACE  &kp F22    &lt 3 BACKSPACE  &lt 2 SPACE        &lt 4 DELETE
+&mt HOME 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            &hmr LEFT_SHIFT J  &hmr LCTRL K  &hmr LEFT_ALT L  &hmr LEFT_WIN SEMICOLON  &kp SQT
+&kp LSHFT     &kp Z  &kp X  &mt LEFT_ALT C  &mt LEFT_WIN V  &mt HOME B    &mt HOME N       &kp M              &kp COMMA     &kp DOT          &kp FSLH                 &mt F1 RET
+                            &mo 4           &kp SPACE       &kp F22       &lt 3 BACKSPACE  &lt 2 SPACE        &lt 4 DELETE
             >;
         };
 
@@ -268,17 +234,17 @@
             bindings = <
 &kp COMMA    &kp PERIOD       &kp EXCLAMATION       &kp EQUAL     &kp PLUS       &kp MINUS         &kp CARET  &kp LESS_THAN  &kp EQUAL             &kp GREATER_THAN  &kp PERIOD       &kp COMMA
 &kp PERCENT  &kp EXCLAMATION  &kp EQUAL             &prent_Dance  &brace_Dance   &bracket_Dance    &kp SEMI   &kp SLASH      &kp NON_US_BACKSLASH  &kp EQUAL         &kp EXCLAMATION  &kp GRAVE
-&kp HASH     &kp SLASH        &kp NON_US_BACKSLASH  &kp PIPE      &kp AMPERSAND  &trans            &kp UNDER  &kp PLUS       &kp LBRC              &kp RBRC          &kp PIPE         &kp TILDE
+&kp HASH     &kp SLASH        &kp NON_US_BACKSLASH  &kp PIPE      &kp AMPERSAND  &trans            &kp UNDER  &kp PLUS       &trans                &trans            &kp PIPE         &kp TILDE
                                                     &trans        &trans         &trans            &trans     &trans         &trans
             >;
         };
 
         Arrow {
             bindings = <
-&none  &none  &none     &kp UP    &none         &none    &none  &none     &kp UP    &none      &none  &none
-&none  &none  &kp LEFT  &kp DOWN  &kp RIGHT     &none    &none  &kp LEFT  &kp DOWN  &kp RIGHT  &none  &none
-&none  &none  &none     &none     &kp LEFT_ALT  &none    &none  &kp LALT  &none     &none      &none  &none
-                        &none     &none         &none    &none  &none     &none
+&none   &none  &none     &kp UP     &none         &none    &none  &none         &kp UP     &none      &none  &none
+&trans  &none  &kp LEFT  &kp DOWN   &kp RIGHT     &none    &none  &kp LEFT      &kp DOWN   &kp RIGHT  &none  &none
+&trans  &none  &none     &none      &none         &none    &none  &none         &none      &none      &none  &none
+                         &kp LCTRL  &kp LEFT_ALT  &none    &none  &kp LEFT_ALT  &kp LCTRL
             >;
         };