diff --git a/dev-libs/Waybar/Manifest b/dev-libs/Waybar/Manifest
deleted file mode 100644
index 7b48d41..0000000
--- a/dev-libs/Waybar/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST 0.1.3.tar.gz 65396 BLAKE2B 333f5b74f3d04510dde15c14ba989f56f546ef39cb4f36666f13daf56a3a3d5cd65d6fb88c70e357493e5c44235615ab73afeb889a2a4997d6bbdc3e392b7310 SHA512 8e1085f2751b8c7f69178c45016c65437d58083130b111b09a0889ca0a67cc7c7dca1ea27c5c5b4328fa21ebc8d061681644273a2f14b1c23ab73806f7cca20c
-EBUILD Waybar-0.1.3.ebuild 1188 BLAKE2B 6f96ebe6977c578583642ac03934f06e5f24c850a36e5c6e57bc3d1589d174bf9e8ecb5a6604e26801c871eaae88b0a1d6d941192aec1a3b142eb951b77bf5e3 SHA512 cd9952a606e4fc35120f29b8ed42d748aabc76a608415d99aeaed2ec1105ae508d5149273649b7ecb538ebac77ec21b06de0d252759852a6f8bcc5531b579420
-EBUILD Waybar-9999.ebuild 1188 BLAKE2B 6f96ebe6977c578583642ac03934f06e5f24c850a36e5c6e57bc3d1589d174bf9e8ecb5a6604e26801c871eaae88b0a1d6d941192aec1a3b142eb951b77bf5e3 SHA512 cd9952a606e4fc35120f29b8ed42d748aabc76a608415d99aeaed2ec1105ae508d5149273649b7ecb538ebac77ec21b06de0d252759852a6f8bcc5531b579420
diff --git a/gui-apps/Waybar/Manifest b/gui-apps/Waybar/Manifest
new file mode 100644
index 0000000..b6580f7
--- /dev/null
+++ b/gui-apps/Waybar/Manifest
@@ -0,0 +1,5 @@
+DIST 0.1.3.tar.gz 65396 BLAKE2B 333f5b74f3d04510dde15c14ba989f56f546ef39cb4f36666f13daf56a3a3d5cd65d6fb88c70e357493e5c44235615ab73afeb889a2a4997d6bbdc3e392b7310 SHA512 8e1085f2751b8c7f69178c45016c65437d58083130b111b09a0889ca0a67cc7c7dca1ea27c5c5b4328fa21ebc8d061681644273a2f14b1c23ab73806f7cca20c
+DIST 0.3.0.tar.gz 81988 BLAKE2B 1e610e7e4d4bbd189535b3230f1fe061a1bb99ab2bf8d9f2d950a4a31d8216fdba5f66701be9f31da0064469b116022e7bd4246bffd28f2f61f107289ef2062a SHA512 2c05b40db351a80bbed6eebc7a137aa8d26b3d5931ddf41a588abfd1905d90459a7684e04fb03137910d87e48bd81752fabb009f46c261281116c5ac7d3120f6
+EBUILD Waybar-0.1.3.ebuild 1188 BLAKE2B 5daaa75284940886fac4bab24a9c3af2368ec349f52c8705a2fc20e5c88266c765626e44d04ca40615949687e1b3146d65897b022a5e8931b6c32942bbfe9126 SHA512 25f06bc0fe8bf2bd57e4aecee08f3495553f7ac2a8324bd3ef121a9419d180802a3065010fe217c5c03181a51654a00a4bc122ccd45dfe0e145797348d86ee67
+EBUILD Waybar-0.3.0.ebuild 1188 BLAKE2B 5daaa75284940886fac4bab24a9c3af2368ec349f52c8705a2fc20e5c88266c765626e44d04ca40615949687e1b3146d65897b022a5e8931b6c32942bbfe9126 SHA512 25f06bc0fe8bf2bd57e4aecee08f3495553f7ac2a8324bd3ef121a9419d180802a3065010fe217c5c03181a51654a00a4bc122ccd45dfe0e145797348d86ee67
+EBUILD Waybar-9999.ebuild 1188 BLAKE2B 5daaa75284940886fac4bab24a9c3af2368ec349f52c8705a2fc20e5c88266c765626e44d04ca40615949687e1b3146d65897b022a5e8931b6c32942bbfe9126 SHA512 25f06bc0fe8bf2bd57e4aecee08f3495553f7ac2a8324bd3ef121a9419d180802a3065010fe217c5c03181a51654a00a4bc122ccd45dfe0e145797348d86ee67
diff --git a/dev-libs/Waybar/Waybar-0.1.3.ebuild b/gui-apps/Waybar/Waybar-0.1.3.ebuild
similarity index 98%
rename from dev-libs/Waybar/Waybar-0.1.3.ebuild
rename to gui-apps/Waybar/Waybar-0.1.3.ebuild
index 56e2030..d0acfd8 100644
--- a/dev-libs/Waybar/Waybar-0.1.3.ebuild
+++ b/gui-apps/Waybar/Waybar-0.1.3.ebuild
@@ -27,7 +27,7 @@ SLOT="0"
 IUSE="dbusmenu-gtk network pulseaudio"
 
 RDEPEND="dev-libs/wayland
-	dev-libs/wlroots
+	gui-libs/wlroots
 	dev-cpp/gtkmm:3.0
 	dbusmenu-gtk? (
 		dev-libs/libdbusmenu[gtk3]
diff --git a/gui-apps/Waybar/Waybar-0.3.0.ebuild b/gui-apps/Waybar/Waybar-0.3.0.ebuild
new file mode 100644
index 0000000..d0acfd8
--- /dev/null
+++ b/gui-apps/Waybar/Waybar-0.3.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/Alexays/Waybar.git"
+EGIT_BRANCH="master"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit eutils meson $GIT_ECLASS
+
+DESCRIPTION="Highly customizable Wayland Polybar like bar for Sway and Wlroots based compositors."
+HOMEPAGE="https://github.com/Alexays/Waybar"
+
+if [[ $PV = 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/Alexays/Waybar/archive/${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="dbusmenu-gtk network pulseaudio"
+
+RDEPEND="dev-libs/wayland
+	gui-libs/wlroots
+	dev-cpp/gtkmm:3.0
+	dbusmenu-gtk? (
+		dev-libs/libdbusmenu[gtk3]
+		dev-libs/glib
+	)
+	dev-libs/jsoncpp
+	dev-libs/libsigc++
+	network? ( dev-libs/libnl )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/meson-0.47
+	dev-util/ninja
+	>=dev-util/gdbus-codegen-2.56
+	>=sys-devel/gcc-8.0"
+
+src_configure() {
+	local emesonargs=(
+		-Dlibnl=$(usex network enabled disabled)
+		-Dpulseaudio=$(usex pulseaudio enabled disabled)
+		-Ddbusmenu-gtk=$(usex dbusmenu-gtk enabled disabled)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/Waybar/Waybar-9999.ebuild b/gui-apps/Waybar/Waybar-9999.ebuild
similarity index 98%
rename from dev-libs/Waybar/Waybar-9999.ebuild
rename to gui-apps/Waybar/Waybar-9999.ebuild
index 56e2030..d0acfd8 100644
--- a/dev-libs/Waybar/Waybar-9999.ebuild
+++ b/gui-apps/Waybar/Waybar-9999.ebuild
@@ -27,7 +27,7 @@ SLOT="0"
 IUSE="dbusmenu-gtk network pulseaudio"
 
 RDEPEND="dev-libs/wayland
-	dev-libs/wlroots
+	gui-libs/wlroots
 	dev-cpp/gtkmm:3.0
 	dbusmenu-gtk? (
 		dev-libs/libdbusmenu[gtk3]
diff --git a/dev-libs/mako/Manifest b/gui-apps/mako/Manifest
similarity index 100%
rename from dev-libs/mako/Manifest
rename to gui-apps/mako/Manifest
diff --git a/dev-libs/mako/mako-1.2.ebuild b/gui-apps/mako/mako-1.2.ebuild
similarity index 100%
rename from dev-libs/mako/mako-1.2.ebuild
rename to gui-apps/mako/mako-1.2.ebuild