diff --git a/config/corne.keymap b/config/corne.keymap
index f0fa5dd..af6cbcd 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -25,10 +25,10 @@
 
         lower_layer {
             bindings = <
-&kp ESC    &none  &kp N7  &kp N8    &kp N9     &kp N0               &none         &kp LC(LS(TAB))  &kp LC(TAB)  &none      &none  &kp DELETE
-&kp LCTRL  &none  &kp N4  &kp N5    &kp N6     &kp LG(LS(J))        &kp LEFT      &kp DOWN         &kp UP       &kp RIGHT  &none  &kp RET
-&kp LSHFT  &none  &kp N1  &kp N2    &kp N3     &kp LG(LA(SPACE))    &kp C_VOL_DN  &kp C_VOL_UP     &none        &none      &none  &kp RSHFT
-                          &kp LGUI  &mo LOWER  &kp SPACE            &kp SPACE     &mo RAISE        &kp RALT
+&kp ESC    &kp LC(LS(TAB))  &kp N7  &kp N8    &kp N9     &kp LC(TAB)    &kp LG(LS(J))      &none         &none     &none      &none  &kp DELETE
+&kp LCTRL  &none            &kp N4  &kp N5    &kp N6     &none          &kp LEFT           &kp DOWN      &kp UP    &kp RIGHT  &none  &kp RET
+&kp LSHFT  &none            &kp N1  &kp N2    &kp N3     &kp N0         &kp C_VOL_DN       &kp C_VOL_UP  &none     &none      &none  &kp RSHFT
+                                    &kp LGUI  &mo LOWER  &kp SPACE      &kp LG(LA(SPACE))  &mo RAISE     &kp RALT
             >;
         };
 
diff --git a/images/corne.svg b/images/corne.svg
index 7df909e..18e3e16 100644
--- a/images/corne.svg
+++ b/images/corne.svg
@@ -458,6 +458,9 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(84, 49)" class="key keypos-1">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em">Tab</tspan><tspan x="0" dy="1.2em">Left</tspan>
+</text>
 </g>
 <g transform="translate(140, 35)" class="key keypos-2">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -473,23 +476,20 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(308, 42)" class="key keypos-5">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">0</text>
-</g>
-<g transform="translate(532, 42)" class="key keypos-6">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-</g>
-<g transform="translate(588, 35)" class="key keypos-7">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">Tab</tspan><tspan x="0" dy="1.2em">Left</tspan>
-</text>
-</g>
-<g transform="translate(644, 28)" class="key keypos-8">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">
 <tspan x="0" dy="-0.6em">Tab</tspan><tspan x="0" dy="1.2em">Right</tspan>
 </text>
 </g>
+<g transform="translate(532, 42)" class="key keypos-6">
+<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+<text x="0" y="0" class="key tap">⌘⇧J</text>
+</g>
+<g transform="translate(588, 35)" class="key keypos-7">
+<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+</g>
+<g transform="translate(644, 28)" class="key keypos-8">
+<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+</g>
 <g transform="translate(700, 35)" class="key keypos-9">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 </g>
@@ -521,7 +521,6 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(308, 98)" class="key keypos-17">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">⌘⇧J</text>
 </g>
 <g transform="translate(532, 98)" class="key keypos-18">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -567,7 +566,7 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(308, 154)" class="key keypos-29">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">⌘⌥⎵</text>
+<text x="0" y="0" class="key tap">0</text>
 </g>
 <g transform="translate(532, 154)" class="key keypos-30">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -605,7 +604,7 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(489, 224) rotate(-30.0)" class="key keypos-39">
 <rect rx="6" ry="6" x="-26" y="-40" width="52" height="80" class="key"/>
-<use href="#mdi:keyboard-space" xlink:href="#mdi:keyboard-space" x="-9" y="-9" height="18" width="18.0" class="key tap glyph mdi:keyboard-space"/>
+<text x="0" y="0" class="key tap">⌘⌥⎵</text>
 </g>
 <g transform="translate(554, 213) rotate(-15.0)" class="key keypos-40">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
diff --git a/images/corne.yaml b/images/corne.yaml
index f01ac67..54c8aac 100644
--- a/images/corne.yaml
+++ b/images/corne.yaml
@@ -5,14 +5,14 @@ layers:
     '$$mdi:keyboard-space$$', raise, '$$mdi:apple-keyboard-option$$']
   lower:
   - $$mdi:keyboard-esc$$
-  - ''
+  - Tab Left
   - '7'
   - '8'
   - '9'
-  - '0'
-  - ''
-  - Tab Left
   - Tab Right
+  - ⌘⇧J
+  - ''
+  - ''
   - ''
   - ''
   - $$mdi:backspace-reverse-outline$$
@@ -21,7 +21,7 @@ layers:
   - '4'
   - '5'
   - '6'
-  - ⌘⇧J
+  - ''
   - $$mdi:arrow-left-bold$$
   - $$mdi:arrow-down-bold$$
   - $$mdi:arrow-up-bold$$
@@ -33,7 +33,7 @@ layers:
   - '1'
   - '2'
   - '3'
-  - ⌘⌥⎵
+  - '0'
   - $$mdi:volume-low$$
   - $$mdi:volume-high$$
   - ''
@@ -43,7 +43,7 @@ layers:
   - $$mdi:apple-keyboard-command$$
   - {t: lower, type: held}
   - $$mdi:keyboard-space$$
-  - $$mdi:keyboard-space$$
+  - ⌘⌥⎵
   - raise
   - $$mdi:apple-keyboard-option$$
   raise: