diff --git a/keymap-drawer/cradio.svg b/keymap-drawer/cradio.svg
index 3ae6083..29ddc77 100644
--- a/keymap-drawer/cradio.svg
+++ b/keymap-drawer/cradio.svg
@@ -322,8 +322,8 @@ rect.held, rect.combo.held {
   translate: 5px -28px;
 } 
 </style>
-<g transform="translate(30, 0)" class="layer-DEF">
-<text x="0" y="28" class="label">DEF</text>
+<g transform="translate(30, 0)" class="layer-base_layer">
+<text x="0" y="28" class="label">base_layer</text>
 <g transform="translate(0, 90)">
 <g transform="translate(28, 90)" class="key keypos-0">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
@@ -453,7 +453,7 @@ rect.held, rect.combo.held {
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
 <rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key"/>
 <text x="0" y="-4" class="key tap">D</text>
-<text x="0" y="25" class="key hold">MSE</text>
+<text x="0" y="25" class="key hold"><tspan style="font-size: 64%">mouse_layer</tspan></text>
 </g>
 <g transform="translate(252, 168)" class="key keypos-24">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
@@ -489,7 +489,7 @@ rect.held, rect.combo.held {
 <g transform="translate(227, 224) rotate(15.0)" class="key keypos-30">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
 <rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key"/>
-<text x="0" y="-4" class="key tap">NAV</text>
+<text x="0" y="-4" class="key tap"><tspan style="font-size: 78%">nav_layer</tspan></text>
 </g>
 <g transform="translate(282, 246) rotate(30.0)" class="key keypos-31">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
@@ -500,12 +500,12 @@ rect.held, rect.combo.held {
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
 <rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key"/>
 <use href="#mdi:keyboard-space" xlink:href="#mdi:keyboard-space" x="-7" y="-11" height="14" width="14.0" class="key tap glyph mdi:keyboard-space"/>
-<text x="0" y="25" class="key hold">HW</text>
+<text x="0" y="25" class="key hold"><tspan style="font-size: 88%">hw_layer</tspan></text>
 </g>
 <g transform="translate(445, 224) rotate(-15.0)" class="key keypos-33">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
 <rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key"/>
-<text x="0" y="-4" class="key tap">NUM</text>
+<text x="0" y="-4" class="key tap"><tspan style="font-size: 78%">num_layer</tspan></text>
 </g>
 <g class="combo combopos-0">
 <rect rx="6" ry="6" x="98" y="26" width="28" height="26" class="combo"/>
@@ -519,7 +519,7 @@ rect.held, rect.combo.held {
 <path d="M140,-18 h46 a10.0,10.0 0 0 1 10.0,10.0 v34" class="combo"/>
 <path d="M140,-18 h-46 a10.0,10.0 0 0 0 -10.0,10.0 v40" class="combo"/>
 <rect rx="6" ry="6" x="126" y="-31" width="28" height="26" class="combo"/>
-<text x="140" y="-18" class="combo tap">GER</text>
+<text x="140" y="-18" class="combo tap"><tspan style="font-size: 78%">ger_layer</tspan></text>
 <use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="136" y="-14" height="8" width="8.0" class="combo hold glyph mdi:circle-small"/>
 </g>
 <g class="combo combopos-3">
@@ -646,8 +646,8 @@ rect.held, rect.combo.held {
 </g>
 </g>
 </g>
-<g transform="translate(30, 441)" class="layer-NAV">
-<text x="0" y="28" class="label">NAV</text>
+<g transform="translate(30, 441)" class="layer-nav_layer">
+<text x="0" y="28" class="label">nav_layer</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 90)" class="key keypos-0">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
@@ -837,8 +837,8 @@ rect.held, rect.combo.held {
 </g>
 </g>
 </g>
-<g transform="translate(30, 782)" class="layer-NUM">
-<text x="0" y="28" class="label">NUM</text>
+<g transform="translate(30, 782)" class="layer-num_layer">
+<text x="0" y="28" class="label">num_layer</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 90)" class="key trans keypos-0">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key trans side"/>
@@ -1035,8 +1035,8 @@ rect.held, rect.combo.held {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1123)" class="layer-FUN">
-<text x="0" y="28" class="label">FUN</text>
+<g transform="translate(30, 1123)" class="layer-fun_layer">
+<text x="0" y="28" class="label">fun_layer</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 90)" class="key trans keypos-0">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key trans side"/>
@@ -1234,8 +1234,8 @@ rect.held, rect.combo.held {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1463)" class="layer-HW">
-<text x="0" y="28" class="label">HW</text>
+<g transform="translate(30, 1463)" class="layer-hw_layer">
+<text x="0" y="28" class="label">hw_layer</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 90)" class="key keypos-0">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
@@ -1414,8 +1414,8 @@ rect.held, rect.combo.held {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1804)" class="layer-GER">
-<text x="0" y="28" class="label">GER</text>
+<g transform="translate(30, 1804)" class="layer-ger_layer">
+<text x="0" y="28" class="label">ger_layer</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 90)" class="key trans keypos-0">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key trans side"/>
@@ -1587,8 +1587,8 @@ rect.held, rect.combo.held {
 </g>
 </g>
 </g>
-<g transform="translate(30, 2144)" class="layer-MSE">
-<text x="0" y="28" class="label">MSE</text>
+<g transform="translate(30, 2144)" class="layer-mouse_layer">
+<text x="0" y="28" class="label">mouse_layer</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 90)" class="key trans keypos-0">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key trans side"/>
diff --git a/keymap-drawer/cradio.yaml b/keymap-drawer/cradio.yaml
index 46102a5..cde57de 100644
--- a/keymap-drawer/cradio.yaml
+++ b/keymap-drawer/cradio.yaml
@@ -1,6 +1,6 @@
 layout: {qmk_keyboard: ferris/sweep}
 layers:
-  DEF:
+  base_layer:
   - Q
   - W
   - F
@@ -24,18 +24,18 @@ layers:
   - Z
   - X
   - C
-  - {t: D, h: MSE}
+  - {t: D, h: mouse_layer}
   - V
   - K
   - H
   - ','
   - .
   - {t: '?', s: '!'}
-  - NAV
+  - nav_layer
   - $$mdi:apple-keyboard-shift$$
-  - {t: '$$mdi:keyboard-space$$', h: HW}
-  - NUM
-  NAV:
+  - {t: '$$mdi:keyboard-space$$', h: hw_layer}
+  - num_layer
+  nav_layer:
   - ESC
   - $$mdi:close-box-outline$$
   - $$mdi:text-search$$
@@ -70,7 +70,7 @@ layers:
   - {t: '$$mdi:chevron-down$$', type: trans}
   - {t: '$$mdi:chevron-down$$', type: trans}
   - {t: '$$mdi:chevron-down$$', type: trans}
-  NUM:
+  num_layer:
   - {t: '$$mdi:chevron-down$$', type: trans}
   - {t: '$$mdi:chevron-down$$', type: trans}
   - {t: '$$mdi:chevron-down$$', type: trans}
@@ -105,7 +105,7 @@ layers:
   - {t: '$$mdi:chevron-down$$', type: trans}
   - {t: '$$mdi:chevron-down$$', type: trans}
   - {type: held}
-  FUN:
+  fun_layer:
   - {t: '$$mdi:chevron-down$$', type: trans}
   - $$mdi:volume-minus$$
   - $$mdi:volume-mute$$
@@ -140,7 +140,7 @@ layers:
   - {t: '$$mdi:chevron-down$$', type: trans}
   - {t: '$$mdi:chevron-down$$', type: trans}
   - {t: '$$mdi:chevron-down$$', type: trans}
-  HW:
+  hw_layer:
   - $$mdi:progress-download$$
   - {t: '$$mdi:chevron-down$$', type: trans}
   - {t: '$$mdi:chevron-down$$', type: trans}
@@ -175,7 +175,7 @@ layers:
   - {t: '$$mdi:chevron-down$$', type: trans}
   - {type: held}
   - {t: '$$mdi:chevron-down$$', type: trans}
-  GER:
+  ger_layer:
   - {t: '$$mdi:chevron-down$$', type: trans}
   - {type: held}
   - {t: '$$mdi:chevron-down$$', type: trans}
@@ -210,7 +210,7 @@ layers:
   - {t: '$$mdi:chevron-down$$', type: trans}
   - {t: '$$mdi:chevron-down$$', type: trans}
   - {t: '$$mdi:chevron-down$$', type: trans}
-  MSE:
+  mouse_layer:
   - {t: '$$mdi:chevron-down$$', type: trans}
   - {t: '$$mdi:chevron-down$$', type: trans}
   - {t: '$$mdi:chevron-down$$', type: trans}
@@ -248,100 +248,100 @@ layers:
 combos:
 - p: [1, 2]
   k: ESC
-  l: [DEF, FUN, NUM]
+  l: [base_layer, fun_layer, num_layer]
 - p: [3, 2]
   k: $$mdi:keyboard-return$$
-  l: [DEF, FUN, NUM]
+  l: [base_layer, fun_layer, num_layer]
 - p: [3, 1]
-  k: {t: GER, h: '$$mdi:circle-small$$'}
-  l: [DEF]
+  k: {t: ger_layer, h: '$$mdi:circle-small$$'}
+  l: [base_layer]
   a: top
   o: 0.6
 - p: [12, 11]
   k: $$mdi:keyboard-tab$$
-  l: [DEF, FUN, NUM]
+  l: [base_layer, fun_layer, num_layer]
 - p: [13, 12]
   k: $$mdi:repeat$$
-  l: [DEF, FUN, NUM]
+  l: [base_layer, fun_layer, num_layer]
 - p: [6, 7]
   k: {t: '[', s: '{'}
-  l: [DEF]
+  l: [base_layer]
 - p: [7, 8]
   k: {t: ']', s: '}'}
-  l: [DEF]
+  l: [base_layer]
 - p: [6, 8]
   k: {t: '[]', s: '{ }'}
-  l: [DEF]
+  l: [base_layer]
   a: top
   o: 0.6
 - p: [16, 17]
   k: {t: (, s: <}
-  l: [DEF]
+  l: [base_layer]
 - p: [17, 18]
   k: {t: ), s: '>'}
-  l: [DEF]
+  l: [base_layer]
 - p: [16, 18]
   k: {t: (), s: <>}
-  l: [DEF]
+  l: [base_layer]
   a: bottom
   o: 1.2
 - p: [26, 27]
   k: $$mdi:backspace-outline$$
-  l: [DEF, FUN, NUM]
+  l: [base_layer, fun_layer, num_layer]
 - p: [27, 28]
   k: $$mdi:backspace-reverse-outline$$
-  l: [DEF, FUN, NUM]
+  l: [base_layer, fun_layer, num_layer]
 - p: [4, 14]
   k: '%'
-  l: [DEF]
+  l: [base_layer]
 - p: [3, 13]
   k: $
-  l: [DEF]
+  l: [base_layer]
 - p: [2, 12]
   k: '#'
-  l: [DEF]
+  l: [base_layer]
 - p: [1, 11]
   k: '@'
-  l: [DEF]
+  l: [base_layer]
 - p: [14, 24]
   k: '~'
-  l: [DEF]
+  l: [base_layer]
 - p: [13, 23]
   k: '='
-  l: [DEF]
+  l: [base_layer]
 - p: [12, 22]
   k: \
-  l: [DEF]
+  l: [base_layer]
 - p: [11, 21]
   k: €
-  l: [DEF]
+  l: [base_layer]
 - p: [5, 15]
   k: ^
-  l: [DEF]
+  l: [base_layer]
 - p: [6, 16]
   k: +
-  l: [DEF]
+  l: [base_layer]
 - p: [7, 17]
   k: '*'
-  l: [DEF]
+  l: [base_layer]
 - p: [8, 18]
   k: '&'
-  l: [DEF]
+  l: [base_layer]
 - p: [9, 19]
   k: §
-  l: [DEF]
+  l: [base_layer]
 - p: [15, 25]
   k: _
-  l: [DEF]
+  l: [base_layer]
 - p: [16, 26]
   k: '-'
-  l: [DEF]
+  l: [base_layer]
 - p: [17, 27]
   k: /
-  l: [DEF]
+  l: [base_layer]
 - p: [18, 28]
   k: '|'
-  l: [DEF]
+  l: [base_layer]
 - p: [19, 29]
   k: °
-  l: [DEF]
+  l: [base_layer]