diff --git a/Manual.org b/Manual.org
index 76df4d6..b8dbe0c 100644
--- a/Manual.org
+++ b/Manual.org
@@ -1475,6 +1475,23 @@ b'\xde\xad\xbe\xef'
     - "/etc/systemd/system/x@.service.d/"
     - "/etc/systemd/system/vdr.service.d/"
     - "/etc/systemd/system/user@{{ vdr.uid }}.service.d/"
+    - "/etc/X11/xorg.conf.d/"
+
+- name: shell | write keyboard configuration from /etc/default/keyboard to /etc/X11/xorg.conf.d/00-keyboard.conf
+  shell: |
+    source /etc/default/keyboard
+    
+    mkdir -p /etc/X11/xorg.conf.d/
+    cat > /etc/X11/xorg.conf.d/00-keyboard.conf <<EOF
+    Section "InputClass"
+            Identifier "system-keyboard"
+            MatchIsKeyboard "on"
+            Option "XkbLayout" "${XKBLAYOUT}"
+            Option "XkbModel" "${XKBMODEL}"
+            Option "XkbVariant" ",${XKBVARIANT}"
+            Option "XkbOptions" "${XKBOPTIONS}"
+    EndSection
+    EOF
 
 - name: systemd-drop-in | add dependency to X-server for vdr.service
   template:
@@ -1491,6 +1508,11 @@ b'\xde\xad\xbe\xef'
     src: templates/systemd/vdr-environ.j2
     dest: /etc/systemd/system/vdr.service.d/load-environ.conf
 
+- name: systemd-drop-in | start vdr.service after network-online.target
+  template:
+    src: templates/systemd/network-online.j2
+    dest: /etc/systemd/system/vdr.service.d/network-online.conf
+
 - name: systemd-drop-in | user@{{ vdr.uid }}.service depends on x@vt7.service
   template:
     src: templates/user@666.service.d/x-dependency.conf.j2
@@ -2090,6 +2112,11 @@ EndSection
 Environment=XDG_RUNTIME_DIR=/run/user/{{ vdr.uid }}/
 EnvironmentFile=-/var/lib/vdr/.session-env
 #+END_SRC
+
+#+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/systemd/network-online.j2
+[Unit]
+After=network-online.target
+#+END_SRC
 **** Systemd User Session
 ***** yavdr-desktop.target
 #+BEGIN_SRC shell :tangle roles/yavdr-xorg/templates/systemd/user/yavdr-desktop.target.j2 :mkdirp yes :padline no
diff --git a/roles/yavdr-xorg/tasks/setup-xorg.yml b/roles/yavdr-xorg/tasks/setup-xorg.yml
index 92c4a9c..1caffb4 100644
--- a/roles/yavdr-xorg/tasks/setup-xorg.yml
+++ b/roles/yavdr-xorg/tasks/setup-xorg.yml
@@ -8,6 +8,23 @@
     - "/etc/systemd/system/x@.service.d/"
     - "/etc/systemd/system/vdr.service.d/"
     - "/etc/systemd/system/user@{{ vdr.uid }}.service.d/"
+    - "/etc/X11/xorg.conf.d/"
+
+- name: shell | write keyboard configuration from /etc/default/keyboard to /etc/X11/xorg.conf.d/00-keyboard.conf
+  shell: |
+    source /etc/default/keyboard
+    
+    mkdir -p /etc/X11/xorg.conf.d/
+    cat > /etc/X11/xorg.conf.d/00-keyboard.conf <<EOF
+    Section "InputClass"
+            Identifier "system-keyboard"
+            MatchIsKeyboard "on"
+            Option "XkbLayout" "${XKBLAYOUT}"
+            Option "XkbModel" "${XKBMODEL}"
+            Option "XkbVariant" ",${XKBVARIANT}"
+            Option "XkbOptions" "${XKBOPTIONS}"
+    EndSection
+    EOF
 
 - name: systemd-drop-in | add dependency to X-server for vdr.service
   template:
@@ -24,6 +41,11 @@
     src: templates/systemd/vdr-environ.j2
     dest: /etc/systemd/system/vdr.service.d/load-environ.conf
 
+- name: systemd-drop-in | start vdr.service after network-online.target
+  template:
+    src: templates/systemd/network-online.j2
+    dest: /etc/systemd/system/vdr.service.d/network-online.conf
+
 - name: systemd-drop-in | user@{{ vdr.uid }}.service depends on x@vt7.service
   template:
     src: templates/user@666.service.d/x-dependency.conf.j2