--- a/override/ubuntu804
+++ b/override/ubuntu804
@@ -1,6 +1,4 @@
 #!/bin/sh
-
-sed -i "s/kernel \/boot\/ubnkern/kernel \/boot\/ubnkern vga=normal/g" $1
 
 if [ "$(echo $0 | grep x64)" != "" ]
 then
@@ -12,18 +10,7 @@
 kerndlurl="http:\/\/archive.ubuntu.com\/ubuntu\/dists\/hardy\/main\/installer-$arch\/current\/images\/netboot\/ubuntu-installer\/$arch\/linux"
 initdlurl="http:\/\/archive.ubuntu.com\/ubuntu\/dists\/hardy\/main\/installer-$arch\/current\/images\/netboot\/ubuntu-installer\/$arch\/initrd.gz"
 
-sed -i "s/\#rptl //g" $1
-sed -i "s/rpubnkernurl/$kerndlurl/g" $1
-sed -i "s/rpubniniturl/$initdlurl/g" $1
-
-sed -i "s/cp \.\/ubnkern/\#/g" $1
-sed -i "s/cp \.\/ubninit/\#/g" $1
-
-if [ "$1" = ./winbuild/menu.lst ]
-then
-sed -i 's/File "ubnkern"//g' ./winbuild/unetbootin.nsi
-sed -i 's/File "ubninit"//g' ./winbuild/unetbootin.nsi
-sed -i 's/\; ltbe //g' ./winbuild/unetbootin.nsi
-sed -i "s/rpubnkernurl/$kerndlurl/g" ./winbuild/unetbootin.nsi
-sed -i "s/rpubniniturl/$initdlurl/g" ./winbuild/unetbootin.nsi
-fi
+./functions/kernpar $1 'vga=normal'
+./functions/nckern $1
+./functions/ncinit $1
+./functions/netbt $1 "$kerndlurl" "$initdlurl"