diff --git a/.config/yadm/bootstrap.d/10-xorg b/.config/yadm/bootstrap.d/10-xorg
index d432df4..e29e229 100755
--- a/.config/yadm/bootstrap.d/10-xorg
+++ b/.config/yadm/bootstrap.d/10-xorg
@@ -1,2 +1,5 @@
 #!/bin/bash
-sudo cp $HOME/.config/yadm/files/40-libinput.conf /usr/share/X11/xorg.conf.d/
+sudo cp $HOME/.config/yadm/files/xorg/usr/40-libinput.conf /usr/share/X11/xorg.conf.d/
+
+sudo cp $HOME/.config/yadm/files/xorg/etc/10-extensions.conf /etc/X11/xorg.conf.d/
+sudo cp $HOME/.config/yadm/files/xorg/etc/10-serverflags.conf /etc/X11/xorg.conf.d/
diff --git a/.config/yadm/files/xorg/etc/10-extensions.conf b/.config/yadm/files/xorg/etc/10-extensions.conf
new file mode 100644
index 0000000..acb3600
--- /dev/null
+++ b/.config/yadm/files/xorg/etc/10-extensions.conf
@@ -0,0 +1,3 @@
+Section "Extensions"
+    Option "DPMS" "false"
+EndSection
diff --git a/.config/yadm/files/xorg/etc/10-serverflags.conf b/.config/yadm/files/xorg/etc/10-serverflags.conf
new file mode 100644
index 0000000..2a4283c
--- /dev/null
+++ b/.config/yadm/files/xorg/etc/10-serverflags.conf
@@ -0,0 +1,4 @@
+Section "ServerFlags"
+    Option "BlankTime" "0"
+EndSection
+
diff --git a/.config/yadm/files/40-libinput.conf b/.config/yadm/files/xorg/usr/40-libinput.conf
similarity index 100%
rename from .config/yadm/files/40-libinput.conf
rename to .config/yadm/files/xorg/usr/40-libinput.conf