diff --git a/config/m60.keymap b/config/m60.keymap
index 27e0337..b857d9f 100644
--- a/config/m60.keymap
+++ b/config/m60.keymap
@@ -6,7 +6,6 @@
 
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
-#include "mouse.dtsi"
 
 #define none &none
 #define ____ &trans
@@ -117,9 +116,9 @@ ____       ____       ____       ____
     alt_layer {
       bindings = <
 none none none none none none none none none none _(C_ASPECT) _(C_BRI_DEC) _(C_BRI_INC) &sys_reset
-none U_BTN1 U_MS_U U_BTN2 none none none U_BTN1 U_MS_U U_BTN2 none none none none
-none U_MS_L U_MS_D U_MS_R none none U_WH_U U_MS_L U_MS_D U_MS_R none none none
-none none none none none &bootloader U_WH_D none none none none none
+none none none none none none none none none none none none none none
+none none none none none none none none none none none none none
+none none none none none &bootloader none none none none none none
 none none none             none              none none none none
       >;
     };
diff --git a/config/mouse.dtsi b/config/mouse.dtsi
deleted file mode 100644
index 7136b87..0000000
--- a/config/mouse.dtsi
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <dt-bindings/zmk/mouse.h>
-
-&mmv {
-  acceleration-exponent = <1>;      // 1
-  time-to-max-speed-ms = <1500>;    // 40
-  delay-ms = <0>;                   // 0
-};
-
-&msc {
-  acceleration-exponent = <1>;      // 0
-  time-to-max-speed-ms = <5000>;    // 40
-  delay-ms = <0>;                   // 10
-};
-
-#define U_MOUSE_MOVE_MAX 1250       // 600
-#define U_MOUSE_SCROLL_MAX 100      // 10
-
-#undef MOVE_UP
-#undef MOVE_DOWN
-#undef MOVE_LEFT
-#undef MOVE_RIGHT
-#define MOVE_UP MOVE_Y(-U_MOUSE_MOVE_MAX)
-#define MOVE_DOWN MOVE_Y(U_MOUSE_MOVE_MAX)
-#define MOVE_LEFT MOVE_X(-U_MOUSE_MOVE_MAX)
-#define MOVE_RIGHT MOVE_X(U_MOUSE_MOVE_MAX)
-
-#undef SCROLL_UP
-#undef SCROLL_DOWN
-#undef SCROLL_LEFT
-#undef SCROLL_RIGHT
-#define SCROLL_UP SCRL_Y(U_MOUSE_SCROLL_MAX)
-#define SCROLL_DOWN SCRL_Y(-U_MOUSE_SCROLL_MAX)
-#define SCROLL_LEFT SCRL_X(-U_MOUSE_SCROLL_MAX)
-#define SCROLL_RIGHT SCRL_X(U_MOUSE_SCROLL_MAX)
-
-#define U_BTN1 &mkp MB1
-#define U_BTN2 &mkp MB2
-#define U_BTN3 &mkp MB3
-#define U_MS_U &mmv MOVE_UP
-#define U_MS_D &mmv MOVE_DOWN
-#define U_MS_L &mmv MOVE_LEFT
-#define U_MS_R &mmv MOVE_RIGHT
-#define U_WH_U &msc SCROLL_UP
-#define U_WH_D &msc SCROLL_DOWN
-#define U_WH_L &msc SCROLL_LEFT
-#define U_WH_R &msc SCROLL_RIGHT
diff --git a/config/west.yml b/config/west.yml
index f709e56..379d291 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -1,10 +1,10 @@
 manifest:
   remotes:
-    - name: urob
-      url-base: https://github.com/urob
+    - name: zmkfirmware
+      url-base: https://github.com/zmkfirmware
   projects:
     - name: zmk
-      remote: urob
+      remote: zmkfirmware
       revision: main
       import: app/west.yml
   self: