Index: trunk/package/Resources/English.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/package/buildpkg.sh
===================================================================
--- trunk/package/buildpkg.sh	(revision 1347)
+++ trunk/package/buildpkg.sh	(revision 1348)
@@ -133,53 +133,17 @@
             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"
             ((xmlindent++))
-            packagesidentity="org.chameleon.module"
+            packagesidentity="org.chameleon.modules"
 # -
-            if [ -e ${1%/*}/i386/modules/AMDGraphicsEnabler.dylib ]; then
-            {
-                mkdir -p ${1}/AMDGraphicsEnabler/Root
-                ditto --noextattr --noqtn ${1%/*}/i386/modules/AMDGraphicsEnabler.dylib ${1}/AMDGraphicsEnabler/Root
-                echo "	[BUILD] AMDGraphicsEnabler "
-                buildpackage "${1}/AMDGraphicsEnabler" "/Extra/modules" "" "start_selected=\"false\"" >/dev/null 2>&1
-            }
-            fi
-# -
-            if [ -e ${1%/*}/i386/modules/ATiGraphicsEnabler.dylib ]; then
-            {
-                mkdir -p ${1}/ATiGraphicsEnabler/Root
-                ditto --noextattr --noqtn ${1%/*}/i386/modules/ATiGraphicsEnabler.dylib ${1}/ATiGraphicsEnabler/Root
-                echo "	[BUILD] ATiGraphicsEnabler "
-                buildpackage "${1}/ATiGraphicsEnabler" "/Extra/modules" "" "start_selected=\"false\"" >/dev/null 2>&1
-            }
-            fi
-# -
-            if [ -e ${1%/*}/i386/modules/IntelGraphicsEnabler.dylib ]; then
-            {
-                mkdir -p ${1}/IntelGraphicsEnabler/Root
-                ditto --noextattr --noqtn ${1%/*}/i386/modules/IntelGraphicsEnabler.dylib ${1}/IntelGraphicsEnabler/Root
-                echo "	[BUILD] IntelGraphicsEnabler "
-                buildpackage "${1}/IntelGraphicsEnabler" "/Extra/modules" "" "start_selected=\"false\"" >/dev/null 2>&1
-            }
-            fi
-# -
             if [ -e ${1%/*}/i386/modules/klibc.dylib ]; then
             {
                 mkdir -p ${1}/klibc/Root
                 ditto --noextattr --noqtn ${1%/*}/i386/modules/klibc.dylib ${1}/klibc/Root
                 echo "	[BUILD] klibc "
-                buildpackage "${1}/klibc" "/Extra/modules" "" "start_selected=\"false\"" >/dev/null 2>&1
+                buildpackage "${1}/klibc" "/Extra/modules" "" "start_selected=\"true\"" >/dev/null 2>&1
             }
             fi
 # -
-            if [ -e ${1%/*}/i386/modules/NVIDIAGraphicsEnabler.dylib ]; then
-            {
-                mkdir -p ${1}/NVIDIAGraphicsEnabler/Root
-                ditto --noextattr --noqtn ${1%/*}/i386/modules/NVIDIAGraphicsEnabler.dylib ${1}/NVIDIAGraphicsEnabler/Root
-                echo "	[BUILD] NVIDIAGraphicsEnabler "
-                buildpackage "${1}/NVIDIAGraphicsEnabler" "/Extra/modules" "" "start_selected=\"false\"" >/dev/null 2>&1
-            }
-            fi
-# -
             if [ -e ${1%/*}/i386/modules/Resolution.dylib ]; then
             {
                 mkdir -p ${1}/AutoReso/Root
@@ -195,7 +159,7 @@
                 ditto --noextattr --noqtn ${1%/*}/i386/modules/uClibcxx.dylib ${1}/uClibc/Root
                 ditto --noextattr --noqtn ${1%/*}/i386/modules/klibc.dylib ${1}/uClibc/Root
                 echo "	[BUILD] uClibc++ "
-                buildpackage "${1}/uClibc" "/Extra/modules" "" "start_selected=\"false\"" >/dev/null 2>&1
+                buildpackage "${1}/uClibc" "/Extra/modules" "" "start_selected=\"true\"" >/dev/null 2>&1
             }
             fi
             ((xmlindent--))
@@ -216,13 +180,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"
+	packagesidentity="org.chameleon.extras"
 
 	# 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.utility.com"
+		packagesidentity="org.chameleon.utilities"
 
 		# build package for Chameleon PrefPanel
 			mkdir -p "${1}/PrefPanel/Root"
@@ -258,7 +222,7 @@
 		((xmlindent++))
 
 		# build base options packages
-		packagesidentity="org.chameleon.options.com"
+		packagesidentity="org.chameleon.options"
 		
 		options=($( find "${pkgroot}/Scripts/BaseOptions" -type d -depth 1 -not -name '.svn' ))
 		for (( i = 0 ; i < ${#options[@]} ; i++ )) 
@@ -276,7 +240,7 @@
 			outline[$((outlinecount++))]="${indent[$xmlindent]}\t<line choice=\"Resolution\">"
 			choices[$((choicescount++))]="<choice\n\tid=\"Resolution\"\n\ttitle=\"Resolution_title\"\n\tdescription=\"Resolution_description\"\n>\n</choice>\n"
 			((xmlindent++))
-			packagesidentity="org.chameleon.resolution"
+			packagesidentity="org.chameleon.options.resolution"
 			resolutions=($( find "${pkgroot}/Scripts/Resolutions" -type d -depth 1 -not -name '.svn' ))
 			for (( i = 0 ; i < ${#resolutions[@]} ; i++ )) 
 			do
@@ -297,7 +261,7 @@
 			choices[$((choicescount++))]="<choice\n\tid=\"Advanced\"\n\ttitle=\"Advanced_title\"\n\tdescription=\"Advanced_description\"\n>\n</choice>\n"
 			((xmlindent++))
 
-			packagesidentity="org.chameleon.advanced.options.pkg"
+			packagesidentity="org.chameleon.options.advanced"
 			optionsadv=($( find "${pkgroot}/Scripts/Advanced" -type d -depth 1 -not -name '.svn' ))
 			for (( i = 0 ; i < ${#optionsadv[@]} ; i++ )) 
 			do
@@ -322,7 +286,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.pkg"
+		packagesidentity="org.chameleon.themes"
 		artwork="${1%/*}"
 		themes=($( find "${artwork%/*}/artwork/themes" -type d -depth 1 -not -name '.svn' ))
 		for (( i = 0 ; i < ${#themes[@]} ; i++ ))