diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.11.1.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.11.1.ebuild
deleted file mode 100644
index 8c29b15..0000000
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.11.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
-HOMEPAGE="https://lxqt.org/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+about admin +filemanager +icons lightdm lximage minimal +oxygen +policykit
- powermanagement sddm ssh-askpass sudo"
-REQUIRED_USE="oxygen? ( icons )"
-
-RDEPEND="
- >=lxde-base/lxmenu-data-0.1.2
- ~lxqt-base/lxqt-common-0.11.2
- ~lxqt-base/lxqt-config-${PV}
- ~lxqt-base/lxqt-globalkeys-${PV}
- ~lxqt-base/lxqt-notificationd-${PV}
- ~lxqt-base/lxqt-panel-${PV}
- ~lxqt-base/lxqt-qtplugin-${PV}
- ~lxqt-base/lxqt-runner-${PV}
- ~lxqt-base/lxqt-session-${PV}
- virtual/ttf-fonts
- about? ( ~lxqt-base/lxqt-about-${PV} )
- admin? ( ~lxqt-base/lxqt-admin-${PV} )
- filemanager? ( >=x11-misc/pcmanfm-qt-${PV} )
- icons? ( oxygen? ( kde-frameworks/oxygen-icons )
- !oxygen? ( virtual/freedesktop-icon-theme ) )
- lightdm? ( x11-misc/lightdm )
- lximage? ( media-gfx/lximage-qt )
- !minimal? ( x11-wm/openbox
- x11-misc/obconf-qt )
- policykit? ( ~lxqt-base/lxqt-policykit-${PV}
- || ( sys-auth/consolekit[policykit(-)]
- sys-apps/systemd[policykit(-)] ) )
- powermanagement? ( ~lxqt-base/lxqt-powermanagement-${PV} )
- sddm? ( >=x11-misc/sddm-0.11.0 )
- ssh-askpass? ( ~lxqt-base/lxqt-openssh-askpass-${PV} )
- sudo? ( ~lxqt-base/lxqt-sudo-${PV} )"
-
-# Note: we prefer kde-frameworks/oxygen-icons over other icon sets, as the initial
-# install expects oxygen icons, until the user specifies otherwise (bug 543380)
-
-S="${WORKDIR}"
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
new file mode 100644
index 0000000..c81250f
--- /dev/null
+++ b/media-gfx/lximage-qt/Manifest
@@ -0,0 +1,3 @@
+DIST lximage-qt-0.4.0.tar.xz 43716 BLAKE2B d166056e90d23effed765abab3131e11880566df3ca7a4fcf8cbd7db994cf2b7b9404b07fa5d611d9ee3665bb359b1f743cd7e98e41033d5b35202a3c087801a SHA512 6b07e16534b835da60f5845c801cad0bdd381b6deb79ad99fc44afb9b776deb3cf76c85c9e4b59ba4148d71e894f659743c002ea4baf5589e8d261eb1a19b1fa
+DIST lximage-qt-0.5.0.tar.xz 36068 BLAKE2B 46cf157c1a48cfea8a3149e3177baa79ec493796843e7297371c1d5802df68bee1ac220aeb9d6110a4072ba588585f276be916f886e0d3f6010792a8800e54e1 SHA512 632399781614a9d62429ed1b31515c2a87cdf1c61ab26bfc8d566654a31eccfa66ae069cd18604f380a9fc8d8700aa73a2c71be16bc32775caeef211eb955b21
+DIST lximage-qt-0.6.0.tar.xz 41576 BLAKE2B 7439618e0854aeb2e934c566c7af910f1878595567b0bce0e0ee965f6804c8bbb9994a30272a47a4eebf3649ec1ac9dcf5a573f122b421f400c04c99a7b75c73 SHA512 13136ac165af8e68d33dcada815110b360cbf47f46e1861a9a6b9eee46ae3898ea298eb4c549ec1a603dd1473c0f5224552b1db602bd02202eccde910ea6bd23
diff --git a/media-gfx/lximage-qt/lximage-qt-0.6.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.6.0.ebuild
new file mode 100644
index 0000000..af5368f
--- /dev/null
+++ b/media-gfx/lximage-qt/lximage-qt-0.6.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="LXImage Image Viewer - GPicView replacement"
+HOMEPAGE="https://lxqt.org/"
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ media-libs/libexif
+ >=x11-libs/libfm-1.2:=
+ >=x11-libs/libfm-qt-0.12.0:=
+ x11-libs/libX11
+ x11-libs/libXfixes
+"
+DEPEND="${RDEPEND}
+ >=dev-util/lxqt-build-tools-0.4.0
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DPULL_TRANSLATIONS=OFF
+ )
+ cmake-utils_src_configure
+}
diff --git a/media-gfx/lximage-qt/metadata.xml b/media-gfx/lximage-qt/metadata.xml
new file mode 100644
index 0000000..34f02d5
--- /dev/null
+++ b/media-gfx/lximage-qt/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ lxqt@gentoo.org
+ LXQt
+
+
+ lxqt/lximage-qt
+
+
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
new file mode 100644
index 0000000..7e9e115
--- /dev/null
+++ b/x11-libs/libfm-qt/Manifest
@@ -0,0 +1,2 @@
+DIST libfm-qt-0.11.1.tar.xz 127624 BLAKE2B a6651e5ffc79a49f17f4ab95dbb9e4f51bd8de08f9d207970e32e2732eec920eaba0edf404ef1fa2fcc1e9b7f14fbc869eeb1ba334dae4b2f5ef3a9f5b94c713 SHA512 e7cb545e81459f459aafdf491541c3de7cc91249c2179f74bc1ddab0f0c50467e82b731afce22b3a86a2462d331f55794f4336912ec607bfb5e2faa43ad58079
+DIST libfm-qt-0.12.0.tar.xz 181924 BLAKE2B 1af06edefb16d7141b79db83323d0f0d5b4bbe74d71cd2149f069e3e7e918d11446f7e7d207b34d299911431f454da04c97f0c976a861017a111e306ba93ba87 SHA512 5c6aa4341672ff7c9d992cf248cff8c8e7f4eaa6e76ed9cc0655bc1a7dcb1cc7768136bb7509c2326a23d93159fa4496151fe284b9129503c03a11c852a60c43
diff --git a/x11-libs/libfm-qt/libfm-qt-0.12.0.ebuild b/x11-libs/libfm-qt/libfm-qt-0.12.0.ebuild
new file mode 100644
index 0000000..d3b9bef
--- /dev/null
+++ b/x11-libs/libfm-qt/libfm-qt-0.12.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils eapi7-ver
+
+DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers"
+HOMEPAGE="https://lxqt.org/"
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0/3"
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ >=lxde-base/menu-cache-1.1.0
+ media-libs/libexif:=
+ >=x11-libs/libfm-1.2.0:=
+ x11-libs/libxcb:=
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+ >=dev-util/lxqt-build-tools-0.4.0
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DPULL_TRANSLATIONS=OFF
+ )
+ cmake-utils_src_configure
+}
diff --git a/x11-libs/libfm-qt/metadata.xml b/x11-libs/libfm-qt/metadata.xml
new file mode 100644
index 0000000..da013df
--- /dev/null
+++ b/x11-libs/libfm-qt/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ lxqt@gentoo.org
+ LXQt
+
+
+ lxqt/libfm-qt
+
+
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
new file mode 100644
index 0000000..d3110eb
--- /dev/null
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -0,0 +1,3 @@
+DIST pcmanfm-qt-0.10.0.tar.xz 228540 BLAKE2B 08691b9a4851bea0490242bf76919bc3ea064b7ed85dcd3ddd3a0672acd28801ade245a85bc39361da62aaad2fb8c26df27d5e985165ebca9ee30c390f6e0ee3 SHA512 1b4ec2a746767e28a851f702a6a0897327cefe08b06cb25d63a1c9dddaed4aeefdbe25ee7d6431c94266e0071d5d25e3591c588c484ad097b10ce601e9a18201
+DIST pcmanfm-qt-0.11.1.tar.xz 92916 BLAKE2B 8f71b5c1845ac4761fe8ba48734905e63011b98a4856b1d7759259b387d897483315dbadc6d68aa588f1ad223c4a3cefd83b00979a04723cc706d75cb26611c4 SHA512 860a0853b6c42e04ba6cdbe617d4c5f61e0033c9ae5483c5b8a457368fe23084af813feab5fa50accecc8d21055a5ef073731b94ea3eb4b3ca6eacb0dbe41450
+DIST pcmanfm-qt-0.12.0.tar.xz 100636 BLAKE2B 5c444164a0f5ed4abc7847a588fcfb956678bc580712c25f3c4bc26a97eef6a80098c5f0d9d8088f57b1ea73f27d51e288408a7cd3a95d1be51b0cf8e29fb675 SHA512 78a75ba6211407c55dbf1f0fc2f307d7444a512b65a732fb4c9c51634f465968443340b999dee8d2aa1d6344bcc1affd80e1b867980d269df69580c102037d95
diff --git a/x11-misc/pcmanfm-qt/metadata.xml b/x11-misc/pcmanfm-qt/metadata.xml
new file mode 100644
index 0000000..f0e3eb3
--- /dev/null
+++ b/x11-misc/pcmanfm-qt/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ lxqt@gentoo.org
+ LXQt
+
+
+ lxqt/pcmanfm-qt
+
+
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.12.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.12.0.ebuild
new file mode 100644
index 0000000..8ab24c8
--- /dev/null
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.12.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils eapi7-ver
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
+HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ >=x11-libs/libfm-1.2.0:=
+ =x11-libs/libfm-qt-$(ver_cut 1-2)*
+ x11-libs/libxcb:=
+ x11-misc/xdg-utils
+ virtual/eject
+ virtual/freedesktop-icon-theme
+ !lxqt-base/lxqt-common
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+ >=dev-util/lxqt-build-tools-0.4.0
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DPULL_TRANSLATIONS=OFF
+ )
+ cmake-utils_src_configure
+}
diff --git a/x11-themes/lxqt-themes/Manifest b/x11-themes/lxqt-themes/Manifest
new file mode 100644
index 0000000..ba27a50
--- /dev/null
+++ b/x11-themes/lxqt-themes/Manifest
@@ -0,0 +1 @@
+DIST lxqt-themes-0.12.0.tar.xz 3203552 BLAKE2B a9979274df7f5a97d0d538297899a7875a96e1f7d0e0d57c1c52f54fefee7d4e1b633fab6c5465ea556d4c7716908e853135f89254bb85eb83fb1c5f002620cd SHA512 1ecbc0d3cf480361fd5b860ed5ae26f5d05ce9a4863a91d0e95516869360f59303ccb928fb3037e8843b2ff5e6e46252962485619c07e95f21b966bf3608d367
diff --git a/x11-themes/lxqt-themes/lxqt-themes-0.12.0.ebuild b/x11-themes/lxqt-themes/lxqt-themes-0.12.0.ebuild
new file mode 100644
index 0000000..56a0f80
--- /dev/null
+++ b/x11-themes/lxqt-themes/lxqt-themes-0.12.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Themes, graphics and icons for LXQt"
+HOMEPAGE="https://lxqt.org/"
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+RDEPEND="!lxqt-base/lxqt-common"
+DEPEND="${RDEPEND}
+ >=dev-util/lxqt-build-tools-0.1.0
+"
diff --git a/x11-themes/lxqt-themes/metadata.xml b/x11-themes/lxqt-themes/metadata.xml
new file mode 100644
index 0000000..ae8df7e
--- /dev/null
+++ b/x11-themes/lxqt-themes/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ lxqt@gentoo.org
+ LXQt
+
+
+ lxqt/lxqt-themes
+
+