diff --git a/conf/portage/make.conf b/conf/portage/make.conf
index 6ad8387..55b9738 100644
--- a/conf/portage/make.conf
+++ b/conf/portage/make.conf
@@ -13,10 +13,12 @@ LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 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"
+
+# All otther CPU related USE flags are set in flight within update_box.sh
+DO_USE="smp"
 
 # X
-DO_USE="${DO_USE} qt3support cairo gtk gtk3 gles2 gstreamer g3dvl nvidia vaapi vdpau libkms X xcb opengl s3tc truetype xcomposite"
+DO_USE="${DO_USE} qt3support cairo gtk gtk3 gles2 gstreamer g3dvl imlib libkms nvidia vaapi vdpau libkms X xcb opencl opengl s3tc truetype vaapi xcomposite"
 
 # OpenBox
 DO_USE="${DO_USE} thunar webkit"
@@ -29,10 +31,16 @@ DO_USE="${DO_USE} pulseaudio alsa openal"
 DO_USE="${DO_USE} mpd mp3 m3u mpg123 ogg opus vorbis mad aac cdr lame libsamplerate taglib"
 
 # Middleware
-DO_USE="${DO_USE} acpi cryptsetup curl cups consolekit policykit java dbus lm_sensors device-mapper gnutls net threads icu nsplugin lvm nfs libnotify python resolvconf sql sqlite spice system-sqlite unicode udev xml"
+DO_USE="${DO_USE} acpi cryptsetup curl cups git java keymap lm_sensors device-mapper gnutls net threads icu nsplugin lvm nfs libnotify python resolvconf sql sqlite spice syslog system-sqlite unicode udev xml"
 
-# USE_NOT="-avahi -abiword -fortran -nfsv3 -arts -ipv6"
-USE_NOT="-hal -ipv6 -libproxy"
+# Wireless / Network / Misc
+DO_USE="${DO_USE} bluetooth networkmanager usb wifi"
+
+# SystemD
+DO_USE="${DO_USE} -systemd consolekit dbus policykit"
+
+# Disable IPV6 for now
+USE_NOT="-ipv6 -ppp"
 
 # PORTDIR_OVERLAY="/mnt/portage/overlays/layman/pentoo"
 PORTDIR_OVERLAY="${PORTDIR_OVERLAY} /mnt/portage/overlays/quarks"
@@ -58,7 +66,7 @@ FEATURES="clean-logs fail-clean parallel-install skiprocheck userfetch parallel-
 CCACHE_DIR="/root/.ccache"
 CCACHE_SIZE="4G"
 
-VIDEO_CARDS="nvidia fbdev radeon radeonsi vesa vga"
+VIDEO_CARDS="intel nvidia fbdev radeon radeonsi vesa vga"
 INPUT_DEVICES="keyboard mouse evdev wacom"
 
 QEMU_SOFTMMU_TARGETS="i386 x86_64"
diff --git a/conf/portage/package.keywords b/conf/portage/package.keywords
index ad9fbfd..08e5d89 100644
--- a/conf/portage/package.keywords
+++ b/conf/portage/package.keywords
@@ -6,6 +6,24 @@ sys-kernel/dracut
 # sys-boot/os-prober
 # sys-kernel/hardened-sources
 app-admin/paxtest
+# Laptop WLAN
+sys-firmware/iwl6030-ucode
+
+# GPUs
+# Intel - https://01.org/linuxgraphics/downloads/2013/2013q2-intel-graphics-stack-release
+media-libs/mesa
+x11-libs/libva
+x11-libs/libva-intel-driver
+=x11-drivers/xf86-video-intel-2.21.9
+=sys-devel/llvm-3.3-r1 ~amd64
+=x11-libs/libdrm-2.4.46 ~amd64
+=dev-libs/libclc-0.0.1_pre20130819 ~amd64
+=sys-devel/clang-3.3-r100 ~amd64
+
+# x11-drivers/ati-drivers 
+x11-drivers/nvidia-drivers 
+# media-video/nvidia-settings
+# app-admin/eselect-opencl
 
 # AMD overclock
 sys-firmware/amd-ucode
@@ -13,7 +31,7 @@ sys-power/tpc
 # sys-power/cpupower
 
 # Shiny boot
-sys-boot/plymouth-openrc-plugin
+# sys-boot/plymouth-openrc-plugin
 sys-boot/plymouth
 
 media-gfx/gimp
@@ -48,20 +66,6 @@ games-util/pyfa
 # required by pyfa (argument)
 =dev-python/sqlalchemy-0.8.2 ~amd64
 
-
-# media-libs/mesa
-# app-admin/eselect-opengl
-# sys-devel/llvm
-# x11-proto/glproto
-# x11-libs/libdrm
-# x11-drivers/xf86-video-ati
-# media-libs/libtxc_dxtn
-
-# x11-drivers/ati-drivers 
-x11-drivers/nvidia-drivers 
-# media-video/nvidia-settings
-# app-admin/eselect-opencl
-
 #required by lxdm (argument)
 lxde-base/lxdm
 x11-misc/tint2
@@ -74,7 +78,7 @@ x11-misc/tint2
 # Android
 dev-util/android-sdk-update-manager
 
-# PenTesting
+# PenTesting/ Hacking
 #net-analyzer/metasploit
 #dev-ruby/kissfft
 #dev-ruby/msgpack
@@ -83,6 +87,14 @@ dev-util/android-sdk-update-manager
 # net-analyzer/dnsrecon
 #app-forensics/regripper
 
+# Wireless
+net-wireless/aircrack-ng
+# required by net-wireless/aircrack-ng-1.2_beta1[airdrop-ng]
+# required by @selected
+# required by @world (argument)
+=net-wireless/lorcon-0.0_p20130212 ~amd64
+
+
 media-video/rtmpdump **
 
 # sci-geosciences/googleearth
diff --git a/conf/portage/package.license b/conf/portage/package.license
index a987524..8aa4391 100644
--- a/conf/portage/package.license
+++ b/conf/portage/package.license
@@ -1 +1,2 @@
 www-plugins/adobe-flash AdobeFlash-11.x
+games-fps/quake3-data Q3EULA
diff --git a/conf/portage/package.use b/conf/portage/package.use
index 077e7b7..0f32c4c 100644
--- a/conf/portage/package.use
+++ b/conf/portage/package.use
@@ -6,8 +6,8 @@ sys-apps/util-linux static-libs
 
 sys-fs/udev extras gudev hwdb
 virtual/udev extras gudev hwdb 
+net-fs/nfs-utils nfsv41
 
-# x11-drivers/ati-drivers qt4
 app-emulation/wine -win64 -gstreamer
 dev-python/matplotlib wxwidgets
 
@@ -17,6 +17,7 @@ net-misc/spice-gtk -gstreamer
 gnome-base/gvfs gdu
 
 app-admin/conky eve
+x11-misc/tint2 battery tint2conf
 
 media-libs/libgpod ios
 
@@ -27,13 +28,14 @@ dev-db/sqlite secure-delete unlock-notify
 
 net-analyzer/nmap lua
 
-media-sound/pulseaudio gnome
-
-x11-misc/tint2 battery
+media-sound/pulseaudio gnome 
 
 dev-lang/php pcntl gd zip
 
 sys-kernel/hardened-sources injection symlink
+x11-drivers/ati-drivers qt4
+media-libs/mesa r600-llvm-compiler
+sys-devel/llvm clang
 
 # Don't support ruby1.9 yet
 app-editors/gvim -ruby
@@ -43,3 +45,5 @@ app-editors/vim -ruby
 sys-libs/zlib minizip
 
 www-client/firefox system-cairo system-jpeg
+
+net-misc/networkmanager dhclient -dhcpcd -nss
diff --git a/scripts/make_kernel.sh b/scripts/make_kernel.sh
index 163251f..71c1599 100755
--- a/scripts/make_kernel.sh
+++ b/scripts/make_kernel.sh
@@ -2,10 +2,11 @@
 set -e
 
 CPUS=$(nproc)
-NEW=$(grep "Kernel Configuration" /usr/src/linux/.config | awk '{print $3}')
+
+[ "x$NEW" == "x" ] && NEW=$(grep "Kernel Configuration" /usr/src/linux/.config | awk '{print $3}')
 echo $NEW
 
-cd /usr/src/linux-${NEW}
+cd /usr/src/linux-${NEW} 
 # make clean
 # make oldconfig
 make menuconfig
diff --git a/scripts/update_box.sh b/scripts/update_box.sh
index 714b40d..a8a36d0 100755
--- a/scripts/update_box.sh
+++ b/scripts/update_box.sh
@@ -1,5 +1,23 @@
 #!/bin/sh
-# set -x
+#set -x
+
+# Look at CPU and return all actually available USE flags
+get_cpu_use() {
+	AVAILABLE_USE="mmx mmxext sse sse2 sse3 ssse3 sse4 sse4_1 avx 3dnow 3dnowext" 
+	CPU_FLAGS=$(cat /proc/cpuinfo | grep flags | cut -d\  -f2- | uniq)
+
+	_USE=""
+	for f in ${AVAILABLE_USE}; do
+		if [ "$CPU_FLAGS" != "${CPU_FLAGS/$f/}" ]; then
+			_USE="$_USE $f"
+		fi
+	done
+	echo $_USE
+}
+
+CPU_USE=$(get_cpu_use)
+export USE="$CPU_USE"
+
 CPUS=$(nproc)
 
 # as many cc as CPUs