diff --git a/conf/portage/make.conf b/conf/portage/make.conf
index 88c965c..359b8b9 100644
--- a/conf/portage/make.conf
+++ b/conf/portage/make.conf
@@ -31,7 +31,7 @@ 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 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"
+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 xfs xml"
 
 # Wireless / Network / Misc
 DO_USE="${DO_USE} bluetooth networkmanager usb wifi"
diff --git a/conf/portage/package.keywords b/conf/portage/package.keywords
index ead9212..bfc7c81 100644
--- a/conf/portage/package.keywords
+++ b/conf/portage/package.keywords
@@ -27,24 +27,12 @@ x11-drivers/nvidia-drivers
 # app-admin/eselect-opencl
 
 # AMD overclock
-sys-firmware/amd-ucode
 sys-power/tpc
 # sys-power/cpupower
 
 # Shiny boot
 sys-boot/plymouth
 
-media-gfx/gimp
-# required by media-libs/gegl-0.2.0-r2
-# required by media-gfx/gimp-2.8.6
-# required by @selected
-# required by @world (argument)
-=media-libs/babl-0.1.10-r1 ~amd64
-# required by media-gfx/gimp-2.8.6
-# required by @selected
-# required by @world (argument)
-=media-libs/gegl-0.2.0-r2 ~amd64
-
 app-emulation/wine
 app-emulation/uae
 games-emulation/advancemame
@@ -99,3 +87,5 @@ media-video/rtmpdump **
 # =dev-util/patchelf-0.6 ~amd64
 
 # media-video/mplayer2
+
+sys-block/partclone
diff --git a/conf/portage/package.use b/conf/portage/package.use
index d6d8b3e..cf37087 100644
--- a/conf/portage/package.use
+++ b/conf/portage/package.use
@@ -55,3 +55,6 @@ net-misc/openvpn iproute2
 
 # Games
 games-fps/quake3-data cdinstall
+
+sys-block/partclone fat ntfs 
+sys-fs/xfsprogs libxfs-dev
diff --git a/scripts/update_box.sh b/scripts/update_box.sh
index 0ae40dc..a1fb7d7 100755
--- a/scripts/update_box.sh
+++ b/scripts/update_box.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#set -x
+set -e
 
 
 # Trigger mount