diff --git a/gui-gtk b/gui-gtk-all
similarity index 100%
rename from gui-gtk
rename to gui-gtk-all
diff --git a/gui-kde b/gui-kde-all
similarity index 72%
rename from gui-kde
rename to gui-kde-all
index 4df1fd1..a8016e9 100644
--- a/gui-kde
+++ b/gui-kde-all
@@ -1,9 +1,7 @@
-<<<<<<< HEAD
 media-libs/mesa wayland
-=======
 dev-python/PyQt5 webengine
->>>>>>> d079e9024e98ef45959ca489a493ee55d3b52a4d
 kde-apps/kipi-plugins mediawiki
 kde-apps/krdc vnc
+kde-misc/kdeconnect mousepad
 kde-plasma/xdg-desktop-portal-kde screencast
 sys-apps/xdg-desktop-portal screencast
diff --git a/gui-x64-all b/gui-x64-all
index cb4a629..3d19bd6 100644
--- a/gui-x64-all
+++ b/gui-x64-all
@@ -1,2 +1,3 @@
 www-client/firefox geckodriver gmp-autoupdate -screenshot system-av1 system-harfbuzz system-icu system-jpeg system-libevent -system-libvpx system-sqlite system-webp
 app-office/libreoffice -branding googledrive wiki-publisher
+dev-util/electron -system-libvpx
diff --git a/portage b/portage-tools
similarity index 100%
rename from portage
rename to portage-tools