diff --git a/keyboards/zsa/voyager/keymaps/ryuk/keymap.c b/keyboards/zsa/voyager/keymaps/ryuk/keymap.c
index a4b4cb2..ae4df11 100644
--- a/keyboards/zsa/voyager/keymaps/ryuk/keymap.c
+++ b/keyboards/zsa/voyager/keymaps/ryuk/keymap.c
@@ -9,27 +9,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap 0: Basic layer
    *
    * ,---------------------------------------------.           ,--------------------------------------------.
-   * | ESC      |   1  |   2  |   3  |   4  |   5  |           |   6  |   7  |   8  |   9  |   0  |    -    |
+   * | ESC      |   Q  |   W  |   F  |   P  |   G  |           |   J  |   L  |   U  |   Y  |   ;  |    -    |
    * |----------+------+------+------+------+------|           |------+------+------+------+------+---------|
-   * | CapsWord |   Q  |   W  |   F  |   P  |   G  |           |   J  |   L  |   U  |   Y  |   ;  |    \    |
+   * |          |   A  |   R  |   S  |   T  |   D  |           |   H  |   N  |   E  |   I  |   O  |    \    |
    * |----------+------+------+------+------+------|           |------+------+------+------+------+---------|
-   * | L⇧ (⌫) |   A  |   R  |   S  |   T  |   D  |           |   H  |   N  |   E  |   I  |   O  | R⇧ (/) |
+   * |          |   Z  |   X  |   C  |   V  |   B  |           |   K  |   M  |   ,  |   .  |   '  |    /    |
    * |----------+------+------+------+------+------|           |------+------+------+------+------+---------|
-   * | LGui     |   Z  |   X  |   C  |   V  |   B  |           |   K  |   M  |   ,  |   .  |   '  | Hyper   |
+   * |   ~L1    |  ~L2 | LALT |LSHIFT| LCtrl|      |           |      | RCtrl|RSHIFT| LALT | ~L2  |   ~L1   |
    * `----------+------+------+------+------+------'           `------+------+------+------+------+---------'
    *
-   *                              ,----------------.           ,-----------------.
-   *                              | L1(RET) |      |           |       | L2(SPC) |
-   *                              '---------|C(TAB)|           |S(BSPS)|---------'
-   *                                        |      |           |       |
-   *                                        `------'           `-------'
+   *                              ,----------------.           ,----------------.
+   *                              |   BSPS  |      |           |      |   SPC   |
+   *                              '---------|G(TAB)|           |G(RET)|---------'
+   *                                        |      |           |      |
+   *                                        `------'           `------'
    */
     [0] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-        CW_TOGG, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,               KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-        SFT_T(KC_BSPC),KC_A, KC_R, KC_S,    KC_T,    KC_D,               KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    RSFT_T(KC_SLSH),
-        KC_LGUI, ALT_T(KC_Z),KC_X, KC_C,    KC_V,    KC_B,               KC_K,    KC_M,    KC_COMMA,KC_DOT,  RALT_T(KC_QUOT), KC_RCTL,
-                                LT(1,KC_BSPC), CTL_T(KC_TAB),          SFT_T(KC_ENT), LT(2,KC_SPC)
+        KC_ESC,  KC_Q,  KC_W,    KC_F,    KC_P,    KC_G,                   KC_J,    KC_L,    KC_U,     KC_Y,    KC_SCLN, KC_MINS,
+         KC_NO,  KC_A,  KC_R,    KC_S,    KC_T,    KC_D,                   KC_H,    KC_N,    KC_E,     KC_I,    KC_O,    KC_BSLS,
+         KC_NO,  KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,                   KC_K,    KC_M,    KC_COMMA, KC_DOT,  KC_QUOT, KC_SLSH,
+         MO(2), MO(1), KC_LALT, KC_LSFT, KC_LCTL, KC_NO,                   KC_NO,   KC_RCTL, KC_RSFT,  KC_LALT, MO(1),   MO(2),
+                                    KC_BSPC, LGUI_T(KC_TAB),           LGUI_T(KC_ENT), LT(2,KC_SPC)
     ),
   /* Keymap 1: Symbols && Numbers
    *