diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 2f22daf..781fb76 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -5,7 +5,7 @@
 # Does not include package selection (other then mandatory)
 # Does not include localization packages or configuration
 
-# Does includes "default" language customization (kickstarts including
+# Does includes "default" language configuration (kickstarts including
 # this template can override these settings)
 
 lang en_US.UTF-8
@@ -18,8 +18,9 @@ xconfig --startxonboot
 part / --size 4096
 services --enabled=NetworkManager --disabled=network,sshd
 
-repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-8&arch=$basearch
-repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f8&arch=$basearch
+#repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-8&arch=$basearch
+#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f8&arch=$basearch
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
 
 %packages
 @base-x
diff --git a/fedora-live-xfce-nl_NL.ks b/fedora-live-xfce-nl_NL.ks
new file mode 100644
index 0000000..3835672
--- /dev/null
+++ b/fedora-live-xfce-nl_NL.ks
@@ -0,0 +1,11 @@
+# fedora-live-xfce-nl_NL.ks
+
+%include fedora-live-xfce.ks
+
+lang nl_NL
+keyboard us
+timezone Europe/Amsterdam
+
+%packages
+@dutch-support
+%end
\ No newline at end of file
diff --git a/fedora-live-xfce.ks b/fedora-live-xfce.ks
index c318b5b..02f0d97 100644
--- a/fedora-live-xfce.ks
+++ b/fedora-live-xfce.ks
@@ -1,14 +1,10 @@
-# Fedora Project Spin 
+# Fedora Project Spin
 # (c) Rahul Sundaram <sundaram@fedoraproject.org>
 # GPlv2 or later
 
-%include /usr/share/livecd-tools/livecd-fedora-base-desktop.ks
-repo --name=raw --priority=1 --baseurl=http://nighthawk.pnq.redhat.com/nightly/latest-Rawhide/i386/os/
-selinux --enforcing
-
+%include fedora-live-base.ks
 
 %packages
-
 firefox
 NetworkManager-vpnc
 NetworkManager-openvpn
@@ -27,12 +23,10 @@ desktop-backgrounds-compat
 xscreensaver-base
 setroubleshoot
 
-# development 
+# development
 geany
 
-
-# More Desktop stuff 
-
+# More Desktop stuff
 xdg-user-dirs
 @java
 totem
@@ -56,8 +50,6 @@ bluez-gnome
 alsa-plugins-pulseaudio
 
 # Command line
-
-
 ntfs-3g
 powertop
 wget
@@ -65,19 +57,12 @@ irssi
 mutt
 yum-utils
 
-# xfce packages
-
 # xfce packages
 @xfce-desktop
 gtk-xfce-engine
 orage
-xarchiver
-
-
-xfce4-taskmanager
 thunar-volman
-
-
+xarchiver
 xfce4-battery-plugin
 xfce4-clipman-plugin
 xfce4-cpugraph-plugin
@@ -95,18 +80,16 @@ xfce4-quicklauncher-plugin
 xfce4-screenshooter-plugin
 xfce4-sensors-plugin
 xfce4-systemload-plugin
+xfce4-taskmanager
 xfce4-volstatus-icon
 xfce4-verve-plugin
-#we use NetworkManager-gnome. So this is redundant  
+# We use NetworkManager-gnome. So this is redundant
 xfce4-weather-plugin
 xfce4-websearch-plugin
-
 # this one a compatibility layer for GNOME applets and depends on it
 #xfce4-xfapplet-plugin
-
 xfwm4-themes
 
-
 # dictionaries are big
 -aspell-*
 -man-pages-*
@@ -116,7 +99,6 @@ xfwm4-themes
 -dejavu-fonts
 
 # drop more fonts
-
 -lohit-fonts-*
 -thaifonts-scalable
 -paktype-fonts
@@ -128,7 +110,7 @@ xfwm4-themes
 -abyssinica-fonts
 -cjkunifonts-uming
 
-# more fun with space saving 
+# more fun with space saving
 -scim-lang-chinese
 scim-chewing
 scim-pinyin
@@ -139,17 +121,12 @@ scim-pinyin
 -nss_db
 -sendmail
 
-#system-config-printer does printer management better
-#xfprint has now been made as optional in comps.
-
+# system-config-printer does printer management better
+# xfprint has now been made as optional in comps.
 system-config-printer
-
-
 %end
 
 %post
-
-
 # xfce configuration
 
 # create /etc/sysconfig/desktop (needed for installation)
@@ -159,13 +136,13 @@ PREFERRED=/usr/bin/startxfce4
 EOF
 
 mkdir -p /home/fedora/.config/tracker
+
 cat > /home/fedora/.config/tracker/tracker.cfg <<EOF
 [Indexing]
 EnableIndexing=false
 Language=en
 EOF
 
-
 mkdir -p /root/.config/tracker
 cat > /root/.config/tracker/tracker.cfg <<EOF
 [Indexing]
@@ -173,25 +150,23 @@ EnableIndexing=false
 Language=en
 EOF
 
-
 cat >> /etc/rc.d/init.d/fedora-live << EOF
 chown -R fedora:fedora /home/fedora
 
 # set up timed auto-login for after 10 seconds
-cat >> /etc/gdm/custom.conf << FOE
+cat >> /etc/gdm/custom.conf << _EOF_
 [daemon]
 TimedLoginEnable=true
 TimedLogin=fedora
 TimedLoginDelay=10
-FOE
-
+_EOF_
 
 if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
     cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /home/fedora/.face
     chown fedora:fedora /home/fedora/.face
     # TODO: would be nice to get e-d-s to pick this one up too... but how?
 fi
-
 EOF
+
 %end