diff --git a/keymap-drawer/cradio.svg b/keymap-drawer/cradio.svg
index 6d84b9d..7a0235d 100644
--- a/keymap-drawer/cradio.svg
+++ b/keymap-drawer/cradio.svg
@@ -188,6 +188,68 @@ path.combo {
     visibility: hidden;
 }
 /* End Tabler Icons Cleanup */
+
+svg.keymap {
+  font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
+  font-size: 10px;
+  font-weight: bold;
+}
+
+text.label {
+  stroke: #dfdfde;
+  stroke-width: 12;
+  stroke-linejoin: round;
+}
+
+rect.combo, rect.combo-separate {
+  opacity: 0.95;
+  stroke: #c9cccf;
+  stroke-width: 0.5;
+  fill: #d7eaed;
+}
+path.combo {
+  stroke-dasharray: 4, 4;
+  stroke-opacity: 0.3;
+}
+
+rect.held, rect.combo.held {
+  fill: #ebdada;
+}
+
+.trans.tap, .ghost.tap {
+  opacity: 0.5;
+}
+
+.shifted {
+  translate: -9px 3px;
+  opacity: 0.3;
+}
+
+.toggle.shifted {
+  translate: -12px 17px;
+  opacity: 1.0;
+}
+.toggle.hold {
+  translate: 12px -25px;
+}
+
+.text_with_symbol.tap {
+  translate: -1px 1px;
+}
+.text_with_symbol.shifted {
+  translate: 8px 13px;
+  font-size: 8px;
+  opacity: 1.0;
+}
+
+.combo.text_with_symbol.tap {
+  translate: -1px 1px;
+}
+.combo.text_with_symbol.shifted {
+  translate: 7px 5px;
+  font-size: 8px;
+  opacity: 1.0;
+}
 </style>
 <g transform="translate(30, 0)" class="layer-base">
 <text x="0" y="28" class="label">base:</text>
@@ -378,7 +440,7 @@ path.combo {
 <g class="combo combopos-3">
 <rect rx="6" ry="6" x="98" y="80" width="28" height="26" class="combo"/>
 <use href="#mdi:apple-keyboard-control" xlink:href="#mdi:apple-keyboard-control" x="105" y="86" height="14" width="14.0" class="combo tap glyph mdi:apple-keyboard-control"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="106" y="92" height="12" width="12.0" class="combo hold glyph mdi:circle-small"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="108" y="96" height="8" width="8.0" class="combo hold glyph mdi:circle-small"/>
 </g>
 <g class="combo combopos-4">
 <rect rx="6" ry="6" x="154" y="79" width="28" height="26" class="combo"/>
@@ -388,7 +450,7 @@ path.combo {
 <g class="combo combopos-5">
 <rect rx="6" ry="6" x="42" y="106" width="28" height="26" class="combo"/>
 <use href="#mdi:apple-keyboard-command" xlink:href="#mdi:apple-keyboard-command" x="49" y="112" height="14" width="14.0" class="combo tap glyph mdi:apple-keyboard-command"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="50" y="118" height="12" width="12.0" class="combo hold glyph mdi:circle-small"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="52" y="122" height="8" width="8.0" class="combo hold glyph mdi:circle-small"/>
 </g>
 <g class="combo combopos-6">
 <rect rx="6" ry="6" x="546" y="24" width="28" height="26" class="combo"/>
@@ -397,7 +459,7 @@ path.combo {
 <g class="combo combopos-7">
 <rect rx="6" ry="6" x="546" y="80" width="28" height="26" class="combo"/>
 <use href="#mdi:apple-keyboard-control" xlink:href="#mdi:apple-keyboard-control" x="553" y="86" height="14" width="14.0" class="combo tap glyph mdi:apple-keyboard-control"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="554" y="92" height="12" width="12.0" class="combo hold glyph mdi:circle-small"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="556" y="96" height="8" width="8.0" class="combo hold glyph mdi:circle-small"/>
 </g>
 <g class="combo combopos-8">
 <rect rx="6" ry="6" x="490" y="79" width="28" height="26" class="combo"/>
@@ -406,21 +468,21 @@ path.combo {
 <g class="combo combopos-9">
 <rect rx="6" ry="6" x="602" y="106" width="28" height="26" class="combo"/>
 <use href="#mdi:apple-keyboard-command" xlink:href="#mdi:apple-keyboard-command" x="609" y="112" height="14" width="14.0" class="combo tap glyph mdi:apple-keyboard-command"/>
-<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"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="612" y="122" height="8" width="8.0" class="combo hold glyph mdi:circle-small"/>
 </g>
 <g class="combo combopos-10">
 <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"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="108" y="-65" height="8" width="8.0" class="combo hold glyph mdi:circle-small"/>
 </g>
 <g class="combo combopos-11">
 <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"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="556" y="-65" height="8" width="8.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"/>
@@ -662,13 +724,13 @@ 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"/>
 <use href="#mdi:apple-keyboard-shift" xlink:href="#mdi:apple-keyboard-shift" x="-7" y="-11" height="14" width="14.0" class="key tap glyph mdi:apple-keyboard-shift"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-6" y="12" height="12" width="12.0" class="key hold glyph mdi:circle-small"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:circle-small"/>
 </g>
 <g transform="translate(84, 101)" class="key keypos-11">
 <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:apple-keyboard-command" xlink:href="#mdi:apple-keyboard-command" x="-7" y="-11" height="14" width="14.0" class="key tap glyph mdi:apple-keyboard-command"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-6" y="12" height="12" width="12.0" class="key hold glyph mdi:circle-small"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:circle-small"/>
 </g>
 <g transform="translate(140, 84)" class="key keypos-12">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
@@ -961,7 +1023,7 @@ path.combo {
 <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" xlink:href="#mdi:bluetooth" x="-7" y="-11" height="14" width="14.0" class="key text_with_symbol tap glyph mdi:bluetooth"/>
-<use href="#mdi:close-thick" xlink:href="#mdi:close-thick" x="-5" y="-24" height="10" width="10.0" class="key text_with_symbol shifted glyph mdi:close-thick"/>
+<use href="#mdi:close-thick" xlink:href="#mdi:close-thick" x="-4" y="-24" height="8" width="8.0" class="key text_with_symbol shifted glyph mdi:close-thick"/>
 </g>
 <g transform="translate(224, 238)" class="key held keypos-30">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key held side"/>
@@ -1070,25 +1132,25 @@ 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"/>
 <use href="#mdi:apple-keyboard-control" xlink:href="#mdi:apple-keyboard-control" x="-7" y="-11" height="14" width="14.0" class="key tap glyph mdi:apple-keyboard-control"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-6" y="12" height="12" width="12.0" class="key hold glyph mdi:circle-small"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:circle-small"/>
 </g>
 <g transform="translate(532, 84)" class="key keypos-17">
 <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:apple-keyboard-option" xlink:href="#mdi:apple-keyboard-option" x="-7" y="-11" height="14" width="14.0" class="key tap glyph mdi:apple-keyboard-option"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-6" y="12" height="12" width="12.0" class="key hold glyph mdi:circle-small"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:circle-small"/>
 </g>
 <g transform="translate(588, 101)" class="key keypos-18">
 <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:apple-keyboard-command" xlink:href="#mdi:apple-keyboard-command" x="-7" y="-11" height="14" width="14.0" class="key tap glyph mdi:apple-keyboard-command"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-6" y="12" height="12" width="12.0" class="key hold glyph mdi:circle-small"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:circle-small"/>
 </g>
 <g transform="translate(644, 136)" class="key keypos-19">
 <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:apple-keyboard-shift" xlink:href="#mdi:apple-keyboard-shift" x="-7" y="-11" height="14" width="14.0" class="key tap glyph mdi:apple-keyboard-shift"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-6" y="12" height="12" width="12.0" class="key hold glyph mdi:circle-small"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:circle-small"/>
 </g>
 <g transform="translate(28, 192)" class="key trans keypos-20">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key trans side"/>
@@ -1238,25 +1300,25 @@ 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"/>
 <use href="#mdi:apple-keyboard-control" xlink:href="#mdi:apple-keyboard-control" x="-7" y="-11" height="14" width="14.0" class="key tap glyph mdi:apple-keyboard-control"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-6" y="12" height="12" width="12.0" class="key hold glyph mdi:circle-small"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:circle-small"/>
 </g>
 <g transform="translate(532, 84)" class="key keypos-17">
 <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:apple-keyboard-option" xlink:href="#mdi:apple-keyboard-option" x="-7" y="-11" height="14" width="14.0" class="key tap glyph mdi:apple-keyboard-option"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-6" y="12" height="12" width="12.0" class="key hold glyph mdi:circle-small"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:circle-small"/>
 </g>
 <g transform="translate(588, 101)" class="key keypos-18">
 <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:apple-keyboard-command" xlink:href="#mdi:apple-keyboard-command" x="-7" y="-11" height="14" width="14.0" class="key tap glyph mdi:apple-keyboard-command"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-6" y="12" height="12" width="12.0" class="key hold glyph mdi:circle-small"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:circle-small"/>
 </g>
 <g transform="translate(644, 136)" class="key keypos-19">
 <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:apple-keyboard-shift" xlink:href="#mdi:apple-keyboard-shift" x="-7" y="-11" height="14" width="14.0" class="key tap glyph mdi:apple-keyboard-shift"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-6" y="12" height="12" width="12.0" class="key hold glyph mdi:circle-small"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:circle-small"/>
 </g>
 <g transform="translate(28, 192)" class="key keypos-20">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
@@ -1403,25 +1465,25 @@ 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"/>
 <use href="#mdi:apple-keyboard-control" xlink:href="#mdi:apple-keyboard-control" x="-7" y="-11" height="14" width="14.0" class="key tap glyph mdi:apple-keyboard-control"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-6" y="12" height="12" width="12.0" class="key hold glyph mdi:circle-small"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:circle-small"/>
 </g>
 <g transform="translate(532, 84)" class="key keypos-17">
 <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:apple-keyboard-option" xlink:href="#mdi:apple-keyboard-option" x="-7" y="-11" height="14" width="14.0" class="key tap glyph mdi:apple-keyboard-option"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-6" y="12" height="12" width="12.0" class="key hold glyph mdi:circle-small"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:circle-small"/>
 </g>
 <g transform="translate(588, 101)" class="key keypos-18">
 <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:apple-keyboard-command" xlink:href="#mdi:apple-keyboard-command" x="-7" y="-11" height="14" width="14.0" class="key tap glyph mdi:apple-keyboard-command"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-6" y="12" height="12" width="12.0" class="key hold glyph mdi:circle-small"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:circle-small"/>
 </g>
 <g transform="translate(644, 136)" class="key keypos-19">
 <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:apple-keyboard-shift" xlink:href="#mdi:apple-keyboard-shift" x="-7" y="-11" height="14" width="14.0" class="key tap glyph mdi:apple-keyboard-shift"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-6" y="12" height="12" width="12.0" class="key hold glyph mdi:circle-small"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:circle-small"/>
 </g>
 <g transform="translate(28, 192)" class="key trans keypos-20">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key trans side"/>
@@ -1460,7 +1522,7 @@ 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"/>
 <use href="#mdi:apple-keyboard-option" xlink:href="#mdi:apple-keyboard-option" x="-7" y="-11" height="14" width="14.0" class="key tap glyph mdi:apple-keyboard-option"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-6" y="12" height="12" width="12.0" class="key hold glyph mdi:circle-small"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:circle-small"/>
 </g>
 <g transform="translate(588, 157)" class="key keypos-28">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>