diff --git a/audio-pulse b/audio-pulse
new file mode 100644
index 0000000..e3b0476
--- /dev/null
+++ b/audio-pulse
@@ -0,0 +1 @@
+*/* pulseaudio
diff --git a/core b/core
index 9184ee8..b4fa0d3 100644
--- a/core
+++ b/core
@@ -1,6 +1,2 @@
-net-dns/avahi mdnsresponder-compat	# required by net-misc/ntp[zeroconf]
-net-fs/samba client -gpg winbind	# Don't use gpg, enable winbind, only need client
-sys-apps/coreutils hostname		# Give hostname to coreutils
-sys-apps/net-tools -hostname		# Give hostname to coreutils
 sys-apps/smartmontools update_drivedb	# Build smartmontools with update_drivedb
 sys-apps/util-linux static-libs		# required by sys-kernel/genkernel
diff --git a/gpu-nvidia b/gpu-nvidia
new file mode 100644
index 0000000..843beb6
--- /dev/null
+++ b/gpu-nvidia
@@ -0,0 +1,12 @@
+dev-libs/libpthread-stubs abi_x86_32
+dev-util/pkgconf abi_x86_32
+sys-libs/zlib abi_x86_32
+x11-base/xcb-proto abi_x86_32
+x11-libs/libX11 abi_x86_32
+x11-libs/libXext abi_x86_32
+x11-libs/libvdpau abi_x86_32
+x11-libs/libxcb abi_x86_32
+x11-libs/libXau abi_x86_32
+x11-libs/libXdmcp abi_x86_32
+virtual/pkgconfig abi_x86_32
+x11-drivers/nvidia-drivers uvm
diff --git a/gui-kde b/gui-kde
index ad7f971..4df1fd1 100644
--- a/gui-kde
+++ b/gui-kde
@@ -1,6 +1,9 @@
+<<<<<<< HEAD
+media-libs/mesa wayland
+=======
 dev-python/PyQt5 webengine
+>>>>>>> d079e9024e98ef45959ca489a493ee55d3b52a4d
 kde-apps/kipi-plugins mediawiki
 kde-apps/krdc vnc
-sys-apps/xdg-desktop-portal screencast
 kde-plasma/xdg-desktop-portal-kde screencast
-x11-wm/xpra csc dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 pillow server webcam
+sys-apps/xdg-desktop-portal screencast
diff --git a/gui-x64-all b/gui-x64-all
new file mode 100644
index 0000000..cb4a629
--- /dev/null
+++ b/gui-x64-all
@@ -0,0 +1,2 @@
+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
diff --git a/init-systemd b/init-systemd
new file mode 100644
index 0000000..8d9a77c
--- /dev/null
+++ b/init-systemd
@@ -0,0 +1 @@
+sys-apps/dbus user-session
diff --git a/network-filesystems b/network-filesystems
new file mode 100644
index 0000000..5c646a9
--- /dev/null
+++ b/network-filesystems
@@ -0,0 +1 @@
+net-fs/samba client -gpg winbind	# Don't use gpg, enable winbind, only need client
diff --git a/networking b/networking
new file mode 100644
index 0000000..fc133bf
--- /dev/null
+++ b/networking
@@ -0,0 +1,3 @@
+net-dns/avahi mdnsresponder-compat	# required by net-misc/ntp[zeroconf]
+sys-apps/coreutils hostname		# Give hostname to coreutils
+sys-apps/net-tools -hostname		# Give hostname to coreutils
diff --git a/networking-wireless b/networking-wireless
new file mode 100644
index 0000000..656ad0c
--- /dev/null
+++ b/networking-wireless
@@ -0,0 +1 @@
+net-misc/networkmanager connection-sharing -wext wifi
diff --git a/temp-conflicts b/temp-conflicts
index 17712c9..a54553c 100644
--- a/temp-conflicts
+++ b/temp-conflicts
@@ -1,9 +1,9 @@
-#=dev-util/cmake-3.14.6 -qt5
-#=media-libs/mesa-19.0.8 -gallium
-#=media-libs/tiff-4.0.10 -webp
-#=app-arch/libarchive-3.3.3 -lz4
-#=net-print/cups-2.2.11 -zeroconf
-#=media-plugins/frei0r-plugins-1.6.1 -facedetect
-#=dev-util/ninja-1.8.2 -vim-syntax
-#=app-arch/zstd-1.3.7-r1 -lz4
-#=media-fonts/liberation-fonts-2.00.1-r3 -fontforge
+#dev-util/cmake -qt5
+#media-libs/mesa -gallium
+#media-libs/tiff -webp
+#app-arch/libarchive -lz4
+#net-print/cups -zeroconf
+#media-plugins/frei0r-plugins -facedetect
+#dev-util/ninja -vim-syntax
+#app-arch/zstd -lz4
+#media-fonts/liberation-fonts -fontforge