diff --git a/config/corne.keymap b/config/corne.keymap
index 1bc054b..32ab3be 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -5,7 +5,6 @@
  */
 
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/bt.h>
 #include <dt-bindings/zmk/keys.h>
 
 / {
@@ -16,26 +15,26 @@
             bindings = <
 &kp TAB    &kp Q  &kp W  &kp E     &kp R  &kp T        &kp Y      &kp U  &kp I      &kp O    &kp P     &kp BSPC
 &kp LCTRL  &kp A  &kp S  &kp D     &kp F  &kp G        &kp H      &kp J  &kp K      &kp L    &kp SEMI  &kp ENTER
-&kp LSHFT  &kp Z  &kp X  &kp C     &kp V  &kp B        &kp N      &kp M  &kp COMMA  &kp DOT  &kp FSLH  &kp ESC
+&kp LSHFT  &kp Z  &kp X  &kp C     &kp V  &kp B        &kp N      &kp M  &kp COMMA  &kp DOT  &kp FSLH  &kp RIGHT_SHIFT
                          &kp LGUI  &mo 1  &kp SPACE    &kp SPACE  &mo 2  &kp RALT
             >;
         };
 
         lower_layer {
             bindings = <
-&kp LS(TAB)  &kp N1        &kp N2        &kp N3        &kp N4        &kp N5          &kp N6          &kp N7          &kp N8        &kp N9           &kp N0  &kp BSPC
-&kp LCTRL    &none         &none         &none         &none         &none           &kp LEFT_ARROW  &kp DOWN_ARROW  &kp UP_ARROW  &kp RIGHT_ARROW  &none   &kp ENTER
-&kp LSHFT    &bt BT_SEL 0  &bt BT_SEL 1  &bt BT_SEL 2  &bt BT_SEL 3  &bt BT_SEL 4    &bt BT_CLR      &none           &none         &none            &none   &kp ESC
-                                         &kp LGUI      &mo 1         &kp SPACE       &kp SPACE       &mo 2           &kp RALT
+&kp ESCAPE  &kp N1  &kp N2  &kp N3           &kp N4       &kp N5               &kp N6          &kp N7          &kp N8        &kp N9           &kp N0  &kp DELETE
+&kp LCTRL   &none   &none   &kp RC(RS(TAB))  &kp RC(TAB)  &kp LG(LS(J))        &kp LEFT_ARROW  &kp DOWN_ARROW  &kp UP_ARROW  &kp RIGHT_ARROW  &none   &kp ENTER
+&kp LSHFT   &none   &none   &none            &none        &kp LG(LA(SPACE))    &kp C_VOL_DN    &kp C_VOL_UP    &none         &none            &none   &kp RIGHT_SHIFT
+                            &kp LGUI         &mo 1        &kp SPACE            &kp SPACE       &mo 2           &kp RALT
             >;
         };
 
         raise_layer {
             bindings = <
-&kp LC(TAB)  &kp EXCL   &kp AT     &kp POUND       &kp DOLLAR        &kp PERCENT             &kp CARET              &kp AMPERSAND      &kp STAR         &kp PLUS       &kp EQUAL  &kp BSPC
-&kp LCTRL    &kp GRAVE  &kp TILDE  &kp LEFT_BRACE  &kp LEFT_BRACKET  &kp LEFT_PARENTHESIS    &kp RIGHT_PARENTHESIS  &kp RIGHT_BRACKET  &kp RIGHT_BRACE  &kp BACKSLASH  &kp PIPE   &kp ENTER
-&kp LSHFT    &none      &none      &none           &kp SQT           &kp MINUS               &kp UNDER              &kp DOUBLE_QUOTES  &none            &none          &none      &kp RIGHT_SHIFT
-                                   &kp LGUI        &mo 1             &kp SPACE               &kp SPACE              &mo 2              &kp RALT
+&kp ESCAPE  &kp EXCL   &kp AT     &kp POUND       &kp DOLLAR        &kp PERCENT             &kp CARET              &kp AMPERSAND      &kp STAR         &kp PLUS       &kp EQUAL  &kp DELETE
+&kp LCTRL   &kp GRAVE  &kp TILDE  &kp LEFT_BRACE  &kp LEFT_BRACKET  &kp LEFT_PARENTHESIS    &kp RIGHT_PARENTHESIS  &kp RIGHT_BRACKET  &kp RIGHT_BRACE  &kp BACKSLASH  &kp PIPE   &kp ENTER
+&kp LSHFT   &none      &none      &none           &kp SQT           &kp DOUBLE_QUOTES       &kp UNDER              &kp MINUS          &none            &none          &none      &kp RIGHT_SHIFT
+                                  &kp LGUI        &mo 1             &kp SPACE               &kp SPACE              &mo 2              &kp RALT
             >;
         };
     };
diff --git a/config/corne_left.conf b/config/corne_left.conf
index 9f9ac10..74b68c9 100644
--- a/config/corne_left.conf
+++ b/config/corne_left.conf
@@ -3,10 +3,10 @@ CONFIG_ZMK_DISPLAY=y
 # CONFIG_ZMK_WIDGET_BATTERY_STATUS=y
 # CONFIG_ZMK_WIDGET_BATTERY_STATUS_SHOW_PERCENTAGE=y
 # CONFIG_ZMK_WIDGET_WPM_STATUS=n
-#
+
 # nice-view-gem
 CONFIG_ZMK_DISPLAY_STATUS_SCREEN_CUSTOM=y
-CONFIG_NICE_VIEW_GEM_ANIMATION=y
+CONFIG_NICE_VIEW_GEM_ANIMATION=n
 
 # Disable in-built nice!view widget
 # CONFIG_ZMK_DISPLAY_STATUS_SCREEN_BUILT_IN=y
diff --git a/config/corne_right.conf b/config/corne_right.conf
index 9f9ac10..74b68c9 100644
--- a/config/corne_right.conf
+++ b/config/corne_right.conf
@@ -3,10 +3,10 @@ CONFIG_ZMK_DISPLAY=y
 # CONFIG_ZMK_WIDGET_BATTERY_STATUS=y
 # CONFIG_ZMK_WIDGET_BATTERY_STATUS_SHOW_PERCENTAGE=y
 # CONFIG_ZMK_WIDGET_WPM_STATUS=n
-#
+
 # nice-view-gem
 CONFIG_ZMK_DISPLAY_STATUS_SCREEN_CUSTOM=y
-CONFIG_NICE_VIEW_GEM_ANIMATION=y
+CONFIG_NICE_VIEW_GEM_ANIMATION=n
 
 # Disable in-built nice!view widget
 # CONFIG_ZMK_DISPLAY_STATUS_SCREEN_BUILT_IN=y
diff --git a/images/corne.svg b/images/corne.svg
index 2bc77f1..13bc202 100644
--- a/images/corne.svg
+++ b/images/corne.svg
@@ -386,7 +386,9 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(812, 161)" class="key keypos-35">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">Esc</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em">RIGHT</tspan><tspan x="0" dy="1.2em">SHIFT</tspan>
+</text>
 </g>
 <g transform="translate(224, 205)" class="key keypos-36">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -421,9 +423,7 @@ rect.held, rect.combo.held {
 <g transform="translate(0, 56)">
 <g transform="translate(28, 49)" class="key keypos-0">
 <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">Win</tspan><tspan x="0" dy="1.2em">Prev</tspan>
-</text>
+<text x="0" y="0" class="key tap">ESCAPE</text>
 </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"/>
@@ -467,7 +467,7 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(812, 49)" class="key keypos-11">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<use href="#mdi:backspace-outline" xlink:href="#mdi:backspace-outline" x="-9" y="-9" height="18" width="18.0" class="key tap glyph mdi:backspace-outline"/>
+<text x="0" y="0" class="key tap">DELETE</text>
 </g>
 <g transform="translate(28, 105)" class="key keypos-12">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -481,12 +481,19 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(196, 84)" class="key keypos-15">
 <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">Ctl+</tspan><tspan x="0" dy="1.2em">Sft+↹</tspan>
+</text>
 </g>
 <g transform="translate(252, 91)" class="key keypos-16">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+<text x="0" y="0" class="key tap">Ctl+↹</text>
 </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">
+<tspan x="0" dy="-0.6em">Gui+</tspan><tspan x="0" dy="1.2em">Sft+J</tspan>
+</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"/>
@@ -525,42 +532,33 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(84, 161)" class="key keypos-25">
 <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">BT</tspan><tspan x="0" dy="1.2em">1</tspan>
-</text>
 </g>
 <g transform="translate(140, 147)" class="key keypos-26">
 <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">BT</tspan><tspan x="0" dy="1.2em">2</tspan>
-</text>
 </g>
 <g transform="translate(196, 140)" class="key keypos-27">
 <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">BT</tspan><tspan x="0" dy="1.2em">3</tspan>
-</text>
 </g>
 <g transform="translate(252, 147)" class="key keypos-28">
 <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">BT</tspan><tspan x="0" dy="1.2em">4</tspan>
-</text>
 </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">
-<tspan x="0" dy="-0.6em">BT</tspan><tspan x="0" dy="1.2em">5</tspan>
+<tspan x="0" dy="-0.6em">Gui+</tspan><tspan x="0" dy="1.2em">Alt+␣</tspan>
 </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"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">BT</tspan><tspan x="0" dy="1.2em">CLR</tspan>
+<tspan x="0" dy="-0.6em">Vol</tspan><tspan x="0" dy="1.2em">Down</tspan>
 </text>
 </g>
 <g transform="translate(588, 147)" class="key keypos-31">
 <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">Vol</tspan><tspan x="0" dy="1.2em">Up</tspan>
+</text>
 </g>
 <g transform="translate(644, 140)" class="key keypos-32">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -573,7 +571,9 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(812, 161)" class="key keypos-35">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">Esc</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em">RIGHT</tspan><tspan x="0" dy="1.2em">SHIFT</tspan>
+</text>
 </g>
 <g transform="translate(224, 205)" class="key keypos-36">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -608,9 +608,7 @@ rect.held, rect.combo.held {
 <g transform="translate(0, 56)">
 <g transform="translate(28, 49)" class="key keypos-0">
 <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>
+<text x="0" y="0" class="key tap">ESCAPE</text>
 </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"/>
@@ -654,7 +652,7 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(812, 49)" class="key keypos-11">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<use href="#mdi:backspace-outline" xlink:href="#mdi:backspace-outline" x="-9" y="-9" height="18" width="18.0" class="key tap glyph mdi:backspace-outline"/>
+<text x="0" y="0" class="key tap">DELETE</text>
 </g>
 <g transform="translate(28, 105)" class="key keypos-12">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -723,7 +721,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">&quot;</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"/>
@@ -731,7 +729,7 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(588, 147)" class="key keypos-31">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">&quot;</text>
+<text x="0" y="0" class="key tap">-</text>
 </g>
 <g transform="translate(644, 140)" class="key keypos-32">
 <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 c79cfc6..7881bd2 100644
--- a/images/corne.yaml
+++ b/images/corne.yaml
@@ -1,9 +1,9 @@
 layout: {qmk_keyboard: corne_rotated, layout_name: LAYOUT_split_3x6_3}
 layers:
   default: [↹, Q, W, E, R, T, Y, U, I, O, P, '$$mdi:backspace-outline$$', '$$mdi:apple-keyboard-control$$', A, S, D, F, G, H, J, K, L, ;, ENTER, '$$mdi:apple-keyboard-shift$$',
-    Z, X, C, V, B, N, M, ',', ., /, Esc, '$$mdi:apple-keyboard-command$$', lower, ␣, ␣, raise, '$$mdi:apple-keyboard-option$$']
+    Z, X, C, V, B, N, M, ',', ., /, RIGHT SHIFT, '$$mdi:apple-keyboard-command$$', lower, ␣, ␣, raise, '$$mdi:apple-keyboard-option$$']
   lower:
-  - Win Prev
+  - ESCAPE
   - '1'
   - '2'
   - '3'
@@ -14,13 +14,13 @@ layers:
   - '8'
   - '9'
   - '0'
-  - $$mdi:backspace-outline$$
+  - DELETE
   - $$mdi:apple-keyboard-control$$
   - ''
   - ''
-  - ''
-  - ''
-  - ''
+  - Ctl+Sft+↹
+  - Ctl+↹
+  - Gui+Sft+J
   - LEFT ARROW
   - DOWN ARROW
   - UP ARROW
@@ -28,17 +28,17 @@ layers:
   - ''
   - ENTER
   - $$mdi:apple-keyboard-shift$$
-  - BT 1
-  - BT 2
-  - BT 3
-  - BT 4
-  - BT 5
-  - BT CLR
   - ''
   - ''
   - ''
   - ''
-  - Esc
+  - Gui+Alt+␣
+  - Vol Down
+  - Vol Up
+  - ''
+  - ''
+  - ''
+  - RIGHT SHIFT
   - $$mdi:apple-keyboard-command$$
   - {t: lower, type: held}
   - ␣
@@ -46,7 +46,7 @@ layers:
   - raise
   - $$mdi:apple-keyboard-option$$
   raise:
-  - Tab Right
+  - ESCAPE
   - '!'
   - '@'
   - '#'
@@ -57,7 +57,7 @@ layers:
   - '*'
   - +
   - '='
-  - $$mdi:backspace-outline$$
+  - DELETE
   - $$mdi:apple-keyboard-control$$
   - '`'
   - '~'
@@ -75,9 +75,9 @@ layers:
   - ''
   - ''
   - ''''
-  - '-'
-  - _
   - '"'
+  - _
+  - '-'
   - ''
   - ''
   - ''