diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f0f644e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+LICENSE
+README.md
diff --git a/core b/core
new file mode 100644
index 0000000..9184ee8
--- /dev/null
+++ b/core
@@ -0,0 +1,6 @@
+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/deadbeef b/deadbeef
new file mode 100644
index 0000000..aaac399
--- /dev/null
+++ b/deadbeef
@@ -0,0 +1,6 @@
+media-sound/deadbeef -opus	# File collision with media-plugins/deadbeef-opus
+
+# Extra functionality
+media-plugins/deadbeef-plugins-meta bookmark-manager infobar jack musical-spectrum quick-search replaygain-control spectrogram stereo-widener vk vu-meter waveform-seekbar
+media-sound/deadbeef converter cover cover-imlib2 cover-network curl lastfm playlist-browser replaygain-scanner wavpack
+
diff --git a/gui-gtk b/gui-gtk
new file mode 100644
index 0000000..2dd4d85
--- /dev/null
+++ b/gui-gtk
@@ -0,0 +1,9 @@
+dev-util/geany-plugins -markdown                # Bringing in markdown forces use of GTK3
+gnome-extra/zeitgeist downloads-monitor datahub # Enable some extra features in zeitgeist
+x11-misc/tint2 tint2conf                        # Build/Install tint2conf as well with tint2
+x11-themes/elementary-theme gtk3                # Enable building GTK3 themes since pantheon uses it regardless
+
+# Requirements caused by other packages
+dev-libs/libdbusmenu gtk3                       # required by pantheon-base/plank[dbus]
+media-libs/libcanberra gtk3                     # required by sys-apps/gnome-disk-utility
+app-crypt/pinentry gnome-keyring	        # required by gnome-disk-utility
diff --git a/gui-kde b/gui-kde
new file mode 100644
index 0000000..f0e33f1
--- /dev/null
+++ b/gui-kde
@@ -0,0 +1,5 @@
+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
diff --git a/portage b/portage
new file mode 100644
index 0000000..1b4a54f
--- /dev/null
+++ b/portage
@@ -0,0 +1,3 @@
+app-portage/layman sync-plugin-portage		# Make sure we have the sync-plugin-portage
+dev-vcs/git -python_single_target_python2_7	# dev-vcs/git recognizes both python2 and python3 single target flags
+sys-apps/portage ipc				# Make sure we have the sync-plugin-portage
diff --git a/shell-zsh b/shell-zsh
new file mode 100644
index 0000000..bce770e
--- /dev/null
+++ b/shell-zsh
@@ -0,0 +1 @@
+app-misc/powerline bash extra man tmux vim zsh	# Specify what is wanted from powerline
diff --git a/temp-conflicts b/temp-conflicts
new file mode 100644
index 0000000..17712c9
--- /dev/null
+++ b/temp-conflicts
@@ -0,0 +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
diff --git a/xorg b/xorg
new file mode 100644
index 0000000..78bdb08
--- /dev/null
+++ b/xorg
@@ -0,0 +1,6 @@
+media-fonts/noto -cjk                   # Brings in nearly 2GB of data
+media-fonts/source-han-sans l10n_ja     # source-hans-sans needs an Asian L10N
+x11-base/xorg-x11 -fonts                # Use the meta package but don't bring in all the fonts
+net-dns/avahi gtk3                      # required by Remmina
+dev-db/sqlite secure-delete             # Required by Firefox
+media-libs/libvpx postproc              # Required by Firexox