diff --git a/Makefile b/Makefile
index fc94351..64f1d1a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,4 @@
-setup:
-	rm -rf qmk_firmware/keyboards/lily58/keymaps/jakew
-	
-	ln -s $(shell pwd)/lily58 qmk_firmware/keyboards/lily58/keymaps/jakew
-
 build:
+	rm -rf ./qmk_firmware/keyboards/lily58/keymaps/jakew
+	cp -r ./lily58 ./qmk_firmware/keyboards/lily58/keymaps/jakew
 	docker run --rm -it --user $(shell id -u):$(shell id -g) -w /qmk_firmware -v $(shell pwd)/qmk_firmware:/qmk_firmware ghcr.io/qmk/qmk_cli qmk compile -kb lily58 -km jakew
diff --git a/lily58/keymap.c b/lily58/keymap.c
index 5686364..74452e1 100644
--- a/lily58/keymap.c
+++ b/lily58/keymap.c
@@ -3,10 +3,7 @@
 
 #define SY_EQL LT(_SYMBOL, KC_EQL)
 #define SY_MIN LT(_SYMBOL, KC_MINS)
-#define SY_SPC LT(_SYMBOL, KC_SPC)
-#define G_COMM LGUI_T(KC_COMM)
-#define A_DOT  LALT_T(KC_DOT)
-#define ADJ    MO(_ADJUST)
+#define SYM    MO(_SYMBOL)
 
 enum layer_names {
     _QWERTY,
@@ -26,17 +23,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------| SYM = |    | SYM - |------+------+------+------+------+------|
  * | Shift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  | Shift|
  * `-----------------------------------------/       /     \ Shift\-----------------------------------------'
- *                   |  ADJ |  Alt |  Cmd | / Space /       \ Enter\  | Bksp | Left | Right|
- *                   |      |      |   ,  |/       /         \      \ |      |      |      |
+ *                   |  Alt |  Cmd | SYM  | / Space /       \ Enter\  | Bksp | Left | Right|
+ *                   |      |      |      |/       /         \      \ |      |      |      |
  *                   `----------------------------'           '------''--------------------'
  */
 
  [_QWERTY] = LAYOUT(
   KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-  KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+  KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_NUBS,
   KC_LCTL,  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                       KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,   SY_EQL,    SY_MIN,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-                             ADJ,     KC_LALT, G_COMM, KC_SPC,    SC_SENT, KC_BSPC, KC_LEFT, KC_RGHT
+                             KC_LALT, KC_LGUI, SYM,    KC_SPC,    SC_SENT, KC_BSPC, KC_LEFT, KC_RGHT
 ),
 /* SYMBOL
  * ,-----------------------------------------.                    ,-----------------------------------------.
@@ -84,8 +81,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
-        case SY_SPC:
-            return false;
         case QK_MOD_TAP ... QK_MOD_TAP_MAX:
             return true;
         default: