diff --git a/keyboards/42keebs/basketweave_s/config.h b/keyboards/42keebs/basketweave_s/config.h
index dfab9d9702..403a9fd3a0 100644
--- a/keyboards/42keebs/basketweave_s/config.h
+++ b/keyboards/42keebs/basketweave_s/config.h
@@ -57,5 +57,5 @@
 
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
+#define BOOTMAGIC_LITE_COLUMN 1
 
diff --git a/keyboards/42keebs/basketweave_s/keymaps/vial/config.h b/keyboards/42keebs/basketweave_s/keymaps/vial/config.h
index b373a09629..eb02082ef7 100644
--- a/keyboards/42keebs/basketweave_s/keymaps/vial/config.h
+++ b/keyboards/42keebs/basketweave_s/keymaps/vial/config.h
@@ -5,7 +5,7 @@
 #define VIAL_KEYBOARD_UID {0x82, 0x1C, 0x92, 0xC7, 0x6B, 0xC1, 0xB2, 0xA9}
 
 #define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
-#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }
+#define VIAL_UNLOCK_COMBO_COLS { 1, 13 }
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 4
 
@@ -14,3 +14,6 @@
 #define VIAL_TAP_DANCE_ENTRIES 5
 #define VIAL_COMBO_ENTRIES 5
 #define VIAL_KEY_OVERRIDE_ENTRIES 5
+
+#undef LOCKING_SUPPORT_ENABLE
+#undef LOCKING_RESYNC_ENABLE
diff --git a/keyboards/42keebs/basketweave_s/keymaps/vial/vial.json b/keyboards/42keebs/basketweave_s/keymaps/vial/vial.json
index 4df5c010c3..1374a03a64 100644
--- a/keyboards/42keebs/basketweave_s/keymaps/vial/vial.json
+++ b/keyboards/42keebs/basketweave_s/keymaps/vial/vial.json
@@ -9,7 +9,9 @@
   },
   "layouts": {
     "labels": [
-      "Split Backspace"
+      "Split Backspace",
+      "Encoder Left",
+      "Encoder Right"
     ],
     "keymap": [
       {
@@ -26,14 +28,27 @@
       ],
       [
         {
-          "y": -0.10000000000000009,
+          "y": -0.75,
+          "x": 0.25,
+          "c": "#cccccc",
+          "d": true
+        },
+        "0,1\n\n\n1,0\n\n\n\n\n\ne",
+        {
+          "x": 18.5,
+          "d": true
+        },
+        "1,1\n\n\n2,0\n\n\n\n\n\ne"
+      ],
+      [
+        {
+          "y": -0.3500000000000001,
           "x": 1.5,
-          "c": "#777777"
+          "c": "#aaaaaa"
         },
         "0,0",
         {
-          "x": 16,
-          "c": "#aaaaaa"
+          "x": 16
         },
         "0,15"
       ],
@@ -51,10 +66,14 @@
       ],
       [
         {
-          "y": -0.9500000000000002,
-          "x": 2.75
+          "y": -0.95,
+          "x": 2.75,
+          "c": "#777777"
         },
         "0,1",
+        {
+          "c": "#cccccc"
+        },
         "0,2",
         {
           "x": 10.4
@@ -72,21 +91,21 @@
           "x": 0.25,
           "c": "#cccccc"
         },
-        "0,1\n\n\n\n\n\n\n\n\ne",
+        "0,1\n\n\n1,1\n\n\n\n\n\ne",
         {
           "x": 18.5
         },
-        "1,1\n\n\n\n\n\n\n\n\ne"
+        "1,1\n\n\n2,1\n\n\n\n\n\ne"
       ],
       [
         {
           "y": -0.3500000000000001,
-          "x": 1.25
+          "x": 1.25,
+          "c": "#aaaaaa"
         },
         "1,0",
         {
-          "x": 16.5,
-          "c": "#aaaaaa"
+          "x": 16.5
         },
         "1,15"
       ],
@@ -124,27 +143,27 @@
         {
           "y": -0.75
         },
-        "0,0\n\n\n\n\n\n\n\n\ne",
+        "0,0\n\n\n1,1\n\n\n\n\n\ne",
         {
           "x": 19
         },
-        "1,0\n\n\n\n\n\n\n\n\ne"
+        "1,0\n\n\n2,1\n\n\n\n\n\ne"
       ],
       [
         {
           "y": -0.3500000000000001,
-          "x": 1
+          "x": 1,
+          "c": "#aaaaaa"
         },
         "2,0",
         {
-          "x": 17,
-          "c": "#aaaaaa"
+          "x": 17
         },
         "2,15"
       ],
       [
         {
-          "y": -0.9000000000000004,
+          "y": -0.8999999999999999,
           "x": 2.25,
           "w": 1.75
         },
@@ -166,6 +185,20 @@
       ],
       [
         {
+          "y": -0.75,
+          "c": "#cccccc",
+          "d": true
+        },
+        "0,0\n\n\n1,0\n\n\n\n\n\ne",
+        {
+          "x": 19,
+          "d": true
+        },
+        "1,0\n\n\n2,0\n\n\n\n\n\ne"
+      ],
+      [
+        {
+          "y": -0.25,
           "x": 2,
           "c": "#aaaaaa",
           "w": 2.25
@@ -274,7 +307,7 @@
         },
         "4,4",
         {
-          "x": 0.049999999999998934,
+          "x": 0.05000000000000071,
           "c": "#aaaaaa",
           "w": 1.25
         },
@@ -291,7 +324,7 @@
       [
         {
           "r": -12,
-          "y": -1.0100000000000007,
+          "y": -1.0099999999999998,
           "x": 9.45,
           "c": "#cccccc"
         },