diff --git a/keyboards/qvex/lynepad/keymap.c b/keyboards/qvex/lynepad/keymap.c
index dfd0da9d..3bae156e 100644
--- a/keyboards/qvex/lynepad/keymap.c
+++ b/keyboards/qvex/lynepad/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_Lynepad(
         LCTL(LALT(KC_TAB)),  KC_MS_BTN2,  KC_MS_UP,    KC_MS_BTN1,
         LGUI(KC_DOWN),       KC_MS_LEFT,  KC_MS_DOWN,  KC_MS_RIGHT,
-        TO(0), TO(1), TO(2)
+        KC_MS_BTN3, TO(1), TO(2)
     ),
     [1] = LAYOUT_Lynepad(
         LCTL(LALT(KC_2)),  LCTL(KC_BSPACE),  LSFT(KC_X),  LSFT(KC_P),
@@ -226,24 +226,36 @@ void matrix_scan_user(void) {
     }
     if (enc2Left != enc2LeftPrev) {
         if (enc2Left < ENC_TILT_THRESHOLD) {
-            if (layer_state_is(1) || layer_state_is(2)) {
+            if (layer_state_is(0)) {
+                register_code16(KC_MS_WH_LEFT);
+            }
+            else if (layer_state_is(1) || layer_state_is(2)) {
                 register_code16(KC_LEFT);
             }
         }
         else {
-            if (layer_state_is(1) || layer_state_is(2)) {
+            if (layer_state_is(0)) {
+                unregister_code16(KC_MS_WH_LEFT);
+            }
+            else if (layer_state_is(1) || layer_state_is(2)) {
                 unregister_code16(KC_LEFT);
             }
         }
     }
     if (enc2Right != enc2RightPrev) {
         if (enc2Right < ENC_TILT_THRESHOLD) {
-            if (layer_state_is(1) || layer_state_is(2)) {
+            if (layer_state_is(0)) {
+                register_code16(KC_MS_WH_RIGHT);
+            }
+            else if (layer_state_is(1) || layer_state_is(2)) {
                 register_code16(KC_RIGHT);
             }
         }
         else {
-            if (layer_state_is(1) || layer_state_is(2)) {
+            if (layer_state_is(0)) {
+                unregister_code16(KC_MS_WH_RIGHT);
+            }
+            else if (layer_state_is(1) || layer_state_is(2)) {
                 unregister_code16(KC_RIGHT);
             }
         }
diff --git a/keyboards/qvex/lynepad/layer-1.json b/keyboards/qvex/lynepad/layer-1.json
index cca166b7..317b4939 100644
--- a/keyboards/qvex/lynepad/layer-1.json
+++ b/keyboards/qvex/lynepad/layer-1.json
@@ -23,18 +23,18 @@
     {
       "y": -0.5,
       "x": 4.5,
-      "a": 5,
-      "w": 1.25,
-      "h": 1.25
+      "a": 4,
+      "w": 2.5,
+      "h": 2
     },
-    "Whl Up\nWhl Dn\n\n\n\n\n<i class='fa fa-retweet'></i> Vol"
+    "\n\n\n\n\n\nWhl Lft\nWhl Rt\nWhl Up\n<i class='fa fa-retweet'></i> Vol\nWhl Dn"
   ],
   [
     {
       "y": -0.5,
       "a": 7
     },
-    "Layer 0",
+    "Mouse Btn 3",
     "Layer 1",
     "Layer 2"
   ],
diff --git a/keyboards/qvex/lynepad/layer-1.png b/keyboards/qvex/lynepad/layer-1.png
index 2e6ee5b6..f7a009ff 100644
Binary files a/keyboards/qvex/lynepad/layer-1.png and b/keyboards/qvex/lynepad/layer-1.png differ
diff --git a/qmk/keyboards/qvex/lynepad/keymaps/kemonine/keymap.c b/qmk/keyboards/qvex/lynepad/keymaps/kemonine/keymap.c
index b02d8ef0..14caf6ba 100644
--- a/qmk/keyboards/qvex/lynepad/keymaps/kemonine/keymap.c
+++ b/qmk/keyboards/qvex/lynepad/keymaps/kemonine/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_Lynepad(
         LCTL(LALT(KC_TAB)),  KC_MS_BTN2,  KC_MS_UP,    KC_MS_BTN1,
         LGUI(KC_DOWN),       KC_MS_LEFT,  KC_MS_DOWN,  KC_MS_RIGHT,
-        TO(0), TO(1), TO(2)
+        KC_MS_BTN3, TO(1), TO(2)
     ),
     [1] = LAYOUT_Lynepad(
         LCTL(LALT(KC_2)),  LCTL(KC_BSPACE),  LSFT(KC_X),  LSFT(KC_P),
@@ -226,24 +226,36 @@ void matrix_scan_user(void) {
     }
     if (enc2Left != enc2LeftPrev) {
         if (enc2Left < ENC_TILT_THRESHOLD) {
-            if (layer_state_is(1) || layer_state_is(2)) {
+            if (layer_state_is(0)) {
+                register_code16(KC_MS_WH_LEFT);
+            }
+            else if (layer_state_is(1) || layer_state_is(2)) {
                 register_code16(KC_LEFT);
             }
         }
         else {
-            if (layer_state_is(1) || layer_state_is(2)) {
+            if (layer_state_is(0)) {
+                unregister_code16(KC_MS_WH_LEFT);
+            }
+            else if (layer_state_is(1) || layer_state_is(2)) {
                 unregister_code16(KC_LEFT);
             }
         }
     }
     if (enc2Right != enc2RightPrev) {
         if (enc2Right < ENC_TILT_THRESHOLD) {
-            if (layer_state_is(1) || layer_state_is(2)) {
+            if (layer_state_is(0)) {
+                register_code16(KC_MS_WH_RIGHT);
+            }
+            else if (layer_state_is(1) || layer_state_is(2)) {
                 register_code16(KC_RIGHT);
             }
         }
         else {
-            if (layer_state_is(1) || layer_state_is(2)) {
+            if (layer_state_is(0)) {
+                unregister_code16(KC_MS_WH_RIGHT);
+            }
+            else if (layer_state_is(1) || layer_state_is(2)) {
                 unregister_code16(KC_RIGHT);
             }
         }