diff --git a/conf/portage/make.conf b/conf/portage/make.conf
index 1c0b422..88c965c 100644
--- a/conf/portage/make.conf
+++ b/conf/portage/make.conf
@@ -18,7 +18,7 @@ CHOST="x86_64-pc-linux-gnu"
 DO_USE="smp"
 
 # X
-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"
+DO_USE="${DO_USE} cairo gtk gtk3 gles2 gstreamer g3dvl imlib libkms nvidia qt4 qt3support vaapi vdpau libkms X xcb opencl opengl s3tc truetype vaapi xcomposite"
 
 # OpenBox
 DO_USE="${DO_USE} thunar"
diff --git a/conf/portage/package.keywords b/conf/portage/package.keywords
index 5dffa0c..0c9cfb0 100644
--- a/conf/portage/package.keywords
+++ b/conf/portage/package.keywords
@@ -1,7 +1,8 @@
 # Base 
 sys-boot/grub
 sys-fs/cryptsetup
-sys-kernel/dracut
+<sys-kernel/dracut-033
+sys-fs/mdadm
 # sys-boot/efibootmgr
 # sys-boot/os-prober
 # sys-kernel/hardened-sources
@@ -53,7 +54,6 @@ games-emulation/advancemame
 media-gfx/dispcalgui
 
 www-client/firefox
-www-plugins/adobe-flash
 
 # EVE
 games-util/gtkevemon **
@@ -65,8 +65,6 @@ games-util/pyfa
 # required by pyfa (argument)
 =dev-python/sqlalchemy-0.8.2 ~amd64
 
-#required by lxdm (argument)
-lxde-base/lxdm
 x11-misc/tint2
 
 # Android
@@ -88,6 +86,11 @@ net-wireless/aircrack-ng
 # required by @world (argument)
 =net-wireless/lorcon-0.0_p20130212 ~amd64
 
+# Video player + editing
+media-video/ffmpeg
+media-video/avidemux
+media-libs/avidemux-core
+media-libs/avidemux-plugins
 
 media-video/rtmpdump **
 
diff --git a/conf/portage/package.mask b/conf/portage/package.mask
new file mode 100644
index 0000000..e69de29
diff --git a/conf/portage/package.use b/conf/portage/package.use
index 4f2601a..d6d8b3e 100644
--- a/conf/portage/package.use
+++ b/conf/portage/package.use
@@ -29,13 +29,14 @@ dev-libs/libxml2 python
 dev-db/sqlite secure-delete unlock-notify
 
 net-analyzer/nmap lua
+# Use gtk3 
+net-analyzer/wireshark -gtk2 -qt4
 
 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
 
diff --git a/scripts/make_kernel.sh b/scripts/make_kernel.sh
index 71c1599..5cd1d59 100755
--- a/scripts/make_kernel.sh
+++ b/scripts/make_kernel.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -e
 
-CPUS=$(nproc)
-
 [ "x$NEW" == "x" ] && NEW=$(grep "Kernel Configuration" /usr/src/linux/.config | awk '{print $3}')
 echo $NEW
 
@@ -10,7 +8,7 @@ cd /usr/src/linux-${NEW}
 # make clean
 # make oldconfig
 make menuconfig
-make -j${CPUS} all
+make all ${MAKEOPTS}
 make modules_install
 
 for f in initrd vmlinuz System.map config; do
diff --git a/scripts/portage_env.sh b/scripts/portage_env.sh
new file mode 100644
index 0000000..a350656
--- /dev/null
+++ b/scripts/portage_env.sh
@@ -0,0 +1,19 @@
+# use as many cores as available
+export MAKEOPTS="-j$(nproc)"
+
+# USE
+# 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
+}
+
+export USE=$(get_cpu_use)
diff --git a/scripts/setup_box.sh b/scripts/setup_box.sh
index 14c4f76..6608853 100755
--- a/scripts/setup_box.sh
+++ b/scripts/setup_box.sh
@@ -16,4 +16,4 @@ link() {
 }
 
 link "update_portage.sh update_box.sh make_kernel.sh" "/mnt/portage/overlays/quarks/scripts" "/usr/local/sbin"
-link "make.conf package.use package.keywords package.license" "/mnt/portage/overlays/quarks/conf/portage" "/etc/portage"
+link "make.conf package.use package.keywords package.license package.mask" "/mnt/portage/overlays/quarks/conf/portage" "/etc/portage"
diff --git a/scripts/update_box.sh b/scripts/update_box.sh
index a8a36d0..0ae40dc 100755
--- a/scripts/update_box.sh
+++ b/scripts/update_box.sh
@@ -1,32 +1,12 @@
 #!/bin/sh
 #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
-export MAKEOPTS="-j${CPUS}"
 
 # Trigger mount
 # ls /mnt/portage/distfiles /mnt/portage/portage > /dev/null
 
 # Half as many emerge as CPUs, to speed up configure runs
+CPUS=$(nproc)
 emerge --ask --update --deep --newuse --keep-going --accept-properties=-interactive --jobs $((CPUS/2)) world
 
 # echo "Fixing pax flags..."
@@ -35,6 +15,11 @@ emerge --ask --update --deep --newuse --keep-going --accept-properties=-interact
 echo "Going to remove unneeded packages ..."
 emerge --depclean
 
+if [ -x $(which localepurge) ]; then
+	echo "Removing unneeded locales..."
+	localepurge
+fi
+
 echo "Fixing dependencies..."
 revdep-rebuild -i