diff --git a/aports/device/device-lg-hammerhead/APKBUILD b/aports/device/device-lg-hammerhead/APKBUILD
index 7227e842..a0a26be9 100644
--- a/aports/device/device-lg-hammerhead/APKBUILD
+++ b/aports/device/device-lg-hammerhead/APKBUILD
@@ -1,14 +1,14 @@
 pkgname=device-lg-hammerhead
 pkgver=1
-pkgrel=13
+pkgrel=14
 pkgdesc="Google Nexus 5"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-lg-hammerhead linux-firmware mkbootimg"
+depends="linux-lg-hammerhead linux-firmware mkbootimg msm-fb-refresher"
 makedepends=""
 install=""
-subpackages=""
+subpackages="$pkgname-weston $pkgname-x11"
 source="
 	deviceinfo
 	90-android-touch-dev.rules
@@ -16,6 +16,7 @@ source="
 	profile.sh
 	bcmdhd.cal
 	weston.ini
+	xorg.conf
 "
 options="!check"
 
@@ -32,15 +33,26 @@ package() {
 		"$pkgdir"/etc/wifi/bcmdhd.cal
 }
 
+x11() {
+	install_if="$pkgname xorg-server"
+	depends="
+		libinput
+		xf86-input-libinput
+		xf86-video-fbdev"
+	install -Dm644 "$srcdir"/xorg.conf \
+		"$subpkgdir"/etc/X11/xorg.conf.d/10-hammerhead.conf
+}
+
 weston() {
 	install_if="$pkgname weston"
 	install -Dm644 "$srcdir"/weston.ini \
 		"$subpkgdir"/etc/xdg/weston/weston.ini
 }
 
-sha512sums="e954e4ad792932bb23acee1a0f864067d6bf5d50372fc8fd99e3faaf5bda1d57a4f29978649d106100cd80cdfc8a1fa496b396d6fa461e08769a75c23f8449af  deviceinfo
+sha512sums="f7ba9458043b6b00a5f1631750367c029f4d1362f96b359a6d330c8b1f318032c218b7fff526bd0ecf4b2cadb6f666bc62ed375cfc180edc7183b6c3e0002e39  deviceinfo
 ee25f3d0377f027d108593eb7953b8db49d7f05a5c36a0c8ca7e7849d15e3c217bc1ac97d77a66e28d2db4b81c0f50b905639911276da40321d2b6cca7f797df  90-android-touch-dev.rules
 4f528656c4febb18742e89552dfe7fdc824ed4ad6ad2777d20b4f55040edd93d8e3ea657baabcdbe77bd0fb4bd3d23e5e0b2dae574f0df6723b2e26216ee81e1  udev-v4l-hack.sh
 d04013c17caf77a87ebea167dbe48f7efa9c9d3123c5743d359f3ea8ccc6b268fa021535a4bf8291eb4a352f0c92f6eb527da0db340421f53bc1cc439a453306  profile.sh
 32652ef366694f34dec31f316a38aca96700e3a5a3eac1f8d192e3c5de7b91e480b1c0fcd8e7c80a51692dc3737020ebbb2e5d3779436e82fb18822089c63055  bcmdhd.cal
-4f321242005b4da012322a8e9bce14a3734281d6ab410f60e7c9c28a6df905876ccce65c3b914233f351118718ccd81b9be41724ee2099ca36d40b4cfff46b93  weston.ini"
+4f321242005b4da012322a8e9bce14a3734281d6ab410f60e7c9c28a6df905876ccce65c3b914233f351118718ccd81b9be41724ee2099ca36d40b4cfff46b93  weston.ini
+f86ef35730b89bcc8160c08db7a7fcd0970adf60c0b77af68bac397de49c0d1783e6b8db1762380c9bf874aff2d030c6f44ecb75c803d69e79ede11376409369  xorg.conf"
diff --git a/aports/device/device-lg-hammerhead/deviceinfo b/aports/device/device-lg-hammerhead/deviceinfo
index 5f09d925..ce9e9d9d 100644
--- a/aports/device/device-lg-hammerhead/deviceinfo
+++ b/aports/device/device-lg-hammerhead/deviceinfo
@@ -18,6 +18,9 @@ deviceinfo_arch="armhf"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
 
+# Display related
+deviceinfo_msm_refresher="true"
+
 # Fastboot related
 deviceinfo_generate_bootimg="true"
 deviceinfo_flash_offset_base="0"
@@ -28,5 +31,3 @@ deviceinfo_flash_offset_tags="0x02700000"
 deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.hardware=hammerhead user_debug=31 maxcpus=2 msm_watchdog_v2.enable=1"
 deviceinfo_flash_pagesize="2048"
 
-# Weston red screen workaround (see issue #54)
-deviceinfo_weston_pixman_type="2"
diff --git a/aports/device/device-lg-hammerhead/xorg.conf b/aports/device/device-lg-hammerhead/xorg.conf
new file mode 100644
index 00000000..b7374dc4
--- /dev/null
+++ b/aports/device/device-lg-hammerhead/xorg.conf
@@ -0,0 +1,24 @@
+Section "ServerLayout"
+  Identifier "Layout0"
+  Screen "Screen0"
+EndSection
+
+Section "Device"
+  Identifier "Card0"
+  Driver "fbdev"
+  Option "fbdev" "/dev/fb0" #linuxdeploy
+EndSection
+
+Section "Screen"
+  Identifier "Screen0"
+  Device "Card0"
+  DefaultDepth 24
+  SubSection "Display"
+    Depth 32
+  EndSubSection
+EndSection
+
+Section "ServerFlags"
+  Option "Pixmap" "24"
+EndSection
+
diff --git a/aports/device/linux-lg-hammerhead/06_fix_mdss_fb_rgb_mode.patch b/aports/device/linux-lg-hammerhead/06_fix_mdss_fb_rgb_mode.patch
new file mode 100644
index 00000000..301111f5
--- /dev/null
+++ b/aports/device/linux-lg-hammerhead/06_fix_mdss_fb_rgb_mode.patch
@@ -0,0 +1,13 @@
+diff --git a/drivers/video/msm/mdss/mdss_fb.c b/drivers/video/msm/mdss/mdss_fb.c
+index 53112ca6..69673017 100644
+--- a/drivers/video/msm/mdss/mdss_fb.c
++++ b/drivers/video/msm/mdss/mdss_fb.c
+@@ -569,7 +569,7 @@ static int mdss_fb_probe(struct platform_device *pdev)
+ 	mfd->bl_level = 0;
+ 	mfd->bl_scale = 1024;
+ 	mfd->bl_min_lvl = 30;
+-	mfd->fb_imgType = MDP_RGBA_8888;
++	mfd->fb_imgType = MDP_RGB_888;
+ 
+ 	mfd->pdev = pdev;
+ 	if (pdata->next)
diff --git a/aports/device/linux-lg-hammerhead/APKBUILD b/aports/device/linux-lg-hammerhead/APKBUILD
index 41ef1929..9c75d6b9 100644
--- a/aports/device/linux-lg-hammerhead/APKBUILD
+++ b/aports/device/linux-lg-hammerhead/APKBUILD
@@ -20,7 +20,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=11
+pkgrel=12
 arch="armhf"
 pkgdesc="LineageOS kernel for Nexus 5 hammerhead"
 url="https://github.com/LineageOS/android_kernel_lge_hammerhead"
@@ -34,6 +34,7 @@ source="
 	compiler-gcc6.h
 	00_fix_return_address.patch
 	02_gpu-msm-fix-gcc5-compile.patch
+	06_fix_mdss_fb_rgb_mode.patch
 "
 subpackages=""
 license="GPL2"
@@ -118,4 +119,5 @@ sha512sums="f02667fcdbec30f222e0be537a68de39adaee54790a7870dd406e97613f416492713
 3f80aff79cf42075969b34ab6b204b3e3726b6d47f970066cc939ee33dc88ab99702d536eb6d9101cd130454a02652ce5c10d6aa171cc147d3037bc609c9424e  config-lg-hammerhead.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
-7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch"
+7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch
+384ae0bf2f5d7e15b0b60655693fd600b52c0f5bfcaa4ba7336d0ebeb224e84b99b597f77d26a1249e14a4e7bbc1629be00556b393bb9dd2266cb4bd67c3cfea  06_fix_mdss_fb_rgb_mode.patch"