diff --git a/keyboard_color_support/clevo-xsm-wmi-util/PKGBUILD b/keyboard_color_support/clevo-xsm-wmi-util/PKGBUILD
new file mode 100644
index 0000000..773cff5
--- /dev/null
+++ b/keyboard_color_support/clevo-xsm-wmi-util/PKGBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Arnoud Willemsen <mail@lynthium.com>
+# Contributor: Pekka Helenius (~ Fincer) <fincer89@hotmail.com>
+
+pkgname='clevo-xsm-wmi-util'
+pkgver='1.1'
+_pkgtag='6bfe9fe44e04'
+pkgrel=1
+pkgdesc='A GUI control utility for the clevo-xsm-wmi driver.'
+arch=('i686' 'x86_64')
+license=('GPL')
+url='https://bitbucket.org/tuxedocomputers/clevo-xsm-wmi'
+source=("clevo-xsm-wmi-${pkgver}.src.tar.gz::https://bitbucket.org/tuxedocomputers/clevo-xsm-wmi/get/v${pkgver}.tar.gz"
+clevo-xsm-wmi-util.desktop
+patch_n950tp6-support.patch
+patch_add-orange.patch)
+options=(!emptydirs)
+depends=('clevo-xsm-wmi' 'qt5-base')
+
+prepare() {
+    cd "${srcdir}/tuxedocomputers-clevo-xsm-wmi-${_pkgtag}/"
+    patch -Np1 -i ../patch_n950tp6-support.patch
+    patch -Np1 -i ../patch_add-orange.patch
+}
+
+build() {
+	cd "${srcdir}/tuxedocomputers-clevo-xsm-wmi-${_pkgtag}/utility"
+	qmake && make
+}
+package() {
+	cd "${srcdir}/tuxedocomputers-clevo-xsm-wmi-${_pkgtag}/utility"
+
+	mkdir -p ${pkgdir}/usr/share/applications/
+	install -m644 ${srcdir}/clevo-xsm-wmi-util.desktop ${pkgdir}/usr/share/applications/clevo-xsm-wmi-util.desktop
+	install -Dm755 clevo-xsm-wmi ${pkgdir}/usr/bin/clevo-xsm-wmi
+	install -Dm644 systemd/clevo-xsm-wmi.service ${pkgdir}/usr/lib/systemd/system/clevo-xsm-wmi.service
+	install -D -m644 /usr/share/licenses/common/GPL2/license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+sha256sums=('630ff6dbfa90c8a9285badf75b60579b2a9495e85862b62ef77a3654535e4b72'
+            '5a7718c3ec49069a93d7bef5d9cfd2ca302eb612f1a8f2e05f3e0aec15047019'
+            '5cd43e09f262db1732422c874774869114362586febe00bb6341a5e8932059c9'
+            '4e2833df06f88efae08043fee711c9bba80b769a7f51f860a729afaab0d0fa51')
diff --git a/keyboard_color_support/clevo-xsm-wmi-util/clevo-xsm-wmi-util.desktop b/keyboard_color_support/clevo-xsm-wmi-util/clevo-xsm-wmi-util.desktop
new file mode 100644
index 0000000..c10ff5b
--- /dev/null
+++ b/keyboard_color_support/clevo-xsm-wmi-util/clevo-xsm-wmi-util.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Clevo Keyboard Configuration
+Comment=Utility to configure keyboard lightning for Clevo laptops
+Exec=kdesu /usr/bin/clevo-xsm-wmi
+Icon=input-keyboard
+Type=Application
+Categories=Application;Utility;
+StartupNotify=true
diff --git a/keyboard_color_support/clevo-xsm-wmi-util/patch_add-orange.patch b/keyboard_color_support/clevo-xsm-wmi-util/patch_add-orange.patch
new file mode 100644
index 0000000..4b4b225
--- /dev/null
+++ b/keyboard_color_support/clevo-xsm-wmi-util/patch_add-orange.patch
@@ -0,0 +1,25 @@
+--- a/module/clevo-xsm-wmi.c
++++ b/module/clevo-xsm-wmi.c
+@@ -66,7 +66,8 @@
+ #define COLORS { C(black,  0x000000), C(blue,    0x0000FF), \
+ 				 C(red,    0xFF0000), C(magenta, 0xFF00FF), \
+ 				 C(green,  0x00FF00), C(cyan,    0x00FFFF), \
+-				 C(yellow, 0xFFFF00), C(white,   0xFFFFFF), }
++				 C(yellow, 0xFFFF00), C(white,   0xFFFFFF), \
++				 C(orange, 0xFF7F00), }
+ #undef C
+ 
+ #define C(n, v) KB_COLOR_##n
+--- a/utility/mainwindow.h
++++ b/utility/mainwindow.h
+@@ -20,8 +20,8 @@
+ #ifndef MAINWINDOW_H
+ #define MAINWINDOW_H
+ 
+-#define COLORS { C(black), C(blue), C(red), C(magenta), C(green), C(cyan), C(yellow), C(white) }
+-#define COLORS_AMOUNT 8
++#define COLORS { C(black), C(blue), C(red), C(magenta), C(green), C(cyan), C(yellow), C(orange), C(white) }
++#define COLORS_AMOUNT 9
+ 
+ #include <QFile>
+ #include <QTextStream>
diff --git a/keyboard_color_support/clevo-xsm-wmi-util/patch_n950tp6-support.patch b/keyboard_color_support/clevo-xsm-wmi-util/patch_n950tp6-support.patch
new file mode 100644
index 0000000..612d80d
--- /dev/null
+++ b/keyboard_color_support/clevo-xsm-wmi-util/patch_n950tp6-support.patch
@@ -0,0 +1,17 @@
+--- a/module/clevo-xsm-wmi.c
++++ b/module/clevo-xsm-wmi.c
+@@ -1488,6 +1488,14 @@
+ 		.driver_data = &kb_8_color_ops,
+ 	},
+ 	{
++		.ident = "Clevo N950TP",
++		.matches = {
++			DMI_MATCH(DMI_PRODUCT_NAME, "N95TP6"),
++		},
++		.callback = clevo_xsm_dmi_matched,
++		.driver_data = &kb_full_color_ops,
++	},
++	{
+ 		/* terminating NULL entry */
+ 	},
+ };