diff --git a/conf/portage/make.conf b/conf/portage/make.conf
index 5249ee0..9649d3a 100644
--- a/conf/portage/make.conf
+++ b/conf/portage/make.conf
@@ -14,21 +14,18 @@ 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.
 
-# All otther CPU related USE flags are set in flight within update_box.sh
+# All other CPU related USE flags are set via /etc/profile.d/portage_env.sh
 DO_USE="smp"
 
 # X
 DO_USE="${DO_USE} cairo gtk gtk3 gtkstyle 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"
-
 # 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 opus vorbis mad aac cdr lame libsamplerate taglib"
+DO_USE="${DO_USE} flac id3tag mpd mp3 m3u mpg123 ogg opus vorbis mad aac cdr lame libsamplerate taglib"
 
 # Middleware
 DO_USE="${DO_USE} acpi cryptsetup curl cups dbus 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"
diff --git a/conf/portage/package.keywords b/conf/portage/package.keywords
index 742f385..a38374f 100644
--- a/conf/portage/package.keywords
+++ b/conf/portage/package.keywords
@@ -1,8 +1,9 @@
 # Base 
-sys-fs/cryptsetup
 sys-kernel/dracut
+sys-fs/cryptsetup
+app-crypt/efitools
+sys-fs/bcache-tools
 =sys-boot/plymouth-openrc-plugin-0.1.2 ~amd64
-# sys-boot/efibootmgr
 # sys-boot/os-prober
 # sys-kernel/hardened-sources
 app-admin/paxtest
diff --git a/conf/portage/package.use b/conf/portage/package.use
index 4f271df..63f997e 100644
--- a/conf/portage/package.use
+++ b/conf/portage/package.use
@@ -33,6 +33,7 @@ net-analyzer/nmap lua
 net-analyzer/wireshark -gtk2 -qt4
 
 media-sound/pulseaudio gnome -realtime 
+media-sound/audacity vamp sbsms
 
 dev-lang/php pcntl gd zip
 
diff --git a/scripts/make_kernel.sh b/scripts/make_kernel.sh
index f4430ea..9170ba9 100755
--- a/scripts/make_kernel.sh
+++ b/scripts/make_kernel.sh
@@ -16,9 +16,12 @@ for f in initrd vmlinuz System.map config; do
 done
 
 cp /usr/src/linux/.config  /etc/kernel/kernel-config-${NEW} 
-make install
 
-dracut --xz -H --force --strip /boot/initrd-${NEW} ${NEW}
+#dracut --xz -H --force --strip /boot/initrd-${NEW} ${NEW}
+dracut --no-compress -H --force --strip /usr/src/linux/initrd.cpio ${NEW}
+make all ${MAKEOPTS}
+
+make install
 
 grub2-mkconfig -o /boot/grub2/grub.cfg