diff --git a/0001-Add-CSS-selectors-for-GTK-3.20-and-newer.patch b/0001-Add-CSS-selectors-for-GTK-3.20-and-newer.patch
new file mode 100644
index 0000000000000000000000000000000000000000..421ba5fa99fb8cf40e799e54f1734cb162473696
--- /dev/null
+++ b/0001-Add-CSS-selectors-for-GTK-3.20-and-newer.patch
@@ -0,0 +1,52 @@
+From ee4d4947584d5b6bec6968aa16aa1f2e902eea81 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Tue, 21 Feb 2017 04:41:58 +0100
+Subject: [PATCH] Add CSS selectors for GTK+ 3.20 and newer
+
+And keep the compatibility with older versions.
+---
+ gtk.css | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/gtk.css b/gtk.css
+index 93407ee..a1035e9 100644
+--- a/gtk.css
++++ b/gtk.css
+@@ -1,25 +1,33 @@
++viewport,
+ GtkViewport {
+ 	background: none;
+ }
+ 
++notebook tab,
+ .notebook {
+ 	background: #3675AD;
+-	font: Sans Bold 11;
++	font-weight: bold;
+ }
+ 
++notebook header,
++notebook stack,
+ .notebook > .frame,
+ .notebook > .vertical {
+ 	background: #B7D6EA;
++	font-weight: bold;
+ }
+ 
++notebook tab label,
+ .notebook > .horizontal .label {
+ 	color: #B7D6EA;
+ }
+ 
++notebook tab:checked label,
+ .notebook > .horizontal.active-page .label {
+ 	color: #FFFFFF;
+ }
+ 
++notebook stack label,
+ .notebook > .vertical .label,
+ .button .label {
+ 	color: #3675AD;
+-- 
+2.11.1
+
diff --git a/PKGBUILD b/PKGBUILD
index e7586f8d62a5ec90b062204581cbd481b003514b..d7da4c20c4c8c06d5f649173eda5d2be4a1f04c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,27 +3,62 @@
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
-pkgname=lxlauncher
+pkgbase=lxlauncher
+pkgname=(lxlauncher lxlauncher-gtk3)
 pkgver=0.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Open source clone of the Asus launcher for EeePC'
 arch=('i686' 'x86_64')
 license=('GPL2')
 url='http://lxde.org/'
-groups=('lxde')
-depends=('gtk2' 'startup-notification' 'lxmenu-data' 'menu-cache')
+depends=('gtk2' 'gtk3' 'startup-notification' 'lxmenu-data' 'menu-cache')
 makedepends=('intltool')
-backup=('etc/xdg/lxlauncher/gtkrc' 'etc/xdg/lxlauncher/settings.conf')
-source=(https://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.xz)
-md5sums=('94a7a36af92f8409365b6a25b6904eeb')
+backup=('etc/xdg/lxlauncher/gtk.css'
+        'etc/xdg/lxlauncher/gtkrc'
+        'etc/xdg/lxlauncher/settings.conf')
+source=(https://downloads.sourceforge.net/lxde/$pkgbase-$pkgver.tar.xz
+        0001-Add-CSS-selectors-for-GTK-3.20-and-newer.patch)
+sha256sums=('cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7'
+            '794a92dda67f055a794315af4d1a1b0d3319da836582fbc88bbaa3f737612f70')
+
+prepare() {
+  cd $pkgbase-$pkgver
+
+  # Add CSS selectors for GTK+ 3.20 and newer
+  # https://sourceforge.net/p/lxde/patches/543/
+  patch -Np1 -i ../0001-Add-CSS-selectors-for-GTK-3.20-and-newer.patch
+}
 
 build() {
-  cd $pkgname-$pkgver
+  # GTK+ 2 version
+  [ -d gtk2 ] || cp -r $pkgbase-$pkgver gtk2
+  cd gtk2
   ./configure --sysconfdir=/etc --prefix=/usr
   make
+
+  cd "$srcdir"
+  # GTK+ 3 version
+  [ -d gtk3 ] || cp -r $pkgbase-$pkgver gtk3
+  cd gtk3
+  ./configure --sysconfdir=/etc --prefix=/usr --enable-gtk3
+  make
 }
 
-package() {
-  cd $pkgname-$pkgver
+package_lxlauncher() {
+  groups=('lxde')
+  depends=('gtk2' 'startup-notification' 'lxmenu-data' 'menu-cache')
+
+  cd gtk2
   make DESTDIR="$pkgdir" install
 }
+
+package_lxlauncher-gtk3() {
+  groups=('lxde-gtk3')
+  pkgdesc+=' (GTK+ 3 version)'
+  depends=('gtk3' 'startup-notification' 'lxmenu-data' 'menu-cache')
+  conflicts=('lxlauncher')
+
+  cd gtk3
+  make DESTDIR="$pkgdir" install
+}
+