Index: branches/blackosx/package/Distribution
===================================================================
--- branches/blackosx/package/Distribution	(revision 1639)
+++ branches/blackosx/package/Distribution	(revision 1640)
@@ -12,7 +12,7 @@
 	<license file="License.rtf" sla="EA0401"/>
 	<readme  file='Description.html'/>
 	<conclusion file="Conclusion.rtfd"/>
-	<background file='background.tiff' alignment='topleft' scaling='proportional'/>
+	<background file='background.tiff' alignment='topleft' scaling='tofit'/>
 
 	<title>Chameleon_title</title>
 
Index: branches/blackosx/package/slimpkg.sh
===================================================================
--- branches/blackosx/package/slimpkg.sh	(revision 1639)
+++ branches/blackosx/package/slimpkg.sh	(revision 1640)
@@ -3,13 +3,8 @@
 # $1 Path to store built package
 
 packagesidentity="org.chameleon"
-
 packagename="Chameleon"
-
 pkgroot="${0%/*}"
-
-# blackosx to use /usr/local as a place for temporary files
-# taken from http://en.wikipedia.org/wiki/Filesystem_Hierarchy_Standard#cite_note-27
 chamTemp="usr/local/chamTemp"
 
 COL_BLACK="\x1b[30;01m"
@@ -22,7 +17,6 @@
 COL_BLUE="\x1b[34;01m"
 COL_RESET="\x1b[39;49;00m"
 
-#version=$( grep I386BOOT_CHAMELEONVERSION vers.h | awk '{ print $3 }' | tr -d '\"' )
 version=$( cat version )
 stage=${version##*-}" (blackosx branch)"
 revision=$( grep I386BOOT_CHAMELEONREVISION vers.h | awk '{ print $3 }' | tr -d '\"' )
@@ -61,8 +55,7 @@
 
 # build core package
 	echo "================= Core ================="
-	((xmlindent++))
-	packagesidentity="org.chameleon.core"
+	packagesidentity="org.chameleon"
 	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
@@ -79,12 +72,14 @@
 	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
+# End build core package
 
 # build Chameleon package
 	echo "================= Chameleon ================="
-	outline[$((outlinecount++))]="${indent[$xmlindent]}\t<line choice=\"Chameleon\">"
-	choices[$((choicescount++))]="<choice\n\tid=\"Chameleon\"\n\ttitle=\"Chameleon_title\"\n\tdescription=\"Chameleon_description\"\n>\n</choice>\n"
-
+	outline[$((outlinecount++))]="${indent[$xmlindent]}<line choice=\"Chameleon\">"
+	choices[$((choicescount++))]="\t<choice\n\t\tid=\"Chameleon\"\n\t\ttitle=\"Chameleon_title\"\n\t\tdescription=\"Chameleon_description\">\n\t</choice>\n"
+	((xmlindent++))
+	
 	# build standard package 
 		mkdir -p ${1}/Standard/Root
 		mkdir -p ${1}/Standard/Scripts/Resources
@@ -94,7 +89,7 @@
 		ditto --noextattr --noqtn ${1%/*/*}/revision ${1}/Standard/Scripts/Resources/revision
 		ditto --noextattr --noqtn ${1%/*/*}/version ${1}/Standard/Scripts/Resources/version
 		echo "	[BUILD] Standard "
-		buildpackage "${1}/Standard" "/" "${coresize}" "start_enabled=\"true\" start_selected=\"upgrade_allowed()\" selected=\"exclusive(choices['EFI']) &amp;&amp; exclusive(choices['noboot'])\"" >/dev/null 2>&1
+        buildpackage "${1}/Standard" "/" "${coresize}" "start_enabled=\"true\" selected=\"exclusive(choices['EFI']) &amp;&amp; exclusive(choices['noboot'])\"" >/dev/null 2>&1
 	# End build standard package 
 
 	# build efi package 
@@ -106,17 +101,17 @@
 		ditto --noextattr --noqtn ${1%/*/*}/revision ${1}/EFI/Scripts/Resources/revision
 		ditto --noextattr --noqtn ${1%/*/*}/version ${1}/EFI/Scripts/Resources/version
 		echo "	[BUILD] EFI "
-		buildpackage "${1}/EFI" "/" "${coresize}" "start_visible=\"systemHasGPT()\" start_selected=\"false\" selected=\"exclusive(choices['Standard']) &amp;&amp; exclusive(choices['noboot'])\"" >/dev/null 2>&1
+		buildpackage "${1}/EFI" "/" "${coresize}" "start_visible=\"systemHasGPT()\" selected=\"exclusive(choices['Standard']) &amp;&amp; exclusive(choices['noboot'])\"" >/dev/null 2>&1
 	# End build efi package
 
 	# build reset choice package 
 		mkdir -p ${1}/noboot/Root
 		echo "	[BUILD] Reset choice "
-		buildpackage "${1}/noboot" "/$chamTemp" "" "start_visible=\"true\" start_selected=\"false\" selected=\"exclusive(choices['Standard']) &amp;&amp; exclusive(choices['EFI'])\"" >/dev/null 2>&1
+		buildpackage "${1}/noboot" "/$chamTemp" "" "selected=\"exclusive(choices['Standard']) &amp;&amp; exclusive(choices['EFI'])\"" >/dev/null 2>&1
 	# End build reset choice package 
-	
-	((xmlindent--))
-	outline[$((outlinecount++))]="${indent[$xmlindent]}\t</line>"
+
+    ((xmlindent--))
+    outline[$((outlinecount++))]="${indent[$xmlindent]}</line>"
 # End build Chameleon package
 
 # build Modules package
@@ -131,8 +126,8 @@
 	###############################
 	if [ "$(ls -A "${1%/*}/i386/modules")" ]; then
 	{
-		outline[$((outlinecount++))]="${indent[$xmlindent]}\t<line choice=\"Module\">"
-		choices[$((choicescount++))]="<choice\n\tid=\"Module\"\n\ttitle=\"Module_title\"\n\tdescription=\"Module_description\"\n>\n</choice>\n"
+		outline[$((outlinecount++))]="${indent[$xmlindent]}<line choice=\"Module\">"
+		choices[$((choicescount++))]="\t<choice\n\t\tid=\"Module\"\n\t\ttitle=\"Module_title\"\n\t\tdescription=\"Module_description\">\n\t</choice>\n"
 		((xmlindent++))
 		packagesidentity="org.chameleon.modules"
 # -
@@ -174,7 +169,7 @@
 		fi
 
 		((xmlindent--))
-		outline[$((outlinecount++))]="${indent[$xmlindent]}\t</line>"
+		outline[$((outlinecount++))]="${indent[$xmlindent]}</line>"
 	}
 	else
 	{
@@ -185,19 +180,24 @@
 
 # build post install package
 	echo "================= Post ================="
+	packagesidentity="org.chameleon"
 	mkdir -p ${1}/Post/Root
 	mkdir -p ${1}/Post/Scripts
 	cp -f ${pkgroot}/Scripts/Main/Post/* ${1}/Post/Scripts
 	cp -f ${pkgroot}/Scripts/Sub/InstallLog.sh ${1}/Post/Scripts
+	cp -f ${pkgroot}/Scripts/Sub/UnMountEFIvolumes.sh ${1}/Post/Scripts
 	ditto --noextattr --noqtn ${1%/*/*}/revision ${1}/Post/Scripts/Resources/revision
 	ditto --noextattr --noqtn ${1%/*/*}/version ${1}/Post/Scripts/Resources/version
 	echo "	[BUILD] Post "
 	buildpackage "${1}/Post" "/" "" "start_visible=\"false\" start_selected=\"true\"" >/dev/null 2>&1
-	outline[$((outlinecount++))]="${indent[$xmlindent]}</choices-outline>"
+# End build post install package
 
+#((xmlindent--))
+outline[$((outlinecount++))]="${indent[$xmlindent]}</choices-outline>"
+
 # build meta package
 
-	makedistribution "${1}" "${2}" "${3}" "${4}" "${5}"
+	makedistribution "${1}" "${2}" "${3}" "${4}" #"${5}"
 
 # clean up 
 
@@ -271,13 +271,12 @@
 
 	popd >/dev/null
 
-	outline[$((outlinecount++))]="${indent[$xmlindent]}\t<line choice=\"${packagename// /}\"/>"
+	outline[$((outlinecount++))]="${indent[$xmlindent]}<line choice=\"${packagename// /}\"/>"
 
 	if [ "${4}" ]; then
-		local choiceoptions="${indent[$xmlindent]}${4}\n"	
+		local choiceoptions="\t\t${4}"
 	fi
-	choices[$((choicescount++))]="<choice\n\tid=\"${packagename// /}\"\n\ttitle=\"${packagename}_title\"\n\tdescription=\"${packagename}_description\"\n${choiceoptions}>\n\t<pkg-ref id=\"${identifier}\" installKBytes='${installedsize}' version='${version}.0.0.${timestamp}' auth='root'>#${packagename// /}.pkg</pkg-ref>\n</choice>\n"
-
+	choices[$((choicescount++))]="\t<choice\n\t\tid=\"${packagename// /}\"\n\t\ttitle=\"${packagename}_title\"\n\t\tdescription=\"${packagename}_description\"\n${choiceoptions}>\n\t\t<pkg-ref id=\"${identifier}\" installKBytes='${installedsize}' version='${version}.0.0.${timestamp}' >#${packagename// /}.pkg</pkg-ref>\n\t</choice>\n"	
 	rm -R -f "${1}"
 fi
 }
@@ -329,12 +328,12 @@
 	popd >/dev/null
 
 #   Here is the place for assign a Icon to the pkg
-	ditto -xk "${pkgroot}/Icons/pkg.zip" "${pkgroot}/Icons/"
-	DeRez -only icns "${pkgroot}/Icons/Icons/pkg.icns" > tempicns.rsrc
-	Rez -append tempicns.rsrc -o "${1%/*}/$packagename-${version}-r$revision.pkg"
-	SetFile -a C "${1%/*}/$packagename-${version}-r$revision.pkg"
-	rm -f tempicns.rsrc
-	rm -rf "${pkgroot}/Icons/Icons"
+    ditto -xk "${pkgroot}/Icons/pkg.zip" "${pkgroot}/Icons/"
+    DeRez -only icns "${pkgroot}/Icons/Icons/pkg.icns" > tempicns.rsrc
+    Rez -append tempicns.rsrc -o "${1%/*}/$packagename-${version}-r$revision.pkg"
+    SetFile -a C "${1%/*}/$packagename-${version}-r$revision.pkg"
+    rm -f tempicns.rsrc
+    rm -rf "${pkgroot}/Icons/Icons"
 # End
 
 	echo ""	
@@ -354,5 +353,5 @@
 
 }
 
-main "${1}" "${2}" "${3}" "${4}" "${5}"
+main "${1}" "${2}" "${3}" "${4}" #"${5}"
 
Index: branches/blackosx/package/Changes.txt
===================================================================
--- branches/blackosx/package/Changes.txt	(revision 1639)
+++ branches/blackosx/package/Changes.txt	(revision 1640)
@@ -1,3 +1,5 @@
+- Change the layout/wording displayed in the installer (English only) and give it a facelift. Adjust background image to scale to fit in the window.
+
 - Set exclusive 'None' option to default choice.
 
 - Add code to detect and make necessary changes to avoid possibility of a b1f:error or boot1:error should the user decide to install a secondary boot partition.
Index: branches/blackosx/package/Resources/en.lproj/Description.html
===================================================================
--- branches/blackosx/package/Resources/en.lproj/Description.html	(revision 1639)
+++ branches/blackosx/package/Resources/en.lproj/Description.html	(revision 1640)
@@ -1,29 +1,45 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
   <title></title>
+  <meta name="Generator" content="Cocoa HTML Writer">
+  <meta name="CocoaVersion" content="1038.36">
   <style type="text/css">
-    p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 11.0px Lucida Grande;}
+    p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 10.0px 'Lucida Grande'}
+    p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 10.0px 'Lucida Grande'; min-height: 12.0px}
+    p.p3 {margin: 0.0px 0.0px 0.0px 0.0px; font: 10.0px 'Lucida Grande'; color: #0000ee; min-height: 12.0px}
+    p.p4 {margin: 0.0px 0.0px 0.0px 0.0px; font: 10.0px 'Lucida Grande'; color: #0418ee}
+    p.p5 {margin: 0.0px 0.0px 0.0px 0.0px; font: 10.0px 'Lucida Grande'; color: #0000ee}
+    span.s1 {color: #0000ee}
+    span.s2 {text-decoration: underline ; color: #0418ee}
+    span.s3 {text-decoration: underline ; color: #0000ee}
+    span.s4 {text-decoration: underline}
+    span.s5 {color: #000000}
   </style>
 </head>
 <body>
-<p class="p1">Chameleon is combination of various boot loader components.<br />It is based on David Elliott's fake EFI implementation added to Apple's boot-132 project.<br />Chameleon is extended with the following key features:</p>
-<br /> 
-<p class="p1">New features in Chameleon 2.0</p>
-<br>
-<p class="p1">   - Fully customizable GUI to bring some color to the Darwin Bootloader.</p>
-<p class="p1">   - Booting retail DVDs by directly loading a ramdisk image without help of additional programs.</p>
-<p class="p1">   - Hibernation. Enjoy resuming your Mac OS X with a preview image.</p>
-<p class="p1">   - SMBIOS override to modify the factory SMBIOS values.</p>
-<p class="p1">   - DSDT override to use a modified fixed DSDT which can solve several issues.</p>
-<br>
-<p class="p1">   - Device Property Injection via device-properties string.</p>
-<p class="p1">   - hybrid boot0 / boot1h for MBR and GPT partitioned disks.</p>
-<p class="p1">   - automatic FSB detection code even for recent AMD CPUs.</p>
-<p class="p1">   - Apple Software RAID support.</p>
-<br />  
-<p class="p1">For detailed information, visit : <a href="http://chameleon.osx86.hu">http://chameleon.osx86.hu</a></p>
+<p class="p1">Chameleon is a boot loader built using a combination of components which evolved from the development of David Elliott's fake EFI implementation added to Apple's boot-132 project.</p>
+<p class="p2"><br></p>
+<p class="p1">Chameleon v2 is extended with many features. For example:</p>
+<p class="p2"><br></p>
+<p class="p1">- Fully customizable GUI to bring some color to the Darwin Bootloader.</p>
+<p class="p1">- Load a ramdisk to directly boot retail DVDs without additional programs.</p>
+<p class="p1">- Hibernation. Enjoy resuming your Mac OS X with a preview image.</p>
+<p class="p1">- SMBIOS override to modify the factory SMBIOS values.</p>
+<p class="p1">- DSDT override to use a modified fixed DSDT which can solve several issues.</p>
+<p class="p1">- Device Property Injection via device-properties string.</p>
+<p class="p1">- hybrid boot0 / boot1h for MBR and GPT partitioned disks.</p>
+<p class="p1">- Automatic FSB detection code even for recent AMD CPUs.</p>
+<p class="p1">- Apple Software RAID support.</p>
+<p class="p1">- Module support</p>
+<p class="p1">- Memory detection adapted from memtest86: <a href="http://www.memtest.org">http://www.memtest.org</a></p>
+<p class="p3"><br></p>
+<p class="p3"><br></p>
+<p class="p1">The code is released under version 2 of the Gnu Public License.</p>
+<p class="p4"><a href="http://forge.voodooprojects.org/p/chameleon/">http://forge.voodooprojects.org/p/chameleon</a></p>
+<p class="p2"><br></p>
+<p class="p1">FAQ's: <a href="http://forum.voodooprojects.org/index.php/topic,754.0.html">http://forum.voodooprojects.org/index.php/topic,754.0.html</a></p>
 </body>
 </html>
Index: branches/blackosx/package/Resources/en.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/en.lproj/Welcome.rtfd/TXT.rtf	(revision 1639)
+++ branches/blackosx/package/Resources/en.lproj/Welcome.rtfd/TXT.rtf	(revision 1640)
@@ -1,38 +1,54 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red65\green78\blue255;\red255\green0\blue9;}
-\paperw12240\paperh15840\margl1440\margr1440\vieww11660\viewh12980\viewkind0
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
+\paperw12240\paperh15840\margl1440\margr1440\vieww10960\viewh8040\viewkind0
 \pard\ri0\qc
 
-\f0\b\fs72 \cf0 Chameleon
+\f0\b\fs28 \cf0 \
+
+\fs48 Chameleon
 \fs50 \
 
-\fs26 v%CHAMELEONVERSION% r%CHAMELEONREVISION%
-\fs50 \
+\fs26 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
+\pard\ri0\qc
+
+\fs24 \cf2 (blackosx branch)
+\fs50 \cf0 \
 \pard\ri0\ql\qnatural
 
-\fs26 \cf0 \
+\fs22 \cf0 \
+\
+\
 \pard\ri0\qc
 
-\fs50 \cf2 %CHAMELEONSTAGE%\
+\fs28 \cf2 Do not install to an Apple Macintosh computer\
 \pard\ri0\qc
 
-\fs28 \cf3 (Beta test installer - blackosx branch)
 \fs26 \cf0 \
+\
 \pard\ri0\ql\qnatural
 \cf0 \
-Developers : %DEVELOP%\
-\
-Thanks to : %CREDITS%\
+\pard\ri0\ql\qnatural
+
+\fs24 \cf0 Developers : 
+\fs20 %DEVELOP%
+\fs24 \
+
+\fs18 \
+
+\fs24 Thanks to : 
+\fs20 %CREDITS%
+\fs24 \
 \pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
 
-\b0\fs30 \cf0 \
+\b0\fs18 \cf0 \
 \pard\ri0\ql\qnatural
 
-\b\fs26 \cf0 Packages credits to : %PKGDEV%
+\b\fs24 \cf0 Package : 
+\fs20 %PKGDEV%
 \b0\fs30 \
 \pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\fs26 \cf0 Copyright \'a9 2011}
\ No newline at end of file
+\fs20 \cf0 Copyright \'a9 2011}
\ No newline at end of file
Index: branches/blackosx/package/Resources/en.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/en.lproj/Conclusion.rtfd/TXT.rtf	(revision 1639)
+++ branches/blackosx/package/Resources/en.lproj/Conclusion.rtfd/TXT.rtf	(revision 1640)
@@ -1,47 +1,27 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red65\green78\blue255;\red255\green0\blue9;\red14\green0\blue45;
-\red46\green111\blue253;\red255\green0\blue0;}
-\margl1440\margr1440\vieww11660\viewh12980\viewkind0
-\pard\ri0\qc
+{\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0;
+\red255\green0\blue9;}
+\paperw12240\paperh15840\margl1440\margr1440\vieww10760\viewh7840\viewkind0
+\pard\ri-20\qc
 
-\f0\b\fs72 \cf0 Chameleon
-\fs50 \
-
-\fs26 v%CHAMELEONVERSION% r%CHAMELEONREVISION%
-\fs50 \
-\pard\ri0\qc
-
-\fs28 \cf0 \
-\pard\ri0\qc
-\cf2 %CHAMELEONSTAGE%
-\fs50 \
-\pard\ri0\qc
-
-\fs28 \cf3 (Beta test installer - blackosx branch)
-\fs50 \cf0 \
-\pard\ri0
-
-\fs26 \cf0 \
-\pard\ri0\qc
-
-\fs28 \cf0 The scripts have completed and \cf4 a report named Chameleon_Installer_Log.txt has been generated\
-and saved at the root of your chosen partition.\cf5 \
-\cf6 Please read it to find out if the installation was\
+\f0\b\fs28 \cf0 \
+\
+The scripts have completed and a file\
+ named \cf2 Chameleon_Installer_Log.txt\cf3  has been\
+written to the root of your chosen partition.\
+\
+\cf0 Please \cf4 read it\cf0  to find out if the installation was\
 successful and keep it for a record of what was done.\
+\cf4 \
+\
+\
+\
+\
 
-\b0\fs26 \cf0 \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
+\fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% 
+\fs24 \cf5 (blackosx branch)\
 
-\fs18 \cf0 \
-{\field{\*\fldinst{HYPERLINK "http://chameleon.osx86.hu/"}}{\fldrslt 
-\fs26 http://chameleon.osx86.hu/}}
-\fs26 \
-{\field{\*\fldinst{HYPERLINK "http://forum.voodooprojects.org/index.php"}}{\fldrslt http://forum.voodooprojects.org/index.php}}
-\b \
-\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
-
 \b0\fs30 \cf0 \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs26 \cf0 Copyright \'a9 2011}
\ No newline at end of file
+\fs20 Copyright \'a9 2011}
\ No newline at end of file
Index: branches/blackosx/package/Resources/background.tiff
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/tiff
Index: branches/blackosx/package/buildpkg.sh
===================================================================
--- branches/blackosx/package/buildpkg.sh	(revision 1639)
+++ branches/blackosx/package/buildpkg.sh	(revision 1640)
@@ -3,13 +3,8 @@
 # $1 Path to store built package
 
 packagesidentity="org.chameleon"
-
 packagename="Chameleon"
-
 pkgroot="${0%/*}"
-
-# blackosx to use /usr/local as a place for temporary files
-# taken from http://en.wikipedia.org/wiki/Filesystem_Hierarchy_Standard#cite_note-27
 chamTemp="usr/local/chamTemp"
 
 COL_BLACK="\x1b[30;01m"
@@ -22,7 +17,6 @@
 COL_BLUE="\x1b[34;01m"
 COL_RESET="\x1b[39;49;00m"
 
-#version=$( grep I386BOOT_CHAMELEONVERSION vers.h | awk '{ print $3 }' | tr -d '\"' )
 version=$( cat version )
 stage=${version##*-}
 revision=$( grep I386BOOT_CHAMELEONREVISION vers.h | awk '{ print $3 }' | tr -d '\"' )
@@ -491,8 +485,6 @@
 	if [ "${4}" ]; then
 		local choiceoptions="\t\t${4}"
 	fi
-	#choices[$((choicescount++))]="<choice\n\tid=\"${packagename// /}\"\n\ttitle=\"${packagename}_title\"\n\tdescription=\"${packagename}_description\"\n${choiceoptions}>\n\t<pkg-ref id=\"${identifier}\" installKBytes='${installedsize}' version='${version}.0.0.${timestamp}' auth='root'>#${packagename// /}.pkg</pkg-ref>\n</choice>\n"
-	
 	choices[$((choicescount++))]="\t<choice\n\t\tid=\"${packagename// /}\"\n\t\ttitle=\"${packagename}_title\"\n\t\tdescription=\"${packagename}_description\"\n${choiceoptions}>\n\t\t<pkg-ref id=\"${identifier}\" installKBytes='${installedsize}' version='${version}.0.0.${timestamp}' >#${packagename// /}.pkg</pkg-ref>\n\t</choice>\n"	
 	rm -R -f "${1}"
 fi
@@ -575,5 +567,5 @@
 
 }
 
-main "${1}" "${2}" "${3}" "${4}" "${5}"
+main "${1}" "${2}" "${3}" "${4}" #"${5}"
 
Index: branches/blackosx/Makefile
===================================================================
--- branches/blackosx/Makefile	(revision 1639)
+++ branches/blackosx/Makefile	(revision 1640)
@@ -123,6 +123,7 @@
 
 pkg installer: all
 	${SRCROOT}/package/buildpkg.sh ${SYMROOT}/package;
+	#${SRCROOT}/package/slimpkg.sh ${SYMROOT}/package;
 	@echo "\t[ZIP] ${DISTFILE}.pkg"
 	@ditto -c -k --sequesterRsrc ${DISTFILE}.pkg ${DISTFILE}.zip
 	@rm -r ${DISTFILE}.pkg