diff --git a/bin/cutiepi-screen-common b/bin/cutiepi-screen-common
index 0947b28..4357ca8 100644
--- a/bin/cutiepi-screen-common
+++ b/bin/cutiepi-screen-common
@@ -1,30 +1,38 @@
 #!/bin/bash
 
 # Ensure that the display variable is set
-export DISPLAY=:0
+[ -z "$DISPLAY" ] && export DISPLAY=:0
 
 screen_rotation() {
     cur_rotation=$(xrandr --query --verbose | grep DSI-1 | cut -d ' ' -f 5)
     echo $cur_rotation
 }
 
+touchscreen_id() {
+    xinput | grep -i 'Capacitive TouchScreen' | grep pointer | sed -r -e 's/.*id=([0-9]+).*/\1/'
+}
+
 screen_set_horizontal() {
     xrandr --output DSI-1 --rotate left
-    xinput set-prop 11 "Coordinate Transformation Matrix" 0 -1 1 1 0 0 0 0 1
+    touch_id=$(touchscreen_id)
+    xinput set-prop $touch_id "Coordinate Transformation Matrix" 0 -1 1 1 0 0 0 0 1
 }
 
 screen_set_vertical() {
     xrandr --output DSI-1 --rotate normal
-    xinput set-prop 11 "Coordinate Transformation Matrix" 1 0 0 0 1 0 0 0 1
+    touch_id=$(touchscreen_id)
+    xinput set-prop $touch_id "Coordinate Transformation Matrix" 1 0 0 0 1 0 0 0 1
 }
 
 screen_set_horizontal_inverted() {
     xrandr --output DSI-1 --rotate right
-    xinput set-prop 11 "Coordinate Transformation Matrix" 0 1 0 -1 0 1 0 0 1
+    touch_id=$(touchscreen_id)
+    xinput set-prop $touch_id "Coordinate Transformation Matrix" 0 1 0 -1 0 1 0 0 1
 }
 
 screen_set_vertical_inverted() {
     xrandr --output DSI-1 --rotate inverted
-    xinput set-prop 11 "Coordinate Transformation Matrix" -1 0 1 0 -1 1 0 0 1
+    touch_id=$(touchscreen_id)
+    xinput set-prop $touch_id "Coordinate Transformation Matrix" -1 0 1 0 -1 1 0 0 1
 }