diff --git a/.config/i3/config b/.config/i3/config
index 9f12670..183a1f2 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -178,6 +178,8 @@ exec --no-startup-id nm-applet
 exec --no-startup-id blueman-applet
 exec --no-startup-id redshift
 exec --no-startup-id xbindkeys
+exec --no-startup-id onboard
+exec --no-startup-id ~/.local/share/surface-scripts/rotationd
 exec --no-startup-id compton -b --config ~/.config/compton.conf
 exec --no-startup-id chromium --no-startup-window
 
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..63ea057
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "surface-scripts"]
+	path = surface-scripts
+	url = https://github.com/frebib/surface-scripts.git
diff --git a/.xinitrc b/.xinitrc
index e6f775b..a06f7ad 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -15,4 +15,6 @@ if [ -d "$xinitdir" ]; then
     done
 fi
 
+~/.local/share/surfacetools/rotationd --once
+
 exec i3
diff --git a/.xsession b/.xsession
index bf828d9..a088ba9 100755
--- a/.xsession
+++ b/.xsession
@@ -1,3 +1,5 @@
 setxkbmap -option caps:none
 xset r rate 200 18
 xrandr --dpi 96
+
+~/.local/share/surface-scripts/pend &
diff --git a/surface-scripts b/surface-scripts
new file mode 160000
index 0000000..5969727
--- /dev/null
+++ b/surface-scripts
@@ -0,0 +1 @@
+Subproject commit 59697276d4c9ed080fe5f66c067c016c88367536