diff --git a/recipes-hawaii/archiver/hawaii-archiver_git.bb b/recipes-hawaii/archiver/hawaii-archiver_git.bb
index cb57d8be..d8e32dc4 100644
--- a/recipes-hawaii/archiver/hawaii-archiver_git.bb
+++ b/recipes-hawaii/archiver/hawaii-archiver_git.bb
@@ -6,10 +6,8 @@ inherit cmake_qt5
 
 DEPENDS = "qtbase qttools karchive"
 
-SRC_URI = "git://github.com/mauios/${BPN}.git;protocol=git;branch=dev"
+SRC_URI = "git://github.com/mauios/${BPN}.git;protocol=git;branch=master"
 SRCREV = "2a14d5a0cd4f2d6fdba80b4fe657d6d9962fb4b3"
 PV = "0.0.0+git${SRCPV}"
 
 S = "${WORKDIR}/git"
-
-EXTRA_OECMAKE += "-DQt5LinguistTools_DIR=${STAGING_LIBDIR_NATIVE}/cmake/Qt5LinguistTools"
diff --git a/recipes-hawaii/wind/wind_0.4.0.bb b/recipes-hawaii/wind/wind_0.4.0.bb
new file mode 100644
index 00000000..d4813fd5
--- /dev/null
+++ b/recipes-hawaii/wind/wind_0.4.0.bb
@@ -0,0 +1,25 @@
+SUMMARY = "Wind theme for Maui and Hawaii"
+LICENSE = "GPLv2 BSD LGPLv2.1"
+LIC_FILES_CHKSUM = " \
+	file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+	file://COPYING.BSD;md5=9e96e13a1a76211bcdb0255a5d42b01d \
+	file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
+"
+
+inherit cmake_qt5
+
+DEPENDS = "qtbase qtdeclarative qtquickcontrols plasma-framework"
+
+SRC_URI = "git://github.com/mauios/${BPN}.git;protocol=git;branch=master"
+SRCREV = "cc5d4de41aaeb63611701c0a739a93bc31bccf50"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE += "-DENABLE_WIDGETS_FACTORY:bool=ON"
+
+PACKAGES =+ "${PN}-grub ${PN}-plymouth ${PN}-widget-factory"
+
+FILES_${PN}-grub = "/boot"
+FILES_${PN}-plymouth = "${datadir}/plymouth/themes"
+FILES_${PN}-widget-factory = "${bindir}/*widget-factory"
+FILES_${PN} += "${datadir} ${libdir}/qml"