diff --git a/.cpirc b/.cpirc
index ec599da..f0a2dcf 100644
--- a/.cpirc
+++ b/.cpirc
@@ -1,12 +1,19 @@
 SCREEN=`cat /sys/class/graphics/fb0/modes`
+
+XORG_CONF="/home/cpi/launcher/.xorg.conf"
+if [ -f ~/.lima ]
+then
+XORG_CONF="/home/cpi/launcher/.xorg_lima.conf"
+fi
+
 if [ -f /tmp/autologin ]
 then
    rm -f /tmp/autologin
    mpd ~/.mpd.conf
       if [[ $SCREEN =~ .*320.* ]]
       then
-         startx /home/cpi/launcher/.xinitrc -- -nocursor > /tmp/x.log 2>&1
+         startx /home/cpi/launcher/.xinitrc -- -xf86config $XORG_CONF -nocursor > /tmp/x.log 2>&1
       else
-         startx /home/cpi/launcher/.xinitrc hdmi > /tmp/x.log 2>&1
+         startx /home/cpi/launcher/.xinitrc hdmi -- -xf86config $XORG_CONF > /tmp/x.log 2>&1
       fi
 fi
diff --git a/.xorg.conf b/.xorg.conf
new file mode 100644
index 0000000..fa95690
--- /dev/null
+++ b/.xorg.conf
@@ -0,0 +1,7 @@
+Section "Device"
+        Identifier      "Allwinner A10/A13 FBDEV"
+        Driver          "fbturbo"
+        Option          "fbdev" "/dev/fb0"
+
+        Option          "SwapbuffersWait" "true"
+EndSection
diff --git a/.xorg_lima.conf b/.xorg_lima.conf
new file mode 100644
index 0000000..8c4fac2
--- /dev/null
+++ b/.xorg_lima.conf
@@ -0,0 +1,7 @@
+Section "Device"
+        Identifier      "Allwinner A10/A13 FBDEV"
+        Driver          "modesetting"
+        Option          "fbdev" "/dev/fb0"
+
+        Option          "SwapbuffersWait" "true"
+EndSection