Index: branches/blackosx/package/Scripts/Standard/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Standard/postinstall	(revision 1560)
+++ branches/blackosx/package/Scripts/Standard/postinstall	(revision 1561)
@@ -45,6 +45,7 @@
 targetDiskRaw=${targetDisk/disk/rdisk}
 targetSlice=${targetDevice#*disk*s}
 
+targetResources="${targetVolume}/usr/local/bin/"
 
 echo "==============================================="
 echo "DEBUG: display script variables"
@@ -144,7 +145,7 @@
 				echo "Diskupdate = true, so the stage 0 loader can be written to the MBR"
 
 				# Write the stage 0 loader to the MBR
-				"$scriptDir"WriteChameleonStage0.sh "${diskSigCheck}" "${stage0Loader}" "${stage0LoaderDualBoot}" "${targetDisk}" "${targetVolume}" "${scriptDir}"
+				"$scriptDir"WriteChameleonStage0.sh "${diskSigCheck}" "${stage0Loader}" "${stage0LoaderDualBoot}" "${targetDisk}" "${targetResources}" "${targetVolume}" "${scriptDir}"
 			else
 				echo "Diskupdate = false, so didn't write the stage 0 loader to the MBR."
 				"$scriptDir"InstallLog.sh "${targetVolume}" "Stage 0 loader not written to ${targetDisk}."
Index: branches/blackosx/package/Scripts/EFI/postinstall
===================================================================
--- branches/blackosx/package/Scripts/EFI/postinstall	(revision 1560)
+++ branches/blackosx/package/Scripts/EFI/postinstall	(revision 1561)
@@ -46,8 +46,8 @@
 targetDiskRaw=${targetDisk/disk/rdisk}
 targetSlice=${targetDevice#*disk*s}
 
+targetResources="${targetVolumeChosenByUser}/usr/local/bin/"
 
-
 echo "==============================================="
 echo "DEBUG: display script variables"
 echo "***************************"
@@ -65,6 +65,7 @@
 echo "DEBUG: targetDisk: Disk device is ${targetDisk}"
 echo "DEBUG: targetDiskRaw: Disk raw device is ${targetDiskRaw}"
 echo "DEBUG: targetSlice: Volume slice is ${targetSlice}"
+echo "DEBUG: targetResources: Boot Resources is ${targetResources}" 
 echo "-----------------------------------------------"
 echo ""
 
@@ -144,7 +145,7 @@
 					#echo "Diskupdate = true, so the stage 0 loader can be written to the MBR"
 
 					# Write the stage 0 loader to the MBR
-					"$scriptDir"WriteChameleonStage0.sh "${diskSigCheck}" "${stage0Loader}" "${stage0LoaderDualBoot}" "${targetDisk}" "${targetVolumeChosenByUser}" "${scriptDir}"
+					"$scriptDir"WriteChameleonStage0.sh "${diskSigCheck}" "${stage0Loader}" "${stage0LoaderDualBoot}" "${targetDisk}" "${targetResources}" "${targetVolumeChosenByUser}" "${scriptDir}"
 				else
 					#echo "Diskupdate = false, so didn't write the stage 0 loader to the MBR."
 					"$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Stage 0 loader not written to ${targetDisk}."
Index: branches/blackosx/package/Scripts/Install/WriteChameleonStage0.sh
===================================================================
--- branches/blackosx/package/Scripts/Install/WriteChameleonStage0.sh	(revision 1560)
+++ branches/blackosx/package/Scripts/Install/WriteChameleonStage0.sh	(revision 1561)
@@ -10,21 +10,24 @@
 # Receives stage0Loader: for example, boot0
 # Receives stage0Loaderdualboot: for example, boot0md
 # Receives targetDisk: for example, /dev/disk3
+# Receives targetResources: location of fdisk440
 # Receives targetVolume: for example, /Volumes/USB
 # Receives scriptDir: The location of the main script dir.
 
 
-if [ "$#" -eq 6 ]; then
+if [ "$#" -eq 7 ]; then
 	disksignature="$1"
 	stage0Loader="$2"
 	stage0Loaderdualboot="$3"
 	targetDisk="$4"
-	targetVolume="$5"
-	scriptDir="$6"
+	targetResources="$5"
+	targetVolume="$6"
+	scriptDir="$7"
 	echo "DEBUG: passed argument for disksignature = $disksignature"
 	echo "DEBUG: passed argument for stage0Loader = $stage0Loader"
 	echo "DEBUG: passed argument for stage0Loaderdualboot = $stage0Loaderdualboot"
 	echo "DEBUG: passed argument for targetDisk = $targetDisk"
+	echo "DEBUG: passed argument for targetResources = $targetResources"
 	echo "DEBUG: passed argument for targetVolume = $targetVolume"
 	echo "DEBUG: passed argument for scriptDir = $scriptDir"
 else
@@ -36,15 +39,15 @@
 if [ ${disksignature} = "0" ]; then
 	# ThereÕs no Windows disk signature so we can write boot0
 		
-	echo "Executing command: fdisk440 -u -f /usr/standalone/i386/${stage0Loader} -y ${targetDisk}"
-	"${scriptDir}"/Tools/fdisk440 -u -f "${targetVolume}"/usr/standalone/i386/${stage0Loader} -y ${targetDisk}
-	"$scriptDir"InstallLog.sh "${targetVolume}" "Written ${stage0Loader to ${targetDisk}."
+	echo "Executing command: ${targetResources}fdisk440 -u -f /usr/standalone/i386/${stage0Loader} -y ${targetDisk}"
+	"${targetResources}"fdisk440 -u -f "${targetVolume}"/usr/standalone/i386/${stage0Loader} -y ${targetDisk}
+    "$scriptDir"InstallLog.sh "${targetVolume}" "Written ${stage0Loader} to ${targetDisk}."
 else
 	# Windows is also installed on the HDD so we need to write boot0md
 		
-	echo "Executing command: /fdisk440 -u -f /usr/standalone/i386/${stage0Loaderdualboot} -y ${targetDisk}"
-	"${scriptDir}"/Tools/fdisk440 -u -f "${targetVolume}"/usr/standalone/i386/${stage0Loaderdualboot} -y ${targetDisk}
-	"$scriptDir"InstallLog.sh "${targetVolume}" "Written ${stage0Loaderdualboot} to ${targetDisk}."
+	echo "Executing command: ${targetResources}fdisk440 -u -f /usr/standalone/i386/${stage0Loaderdualboot} -y ${targetDisk}"
+	"${targetResources}"fdisk440 -u -f "${targetVolume}"/usr/standalone/i386/${stage0Loaderdualboot} -y ${targetDisk}
+    "$scriptDir"InstallLog.sh "${targetVolume}" "Written ${stage0Loaderdualboot} to ${targetDisk}."
 fi
 
 
Index: branches/blackosx/package/buildpkg.sh
===================================================================
--- branches/blackosx/package/buildpkg.sh	(revision 1560)
+++ branches/blackosx/package/buildpkg.sh	(revision 1561)
@@ -58,22 +58,19 @@
 	echo "================= Core ================="
 	((xmlindent++))
 	packagesidentity="org.chameleon.core"
-	mkdir -p ${1}/Core/Root/usr/sbin
 	mkdir -p ${1}/Core/Root/usr/local/bin
 	mkdir -p ${1}/Core/Root/usr/standalone/i386
 	ditto --noextattr --noqtn ${1%/*}/i386/boot ${1}/Core/Root/usr/standalone/i386
 	ditto --noextattr --noqtn ${1%/*}/i386/boot0 ${1}/Core/Root/usr/standalone/i386
 	ditto --noextattr --noqtn ${1%/*}/i386/boot0md ${1}/Core/Root/usr/standalone/i386
-#	ditto --noextattr --noqtn ${1%/*}/i386/boot0hf ${1}/Core/Root/usr/standalone/i386
 	ditto --noextattr --noqtn ${1%/*}/i386/boot1f32 ${1}/Core/Root/usr/standalone/i386
 	ditto --noextattr --noqtn ${1%/*}/i386/boot1h ${1}/Core/Root/usr/standalone/i386
 	ditto --noextattr --noqtn ${1%/*}/i386/boot1he ${1}/Core/Root/usr/standalone/i386
 	ditto --noextattr --noqtn ${1%/*}/i386/boot1hp ${1}/Core/Root/usr/standalone/i386
 	ditto --noextattr --noqtn ${1%/*}/i386/cdboot ${1}/Core/Root/usr/standalone/i386
 	ditto --noextattr --noqtn ${1%/*}/i386/chain0 ${1}/Core/Root/usr/standalone/i386
-# fixperms "${1}/Core/Root/"
-	ditto --noextattr --noqtn ${1%/*}/i386/fdisk440 ${1}/Core/Root/usr/sbin
-	ditto --noextattr --noqtn ${1%/*}/i386/bdmesg ${1}/Core/Root/usr/sbin
+	ditto --noextattr --noqtn ${1%/*}/i386/fdisk440 ${1}/Core/Root/usr/local/bin
+	ditto --noextattr --noqtn ${1%/*}/i386/bdmesg ${1}/Core/Root/usr/local/bin
 	local coresize=$( du -hkc "${1}/Core/Root" | tail -n1 | awk {'print $1'} )
 	echo "	[BUILD] i386 "
 	buildpackage "${1}/Core" "/" "0" "start_visible=\"false\" start_selected=\"true\"" >/dev/null 2>&1
@@ -320,22 +317,18 @@
 		outline[$((outlinecount++))]="${indent[$xmlindent]}\t<line choice=\"Themes\">"
 		choices[$((choicescount++))]="<choice\n\tid=\"Themes\"\n\ttitle=\"Themes_title\"\n\tdescription=\"Themes_description\"\n>\n</choice>\n"
 		((xmlindent++))
+
+		# Using themes section from Azi's/package branch.
 		packagesidentity="org.chameleon.themes"
-		artwork="${1%/*}"
-		themes=($( find "${artwork%/*}/artwork/themes" -type d -depth 1 -not -name '.svn' ))
+		artwork="${1%/sym/package}/artwork/themes"
+		themes=($( find "${artwork}" -type d -depth 1 -not -name '.svn' ))
 		for (( i = 0 ; i < ${#themes[@]} ; i++ )) 
 		do
 			theme=$( echo ${themes[$i]##*/} | awk 'BEGIN{OFS=FS=""}{$1=toupper($1);print}' )
-			mkdir -p "${1}/${themes[$i]##*/}/Root/"
-            rsync -r --exclude=.svn "${themes[$i]}/" "${1}/${themes[$i]##*/}/Root/${theme}"
-            # #### Comment out thx meklort
-            # ditto --noextattr --noqtn "${themes[$i]}" "${1}/${themes[$i]##*/}/Root/${theme}" 
-            # ####
-            find "${1}/${themes[$i]##*/}" -name '.DS_Store' -or -name '.svn' -exec rm -R {} \+
-			find "${1}/${themes[$i]##*/}" -type f -exec chmod 644 {} \+
-			echo "	[BUILD] ${themes[$i]##*/} "
+			mkdir -p "${1}/${theme}/Root/"
+			rsync -r --exclude=.svn "${themes[$i]}/" "${1}/${theme}/Root/${theme}"
+			echo "	[BUILD] ${theme}"
 			buildpackage "${1}/${theme}" "/Extra/Themes" "" "start_selected=\"false\"" >/dev/null 2>&1
-			rm -R -f "${1}/${i##*/}"
 		done
 
 		((xmlindent--))