Index: branches/iFabio/Chameleon/i386/boot2/Makefile
===================================================================
--- branches/iFabio/Chameleon/i386/boot2/Makefile	(revision 274)
+++ branches/iFabio/Chameleon/i386/boot2/Makefile	(revision 275)
@@ -131,7 +131,7 @@
 	    exit 1;\
 	  fi)
 
-	
+
 embed_symbols: machOconv
 	@echo ================= Embedding Symbols.dylib =================
 	@echo "\t[MACHOCONV] boot"
@@ -142,8 +142,8 @@
 	@echo "\t[MACHOCONV] boot"
 	@$(SYMROOT)/machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot
 
-	
 
+
 prompt.o: vers.h
 vers.h:
 	@echo "#define I386BOOT_VERSION \"5.0.132\"" > $(SYMROOT)/vers.h
Index: branches/iFabio/Chameleon/package/buildpkg
===================================================================
--- branches/iFabio/Chameleon/package/buildpkg	(revision 274)
+++ branches/iFabio/Chameleon/package/buildpkg	(revision 275)
@@ -48,7 +48,7 @@
 # build core package
 	echo "================= core ================="
 	((xmlindent++))
-	packagesidentity="org.chameleon"
+	packagesidentity="org.chameleon.core.pkg"
 	mkdir -p ${1}/Core/Root/usr/sbin
 	mkdir -p ${1}/Core/Root/usr/standalone/i386
 	cp -f ${1%/*}/i386/boot ${1}/Core/Root/usr/standalone/i386
@@ -96,6 +96,44 @@
 		buildpackage "${1}/noboot" "/tmpcham" "" "start_visible=\"true\" start_selected=\"false\" selected=\"exclusive(choices['Standard']) && exclusive(choices['EFI'])\"" >/dev/null 2>&1
 	# End build reset choice package 
 
+	# build Modules package
+		outline[$((outlinecount++))]="${indent[$xmlindent]}\t<line choice=\"Modules\">"
+		choices[$((choicescount++))]="<choice\n\tid=\"Modules\"\n\ttitle=\"Modules_title\"\n\tdescription=\"Modules_description\"\n>\n</choice>\n"
+		((xmlindent++))
+		packagesidentity="org.chameleon.modules.pkg"
+
+		# build Module-One
+			mkdir -p ${1}/Module-One/Root
+			# mkdir -p ${1}/Module-One/Scripts/Tools
+			# cp -f ${pkgroot}/Scripts/Module-One/* ${1}/Module-n/Scripts
+			# ditto --arch i386 `which SetFile` ${1}/Module-One/Scripts/Tools/SetFile
+			echo "	[BUILD] Modules-One "
+			buildpackage "${1}/Module-one" "/Extra/modules" "${coresize}" "" "start_selected=\"false\"" >/dev/null 2>&1
+		# End build Module-One
+
+		# build Module-Two
+			mkdir -p ${1}/Module-Two/Root
+			# mkdir -p ${1}/Module-Two/Scripts/Tools
+			# cp -f ${pkgroot}/Scripts/Module-Two/* ${1}/Module-n/Scripts
+			# ditto --arch i386 `which SetFile` ${1}/Module-Two/Scripts/Tools/SetFile
+			echo "	[BUILD] Modules-Two "
+			buildpackage "${1}/Module-Two" "/Extra/modules" "${coresize}" "" "start_selected=\"false\"" >/dev/null 2>&1
+		# End build Module-Two
+
+		# build Module-n
+			mkdir -p ${1}/Module-n/Root
+			# mkdir -p ${1}/Module-n/Scripts/Tools
+			# cp -f ${pkgroot}/Scripts/Module-n/* ${1}/Module-n/Scripts
+			# ditto --arch i386 `which SetFile` ${1}/Module-n/Scripts/Tools/SetFile
+			echo "	[BUILD] Modules-n "
+			buildpackage "${1}/Module-n" "/Extra/modules" "${coresize}" "" "start_selected=\"false\"" >/dev/null 2>&1
+		# End build Module-n
+
+		((xmlindent--))
+		outline[$((outlinecount++))]="${indent[$xmlindent]}\t</line>"
+	# End utility package
+	# End build Modules package 
+
 	((xmlindent--))
 	outline[$((outlinecount++))]="${indent[$xmlindent]}\t</line>"
 # End build Chameleon package
@@ -105,12 +143,13 @@
 	outline[$((outlinecount++))]="${indent[$xmlindent]}\t<line choice=\"Extras\">"
 	choices[$((choicescount++))]="<choice\n\tid=\"Extras\"\n\ttitle=\"Extras_title\"\n\tdescription=\"Extras_description\"\n>\n</choice>\n"
 	((xmlindent++))
+	packagesidentity="org.chameleon.extras.com"
 
 	# build utility package
 		outline[$((outlinecount++))]="${indent[$xmlindent]}\t<line choice=\"Utility\">"
 		choices[$((choicescount++))]="<choice\n\tid=\"Utility\"\n\ttitle=\"Utility_title\"\n\tdescription=\"Utility_description\"\n>\n</choice>\n"
 		((xmlindent++))
-		packagesidentity="org.chameleon"
+		packagesidentity="org.chameleon.utility.com"
 
 		# build package for Chameleon PrefPanel
 			mkdir -p "${1}/PrefPanel/Root/"
@@ -153,7 +192,7 @@
 		((xmlindent++))
 
 		# build base options packages
-		packagesidentity="org.chameleon"
+		packagesidentity="org.chameleon.options.com"
 		
 		options=($( find "${pkgroot}/Scripts/BaseOptions" -type d -depth 1 -not -name '.svn' ))
 		for (( i = 0 ; i < ${#options[@]} ; i++ )) 
@@ -192,7 +231,7 @@
 			choices[$((choicescount++))]="<choice\n\tid=\"Advanced\"\n\ttitle=\"Advanced_title\"\n\tdescription=\"Advanced_description\"\n>\n</choice>\n"
 			((xmlindent++))
 
-			packagesidentity="org.chameleon"
+			packagesidentity="org.chameleon.advanced.options.pkg"
 			optionsadv=($( find "${pkgroot}/Scripts/Advanced" -type d -depth 1 -not -name '.svn' ))
 			for (( i = 0 ; i < ${#optionsadv[@]} ; i++ )) 
 			do
@@ -217,7 +256,7 @@
 		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++))
-		packagesidentity="org.chameleon.theme"
+		packagesidentity="org.chameleon.theme.pkg"
 		artwork="${1%/*}"
 		themes=($( find "${artwork%/*}/artwork/themes" -type d -depth 1 -not -name '.svn' ))
 		for (( i = 0 ; i < ${#themes[@]} ; i++ )) 
@@ -241,7 +280,7 @@
 		outline[$((outlinecount++))]="${indent[$xmlindent]}\t<line choice=\"Kexts\">"
 		choices[$((choicescount++))]="<choice\n\tid=\"Kexts\"\n\ttitle=\"Kexts_title\"\n\tdescription=\"Kexts_description\"\n>\n</choice>\n"
 		((xmlindent++))
-		packagesidentity="org.chameleon"
+		packagesidentity="org.chameleon.kext.pkg"
 		kexts=($( find "${pkgroot}/Kexts" -type d -name '*.kext' -depth 1 ))
 		for (( i = 0 ; i < ${#kexts[@]} ; i++ )) 
 		do