diff --git a/keymap-drawer/wasfoora.svg b/keymap-drawer/wasfoora.svg
index c75ee0d..6f32839 100644
--- a/keymap-drawer/wasfoora.svg
+++ b/keymap-drawer/wasfoora.svg
@@ -1,4 +1,4 @@
-<svg width="825" height="3048" viewBox="0 0 825 3048" class="keymap" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="825" height="3017" viewBox="0 0 825 3017" class="keymap" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <defs>/* start glyphs */
 <svg id="mdi:arrow-down">
 <svg xmlns="http://www.w3.org/2000/svg" id="mdi-arrow-down" viewBox="0 0 24 24"><path d="M11,4H13V16L18.5,10.5L19.92,11.92L12,19.84L4.08,11.92L5.5,10.5L11,16V4Z" /></svg>
@@ -317,14 +317,14 @@ path.combo {
 <text x="150" y="-18" class="combo tap">Q</text>
 </g>
 <g class="combo combopos-3">
-<path d="M120,186 h-24 a6.0,6.0 0 0 1 -6.0,-6.0 v-21" class="combo"/>
-<path d="M120,186 h24 a6.0,6.0 0 0 0 6.0,-6.0 v-21" class="combo"/>
-<rect rx="6" ry="6" x="106" y="173" width="28" height="26" class="combo"/>
-<text x="120" y="186" class="combo tap">Z</text>
+<rect rx="6" ry="6" x="106" y="127" width="28" height="26" class="combo"/>
+<text x="120" y="140" class="combo tap">X</text>
 </g>
 <g class="combo combopos-4">
-<rect rx="6" ry="6" x="166" y="127" width="28" height="26" class="combo"/>
-<text x="180" y="140" class="combo tap">X</text>
+<path d="M180,186 h-24 a6.0,6.0 0 0 1 -6.0,-6.0 v-21" class="combo"/>
+<path d="M180,186 h24 a6.0,6.0 0 0 0 6.0,-6.0 v-21" class="combo"/>
+<rect rx="6" ry="6" x="166" y="173" width="28" height="26" class="combo"/>
+<text x="180" y="186" class="combo tap">Z</text>
 </g>
 <g class="combo combopos-5">
 <rect rx="6" ry="6" x="556" y="15" width="28" height="26" class="combo"/>
@@ -336,50 +336,44 @@ path.combo {
 <text x="630" y="17" class="combo shifted">&quot;</text>
 </g>
 <g class="combo combopos-7">
-<path d="M600,-18 h-54 a6.0,6.0 0 0 0 -6.0,6.0 v21" class="combo"/>
-<path d="M600,-18 h54 a6.0,6.0 0 0 1 6.0,6.0 v21" class="combo"/>
-<rect rx="6" ry="6" x="586" y="-31" width="28" height="26" class="combo"/>
-<text x="600" y="-18" class="combo tap">```</text>
+<path d="M600,94 h-54 a6.0,6.0 0 0 0 -6.0,6.0 v21" class="combo"/>
+<path d="M600,94 h54 a6.0,6.0 0 0 1 6.0,6.0 v21" class="combo"/>
+<rect rx="6" ry="6" x="586" y="81" width="28" height="26" class="combo"/>
+<text x="600" y="94" class="combo tap">```</text>
 </g>
 <g class="combo combopos-8">
-<path d="M600,186 h-54 a6.0,6.0 0 0 1 -6.0,-6.0 v-21" class="combo"/>
-<path d="M600,186 h54 a6.0,6.0 0 0 0 6.0,-6.0 v-21" class="combo"/>
-<rect rx="6" ry="6" x="586" y="173" width="28" height="26" class="combo"/>
-<text x="600" y="186" class="combo tap">&lt; &gt;</text>
-</g>
-<g class="combo combopos-9">
 <rect rx="6" ry="6" x="556" y="127" width="28" height="26" class="combo"/>
 <text x="570" y="140" class="combo tap">\</text>
 </g>
-<g class="combo combopos-10">
+<g class="combo combopos-9">
 <rect rx="6" ry="6" x="616" y="127" width="28" height="26" class="combo"/>
 <text x="630" y="140" class="combo tap">/</text>
 </g>
-<g class="combo combopos-11">
+<g class="combo combopos-10">
 <rect rx="6" ry="6" x="256" y="71" width="28" height="26" class="combo"/>
 <text x="270" y="84" class="combo tap">&lt;</text>
 </g>
-<g class="combo combopos-12">
+<g class="combo combopos-11">
 <rect rx="6" ry="6" x="466" y="71" width="28" height="26" class="combo"/>
 <text x="480" y="84" class="combo tap">&gt;</text>
 </g>
-<g class="combo combopos-13">
+<g class="combo combopos-12">
 <rect rx="6" ry="6" x="76" y="43" width="28" height="26" class="combo"/>
 <text x="90" y="56" class="combo tap"><tspan style="font-size: 64%">&amp;macro_arr…</tspan></text>
 </g>
-<g class="combo combopos-14">
+<g class="combo combopos-13">
 <rect rx="6" ry="6" x="136" y="99" width="28" height="26" class="combo"/>
 <text x="150" y="112" class="combo tap"><tspan style="font-size: 64%">&amp;macro_bra…</tspan></text>
 </g>
-<g class="combo combopos-15">
+<g class="combo combopos-14">
 <rect rx="6" ry="6" x="586" y="99" width="28" height="26" class="combo"/>
 <text x="600" y="112" class="combo tap"><tspan style="font-size: 64%">&amp;macro_sqt…</tspan></text>
 </g>
-<g class="combo combopos-16">
+<g class="combo combopos-15">
 <rect rx="6" ry="6" x="196" y="99" width="28" height="26" class="combo"/>
 <text x="210" y="112" class="combo tap"><tspan style="font-size: 64%">&amp;macro_dou…</tspan></text>
 </g>
-<g class="combo combopos-17">
+<g class="combo combopos-16">
 <rect rx="6" ry="6" x="196" y="43" width="28" height="26" class="combo"/>
 <text x="210" y="56" class="combo tap"><tspan style="font-size: 64%">&amp;macro_com…</tspan></text>
 </g>
@@ -387,7 +381,7 @@ path.combo {
 </g>
 <g transform="translate(30, 311)" class="layer-Number/Symbol">
 <text x="0" y="28" class="label" id="NumberSymbol">Number/Symbol:</text>
-<g transform="translate(0, 87)">
+<g transform="translate(0, 56)">
 <g transform="translate(30, 28)" class="key ghost keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key ghost"/>
 </g>
@@ -520,56 +514,50 @@ path.combo {
 <text x="630" y="17" class="combo shifted">&quot;</text>
 </g>
 <g class="combo combopos-2">
-<path d="M600,-18 h-54 a6.0,6.0 0 0 0 -6.0,6.0 v21" class="combo"/>
-<path d="M600,-18 h54 a6.0,6.0 0 0 1 6.0,6.0 v21" class="combo"/>
-<rect rx="6" ry="6" x="586" y="-31" width="28" height="26" class="combo"/>
-<text x="600" y="-18" class="combo tap">```</text>
+<path d="M600,94 h-54 a6.0,6.0 0 0 0 -6.0,6.0 v21" class="combo"/>
+<path d="M600,94 h54 a6.0,6.0 0 0 1 6.0,6.0 v21" class="combo"/>
+<rect rx="6" ry="6" x="586" y="81" width="28" height="26" class="combo"/>
+<text x="600" y="94" class="combo tap">```</text>
 </g>
 <g class="combo combopos-3">
-<path d="M600,186 h-54 a6.0,6.0 0 0 1 -6.0,-6.0 v-21" class="combo"/>
-<path d="M600,186 h54 a6.0,6.0 0 0 0 6.0,-6.0 v-21" class="combo"/>
-<rect rx="6" ry="6" x="586" y="173" width="28" height="26" class="combo"/>
-<text x="600" y="186" class="combo tap">&lt; &gt;</text>
-</g>
-<g class="combo combopos-4">
 <rect rx="6" ry="6" x="556" y="127" width="28" height="26" class="combo"/>
 <text x="570" y="140" class="combo tap">\</text>
 </g>
-<g class="combo combopos-5">
+<g class="combo combopos-4">
 <rect rx="6" ry="6" x="616" y="127" width="28" height="26" class="combo"/>
 <text x="630" y="140" class="combo tap">/</text>
 </g>
-<g class="combo combopos-6">
+<g class="combo combopos-5">
 <rect rx="6" ry="6" x="256" y="71" width="28" height="26" class="combo"/>
 <text x="270" y="84" class="combo tap">&lt;</text>
 </g>
-<g class="combo combopos-7">
+<g class="combo combopos-6">
 <rect rx="6" ry="6" x="466" y="71" width="28" height="26" class="combo"/>
 <text x="480" y="84" class="combo tap">&gt;</text>
 </g>
-<g class="combo combopos-8">
+<g class="combo combopos-7">
 <rect rx="6" ry="6" x="76" y="43" width="28" height="26" class="combo"/>
 <text x="90" y="56" class="combo tap"><tspan style="font-size: 64%">&amp;macro_arr…</tspan></text>
 </g>
-<g class="combo combopos-9">
+<g class="combo combopos-8">
 <rect rx="6" ry="6" x="136" y="99" width="28" height="26" class="combo"/>
 <text x="150" y="112" class="combo tap"><tspan style="font-size: 64%">&amp;macro_bra…</tspan></text>
 </g>
-<g class="combo combopos-10">
+<g class="combo combopos-9">
 <rect rx="6" ry="6" x="586" y="99" width="28" height="26" class="combo"/>
 <text x="600" y="112" class="combo tap"><tspan style="font-size: 64%">&amp;macro_sqt…</tspan></text>
 </g>
-<g class="combo combopos-11">
+<g class="combo combopos-10">
 <rect rx="6" ry="6" x="196" y="99" width="28" height="26" class="combo"/>
 <text x="210" y="112" class="combo tap"><tspan style="font-size: 64%">&amp;macro_dou…</tspan></text>
 </g>
-<g class="combo combopos-12">
+<g class="combo combopos-11">
 <rect rx="6" ry="6" x="196" y="43" width="28" height="26" class="combo"/>
 <text x="210" y="56" class="combo tap"><tspan style="font-size: 64%">&amp;macro_com…</tspan></text>
 </g>
 </g>
 </g>
-<g transform="translate(30, 622)" class="layer-Navigation">
+<g transform="translate(30, 591)" class="layer-Navigation">
 <text x="0" y="28" class="label" id="Navigation">Navigation:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(30, 28)" class="key ghost keypos-0">
@@ -703,7 +691,7 @@ path.combo {
 </g>
 <g transform="translate(660, 140)" class="key keypos-25">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
-<text x="0" y="0" class="key tap">TAB</text>
+<text x="0" y="0" class="key tap">DELETE</text>
 </g>
 <g transform="translate(270, 196)" class="key ghost keypos-26">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key ghost"/>
@@ -719,7 +707,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 902)" class="layer-Miscellaneous">
+<g transform="translate(30, 871)" class="layer-Miscellaneous">
 <text x="0" y="28" class="label" id="Miscellaneous">Miscellaneous:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(30, 28)" class="key ghost keypos-0">
@@ -854,8 +842,8 @@ path.combo {
 </g>
 </g>
 </g>
-<text x="30" y="1210" class="label" id="Combos">Combos:</text>
-<g transform="translate(30, 1182)" class="layer-combopos-0">
+<text x="30" y="1179" class="label" id="Combos">Combos:</text>
+<g transform="translate(30, 1151)" class="layer-combopos-0">
 <g transform="translate(0, 56)">
 <g transform="translate(30, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key  combo-separate"/>
@@ -955,7 +943,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(435, 1182)" class="layer-combopos-1">
+<g transform="translate(435, 1151)" class="layer-combopos-1">
 <g transform="translate(0, 56)">
 <g transform="translate(30, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key  combo-separate"/>
@@ -1055,7 +1043,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1408)" class="layer-combopos-2">
+<g transform="translate(30, 1377)" class="layer-combopos-2">
 <g transform="translate(0, 28)">
 <g transform="translate(30, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key  combo-separate"/>
@@ -1155,7 +1143,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(435, 1408)" class="layer-combopos-3">
+<g transform="translate(435, 1377)" class="layer-combopos-3">
 <g transform="translate(0, 28)">
 <g transform="translate(30, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key  combo-separate"/>
@@ -1255,7 +1243,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1606)" class="layer-combopos-4">
+<g transform="translate(30, 1575)" class="layer-combopos-4">
 <g transform="translate(0, 28)">
 <g transform="translate(30, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key  combo-separate"/>
@@ -1355,7 +1343,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(435, 1606)" class="layer-combopos-5">
+<g transform="translate(435, 1575)" class="layer-combopos-5">
 <g transform="translate(0, 28)">
 <g transform="translate(30, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key  combo-separate"/>
@@ -1455,7 +1443,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1804)" class="layer-combopos-6">
+<g transform="translate(30, 1773)" class="layer-combopos-6">
 <g transform="translate(0, 28)">
 <g transform="translate(30, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key  combo-separate"/>
@@ -1553,7 +1541,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(435, 1804)" class="layer-combopos-7">
+<g transform="translate(435, 1773)" class="layer-combopos-7">
 <g transform="translate(0, 28)">
 <g transform="translate(30, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key  combo-separate"/>
@@ -1651,7 +1639,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 2002)" class="layer-combopos-8">
+<g transform="translate(30, 1971)" class="layer-combopos-8">
 <g transform="translate(0, 28)">
 <g transform="translate(30, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key  combo-separate"/>
@@ -1749,7 +1737,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(435, 2002)" class="layer-combopos-9">
+<g transform="translate(435, 1971)" class="layer-combopos-9">
 <g transform="translate(0, 28)">
 <g transform="translate(30, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key  combo-separate"/>
@@ -1849,7 +1837,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 2200)" class="layer-combopos-10">
+<g transform="translate(30, 2169)" class="layer-combopos-10">
 <g transform="translate(0, 28)">
 <g transform="translate(30, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key  combo-separate"/>
@@ -1947,7 +1935,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(435, 2200)" class="layer-combopos-11">
+<g transform="translate(435, 2169)" class="layer-combopos-11">
 <g transform="translate(0, 28)">
 <g transform="translate(30, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key  combo-separate"/>
@@ -2047,7 +2035,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 2398)" class="layer-combopos-12">
+<g transform="translate(30, 2367)" class="layer-combopos-12">
 <g transform="translate(0, 28)">
 <g transform="translate(30, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key  combo-separate"/>
@@ -2145,7 +2133,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(435, 2398)" class="layer-combopos-13">
+<g transform="translate(435, 2367)" class="layer-combopos-13">
 <g transform="translate(0, 28)">
 <g transform="translate(30, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key  combo-separate"/>
@@ -2243,7 +2231,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 2596)" class="layer-combopos-14">
+<g transform="translate(30, 2565)" class="layer-combopos-14">
 <g transform="translate(0, 28)">
 <g transform="translate(30, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key  combo-separate"/>
@@ -2341,7 +2329,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(435, 2596)" class="layer-combopos-15">
+<g transform="translate(435, 2565)" class="layer-combopos-15">
 <g transform="translate(0, 28)">
 <g transform="translate(30, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key  combo-separate"/>
@@ -2439,7 +2427,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 2794)" class="layer-combopos-16">
+<g transform="translate(30, 2763)" class="layer-combopos-16">
 <g transform="translate(0, 28)">
 <g transform="translate(30, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key  combo-separate"/>
@@ -2537,7 +2525,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(435, 2794)" class="layer-combopos-17">
+<g transform="translate(435, 2763)" class="layer-combopos-17">
 <g transform="translate(0, 28)">
 <g transform="translate(30, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key  combo-separate"/>
@@ -2635,4 +2623,4 @@ path.combo {
 </g>
 </g>
 </g>
-<text x="795.0" y="3020.0" class="footer">Created with <a href="https://github.com/caksoylar/keymap-drawer">keymap-drawer</a></text></svg>
+<text x="795.0" y="2989.0" class="footer">Created with <a href="https://github.com/caksoylar/keymap-drawer">keymap-drawer</a></text></svg>
diff --git a/keymap-drawer/wasfoora.yaml b/keymap-drawer/wasfoora.yaml
index 0392feb..516704b 100644
--- a/keymap-drawer/wasfoora.yaml
+++ b/keymap-drawer/wasfoora.yaml
@@ -87,7 +87,7 @@ layers:
   - PASTE
   - Enter
   - Back Space
-  - TAB
+  - DELETE
   - ''
   - {type: held}
   - ''
@@ -136,29 +136,24 @@ combos:
   a: top
   o: 0.3
 - p: [20, 21]
+  k: X
+  l: [Default]
+- p: [21, 22]
   k: Z
   l: [Default]
   a: bottom
   o: 0.3
-- p: [21, 22]
-  k: X
-  l: [Default]
 - p: [6, 7]
   k: '`'
   l: [Default, Number/Symbol]
 - p: [7, 8]
   k: {t: '''', s: '"'}
   l: [Default, Number/Symbol]
-- p: [6, 8]
+- p: [23, 25]
   k: '```'
   l: [Default, Number/Symbol]
   a: top
   o: 0.3
-- p: [23, 25]
-  k: <  >
-  l: [Default, Number/Symbol]
-  a: bottom
-  o: 0.3
 - p: [23, 24]
   k: \
   l: [Default, Number/Symbol]