diff --git a/config/lily58.keymap b/config/lily58.keymap
index e48ec0f..b127872 100644
--- a/config/lily58.keymap
+++ b/config/lily58.keymap
@@ -10,24 +10,36 @@
 #include <dt-bindings/zmk/ext_power.h>
 #include <dt-bindings/zmk/outputs.h>
 
+#define DEFAULT 0
+#define LOWER   1
+#define RAISE   2
+#define ADJUST  3
+
 / {
+	conditional_layers {
+        compatible = "zmk,conditional-layers";
+        adjust_layer {
+            if-layers = <LOWER RAISE>;
+            then-layer = <ADJUST>;
+        };
+    };
+
 	keymap {
 		compatible = "zmk,keymap";
 
 		default_layer {
-// DVORAK
 // ------------------------------------------------------------------------------------------------------------
-// |  ESC  |  1  |  2  |  3  |  4  |  5  |                   |  6  |  7   |  8   |  9  |  0  |   `   |
-// |  TAB  |  '  |  ,  |  .  |  P  |  Y  |                   |  F  |  G   |  C   |  R  |  L  |   /   |
-// | LCTRL |  A  |  O  |  E  |  U  |  I  |                   |  D  |  H   |  T   |  N  |  S  |   -   |
-// | SHIFT |  ;  |  Q  |  J  |  K  |  X  |   "["  |  |  "]"  |  B  |  M   |  W   |  V  |  Z  | SHIFT |
+// |  ESC  |  1  |  2  |  3   |  4   |  5   |                   |  6   |  7    |  8    |  9   |   0   |   `   |
+// |  TAB  |  Q  |  W  |  E   |  R   |  T   |                   |  Y   |  U    |  I    |  O   |   P   |   -   |
+// |  CTRL |  A  |  S  |  D   |  F   |  G   |                   |  H   |  J    |  K    |  L   |   ;   |   '   |
+// | SHIFT |  Z  |  X  |  C   |  V   |  B   |   "["  |  |  "]"  |  N   |  M    |  ,    |  .   |   /   | SHIFT |
 //                     | ALT | GUI |LOWER|  SPACE |  | ENTER |RAISE| BSPC | GUI  |
 			label = "Base";
 			bindings = <
-&kp ESC   &kp N1    &kp N2     &kp N3   &kp N4   &kp N5                     &kp N6 &kp N7    &kp N8 &kp N9 &kp N0 &kp GRAVE
-&kp TAB   &kp SQT   &kp COMMA  &kp DOT  &kp P    &kp Y             	        &kp F  &kp G     &kp C  &kp R  &kp L  &kp FSLH
-&kp LCTRL &kp A     &kp O      &kp E    &kp U    &kp I                      &kp D  &kp H     &kp T  &kp N  &kp S  &kp MINUS
-&kp LSHFT &kp SEMI  &kp Q      &kp J    &kp K    &kp X  &kp LBKT   &kp RBKT &kp B  &kp M &kp W  &kp V  &kp Z  &kp RSHFT
+&kp ESC   &kp N1 &kp N2 &kp N3   &kp N4   &kp N5                     &kp N6 &kp N7   &kp N8    &kp N9  &kp N0   &kp GRAVE
+&kp TAB   &kp Q  &kp W  &kp E    &kp R    &kp T                      &kp Y  &kp U    &kp I     &kp O   &kp P    &kp MINUS
+&kp LCTRL &kp A  &kp S  &kp D    &kp F    &kp G                      &kp H  &kp J    &kp K     &kp L   &kp SEMI &kp SQT
+&kp LSHFT &kp Z  &kp X  &kp C    &kp V    &kp B  &kp LBKT   &kp RBKT &kp N  &kp M    &kp COMMA &kp DOT &kp FSLH &kp RSHFT
                         &kp LALT &kp LGUI &mo 1  &kp SPACE  &kp RET  &mo 2  &kp BSPC &kp RGUI
 			>;
 
@@ -71,5 +83,22 @@
 
 			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
 		};
+
+		media_layer {
+// -----------------------------------------------------------------------------------------
+// |     |      |      |     |     |       |           		    |     |      |      |       |       |       |
+// |     |      |      |     |     |       |           		    |     |      |      |       |       |       |
+// |     |      |      |     |     |       |           		    |     |      |      |       |       |       |
+// |     |      |      |     |     |       |           		    |     |      |      |       |       |       |
+//                     |     |     |       |        |  |        |     |      |      |       |
+			label = "Media";
+			bindings = <
+&trans &trans &trans &trans &trans &trans          				&trans  &trans  &trans &trans   &trans    &trans
+&trans &trans &trans &trans &trans &trans          				&trans  &trans  &trans &trans   &trans    &trans
+&trans &trans &trans &trans &trans &trans          				&trans  &trans  &trans &trans   &trans    &trans
+&trans &trans &trans &trans &trans &trans          				&trans  &trans  &trans &trans   &trans    &trans
+					&trans &trans   &trans    &trans   		&trans &trans   &trans    &trans
+			>;
+		};
 	};
 };