diff --git a/scrolling b/scrolling
deleted file mode 100755
index d913c62..0000000
--- a/scrolling
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-synclient HorizEdgeScroll=1
-synclient HorizTwoFingerScroll=1
-synclient CircularScrolling=1
-synclient PalmDetect=1
-synclient VertEdgeScroll=1
-synclient VertTwoFingerScroll=1
diff --git a/xsetup b/xsetup
new file mode 100755
index 0000000..1e34936
--- /dev/null
+++ b/xsetup
@@ -0,0 +1,13 @@
+#!/bin/bash
+# This script sets up my X11 environtment
+# Enable all kinds of scrolling
+synclient HorizEdgeScroll=1 
+synclient HorizTwoFingerScroll=1
+synclient CircularScrolling=1
+synclient PalmDetect=1
+synclient VertEdgeScroll=1
+synclient VertTwoFingerScroll=1
+# Disables the capslock key
+setxkbmap -option caps:none
+# This disables the faulty mouse wheel scroll on my usb mouse
+xinput set-button-map 13 1 2 3  0 0
\ No newline at end of file