diff --git a/tasks/main.yml b/tasks/main.yml
index 7eb59b6..f8e3700 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -21,9 +21,10 @@
     - x11-xserver-utils
     - lightdm
     - lightdm-gtk-greeter
+    - onboard
     - yad
     - xbindkeys
-    - onboard
+    - feh
   notify: restart lightdm
 
 - include: mainentance.yml
diff --git a/templates/mainentance-xsession.sh.j2 b/templates/mainentance-xsession.sh.j2
index a11904c..e88b2a9 100644
--- a/templates/mainentance-xsession.sh.j2
+++ b/templates/mainentance-xsession.sh.j2
@@ -2,5 +2,6 @@
 {{ ansible_managed | comment }}
 xset -dpms
 xset s off
+feh --bg-scale "{{display_manager_background_image_path}}"
 xbindkeys -f /usr/local/share/mainentance/xbindkeys &
 exec yad --no-buttons --no-escape --image-on-top --center --borders 50 --image="{{display_manager_mainentance_icon}}" --text="{{display_manager_mainentance_text}}"
diff --git a/templates/mainentance.xbindkeys.j2 b/templates/mainentance.xbindkeys.j2
index c1d01db..2aa88b5 100644
--- a/templates/mainentance.xbindkeys.j2
+++ b/templates/mainentance.xbindkeys.j2
@@ -1,6 +1,6 @@
-"dm-tool switch-to-greeter"
-  Mod4 + Escape
+# "dm-tool switch-to-greeter"
+#   Mod4 + Escape
 "systemctl reboot"
-  Mod4 + r
+  Control + r
 "systemctl poweroff"
-  Mod4 + p
+  Control + p