diff --git a/live_exam_os/Dockerfile b/live_exam_os/Dockerfile
index 20b31dc46e35f8ad841ec43ad1b7db621206ff8d..82e368dd91e9bb22b791e586a6c428383eb3bf0c 100644
--- a/live_exam_os/Dockerfile
+++ b/live_exam_os/Dockerfile
@@ -25,14 +25,14 @@ ADD ${config_dir}/keyboard/keyboard config/includes.chroot/etc/default/
 ADD ${config_dir}/nexus-exam config/includes.chroot/usr/local/bin/
 ADD ${config_dir}/nexus-exam.desktop config/includes.chroot/etc/xdg/autostart/
 
-## Run various screen settings as soon as user logs in
-ADD ${config_dir}/screen/screen_settings.sh config/includes.chroot/usr/local/bin/
-ADD ${config_dir}/screen/screen_settings.desktop config/includes.chroot/etc/xdg/autostart/
-
-## Systemd service to set various screen settings (does not work - not sure why)
-# ADD ${config_dir}/systemd/screen_settings.sh config/includes.chroot/usr/local/bin/
-# RUN chmod +x config/includes.chroot/usr/local/bin/screen_settings.sh
-# ADD ${config_dir}/systemd/screen_settings.service config/includes.chroot/etc/systemd/system/
+## Run various X11 settings as soon as user logs in
+ADD ${config_dir}/x11/x11_settings.sh config/includes.chroot/usr/local/bin/
+ADD ${config_dir}/x11/x11_settings.desktop config/includes.chroot/etc/xdg/autostart/
+
+## Systemd service to set various X11 settings (does not work - not sure why)
+# ADD ${config_dir}/systemd/x11_settings.sh config/includes.chroot/usr/local/bin/
+# RUN chmod +x config/includes.chroot/usr/local/bin/x11_settings.sh
+# ADD ${config_dir}/systemd/x11_settings.service config/includes.chroot/etc/systemd/system/
 
 # RUN mkdir config/includes.chroot/etc/skel/
 # RUN echo "export NEXUS_SERVER=${server_ip}\nexport NEXUS_CERT=/etc/ssl/certs/nexus-server.pem\n" >> config/includes.chroot/etc/skel/.xsessionrc
diff --git a/live_exam_os/config/packages.list.chroot b/live_exam_os/config/packages.list.chroot
index 262f567a01276674117dd235c724e84ce35b4f81..919b6f9538f1ddf1ff5247b3b248c38a9c3d531c 100644
--- a/live_exam_os/config/packages.list.chroot
+++ b/live_exam_os/config/packages.list.chroot
@@ -13,3 +13,4 @@ network-manager
 network-manager-gnome
 systemd-timesyncd
 light
+numlockx
diff --git a/live_exam_os/config/screen/screen_settings.desktop b/live_exam_os/config/x11/x11_settings.desktop
similarity index 79%
rename from live_exam_os/config/screen/screen_settings.desktop
rename to live_exam_os/config/x11/x11_settings.desktop
index 16b9210395a02d506417a7da9ca7003470ca8feb..82d8785cd1ebb47390a6519518633592cab9b0c8 100644
--- a/live_exam_os/config/screen/screen_settings.desktop
+++ b/live_exam_os/config/x11/x11_settings.desktop
@@ -4,7 +4,7 @@ Version=0.9.4
 Type=Application
 Name=screen settings
 Comment=
-Exec=bash /usr/local/bin/screen_settings.sh
+Exec=bash /usr/local/bin/x11_settings.sh
 OnlyShowIn=XFCE;
 RunHook=0
 StartupNotify=false
diff --git a/live_exam_os/config/screen/screen_settings.sh b/live_exam_os/config/x11/x11_settings.sh
similarity index 81%
rename from live_exam_os/config/screen/screen_settings.sh
rename to live_exam_os/config/x11/x11_settings.sh
index 7b81ba329bbee9ca3dee5437381c5b9aa558757a..5c0127cf739d3eabf7e00c4ca9916f4212f7ac08 100644
--- a/live_exam_os/config/screen/screen_settings.sh
+++ b/live_exam_os/config/x11/x11_settings.sh
@@ -5,3 +5,6 @@ xset s off
 
 # Set brightness to 100%
 light -S 100
+
+# Enable numlock
+numlockx on