diff --git a/keyboards/lily58/rev1/keymaps/rpw/config.h b/keyboards/lily58/rev1/keymaps/rpw/config.h
new file mode 100644
index 00000000..471714d3
--- /dev/null
+++ b/keyboards/lily58/rev1/keymaps/rpw/config.h
@@ -0,0 +1,47 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_rpw.h"
+
+#undef RGBLIGHT_LED_COUNT
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_LED_COUNT 27
+#define RGBLIGHT_LIMIT_VAL 120
+#define RGBLIGHT_HUE_STEP 10
+#define RGBLIGHT_SAT_STEP 17
+#define RGBLIGHT_VAL_STEP 17
+
+// Underglow
+/*
+#undef RGBLIGHT_LED_COUNT
+#define RGBLIGHT_LED_COUNT 14    // Number of LEDs
+#define RGBLIGHT_SLEEP
+*/
diff --git a/keyboards/lily58/rev1/keymaps/rpw/keymap.c b/keyboards/lily58/rev1/keymaps/rpw/keymap.c
new file mode 100644
index 00000000..0082e1b0
--- /dev/null
+++ b/keyboards/lily58/rev1/keymaps/rpw/keymap.c
@@ -0,0 +1,102 @@
+#include QMK_KEYBOARD_H
+
+#include "rpw.c"
+
+enum layer_number {
+    _QWR = 0,
+    _SYM,
+    _NUM,
+    _NAV
+};
+
+enum custom_keycodes {
+    KC_RHLSC0  // right-hand layer shift/cycle
+};
+
+#define KC_RHLSC0 LT(_NAV, 1)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_QWR] = LAYOUT(
+        _______,  KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_GRV,
+        _______,  KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,  KC_BSPC,
+        _______,  CTL_A,  ALT_S,   SFT_D,   GUI_F,   KC_G,                      KC_H,    GUI_J,   SFT_K,   ALT_L,  CTL_QUOT,  KC_QUOT,
+        _______,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, _______,    _______, KC_N,    KC_M,    KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
+                        KC_LALT,KC_LCTL, LT(_NAV, 1), MO(_SYM),        NUM_SPC,  KC_RHLSC0, KC_RCTL, KC_RALT
+    ),
+
+    [_SYM] = LAYOUT(
+        _______,  _______ , _______ , _______ , _______ , _______,                     _______ , _______ , _______ , _______ , _______,  _______,
+        _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                          KC_6,    KC_7,    KC_8,     KC_9,     KC_0,     _______,
+        _______, _______ , _______ , _______ , _______ , _______,                      KC_MINS, GUI_EQL, SFT_LBRC, ALT_RBRC, CTL_BSLS, _______,
+        _______,  KC_EQL, KC_MINS, KC_PLUS, KC_TILD, KC_RCBR, _______,       _______,  KC_UNDS, KC_PLUS, KC_LCBR,  KC_RCBR,  KC_PIPE,  _______,
+                            _______, _______, _______, _______,    TO(_QWR), _______, _______, _______
+    ),
+
+    [_NUM] = LAYOUT(
+        _______, _______ , _______ , _______ , _______ , _______,                      _______,  _______  , _______,  _______ ,  _______ ,_______,
+        _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  _______,
+        _______, _______,  _______,  _______,  _______, _______,                       KC_TRNS, KC_RGUI, KC_RSFT, KC_RALT, CTL_SCLN, _______,
+        _______, C(KC_Z), C(KC_X), C(KC_C), KC_TILD, XXXXXXX,  _______,       _______,  XXXXXXX, _______, XXXXXXX, _______,   XXXXXXX, _______,
+                                _______, _______, KC_TILD, KC_DEL,       _______, _______, _______, _______
+    ),
+
+    [_NAV] = LAYOUT(
+        _______, _______ , _______ , _______ , _______ , _______,                       _______,  _______  , _______,  _______ ,  _______ ,_______,
+        _______, KC_TAB  , KC_TILD,  _______,  _______,  _______,                            KC_6,    KC_7,    KC_8,    KC_DEL,   KC_BSPC,  _______,
+        _______, KC_ESC  , _______,  _______,  _______,  _______,                        KC_LEFT, KC_DOWN,  KC_UP,   KC_RIGHT, KC_ENT,  KC_TRNS,
+        _______, C(KC_Z), C(KC_X), C(KC_C), KC_TILD, XXXXXXX,  _______,       _______,  XXXXXXX, _______, XXXXXXX, _______,   _______, _______,
+                                _______, _______, KC_TILD, KC_DEL,       _______, _______, _______, _______
+    ),
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _SYM, _NUM, _NAV);
+}
+
+//SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk
+#ifdef OLED_ENABLE
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+  if (!is_keyboard_master())
+    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
+  return rotation;
+}
+
+// When you add source files to SRC in rules.mk, you can use functions.
+const char *read_layer_state(void);
+const char *read_logo(void);
+void set_keylog(uint16_t keycode, keyrecord_t *record);
+const char *read_keylog(void);
+const char *read_keylogs(void);
+
+// const char *read_mode_icon(bool swap);
+// const char *read_host_led_state(void);
+// void set_timelog(void);
+// const char *read_timelog(void);
+
+bool oled_task_user(void) {
+  if (is_keyboard_master()) {
+    // If you want to change the display of OLED, you need to change here
+    oled_write_ln(read_layer_state(), false);
+    oled_write_ln(read_keylog(), false);
+    oled_write_ln(read_keylogs(), false);
+    //oled_write_ln(read_mode_icon(keymap_config.swap_lalt_lgui), false);
+    //oled_write_ln(read_host_led_state(), false);
+    //oled_write_ln(read_timelog(), false);
+  } else {
+    oled_write(read_logo(), false);
+  }
+    return false;
+}
+#endif // OLED_ENABLE
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  if (record->event.pressed) {
+#ifdef OLED_ENABLE
+    set_keylog(keycode, record);
+#endif
+    // set_timelog();
+  }
+  return true;
+}
diff --git a/keyboards/lily58/rev1/keymaps/rpw/rules.mk b/keyboards/lily58/rev1/keymaps/rpw/rules.mk
new file mode 100644
index 00000000..0e12facd
--- /dev/null
+++ b/keyboards/lily58/rev1/keymaps/rpw/rules.mk
@@ -0,0 +1,21 @@
+LTO_ENABLE = yes            # Link Time Optimization enabled
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = no        # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+AUDIO_ENABLE = no           # Audio output
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
+SWAP_HANDS_ENABLE = no      # Enable one-hand typing
+OLED_ENABLE = yes           # OLED display
+
+# If you want to change the display of OLED, you need to change here
+SRC +=  ./lib/rgb_state_reader.c \
+        ./lib/layer_state_reader.c \
+        ./lib/logo_reader.c \
+        ./lib/keylogger.c \
+        # ./lib/mode_icon_reader.c \
+        # ./lib/host_led_state_reader.c \
+        # ./lib/timelogger.c \
diff --git a/keyboards/sofle/rev1/keymaps/rpw/keymap.c b/keyboards/sofle/rev1/keymaps/rpw/keymap.c
index 43b0cc60..c65f67ae 100644
--- a/keyboards/sofle/rev1/keymaps/rpw/keymap.c
+++ b/keyboards/sofle/rev1/keymaps/rpw/keymap.c
@@ -10,68 +10,70 @@ enum sofle_layers {
     _SYM,
     _NUM,
     _NAV,
+    _BORK,
 };
 
 enum custom_keycodes {
     KC_PRVWD = QK_USER,
     KC_NXTWD,
     KC_LSTRT,
-    KC_LEND
+    KC_LEND,
+    KC_RHLSC0  // right-hand layer shift/cycle
 };
 
+#define KC_RHLSC0 LT(_NAV, 1)
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * QWERTY
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  `   |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  `   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | ESC  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  | Bspc |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
- * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | RGUI |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
- */
 
-[_QWR] = LAYOUT(
-  _______,  KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_GRV,
-  _______,  KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,  KC_BSPC,
-  _______,  CTL_A,  ALT_S,   SFT_D,   GUI_F,   KC_G,                      KC_H,    GUI_J,   SFT_K,   ALT_L,  CTL_QUOT,  KC_QUOT,
-  _______,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, _______,    _______, KC_N,   KC_M,    KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
-                 KC_LGUI,KC_LALT,KC_LCTL, NAV_TAB, MO(_SYM),        NUM_SPC, MO(_NAV), KC_RCTL, KC_RALT, KC_RGUI
-),
+    [_QWR] = LAYOUT(
+        _______,  KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_GRV,
+        _______,  KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,  KC_BSPC,
+        _______,  CTL_A,  ALT_S,   SFT_D,   GUI_F,   KC_G,                      KC_H,    GUI_J,   SFT_K,   ALT_L,  CTL_QUOT,  KC_QUOT,
+        _______,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, _______,    _______, KC_N,    KC_M,    KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
+                        KC_LGUI,KC_LALT,KC_LCTL, LT(_NAV, 1), MO(_SYM),        NUM_SPC,  KC_RHLSC0, KC_RCTL, KC_RALT, KC_RGUI
+    ),
 
-[_SYM] = LAYOUT(
-  _______,  _______ , _______ , _______ , _______ , _______,                    _______ , _______ , _______ , _______ , _______,  _______,
-  _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,     KC_9,     KC_0,     _______,
-  _______, _______ , _______ , _______ , _______ , _______,                     KC_MINS, GUI_EQL, SFT_LBRC, ALT_RBRC, CTL_BSLS, _______,
-  _______,  KC_EQL, KC_MINS, KC_PLUS, KC_TILD, KC_RCBR, _______,       _______, KC_UNDS, KC_PLUS, KC_LCBR,  KC_RCBR,  KC_PIPE,  _______,
-                       _______, _______, _______, _______, _______,       KC_BSPC, _______, _______, _______, _______
-),
+    [_SYM] = LAYOUT(
+        _______,  _______ , _______ , _______ , _______ , _______,                     _______ , _______ , _______ , _______ , _______,  _______,
+        _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                          KC_6,    KC_7,    KC_8,     KC_9,     KC_0,     _______,
+        _______, _______ , _______ , _______ , _______ , _______,                      KC_MINS, GUI_EQL, SFT_LBRC, ALT_RBRC, CTL_BSLS, _______,
+        _______,  KC_EQL, KC_MINS, KC_PLUS, KC_TILD, KC_RCBR, _______,       _______,  KC_UNDS, KC_PLUS, KC_LCBR,  KC_RCBR,  KC_PIPE,  _______,
+                            _______, _______, _______, _______, _______,    TO(_QWR), _______, _______, _______, _______
+    ),
 
-[_NUM] = LAYOUT(
-  _______, _______ , _______ , _______ , _______ , _______,                      _______,  _______  , _______,  _______ ,  _______ ,_______,
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  _______,
-  _______, _______,  _______,  _______,  _______, _______,                       KC_TRNS, KC_RGUI, KC_RSFT, KC_RALT, CTL_SCLN, _______,
-  _______, C(KC_Z), C(KC_X), C(KC_C), KC_TILD, XXXXXXX,  _______,       _______,  XXXXXXX, KC_LSTRT, XXXXXXX, KC_LEND,   XXXXXXX, _______,
-                         _______, _______, _______, KC_TILD, KC_DEL,       _______, _______, _______, _______, _______
-),
+    [_NUM] = LAYOUT(
+        _______, _______ , _______ , _______ , _______ , _______,                      _______,  _______  , _______,  _______ ,  _______ ,_______,
+        _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  _______,
+        _______, _______,  _______,  _______,  _______, _______,                       KC_TRNS, KC_RGUI, KC_RSFT, KC_RALT, CTL_SCLN, _______,
+        _______, C(KC_Z), C(KC_X), C(KC_C), KC_TILD, XXXXXXX,  _______,       _______,  XXXXXXX, KC_LSTRT, XXXXXXX, KC_LEND,   XXXXXXX, _______,
+                                _______, _______, _______, KC_TILD, KC_DEL,       _______, _______, _______, _______, _______
+    ),
 
-[_NAV] = LAYOUT(
-  _______, _______ , _______ , _______ , _______ , _______,                      _______,  _______  , _______,  _______ ,  _______ ,_______,
-  _______, KC_TAB,    KC_2,    KC_3,    KC_4,    KC_5,                             KC_6,    KC_7,    KC_8,    KC_DEL,  KC_BSPC,  _______,
-  _______, QK_GESC,  _______,  _______,  _______, _______,                       KC_LEFT, RGUI_T(KC_DOWN), RSFT_T(KC_UP), LALT_T(KC_RIGHT), RCTL_T(KC_ENT),  KC_TRNS,
-  _______, C(KC_Z), C(KC_X), C(KC_C), KC_TILD, XXXXXXX,  _______,       _______,  XXXXXXX, KC_LSTRT, XXXXXXX, KC_LEND,   XXXXXXX, _______,
-                         _______, _______, _______, KC_TILD, KC_DEL,       _______, _______, _______, _______, _______
-)
+    [_NAV] = LAYOUT(
+        _______, _______ , _______ , _______ , _______ , _______,                       _______,  _______  , _______,  _______ ,  _______ ,_______,
+        _______, KC_TAB  , KC_TILD,  _______,  _______,  _______,                            KC_6,    KC_7,    KC_8,    KC_DEL,   KC_BSPC,  _______,
+        _______, KC_ESC  , _______,  _______,  _______,  _______,                        KC_LEFT, KC_DOWN,  KC_UP,   KC_RIGHT, KC_ENT,  KC_TRNS,
+        _______, C(KC_Z), C(KC_X), C(KC_C), KC_TILD, XXXXXXX,  _______,       _______,  XXXXXXX, KC_LSTRT, XXXXXXX, KC_LEND,   _______, _______,
+                                _______, _______, _______, KC_TILD, KC_DEL,       _______, _______, _______, _______, _______
+    ),
 
+    [_BORK] = LAYOUT(
+        _______, _______ , _______ , _______ , _______ , _______,                      _______,  _______  , _______,  _______ ,  _______ ,_______,
+        _______, KC_TAB,    KC_2,    KC_3,    KC_4,    KC_5,                             KC_6,    KC_7,    KC_8,    KC_DEL,  KC_BSPC,  _______,
+        _______, QK_GESC,   KC_B,    KC_O,    KC_R,    KC_K,                       KC_Z, KC_B, KC_O, KC_R, KC_K,  KC_TRNS,
+        _______, C(KC_Z), C(KC_X), C(KC_C), KC_TILD, XXXXXXX,  _______,       _______,  XXXXXXX, KC_LSTRT, XXXXXXX, KC_LEND,   XXXXXXX, _______,
+                                _______, _______, _______, KC_TILD, TO(_QWR),       _______, _______, _______, _______, _______
+    )
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
+        case KC_RHLSC0:
+            if (record->tap.count && record->event.pressed) {
+                layer_on(_SYM);      // When held switch the Symbol layer
+                return false;        // Return false to ignore further processing of key
+            }
+            break;
         case KC_PRVWD:
             if (record->event.pressed) {
                 if (keymap_config.swap_lctl_lgui) {
diff --git a/qmk.json b/qmk.json
index bfdeefbd..47291d9e 100644
--- a/qmk.json
+++ b/qmk.json
@@ -3,6 +3,7 @@
     "build_targets": [
         ["atreus62", "rpw"],
         ["sofle/rev1", "rpw"],
-        ["primekb/prime_e", "rpw"]
+        ["primekb/prime_e", "rpw"],
+        ["lily58/rev1", "rpw"]
     ]
 }
\ No newline at end of file