diff --git a/config/corne.keymap b/config/corne.keymap
index a51db67..745d119 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -10,9 +10,15 @@
 #include <dt-bindings/zmk/bt.h>
 #include <dt-bindings/zmk/outputs.h>
 #include <dt-bindings/zmk/ext_power.h>
+#include "keymap_german_mac_iso.h"
 // }}}
 // nvim ~/qmk_firmware/quantum/keymap_extras/keymap_german_mac_iso.h
-// #include "keymap_german_mac_iso.h"
+// label = "DEFAULT";
+// label = "NUMBER";
+// label = "SYMBOL";
+// label = "FUNCTION";
+// label = "MEDIA";
+// label = "MOUSE";
 // label = "MOUSE";
 #ifdef CONFIG_ZMK_DISPLAY
 #    include "oled.dtsi"
@@ -59,6 +65,7 @@
 };
 //}}}
 #endif // CONFIG_ZMK_RGB_UNDERGLOW
+/*
 // ### definiendo capas {{{
 #define DEFAULT 0
 #define NUMBER 1
@@ -100,6 +107,7 @@
 
 #define DE_CARET      &kp HASH         // ^ TODO:
 //}}}
+*/
 / {
    keymap {
       compatible = "zmk,keymap";
@@ -114,6 +122,7 @@
          //    '---------------------------------------------------------|       |----------------------------------------------------------'
          //                             |  CTRL    |  CMD       |   ALT  |       | LT1 SPACE | LT2 CMD   | LT3 RALT |
          //                             '--------------------------------'       '----------------------------------'
+         label = "DEFAULT";
          bindings = <
             &lt MEDIA ESC   &kp Q   &kp W   &kp E   &kp R      &kp T                                  DE_Z    &kp U  &kp I      &kp O     &kp P     &kp BSPC
             &lt MOUSE TAB   &kp A   &kp S   &kp D   &kp F      &kp G                                  &kp H   &kp J  &kp K      &kp L     &kp UP    &kp RET
@@ -133,6 +142,7 @@
          //   '----------------------------------------------------------|       |----------------------------------------------------------'
          //                             |  CTRL |  CMD  |     SPACE      |       |        |  LSFT |      ALTGR    |
          //                             '--------------------------------'       '--------------------------------'
+         label = "NUMBER";
          bindings = <
             &kp N0     &kp N1   &kp N2   &kp N3    DE_MINS   DE_PLUS                                DE_SS     DE_UDIA      DE_ADIA         DE_ODIA     &none   &kp BSPC
             &kp CAPS   &kp N4   &kp N5   &kp N6    DE_FSLH    DE_STAR                                DE_HASH  DE_TILDE  DE_QUESTION  &none     &none   &kp LALT
@@ -152,6 +162,7 @@
          //  '---------------------------------------------------------|       |----------------------------------------------------------'
          //                           |  CTRL    |  CMD       | SPACE  |       |  ENTER | ALTGR |          CTRL |
          //                           '--------------------------------'       '--------------------------------'
+         label = "SYMBOL";
          bindings = <
             &kp DLLR   DE_LPAR  DE_RPAR   DE_LBKT  DE_RBKT   DE_TILDE             DE_ACUT     DE_GRAVE  &none    &none     &none   &kp BSPC
             &kp PRCNT  DE_LBRC  DE_RBRC   DE_CARET &kp PG_UP   DE_HASH              DE_AMPS  DE_PIPE   &none    DE_AT    &none   &kp LALT
@@ -172,6 +183,7 @@
          //                           |  CTRL    |  CMD       |   ALT  |       |  TAB   |   ´   |          CTRL |
          //                           '--------------------------------'       '--------------------------------'
          // LCTL(LGUI(KC_D)), LCTL(LGUI(KC_SPC))
+         label = "FUNCTION";
          bindings = <
             &kp F1 &kp F2   &kp F3 &kp F4 &kp LC(LG(D)) &kp LS(LA(T)) &none   &none &none &none &none &none
             &kp F5 &kp F6   &kp F7 &kp F8  DE_BSLH  &kp LA(LG(G)) &kp LC(LA(DEL))    &none   &none          &none  &kp C_BRI_UP  &none
@@ -193,6 +205,7 @@
          //                          '--------------------------------'       '--------------------------------'
          // &none &none &none &none &none &none &none    &none   &none          &none  &none  &none
          //                         &none  &none  &none                      &none     &none &none
+         label = "MEDIA";
          bindings = <
             &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
@@ -213,6 +226,7 @@
          //   '---------------------------------------------------------|       |----------------------------------------------------------'
          //                            |EP_OFF  | EP_ON|         EP_TOG |       |RGBANI- |RGBANI+|   RGBTOG      |
          //                            '--------------------------------'       '--------------------------------'
+         label = "MOUSE";
          bindings = <
             &none &none &none &out OUT_USB &out OUT_BLE  &out OUT_TOG  &rgb_ug RGB_BRD    &rgb_ug RGB_BRI   &none  &none  &none  &none
             &none &none &none &bt BT_CLR &bt BT_PRV &bt BT_NXT &rgb_ug RGB_SAD  &rgb_ug RGB_SAI   &none  &none  &none  &none
@@ -233,6 +247,7 @@
          //   '---------------------------------------------------------|       |----------------------------------------------------------'
          //                            |EP_OFF  | EP_ON|         EP_TOG |       |       |        |               |
          //                            '--------------------------------'       '--------------------------------'
+         label = "MOUSE";
          bindings = <
             &none &none &none &out OUT_USB &out OUT_BLE  &out OUT_TOG &none    &none   &none  &none  &none  &none
             &none &none &none &bt BT_CLR &bt BT_PRV &bt BT_NXT &none  &none   &none  &none  &none  &none
diff --git a/config/keymap_german_mac_iso.h b/config/keymap_german_mac_iso.h
index 8f33fbc..e68ad13 100644
--- a/config/keymap_german_mac_iso.h
+++ b/config/keymap_german_mac_iso.h
@@ -152,56 +152,56 @@
  * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘
  */
 // Row 1
-#define DE_DLQU LA(GRAVE)   // „
-#define DE_IEXL LA(N1)    // ¡
-#define DE_LDQU LA(N2)    // “
-#define DE_PILC LA(N3)    // ¶
-#define DE_CENT LA(N4)    // ¢
-#define DE_LBRC LA(N5)    // [
-#define DE_RBRC LA(N6)    // ]
-#define DE_PIPE LA(N7)    // |
-#define DE_LCBR LA(N8)    // {
-#define DE_RCBR LA(N9)    // }
-#define DE_NEQL LA(N0)    // ≠
-#define DE_IQUE LA(MINUS)   // ¿
+#define DE_DLQU &kp LA(GRAVE)   // „
+#define DE_IEXL &kp LA(N1)    // ¡
+#define DE_LDQU &kp LA(N2)    // “
+#define DE_PILC &kp LA(N3)    // ¶
+#define DE_CENT &kp LA(N4)    // ¢
+#define DE_LBRC &kp LA(N5)    // [
+#define DE_RBRC &kp LA(N6)    // ]
+#define DE_PIPE &kp LA(N7)    // |
+#define DE_LCBR &kp LA(N8)    // {
+#define DE_RCBR &kp LA(N9)    // }
+#define DE_NEQL &kp LA(N0)    // ≠
+#define DE_IQUE &kp LA(MINUS)   // ¿
 // Row 2
-#define DE_LDAQ LA(Q)    // «
-#define DE_NARS LA(W)    // ∑
-#define DE_EURO LA(E)    // €
-#define DE_REGD LA(R)    // ®
-#define DE_DAGG LA(T)    // †
-#define DE_OMEG LA(Z)    // Ω
-#define DE_DIAE LA(U)    // ¨ (dead)
-#define DE_FRSL LA(I)    // ⁄
-#define DE_OSTR LA(O)    // Ø
-#define DE_PI   LA(P)    // π
-#define DE_BULT LA(LBKT) // •
-#define DE_PLMN LA(RBKT) // ±
+#define DE_LDAQ &kp LA(Q)    // «
+#define DE_NARS &kp LA(W)    // ∑
+#define DE_EURO &kp LA(E)    // €
+#define DE_REGD &kp LA(R)    // ®
+#define DE_DAGG &kp LA(T)    // †
+#define DE_OMEG &kp LA(Z)    // Ω
+#define DE_DIAE &kp LA(U)    // ¨ (dead)
+#define DE_FRSL &kp LA(I)    // ⁄
+#define DE_OSTR &kp LA(O)    // Ø
+#define DE_PI   &kp LA(P)    // π
+#define DE_BULT &kp LA(LBKT) // •
+#define DE_PLMN &kp LA(RBKT) // ±
 // Row 3
-#define DE_ARNG LA(A)    // Å
-#define DE_SLQU LA(S)    // ‚
-#define DE_PDIF LA(D)    // ∂
-#define DE_FHK  LA(F)    // ƒ
-#define DE_COPY LA(G)    // ©
-#define DE_FORD LA(H)    // ª
-#define DE_MORD LA(J)    // º
-#define DE_INCR LA(K)    // ∆
-#define DE_AT   LA(L)    // @
-#define DE_OE   LA(SEMICOLON) // Œ
-#define DE_AE   LA(APOS) // Æ
-#define DE_LSQU LA(BSLH) // ‘
+#define DE_ARNG &kp LA(A)    // Å
+#define DE_SLQU &kp LA(S)    // ‚
+#define DE_PDIF &kp LA(D)    // ∂
+#define DE_FHK  &kp LA(F)    // ƒ
+#define DE_COPY &kp LA(G)    // ©
+#define DE_FORD &kp LA(H)    // ª
+#define DE_MORD &kp LA(J)    // º
+#define DE_INCR &kp LA(K)    // ∆
+#define DE_AT   &kp LA(L)    // @
+#define DE_OE   &kp LA(SEMICOLON) // Œ
+#define DE_AE   &kp LA(APOS) // Æ
+#define DE_LSQU &kp LA(BSLH) // ‘
 // Row 4
-#define DE_LTEQ LA(GRAVE) // ≤
-#define DE_YEN  LA(Y)    // ¥
-#define DE_AEQL LA(X)    // ≈
-#define DE_CCCE LA(C)    // Ç
-#define DE_SQRT LA(V)    // √
-#define DE_INTG LA(B)    // ∫
-#define DE_TILD LA(N)    // ~ (dead)
-#define DE_MICR LA(M)    // µ
-#define DE_INFN LA(COMMA) // ∞
-#define DE_ELLP LA(DOT)  // …
-#define DE_NDSH LA(MINS) // –
+#define DE_LTEQ &kp LA(GRAVE) // ≤
+#define DE_YEN  &kp LA(Y)    // ¥
+#define DE_AEQL &kp LA(X)    // ≈
+#define DE_CCCE &kp LA(C)    // Ç
+#define DE_SQRT &kp LA(V)    // √
+#define DE_INTG &kp LA(B)    // ∫
+#define DE_TILD &kp LA(N)    // ~ (dead)
+#define DE_MICR &kp LA(M)    // µ
+#define DE_INFN &kp LA(COMMA) // ∞
+#define DE_ELLP &kp LA(DOT)  // …
+#define DE_NDSH &kp LA(MINS) // –
 
 /* Shift+Alted symbols
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐