diff --git a/.env b/.env
new file mode 100644
index 00000000..828dee99
--- /dev/null
+++ b/.env
@@ -0,0 +1,3 @@
+kb=crkbd
+kr=rev4_1/standard
+km=vial
diff --git a/Makefile b/Makefile
index e661d2e3..5fc43462 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 .PHONY: git-submodule, qmk-clean, qmk-init, qmk-compile, qmk-flash, qmk-init-all, qmk-compile-all, vial-qmk-clean, vial-qmk-init, vial-qmk-compile, vial-qmk-flash, vial-qmk-init-all, vial-qmk-compile-all, update-all
 
+include .env
+
 KB := crkbd
 KR := rev1
 KM := default
@@ -57,7 +59,7 @@ vial-qmk-init:
 	$(eval KB := ${kb})
 	rm -rf src/vial-kb/vial-qmk/keyboards/tmp/${KB}
 	mkdir -p src/vial-kb/vial-qmk/keyboards/tmp/${KB}
-	cp -r $(shell pwd)/keyboards/${KB}/qmk/qmk_firmware/ src/vial-kb/vial-qmk/keyboards/tmp/${KB}
+	cp -r $(shell pwd)/keyboards/${KB}/qmk/qmk_firmware/* src/vial-kb/vial-qmk/keyboards/tmp/${KB}
 	rm -rf src/vial-kb/vial-qmk/keyboards/tmp/${KB}/keymaps
 	ln -s $(shell pwd)/keyboards/${KB}/vial-kb/vial-qmk/keymaps src/vial-kb/vial-qmk/keyboards/tmp/${KB}/keymaps
 	mkdir -p keyboards/${KB}/vial-kb/vial-qmk/.build
diff --git a/keyboards/crkbd/qmk/qmk_firmware/rev4_1/config.h b/keyboards/crkbd/qmk/qmk_firmware/rev4_1/config.h
index 710da491..b0145991 100644
--- a/keyboards/crkbd/qmk/qmk_firmware/rev4_1/config.h
+++ b/keyboards/crkbd/qmk/qmk_firmware/rev4_1/config.h
@@ -9,7 +9,7 @@
 #define I2C1_SDA_PIN GP6
 #define I2C1_SCL_PIN GP7
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_SLEEP
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
 
@@ -21,3 +21,12 @@
 #define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 6
+
+#define SPLIT_POINTING_ENABLE
+#define POINTING_DEVICE_RIGHT
+#define POINTING_DEVICE_INVERT_Y
+
+#define ANALOG_JOYSTICK_X_AXIS_PIN 26
+#define ANALOG_JOYSTICK_Y_AXIS_PIN 27
+#define ANALOG_JOYSTICK_AXIS_MIN 256
+#define ANALOG_JOYSTICK_AXIS_MAX 1023
diff --git a/keyboards/crkbd/qmk/qmk_firmware/rev4_1/info.json b/keyboards/crkbd/qmk/qmk_firmware/rev4_1/info.json
index abf306b2..fd4fd2d0 100644
--- a/keyboards/crkbd/qmk/qmk_firmware/rev4_1/info.json
+++ b/keyboards/crkbd/qmk/qmk_firmware/rev4_1/info.json
@@ -48,8 +48,8 @@
         "matrix_pins": {
             "right": {
                 "direct": [
-                    [ "GP8",  "GP9",  "GP3",  "GP2",  "GP1", "GP27", "GP25"],
-                    ["GP11", "GP14",  "GP4",  "GP0", "GP28", "GP26", "GP23"],
+                    [ "GP8",  "GP9",  "GP3",  "GP2",  "GP1", "GP6", "GP25"],
+                    ["GP11", "GP14",  "GP4",  "GP0", "GP28", "GP7", "GP23"],
                     ["GP15", "GP18",  "GP5", "GP29", "GP20", "GP22",   null],
                     [  null,   null,   null, "GP16", "GP17", "GP19",   null]
                 ]
diff --git a/keyboards/crkbd/qmk/qmk_firmware/rev4_1/rules.mk b/keyboards/crkbd/qmk/qmk_firmware/rev4_1/rules.mk
index 743228e9..d413bd73 100644
--- a/keyboards/crkbd/qmk/qmk_firmware/rev4_1/rules.mk
+++ b/keyboards/crkbd/qmk/qmk_firmware/rev4_1/rules.mk
@@ -1 +1,3 @@
-SERIAL_DRIVER = vendor
\ No newline at end of file
+SERIAL_DRIVER = vendor
+POINTING_DEVICE_ENABLE = yes
+POINTING_DEVICE_DRIVER = analog_joystick
diff --git a/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_1_standard_vial.uf2 b/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_1_standard_vial.uf2
index 7dce01c3..73cb22f6 100644
Binary files a/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_1_standard_vial.uf2 and b/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_1_standard_vial.uf2 differ