diff --git a/conf/portage/make.conf b/conf/portage/make.conf
new file mode 100644
index 0000000..e55dbf1
--- /dev/null
+++ b/conf/portage/make.conf
@@ -0,0 +1,78 @@
+# These settings were set by the catalyst build script that automatically
+# built this stage.
+# Please consult /usr/share/portage/config/make.conf.example for a more
+# detailed example.
+# CFLAGS="-march=amdfam10 -O2 -pipe"
+CFLAGS="-O2 -pipe -march=native"
+CXXFLAGS="${CFLAGS}"
+LDFLAGS="-Wl,-O1 -Wl,--as-needed"
+
+# _ARCH=`uname -m`
+# WARNING: Changing your CHOST is not something that should be done lightly.
+# Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing.
+CHOST="x86_64-pc-linux-gnu"
+# These are the USE flags that were used in addition to what is provided by the
+# profile used for building.
+DO_USE="mmx mmxext sse sse2 3dnow 3dnowext smp"
+
+# X
+# DO_USE="${DO_USE} qt3support cairo gtk gtk3 d3d gallium libkms nvidia X xcb opengl truetype xcomposite"
+# DO_USE="${DO_USE} qt3support cairo gtk gtk3 gstreamer g3dvl nvidia vaapi vdpau libkms X xcb opengl s3tc truetype xcomposite"
+DO_USE="${DO_USE} qt3support cairo gtk gtk3 gstreamer nvidia vaapi vdpau g3dvl X xcb opengl truetype xcomposite"
+
+# KDE
+# DO_USE="${DO_USE} kde qt4 webkit"
+
+# Gnome
+# DO_USE="${DO_USE} gnome emerald nautilus"
+
+# OpenBox
+DO_USE="${DO_USE} thunar webkit"
+
+# Multimedia
+DO_USE="${DO_USE} apng raw pdf exif gif tiff png jpeg xvid lcms xmp avi dvd dvdr ffmpeg dvdread quicktime svg mpeg x264 theora"
+
+# Sound 
+DO_USE="${DO_USE} pulseaudio alsa openal"
+DO_USE="${DO_USE} mpd mp3 m3u mpg123 ogg vorbis mad aac cdr lame libsamplerate taglib"
+
+# Middleware
+DO_USE="${DO_USE} acpi curl cups dbus lm_sensors device-mapper gnutls net threads icu lvm nfs libnotify python resolvconf sql sqlite system-sqlite unicode udev xml"
+
+# USE_NOT="-avahi -abiword -fortran -nfsv3 -arts -ipv6"
+USE_NOT="-hal -libproxy"
+
+# PORTDIR_OVERLAY="/mnt/portage/overlays/layman/pentoo"
+PORTDIR_OVERLAY="${PORTDIR_OVERLAY} /mnt/portage/overlays/quarks"
+# PORTDIR_OVERLAY="${PORTDIR_OVERLAY} /mnt/portage/overlays/mv"
+# PORTDIR_OVERLAY="${PORTDIR_OVERLAY} /mnt/portage/overlays/layman/x11"
+
+DISTDIR="/mnt/portage/distfiles"
+PORTDIR="/mnt/portage/portage"
+PKGDIR="/mnt/portage/packages"
+
+DRACUT_MODULES="btrfs caps crypt crypt-gpg crypt-ssh lvm mdraid syslog"
+#GRUB_PLATFORMS="coreboot efi-32 efi-64 pc qemu"
+
+# FEATURES="skiprocheck userfetch parallel-fetch strict ccache"
+FEATURES="skiprocheck userfetch parallel-fetch strict"
+CCACHE_DIR="/root/.ccache"
+CCACHE_SIZE="4G"
+
+# VIDEO_CARDS="fbdev vesa vga nvidia nouveau radeon fglrx"
+# VIDEO_CARDS="fglrx radeon radeonsi"
+# VIDEO_CARDS="nvidia nouveau fbdev vesa vga"
+VIDEO_CARDS="fbdev vesa vga nvidia"
+QEMU_SOFTMMU_TARGETS="i386 x86_64"
+QEMU_USER_TARGETS="i386 x86_64"
+RUBY_TARGETS="ruby19"
+
+PORTAGE_TMPDIR="/tmp"
+PORTAGE_NICENESS=10
+CLEAN_DELAY="3"
+
+LINGUAS="en de"
+
+USE="${DO_USE} ${USE_NOT}"
+
+GENTOO_MIRRORS="http://gentoo.arcticnetwork.ca/"
diff --git a/conf/portage/package.keywords b/conf/portage/package.keywords
new file mode 100644
index 0000000..86da197
--- /dev/null
+++ b/conf/portage/package.keywords
@@ -0,0 +1,6 @@
+sys-kernel/dracut
+sys-boot/grub
+
+app-emulation/lxc
+
+=media-sound/logitechmediaserver-bin-7.7.2-r2
diff --git a/conf/portage/package.license b/conf/portage/package.license
new file mode 100644
index 0000000..e69de29
diff --git a/conf/portage/package.use b/conf/portage/package.use
new file mode 100644
index 0000000..3466354
--- /dev/null
+++ b/conf/portage/package.use
@@ -0,0 +1,6 @@
+# required by media-sound/pulseaudio-2.1-r1[udev]
+# required by media-libs/openal-1.15.1[pulseaudio]
+# required by media-video/ffmpeg-1.0.7[openal]
+# required by virtual/ffmpeg-0.10.3
+# required by media-plugins/alsa-plugins-1.0.26[ffmpeg]
+=virtual/udev-200 hwdb
diff --git a/scripts/portage/server/make.conf b/scripts/portage/server/make.conf
deleted file mode 100644
index 16c9c1f..0000000
--- a/scripts/portage/server/make.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# These settings were set by the catalyst build script that automatically
-# built this stage.
-# Please consult /usr/share/portage/config/make.conf.example for a more
-# detailed example.
-CFLAGS="-march=native -O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-# WARNING: Changing your CHOST is not something that should be done lightly.
-# Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing.
-CHOST="x86_64-pc-linux-gnu"
-# These are the USE flags that were used in addition to what is provided by the
-# profile used for building.
-DO_USE="mmx sse sse2"
-
-# USE_NOT="-avahi -abiword -fortran -nfsv3 -arts -ipv6"
-USE_NOT="-avahi -hal -ipv6 -X -gtk -gtk3 -qt4 -kde -webkit -alsa -opengl"
-
-DISTDIR="/mnt/portage/distfiles"
-PORTDIR="/mnt/portage/portage"
-PKGDIR="/mnt/portage/packages"
-
-PORTAGE_TMPDIR="/tmp"
-PORTAGE_NICENESS=10
-MAKEOPTS="-j8"
-CLEAN_DELAY="3"
-
-LINGUAS="en de"
-
-USE="${DO_USE} ${USE_NOT}"
diff --git a/scripts/setup_box.sh b/scripts/setup_box.sh
new file mode 100755
index 0000000..f6bb0ab
--- /dev/null
+++ b/scripts/setup_box.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -x
+
+# Sets up all kinds of softlinks and scripts to share all gentoo/portage 
+# across multiple machines backed by git repository
+SBIN_PREFIX="/usr/local/sbin"
+SBIN_FROM="update_portage.sh update_box.sh make_kernel.sh"
+SBIN_TO="/mnt/portage/overlays/quarks/scripts"
+
+pushd $SBIN_PREFIX > /dev/null
+for i in $SBIN_FROM; do
+	[ -e $i ] || ln -s $SBIN_TO/$i $i
+done
+popd > /dev/null
diff --git a/scripts/update_box.sh b/scripts/update_box.sh
index 05eb00a..8020f18 100755
--- a/scripts/update_box.sh
+++ b/scripts/update_box.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 # set -x
+CPUS=$(nproc)
 
-emerge --update --deep --newuse --pretend world
+emerge --update --deep --newuse --pretend --jobs ${CPUS} world
 
 echo "Press Ctrl-C to abort..."
 read
@@ -9,13 +10,13 @@ read
 # Trigger mount
 # ls /mnt/portage/distfiles /mnt/portage/portage > /dev/null
 
-emerge --update --deep --newuse --keep-going world
+emerge --update --deep --newuse --keep-going --jobs ${CPUS} world
 
 # echo "Fixing pax flags..."
 # ${SCRIPT_DIR}/fix_grsec.sh
 
 echo "Going to remove unneeded packages ..."
-emerge --depclean
+emerge --depclean --jobs ${CPUS}
 
 echo "Fixing dependencies..."
 revdep-rebuild -i