diff --git a/config/corne.keymap b/config/corne.keymap
index 612aab5..600bf1b 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -41,7 +41,7 @@
             >;
       };
       number_layer {
-         //   .-------------------------------------------------.                         .-------------------------------------------------.
+         //   .-------------------------------------------------.        TODO:            .-------------------------------------------------.
          //   |   0     |   1   |   2   |   3   |   -   |   +   |                         |   ß   |   Ü   |   Ä   |   Ö   |       |         |
          //   |---------+-------+-------+-------+-------+-------|                         |-------+-------+-------+-------+-------+---------|
          //   |CAPS_LOCK|   4   |   5   |   6   |   /   |   *   |                         |   #   |   ~   |   ?   |       |       |         |
@@ -59,7 +59,7 @@
       };
 
       symbol_layer {
-         //  .------------------------------------------------.                         .-------------------------------------------------.
+         //  .------------------------------------------------.          TODO:          .-------------------------------------------------.
          //  |   $    |   (   |   )   |   [   |   ]   |   ~   |                         | ´     |   `   |       |       |       |         |
          //  |--------+-------+-------+-------+-------+-------|                         |-------+-------+-------+-------+-------+---------|
          //  |   %    |   {   |   }   |   ^   |PAGE_UP|   #   |                         |   &   |   |   |       |  @    |       |         |
@@ -77,7 +77,7 @@
       };
       function_layer {
          //  .------------------------------------------------.                         .-------------------------------------------------.
-         //  |    F1  |  F2   |   F3  |   F4  |  F5   |TRADUCT|                         |   F7  |    F8 |    F9 |   F10 |   F11 |   F12   |
+         //  |    F1  |  F2   |   F3  |   F4  |  F5   |TRADUCT|          TODO:          |   F7  |    F8 |    F9 |   F10 |   F11 |   F12   |
          //  |--------+-------+-------+-------+-------+-------|                         |-------+-------+-------+-------+-------+---------|
          //  |  ALT   | TAB   | SPELL |EMOJI  |   \   |ALFRED |                         |C-A-DEL|PASS   |       |       |BRI_UP |         |
          //  |--------+-------+-------+-------+-------+-------|                         |-------+-------+-------+-------+-------+---------|
@@ -94,38 +94,38 @@
                                  >;
                          };
       media_layer {
-         //  .------------------------------------------------.                         .-------------------------------------------------.
-         //  |    F1  |  F2   |   F3  |   F4  |  F5   |TRADUCT|                         |   F7  |    F8 |    F9 |   F10 |   F11 |   F12   |
-         //  |--------+-------+-------+-------+-------+-------|                         |-------+-------+-------+-------+-------+---------|
-         //  |  ALT   | TAB   | SPELL |EMOJI  |   \   |ALFRED |                         |C-A-DEL|PASS   |       |       |BRI_UP |         |
-         //  |--------+-------+-------+-------+-------+-------|                         |-------+-------+-------+-------+-------+---------|
-         //  |  ALT   | TAB   |CANCEL |       |ALFRED |   F6  |                         |L_SHIFT|L_SHIFT|R_SHIFT|       | BRI_UP|         |
-         //  '---------------------------------------------------------|       |----------------------------------------------------------'
-         //                           |  CTRL    |  CMD       |   ALT  |       |  TAB   |   ´   |          CTRL |
-         //                           '--------------------------------'       '--------------------------------'
-         // LCTL(LGUI(KC_D)), LCTL(LGUI(KC_SPC))
+         // .------------------------------------------------.           TODO:         .-------------------------------------------------.
+         // |        |<S-D-1>|<S-D-2>|<S-D-3>|       |       |                         |LANG_1 |LANG_2 |LANG_3 |       | STOP  |  DELETE |
+         // |--------+-------+-------+-------+-------+-------|                         |-------+-------+-------+-------+-------+---------|
+         // |        |<S-D-4>|<S-D-5>|       |       |       |                         |       |       |       |       |VOL_UP |PLAY/PAUS|
+         // |--------+-------+-------+-------+-------+-------|                         |-------+-------+-------+-------+-------+---------|
+         // |        |       |       |       |       |       |                         |       |       |  MUTE |  PREV |VOL_DOW|  NEXT   |
+         // '---------------------------------------------------------|       |----------------------------------------------------------'
+         //                          |  CTRL    |  CMD       |   ALT  |       |  SPACE | ALTGR |          CTRL |
+         //                          '--------------------------------'       '--------------------------------'
+         // &none &none &none &none &none &none &none    &none   &none          &none  &none  &none
+         //                         &none  &none  &none                      &none     &none &none
          bindings = <
-            &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp PRCNT &kp F7    &kp F8    &kp F9          &kp F10  &kp F11  &kp F12
-            &kp LALT &kp TAB   &trans &trans   &kp BSLH   &trans      &kp MINUS &kp EQUAL &kp LBKT        &kp RBKT &kp BSLH &kp GRAVE
-            &kp LALT &kp TAB   &trans &trans   &trans   &kp F6      &kp UNDER &kp PLUS  &kp LBRC        &kp RBRC &kp PIPE &kp TILDE
-                                    &kp LCTRL  &kp LGUI  &kp SPACE                      &kp RET     &kp RALT &kp LCTRL
+            &none &kp LS(LG(NUMBER_1)) &kp LS(LG(NUMBER_2)) &kp LS(LG(NUMBER_3)) &none &none &kp LANG1    &kp LANG2   &kp LANG3          &none  &kp C_STOP  &kp DEL
+            &none &kp LS(LG(NUMBER_4)) &kp LS(LG(NUMBER_5)) &none &none &none &none    &none   &none          &none &kp C_VOL_UP  &kp C_PLAY_PAUSE
+            &none &none &none &none &none &none &none    &none   &kp C_MUTE      &kp K_PREV  &kp C_VOL_DN  &kp C_NEXT
+                                    &none  &none  &none                      &none     &none &none
                                  >;
                          };
       mouse_layer {
-         //  .------------------------------------------------.                         .-------------------------------------------------.
-         //  |    F1  |  F2   |   F3  |   F4  |  F5   |TRADUCT|                         |   F7  |    F8 |    F9 |   F10 |   F11 |   F12   |
-         //  |--------+-------+-------+-------+-------+-------|                         |-------+-------+-------+-------+-------+---------|
-         //  |  ALT   | TAB   | SPELL |EMOJI  |   \   |ALFRED |                         |C-A-DEL|PASS   |       |       |BRI_UP |         |
-         //  |--------+-------+-------+-------+-------+-------|                         |-------+-------+-------+-------+-------+---------|
-         //  |  ALT   | TAB   |CANCEL |       |ALFRED |   F6  |                         |L_SHIFT|L_SHIFT|R_SHIFT|       | BRI_UP|         |
-         //  '---------------------------------------------------------|       |----------------------------------------------------------'
-         //                           |  CTRL    |  CMD       |   ALT  |       |  TAB   |   ´   |          CTRL |
-         //                           '--------------------------------'       '--------------------------------'
-         // LCTL(LGUI(KC_D)), LCTL(LGUI(KC_SPC))
+         //   .------------------------------------------------.         TODO:           .-------------------------------------------------.
+         //   |        |       |       |       |       |       |                         |       |       |WH_LEFT|WH_RIGH|WH_DOWN| WH_UP   |
+         //   |--------+-------+-------+-------+-------+-------|                         |-------+-------+-------+-------+-------+---------|
+         //   |        |CLICK_1|CLICK_2|       |       |       |                         |       |       |       |CLICK_1| UP    |CLICK_2  |
+         //   |--------+-------+-------+-------+-------+-------|                         |-------+-------+-------+-------+-------+---------|
+         //   | L_SHIFT|       |       |       |       |       |                         |       |       |       | LEFT  | DOWN  | RIGHT   |
+         //   '---------------------------------------------------------|       |----------------------------------------------------------'
+         //                            |  CTRL    |  CMD       | SPACE  |       |       |        |               |
+         //                            '--------------------------------'       '--------------------------------'
          bindings = <
-            &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp PRCNT &kp F7    &kp F8    &kp F9          &kp F10  &kp F11  &kp F12
-            &kp LALT &kp TAB   &trans &trans   &kp BSLH   &trans      &kp MINUS &kp EQUAL &kp LBKT        &kp RBKT &kp BSLH &kp GRAVE
-            &kp LALT &kp TAB   &trans &trans   &trans   &kp F6      &kp UNDER &kp PLUS  &kp LBRC        &kp RBRC &kp PIPE &kp TILDE
+            &none &none &none &none &none &none &none    &none   &none          &none  &none  &none
+            &none &none &none &none &none &none &none    &none   &none          &none  &none  &none
+            &none &none &none &none &none &none &none    &none   &none          &none  &none  &none
                                     &kp LCTRL  &kp LGUI  &kp SPACE                      &kp RET     &kp RALT &kp LCTRL
                                  >;
                          };