diff --git a/keymap-drawer/cradio.svg b/keymap-drawer/cradio.svg
index ce329b7..1fbc6c6 100644
--- a/keymap-drawer/cradio.svg
+++ b/keymap-drawer/cradio.svg
@@ -1,4 +1,4 @@
-<svg width="732" height="2408" viewBox="0 0 732 2408" class="keymap" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="732" height="2489" viewBox="0 0 732 2489" class="keymap" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <defs>/* start glyphs */
 <svg id="mdi:apple-keyboard-command">
 <svg xmlns="http://www.w3.org/2000/svg" id="mdi-apple-keyboard-command" viewBox="0 0 24 24"><path d="M6,2A4,4 0 0,1 10,6V8H14V6A4,4 0 0,1 18,2A4,4 0 0,1 22,6A4,4 0 0,1 18,10H16V14H18A4,4 0 0,1 22,18A4,4 0 0,1 18,22A4,4 0 0,1 14,18V16H10V18A4,4 0 0,1 6,22A4,4 0 0,1 2,18A4,4 0 0,1 6,14H8V10H6A4,4 0 0,1 2,6A4,4 0 0,1 6,2M16,18A2,2 0 0,0 18,20A2,2 0 0,0 20,18A2,2 0 0,0 18,16H16V18M14,10H10V14H14V10M6,16A2,2 0 0,0 4,18A2,2 0 0,0 6,20A2,2 0 0,0 8,18V16H6M8,6A2,2 0 0,0 6,4A2,2 0 0,0 4,6A2,2 0 0,0 6,8H8V6M18,8A2,2 0 0,0 20,6A2,2 0 0,0 18,4A2,2 0 0,0 16,6V8H18Z" /></svg>
@@ -30,6 +30,9 @@
 <svg id="mdi:backspace-reverse-outline">
 <svg xmlns="http://www.w3.org/2000/svg" id="mdi-backspace-reverse-outline" viewBox="0 0 24 24"><path d="M5,15.59L6.41,17L10,13.41L13.59,17L15,15.59L11.41,12L15,8.41L13.59,7L10,10.59L6.41,7L5,8.41L8.59,12L5,15.59M2,3A2,2 0 0,0 0,5V19A2,2 0 0,0 2,21H17C17.69,21 18.23,20.64 18.59,20.11L24,12L18.59,3.88C18.23,3.35 17.69,3 17,3H2M2,5H17L21.72,12L17,19H2V5Z" /></svg>
 </svg>
+<svg id="mdi:bluetooth-connect">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-bluetooth-connect" viewBox="0 0 24 24"><path d="M19,10L17,12L19,14L21,12M14.88,16.29L13,18.17V14.41M13,5.83L14.88,7.71L13,9.58M17.71,7.71L12,2H11V9.58L6.41,5L5,6.41L10.59,12L5,17.58L6.41,19L11,14.41V22H12L17.71,16.29L13.41,12M7,12L5,10L3,12L5,14L7,12Z" /></svg>
+</svg>
 <svg id="mdi:chevron-down">
 <svg xmlns="http://www.w3.org/2000/svg" id="mdi-chevron-down" viewBox="0 0 24 24"><path d="M7.41,8.58L12,13.17L16.59,8.58L18,10L12,16L6,10L7.41,8.58Z" /></svg>
 </svg>
@@ -182,7 +185,7 @@ path.combo {
 </style>
 <g transform="translate(30, 0)" class="layer-base">
 <text x="0" y="28" class="label">base:</text>
-<g transform="translate(0, 56)">
+<g transform="translate(0, 137)">
 <g transform="translate(28, 80)" class="key keypos-0">
 <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"/>
@@ -400,14 +403,18 @@ path.combo {
 <use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="610" y="118" height="12" width="12.0" class="combo hold glyph mdi:circle-small"/>
 </g>
 <g class="combo combopos-10">
-<rect rx="6" ry="6" x="98" y="52" width="28" height="26" class="combo"/>
-<use href="#mdi:apple-keyboard-option" xlink:href="#mdi:apple-keyboard-option" x="105" y="58" height="14" width="14.0" class="combo tap glyph mdi:apple-keyboard-option"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="106" y="64" height="12" width="12.0" class="combo hold glyph mdi:circle-small"/>
+<path d="M112,-68 h22 a6.0,6.0 0 0 1 6.0,6.0 v72" class="combo"/>
+<path d="M112,-68 h-22 a6.0,6.0 0 0 0 -6.0,6.0 v145" class="combo"/>
+<rect rx="6" ry="6" x="98" y="-81" width="28" height="26" class="combo"/>
+<use href="#mdi:apple-keyboard-option" xlink:href="#mdi:apple-keyboard-option" x="105" y="-75" height="14" width="14.0" class="combo tap glyph mdi:apple-keyboard-option"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="106" y="-69" height="12" width="12.0" class="combo hold glyph mdi:circle-small"/>
 </g>
 <g class="combo combopos-11">
-<rect rx="6" ry="6" x="546" y="52" width="28" height="26" class="combo"/>
-<use href="#mdi:apple-keyboard-option" xlink:href="#mdi:apple-keyboard-option" x="553" y="58" height="14" width="14.0" class="combo tap glyph mdi:apple-keyboard-option"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="554" y="64" height="12" width="12.0" class="combo hold glyph mdi:circle-small"/>
+<path d="M560,-68 h-22 a6.0,6.0 0 0 0 -6.0,6.0 v72" class="combo"/>
+<path d="M560,-68 h22 a6.0,6.0 0 0 1 6.0,6.0 v145" class="combo"/>
+<rect rx="6" ry="6" x="546" y="-81" width="28" height="26" class="combo"/>
+<use href="#mdi:apple-keyboard-option" xlink:href="#mdi:apple-keyboard-option" x="553" y="-75" height="14" width="14.0" class="combo tap glyph mdi:apple-keyboard-option"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="554" y="-69" height="12" width="12.0" class="combo hold glyph mdi:circle-small"/>
 </g>
 <g class="combo combopos-12">
 <rect rx="6" ry="6" x="182" y="59" width="28" height="26" class="combo"/>
@@ -427,7 +434,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 336)" class="layer-sym">
+<g transform="translate(30, 417)" class="layer-sym">
 <text x="0" y="28" class="label">sym:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 80)" class="key keypos-0">
@@ -595,7 +602,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 672)" class="layer-nav">
+<g transform="translate(30, 753)" class="layer-nav">
 <text x="0" y="28" class="label">nav:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 80)" class="key keypos-0">
@@ -770,7 +777,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1008)" class="layer-winnav">
+<g transform="translate(30, 1089)" class="layer-winnav">
 <text x="0" y="28" class="label">winnav:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 80)" class="key keypos-0">
@@ -802,35 +809,35 @@ path.combo {
 <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"/>
 </g>
-<g transform="translate(420, 52)" class="key keypos-5">
-<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">BT</text>
-<text x="0" y="24" class="key hold">0</text>
+<g transform="translate(420, 52)" class="key text_with_symbol keypos-5">
+<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key text_with_symbol side"/>
+<rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key text_with_symbol"/>
+<use href="#mdi:bluetooth-connect" xlink:href="#mdi:bluetooth-connect" x="-7" y="-11" height="14" width="14.0" class="key text_with_symbol tap glyph mdi:bluetooth-connect"/>
+<text x="0" y="-24" class="key text_with_symbol shifted">0</text>
 </g>
-<g transform="translate(476, 44)" class="key keypos-6">
-<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">BT</text>
-<text x="0" y="24" class="key hold">1</text>
+<g transform="translate(476, 44)" class="key text_with_symbol keypos-6">
+<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key text_with_symbol side"/>
+<rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key text_with_symbol"/>
+<use href="#mdi:bluetooth-connect" xlink:href="#mdi:bluetooth-connect" x="-7" y="-11" height="14" width="14.0" class="key text_with_symbol tap glyph mdi:bluetooth-connect"/>
+<text x="0" y="-24" class="key text_with_symbol shifted">1</text>
 </g>
-<g transform="translate(532, 28)" class="key keypos-7">
-<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">BT</text>
-<text x="0" y="24" class="key hold">2</text>
+<g transform="translate(532, 28)" class="key text_with_symbol keypos-7">
+<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key text_with_symbol side"/>
+<rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key text_with_symbol"/>
+<use href="#mdi:bluetooth-connect" xlink:href="#mdi:bluetooth-connect" x="-7" y="-11" height="14" width="14.0" class="key text_with_symbol tap glyph mdi:bluetooth-connect"/>
+<text x="0" y="-24" class="key text_with_symbol shifted">2</text>
 </g>
-<g transform="translate(588, 45)" class="key keypos-8">
-<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">BT</text>
-<text x="0" y="24" class="key hold">3</text>
+<g transform="translate(588, 45)" class="key text_with_symbol keypos-8">
+<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key text_with_symbol side"/>
+<rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key text_with_symbol"/>
+<use href="#mdi:bluetooth-connect" xlink:href="#mdi:bluetooth-connect" x="-7" y="-11" height="14" width="14.0" class="key text_with_symbol tap glyph mdi:bluetooth-connect"/>
+<text x="0" y="-24" class="key text_with_symbol shifted">3</text>
 </g>
-<g transform="translate(644, 80)" class="key keypos-9">
-<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">BT</text>
-<text x="0" y="24" class="key hold">4</text>
+<g transform="translate(644, 80)" class="key text_with_symblol keypos-9">
+<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key text_with_symblol side"/>
+<rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key text_with_symblol"/>
+<use href="#mdi:bluetooth-connect" xlink:href="#mdi:bluetooth-connect" x="-7" y="-11" height="14" width="14.0" class="key text_with_symblol tap glyph mdi:bluetooth-connect"/>
+<text x="0" y="-24" class="key text_with_symblol shifted">4</text>
 </g>
 <g transform="translate(28, 136)" class="key keypos-10">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
@@ -971,7 +978,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1344)" class="layer-num">
+<g transform="translate(30, 1425)" class="layer-num">
 <text x="0" y="28" class="label">num:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 80)" class="key trans keypos-0">
@@ -1149,7 +1156,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1680)" class="layer-fun">
+<g transform="translate(30, 1761)" class="layer-fun">
 <text x="0" y="28" class="label">fun:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 80)" class="key keypos-0">
@@ -1312,7 +1319,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 2016)" class="layer-mods">
+<g transform="translate(30, 2097)" class="layer-mods">
 <text x="0" y="28" class="label">mods:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 80)" class="key trans keypos-0">
diff --git a/keymap-drawer/cradio.yaml b/keymap-drawer/cradio.yaml
index 5268c5e..8547df2 100644
--- a/keymap-drawer/cradio.yaml
+++ b/keymap-drawer/cradio.yaml
@@ -111,11 +111,11 @@ layers:
   - Gui+ 8
   - Gui+ 9
   - ''
-  - {t: BT, h: '0'}
-  - {t: BT, h: '1'}
-  - {t: BT, h: '2'}
-  - {t: BT, h: '3'}
-  - {t: BT, h: '4'}
+  - {t: '$$mdi:bluetooth-connect$$', s: '0', type: text_with_symbol}
+  - {t: '$$mdi:bluetooth-connect$$', s: '1', type: text_with_symbol}
+  - {t: '$$mdi:bluetooth-connect$$', s: '2', type: text_with_symbol}
+  - {t: '$$mdi:bluetooth-connect$$', s: '3', type: text_with_symbol}
+  - {t: '$$mdi:bluetooth-connect$$', s: '4', type: text_with_symblol}
   - ''
   - Gui+ 4
   - Gui+ 5
@@ -279,9 +279,13 @@ combos:
 - p: [2, 11]
   k: {t: '$$mdi:apple-keyboard-option$$', h: '$$mdi:circle-small$$'}
   l: [base]
+  a: top
+  o: 1.2
 - p: [7, 18]
   k: {t: '$$mdi:apple-keyboard-option$$', h: '$$mdi:circle-small$$'}
   l: [base]
+  a: top
+  o: 1.2
 - p: [3, 13]
   k: '-'
   l: [base]