Index: trunk/ChameleonPrefPane/Sources/process.cpp
===================================================================
--- trunk/ChameleonPrefPane/Sources/process.cpp	(revision 46)
+++ trunk/ChameleonPrefPane/Sources/process.cpp	(revision 47)
@@ -1,200 +0,0 @@
-/*
- *  shell_process.cpp
- *
- *  Created by Rekursor on 1/17/2010.
- *
- */
-
-#include "process.h"
-#include <string.h>
-#include <sys/stat.h>
-#include <string_util.h>
-
-
-//----------------------------------------------------------------
-// portable open process:
-FILE * ShellProcess::open(const char *cmd, const char *mode) {
-	_fpt=::popen(cmd,mode);
-	return _fpt;
-}
-
-//----------------------------------------------------------------
-int ShellProcess::close() {
-	int ret = ::pclose(_fpt);
-	_fpt=NULL;
-	return ret;
-}
-
-//----------------------------------------------------------------
-void PartitionInfo::removeSpaces(std::string &str)
-{
-	if (!str.size()) return;
-	int posl=0,posr=0;
-	for (posl=0; posl<str.size()-1 && str[posl]==' '; posl++);
-	for (posr=str.size()-1; posr>0 && str[posr]==' '; posr--);
-	str = (posl>posr) ? "" : str.substr(posl, posr-posl+1);
-}
-//----------------------------------------------------------------
-/**
- * 	return the image index corresponding to a fs:
- */
-int PartitionInfo::imageIndexFromFs() const
-{
-	if (_fsType.find("Apple")!=std::string::npos ||
-		_fsType.find("HFS")!=std::string::npos)
-		return 0; // Windows
-	else if (_fsType.find("Windows")!=std::string::npos ||
-			 _fsType.find("Microsoft")!=std::string::npos ||
-			 _fsType.find("NTFS")!=std::string::npos ||
-			 _fsType.find("FAT")!=std::string::npos)
-		return 1; // Windows
-	else if (_fsType.find("Linux")!=std::string::npos)
-		return 2; // Unknown
-	return 10; //Unknown
-	
-}
-//----------------------------------------------------------------
-bool PartitionInfo::fromPartitionHdString(const char * inHdStr)
-{
-	if (!inHdStr || !(*inHdStr) || 
-		strlen(inHdStr)<7 || !strstr(inHdStr,"hd(")) return false;
-	
-	// enhance me here: should not assume that we have less than 10 partitions per disk/ disks
-	_disk = inHdStr[3]-'0'; 
-	_part = inHdStr[5]-'0';
-	return true;
-}
-//----------------------------------------------------------------
-const char * PartitionExtractor::checkForRename(const char * label, const char *szHd)
-{
-	const int MAX_ALIAS_SIZE=31;
-	static char szAlias[MAX_ALIAS_SIZE+1];
-	char *q=szAlias;
-	const char* szAliases = _renamedParts.c_str();
-	
-	if (!szHd || !*szHd || !szAliases || !*szAliases) return label; // no renaming wanted
-	
-	const char * p = strstr(szAliases, szHd);
-	if(!p || !(*p)) return label; // this volume must not be renamed, or option is malformed
-	
-	p+= strlen(szHd); // skip the "hd(n,m) " field
-	// multiple aliases can be found separated by a semi-column
-	while(*p && *p != ';' && q<(szAlias+MAX_ALIAS_SIZE)) *q++=*p++;
-	*q='\0';
-	
-	return szAlias;
-	
-}
-//----------------------------------------------------------------
-const std::vector<PartitionInfo>& 
-PartitionExtractor::extractPartitions(const char* szHide, const char* szRenamed)
-{
-	const char * const diskTag = "/dev/disk";
-	const char * const nameTag = "NAME";
-	const char * const sizeTag = "SIZE";
-
-	PartitionInfo partInfo;
-
-	char line[1024]="";
-	char label[32]="", fsType[32]="" ;
-	size_t len=0;
-	int disk =0, part=0;
-	int label_pos=0, size_pos=0;
-	char * p=0,*q=0;
-	int skipwhite=0;
-	
-	_partList.clear();
-	if (szHide) hidePartitions(szHide);
-	if (szRenamed) renamedPartitions(szRenamed);
-	this->open("diskutil list");
-	
-	while(get_line(line, sizeof(line)-1))
-	{
-		// printf("%s\n",line);
-		len = strlen(line);
-		for(skipwhite=0; line[skipwhite]==' ';skipwhite++);
-		
-		const char * sdisk = strstr(line, diskTag);
-		const char * sName = strstr(line, nameTag);
-		const char * sSize = strstr(line, sizeTag);
-		
-		if (sdisk)
-		{
-			// extract disk number
-			disk= sdisk[strlen(diskTag)]-'0';
-			if (disk>=0 && disk <MAX_HD)
-				disk = _hdRedirTable[disk];
-		}
-		else if (len && line[skipwhite]=='#' && line[skipwhite+1]==':')
-		{
-			label_pos = sName ? (sName - line) : 0;
-			size_pos = sSize ? (sSize - line) : 0;
-		}
-		else if (len && line[skipwhite+1]==':' && isdigit(line[skipwhite]))
-		{
-			for (p=&line[skipwhite+2], q=fsType; *p && p < &line[label_pos-1]; p++,q++) *q=*p;
-			for (p=&line[label_pos], q=label; *p && p < &line[size_pos]; p++,q++) *q=*p;
-			
-			*q='\0';
-			part = line[skipwhite]-'0';
-			partInfo.fsType(fsType);
-			partInfo.disk(disk);
-			partInfo.partition(part);
-			partInfo.label(checkForRename(label, partInfo.toHdStr().c_str()));
-			size_t len = partInfo.label().length();
-			// filter useless partitions:
-			if ( len > 0 && 
-				partInfo.clabel()[len-1] !='*' && 
-				partInfo.fsType()!="EFI" &&
-				partInfo.fsType()!="Apple_partition_scheme" &&
-				partInfo.fsType()!="Apple_partition_map" &&
-				partInfo.fsType()!="Apple_Free" 
-				)
-			{
-				std::string DiskLabel(label), UnixPath, WinPath; 
-				DiskLabel.erase( DiskLabel.find_last_not_of(" ") + 1);
-				bool found=false;
-				
-				// early bail out if we found what we need:
-				if (fileExists((UnixPath = "/Volumes/" + DiskLabel + "/usr/bin/man"))) 
-					found=true;
-				else if ((strstr(label,"System Reserved") ) || // don't filter system reserved windows 7 boot parts
-						 fileExists((WinPath="/Volumes/" + DiskLabel + "/Windows/system.ini")))
-					found=true;
-				else if (strstr(fsType,"Linux") && !strstr(fsType, "Linux_Swap"))
-					found=true; // Added Linux case
-				if (found)
-				{ //check if one of them exists
-					if (partInfo.label().size()==0) partInfo.label("Untitled");
-					if(_hiddenParts.length()==0 || 
-					   _hiddenParts.find(partInfo.toHdStr()) == std::string::npos)
-						_partList.push_back(partInfo);
-				}
-			}
-		}
-	}
-	close();
-	
-	sort(_partList.begin(), _partList.end(), isDiskIndexInf);
-	return _partList;
-}
-
-/** 
- * Get the index in the internal partlist of the hd(n,m) partition specified by the input string
- * return -1 if no match, >=0 if a match happens
- */
-int PartitionExtractor::getIndexFromHdStringSpec(const char* inHDStr)
-{	
-	PartitionInfo info;
-	
-	if (info.fromPartitionHdString(inHDStr)) // try decode the partition disk and part infos
-	{
-		for (int i=0; i<_partList.size(); i++)
-		{
-			if (_partList[i].disk() == info.disk() && _partList[i].partition() == info.partition())
-				return i;
-		}
-	}
-	
-	return -1;
-}
Index: trunk/ChameleonPrefPane/Sources/property_list.cpp
===================================================================
--- trunk/ChameleonPrefPane/Sources/property_list.cpp	(revision 46)
+++ trunk/ChameleonPrefPane/Sources/property_list.cpp	(revision 47)
@@ -1,343 +0,0 @@
-/*
- *  property_list.cpp
- *
- *  Created by Rekursor on 1/17/10.
- *
- */
-
-#include "property_list.h"
-#include <string.h>
-#include <sys/stat.h>
-
-/****************************************************************************/
-/**
- * Simple parsing and splitting args function, does handle env. vars 
- */
-static void parseArgs(const char * args, const char* argv[], int argvlen)
-{
-	// Create a list of args fron the space delimited args parameters
-	int n=0;
-	if (args && *args) 
-	{
-		bool skipSpaces = true;
-		bool prevCharwasDelim =false;
-		char * buf = strdup(args);
-		char lastPriorityDelim=' ';
-		
-		printf("Parsing <%s>\n", args);
-		
-		int k=0;
-		for (int i=0; i< strlen(args); i++)
-		{
-			switch (args[i]) 
-			{
-				case ' ': case '\t':
-					if(!skipSpaces) {
-						buf[k++]=args[i];
-					}
-					else {
-						prevCharwasDelim = true; // // keep a track of delim to further split tokens
-					}
-					break;
-				case '\0':
-				case '\'': 
-				case '"': 
-					if (!skipSpaces &&lastPriorityDelim!=args[i])
-					{ // consider the imbricated delim as a simple char
-						buf[k++]=args[i];
-						break;
-					}
-					
-					if (!skipSpaces) // end of priority substr
-					{
-						skipSpaces = true;
-						lastPriorityDelim=' ';
-						buf[k]='\0'; 
-						argv[n++]=strdup(buf); // copy the priority substr
-						k=0; // reset the buf index for next token
-						buf[0]='\0';
-					}
-					else
-					{ // start of priority substr
-						skipSpaces=false;
-						lastPriorityDelim=args[i];
-						if(k>0) // previous string to store first
-						{
-							buf[k++]='\0'; // finish the substr
-							argv[n++]=strdup(buf); // copy the substr
-							k=0; // rest the index for next token
-							buf[0]='\0';
-						}
-						//if (args[i] !='\0') buf[k++] = args[i]; // start the new priority substr
-					}
-					break;
-				default: // non delimiters chars
-					if(skipSpaces && prevCharwasDelim)
-					{
-						if(k>0) // a previous substr was before the space
-						{ // store previous token
-							buf[k++]='\0'; // finish the substr
-							argv[n++]=strdup(buf); // copy the substr
-							k=0; // rest the index for next token
-							buf[0]='\0';
-						}
-					}
-					prevCharwasDelim = false;
-					buf[k++]=args[i];
-					break;
-			}
-		}
-		
-		if(*buf) 
-		{
-			buf[k]='\0';
-			argv[n++]=strdup(buf); // copy the last buffer	
-		}
-		free((void*) buf);
-	}
-	argv[n]=NULL;
-}
-
-/****************************************************************************/
- bool executePrivilegedCmd(AuthorizationRef auth, 
-								 const char* pathToTool, 
-								 const char* args, 
-								 AuthorizationFlags flags)
-{
-	const char * argv[16];
-
-	parseArgs(args, argv, sizeof(argv)/sizeof(const char*));
-
-	// Execute Cmd
-	OSStatus status = AuthorizationExecuteWithPrivileges(auth, pathToTool,flags, (char**)argv, NULL);
-	
-	
-	// Cleanup mem
-	for (int i=0; argv[i]; i++) free ((void*) argv[i]);
-
-    return status ? false : true;
-}
-
-
-/****************************************************************************/
-/**
- * Write a property list from a file
- */
-bool WritePropertyListToFile( CFPropertyListRef propertyList, CFURLRef fileURL )
-{
-	CFDataRef xmlData;
-	Boolean status;
-	SInt32 errorCode;
-	
-	// Convert the property list into XML data.
-	xmlData = CFPropertyListCreateXMLData( kCFAllocatorDefault, propertyList );
-	
-	// Write the XML data to the file.
-	status = CFURLWriteDataAndPropertiesToResource (
-													fileURL,                  // URL to use
-													xmlData,                  // data to write
-													NULL,
-													&errorCode);
-	CFRelease(xmlData);
-	
-	return status ? true: false;
-}
-
-/****************************************************************************/
-/**
- * Read a property list from a file
- */
-static CFPropertyListRef CreatePropertyListFromFile( CFURLRef fileURL, CFStringRef * errorString ) {
-	CFPropertyListRef propertyList;
-	CFDataRef         resourceData;
-	Boolean           status;
-	SInt32            errorCode;
-	
-	// Read the XML file.
-	status = CFURLCreateDataAndPropertiesFromResource(
-													  kCFAllocatorDefault,
-													  fileURL,
-													  &resourceData,            // place to put file data
-													  NULL,
-													  NULL,
-													  &errorCode);
-	if (!status) return NULL;
-	
-	// Reconstitute the dictionary using the XML data.
-	propertyList = CFPropertyListCreateFromXMLData( kCFAllocatorDefault,
-												   resourceData,
-												   kCFPropertyListMutableContainersAndLeaves,
-												   errorString);
-
-						
-	CFRelease( resourceData );
-	return propertyList;
-}
-
-/****************************************************************************/
-static void show(CFStringRef formatString, ...) {
-    CFStringRef resultString;
-    CFDataRef data;
-    va_list argList;
-	
-    va_start(argList, formatString);
-    resultString = CFStringCreateWithFormatAndArguments(NULL, NULL, formatString, argList);
-    va_end(argList);
-	
-    data = CFStringCreateExternalRepresentation(NULL, resultString, CFStringGetSystemEncoding(), '?');
-	
-    if (data != NULL) {
-        printf ("%.*s\n\n", (int)CFDataGetLength(data), CFDataGetBytePtr(data));
-        CFRelease(data);
-    }
-	
-    CFRelease(resultString);
-}
-/****************************************************************************/
-/*
- * Always return a valid static const string, if the CFSTR is not valid, then we return ""
- */
-static const char * CfsToCs(CFStringRef inRef)
-{
-	static char buffer[512]="";
-	if(CFStringGetFileSystemRepresentation (inRef, buffer, sizeof(buffer)))
-	   return buffer;
-	return "";
-}
-	
-/****************************************************************************/
-/**
- * Creates a PropertyList Incstance
- */
-PropertyList::~PropertyList()
-{
-	if (_CFURLRef) CFRelease(_CFURLRef);
-	if (_proplistRef) CFRelease(_proplistRef);
-
-}
-bool PropertyList::chmodFile(const char * path, const char * chmodMask,
-									 AuthorizationRef auth, AuthorizationFlags flags)
-{
-	if (!path || !*path) return false;
-	
-	if (auth)
-	{ // give write temporary write rights to the file
-		std::string args = chmodMask;
-		args += ' ';
-		args += path;
-		if(!executePrivilegedCmd(auth, "/bin/chmod", args.c_str(), flags))	
-			return false;
-	}
-	return true;
-	
-}
-
-/****************************************************************************/
-/**
- * Open a properlist from a path name
- */
-bool PropertyList::open(const char * path, CFStringRef * errorString, AuthorizationRef auth, AuthorizationFlags flags)
-{
-	bool ret = false;
-	
-	if (!path || !*path) return false;
-	struct stat st;
-	if(stat(path,&st) != 0) return false; // file does not exist;
-
-	// give write temporary write rights to the file
-	if (!chmodFile(path,"0777", auth, flags)) return false;
-
-	_propFilePath = path;
-
-	CFStringRef cfPath = CFStringCreateWithCString (kCFAllocatorDefault, path, kCFStringEncodingUTF8);
-	CFURLRef inURL = CFURLCreateWithFileSystemPath( kCFAllocatorDefault,
-											cfPath, 
-											kCFURLPOSIXPathStyle,    // interpret as POSIX path
-											false );                 // is it a directory?
-	CFRelease(cfPath);
-	if (_CFURLRef) CFRelease(_CFURLRef);
-	_CFURLRef = inURL;
-	
-	if (_CFURLRef) 
-	{
-		_proplistRef = CreatePropertyListFromFile(inURL, errorString);
-		
-		if (_proplistRef) 
-			ret= true;
-	}
-	// restore rights
-	ret= chmodFile(path,"0644", auth, flags);
-	
-	return ret;
-}
-
-/****************************************************************************/
-/**
- * Save the current property list
- */
-bool PropertyList::save(AuthorizationRef auth, AuthorizationFlags flags)
-{
-	bool ret=false;
-	if (auth)
-	{ // give write temporary write rights to the file
-		std::string args = " 0777 "+ _propFilePath;
-		if(!executePrivilegedCmd(auth, "/bin/chmod", args.c_str(), flags))
-			return false;
-	}
-	if (_proplistRef && _CFURLRef) 
-		ret= WritePropertyListToFile(_proplistRef,_CFURLRef);
-	if (auth)
-	{ // give write temporary write rights to the file
-		std::string args = " 0644 "+ _propFilePath;
-		if(!executePrivilegedCmd(auth, "/bin/chmod", args.c_str(), flags))
-			return false;
-	}
-	return ret;
-}
-
-/****************************************************************************/
-/**
- * Extract a sring value from a property list key, 
- * value returned is not owned by caller, copy it necessary.
- */
-const char * PropertyList::getStringForKey(const char *key)
-{
-	if (!_proplistRef) 	return 0;
-	CFDictionaryRef myDict = 
-	(CFGetTypeID(_proplistRef) == CFDictionaryGetTypeID()) ? (CFDictionaryRef) _proplistRef : NULL;
-	CFStringRef cfKey = CFStringCreateWithCString (kCFAllocatorDefault, key, kCFStringEncodingUTF8);
-	CFStringRef myString;
-	
-	if (myDict && CFDictionaryGetValueIfPresent(myDict, cfKey, (const void **) &myString))
-	{
-		// show(CFSTR("Key  '%@' found , value = <%@>\n"), cfKey, !myString ? CFSTR("") : myString);
-		CFRelease(cfKey);
-		return CfsToCs(myString);
-	}
-	
-	if(cfKey) CFRelease(cfKey);
-	return NULL;
-}
-/****************************************************************************/
-/**
- * replace a sring value from a property list key, 
- * value returned is not owned by caller, copy it necessary.
- */
-bool PropertyList::setStringForKey(const char *key, const char * value)
-{
-	if (!_proplistRef) 	return false;
-	bool ret = false;
-	CFMutableDictionaryRef myDict = 
-	(CFGetTypeID(_proplistRef) == CFDictionaryGetTypeID()) ? (CFMutableDictionaryRef) _proplistRef : NULL;
-	CFStringRef cfKey = CFStringCreateWithCString (kCFAllocatorDefault, key, kCFStringEncodingUTF8);
-	CFStringRef myString = CFStringCreateWithCString (kCFAllocatorDefault, value, kCFStringEncodingUTF8);
-	
-	if (myDict) {
-		CFDictionaryReplaceValue(myDict, cfKey, myString);
-		ret=true;	
-	} 
-	if(cfKey) CFRelease(cfKey);
-	if(myString) CFRelease(myString);
-	return ret;
-}
-
Index: trunk/ChameleonPrefPane/Sources/process.h
===================================================================
--- trunk/ChameleonPrefPane/Sources/process.h	(revision 46)
+++ trunk/ChameleonPrefPane/Sources/process.h	(revision 47)
@@ -1,143 +0,0 @@
-/*
- *  shell_process.h
- *
- *  Created by Rekursor on 1/17/2010.
- *
- */
-#include <Security/Authorization.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <vector>
-#include <string>
-
-//----------------------------------------------------------------
-const int MAX_HD = 10;
-
-//----------------------------------------------------------------
-
-/**
- *  Check whether file exists:
- */
-inline bool fileExists(const char * str) 
-{ 
-	struct stat stFileInfo; 
-	if((stat(str,&stFileInfo)) == 0)  return true; 
-	else return false;
-}
-
-inline bool fileExists(std::string str) {return fileExists(str.c_str());}
-
-//----------------------------------------------------------------
-class ShellProcess 
-{
-public:
-	// construction / destruction
-	ShellProcess() {_fpt= NULL;}
-	~ShellProcess() {if (_fpt) close();}
-	
-	FILE * open	(const char *cmd, const char *mode="r");
-	int  close();
-	FILE * desc() const { return _fpt;} // non null if file is open
-	char * get_line(char * line, size_t s) const {return _fpt ? fgets(line, s, _fpt) : NULL;}
-	
-protected:
-	FILE * _fpt;
-};
-
-//----------------------------------------------------------------
-class PartitionInfo
-{
-public:
-	PartitionInfo() : _disk(0), _part(0) {}
-	PartitionInfo(int disk, int part) {	set(disk, part);}
-	
-	void disk(int disk) { _disk=disk;}
-	int disk() const { return _disk;}
-	
-	void partition(int part) { _part=part;}
-	int partition () const { return _part;}
-	
-	const char * clabel() const { return _label.c_str();}
-	const std::string& label() const { return _label;	}
-	void label(const char * l) { 
-		if (l) _label = l; 
-		removeSpaces(_label);
-	}
-
-	const char * cfsType() const { return _fsType.c_str();}
-	const std::string& fsType() const { return _fsType;}
-	void fsType(const char * fs) { 
-		if (fs) _fsType = fs; 
-		removeSpaces(_fsType);
-	}
-		
-	void set(int disk, int part) { _disk =disk; _part = part;}
-	bool fromPartitionHdString(const char * inHdStr);
-	std::string toHdStr() const 
-	{
-		std::string buf = "hd(n,m)";
-		buf[3]= '0'+disk();
-		buf[5]='0'+partition();
-		return buf;
-	}
-	int imageIndexFromFs() const;
-protected:
-	void removeSpaces(std::string & s);
-
-private:
-	int _disk, _part;
-	std::string _fsType, _label;
-};
-
-static inline bool isDiskIndexInf(PartitionInfo i, PartitionInfo j) 
-{ 
-	return ((i.disk()*100+i.partition()) < (j.disk()*100 + j.partition()) ) ;
-}
-
-//----------------------------------------------------------------
-class PartitionExtractor : public ShellProcess
-{
-public:
-	PartitionExtractor() :	ShellProcess() 	{ init(); }
-	
-	const std::vector<PartitionInfo>& extractPartitions(
-														const char* szHide=NULL,
-														const char* szRenamed=NULL);
-	int getListCount() const {return (int) _partList.size();}
-	
-	const std::vector<PartitionInfo>& partList() const {return _partList;}
-	std::vector<PartitionInfo>& editPartList() {return _partList;}
-	
-	// get the index in the internal partlist of the hd(n,m) partition specified by the input string
-	// return -1 if no match, >=0 if a match happens
-	int getIndexFromHdStringSpec(const char*); 
-	
-	void hidePartitions(const char* szParts){ _hiddenParts = (szParts ? szParts : "");}
-	void renamedPartitions(const char* szParts){ _renamedParts = (szParts ? szParts : "");}
-	void sortPartList() {	sort(_partList.begin(), _partList.end(), isDiskIndexInf);	}
-
-	const char * checkForRename(const char * label, const char* szHd);
-
-	void swapHD(int src, int dst)
-	{
-		if(src < 0 || src > MAX_HD-1 || dst < 0 || dst > MAX_HD-1) return;
-		_hdRedirTable[src]=dst;
-		_hdRedirTable[dst]=src;
-	}
-	
-	void resetSwapping() { init();}
-	
-protected:
-	void init() {
-		for (int i=0; i<MAX_HD; i++) _hdRedirTable[i]=i;
-	}
-	
-private:
-	std::vector<PartitionInfo> _partList;
-	int _hdRedirTable[MAX_HD];
-	std::string _hiddenParts;
-	std::string _renamedParts;
-	
-};
Index: trunk/ChameleonPrefPane/Sources/property_list.h
===================================================================
--- trunk/ChameleonPrefPane/Sources/property_list.h	(revision 46)
+++ trunk/ChameleonPrefPane/Sources/property_list.h	(revision 47)
@@ -1,53 +0,0 @@
-/*
- *  property_list.h
- *
- *  Created by Rekursor on 1/17/10.
- *
- */
-
-#include <CoreFoundation/CFPropertyList.h>
-#include <CoreFoundation/CFURLAccess.h>
-#include <Security/Authorization.h>
-#include <string>
-
-/****************************************************************/
-
-/**
- * priviledged command run for cmds like property chmods and restard command
- */
-bool executePrivilegedCmd(AuthorizationRef auth, 
-						  const char* pathToTool, 
-						  const char* args=NULL, 
-						  AuthorizationFlags flags=kAuthorizationFlagDefaults);
-
-/****************************************************************/
-
-/**
- * Simple PropertyList Abstraction
- */
-class PropertyList
-{
-	
-public:
-	PropertyList() : _proplistRef(0), _CFURLRef(0) {	}
-	virtual ~PropertyList();
-	
-	bool open(const char *propListPath, CFStringRef* errString,
-			  AuthorizationRef auth=NULL, AuthorizationFlags flags=kAuthorizationFlagDefaults);
-	bool save(AuthorizationRef auth=NULL, AuthorizationFlags flags=kAuthorizationFlagDefaults);
-	bool isValid() const { return _proplistRef!=NULL;}
-	
-	const char * getStringForKey(const char *key);
-	bool setStringForKey(const char* key, const char* value);
-	const char * bootConfigPath() const {
-		return _propFilePath.c_str();
-	}
-	
-	static bool chmodFile(const char * path, const char * chmodMask,
-						  AuthorizationRef auth, AuthorizationFlags flags=kAuthorizationFlagDefaults);
-private:
-	CFPropertyListRef _proplistRef;
-	CFURLRef _CFURLRef;
-	std::string _propFilePath; // keep a track of the proplist filename
-};
-
Index: trunk/ChameleonPrefPane/Sources/AdvancedSetupController.h
===================================================================
--- trunk/ChameleonPrefPane/Sources/AdvancedSetupController.h	(revision 46)
+++ trunk/ChameleonPrefPane/Sources/AdvancedSetupController.h	(revision 47)
@@ -45,6 +45,9 @@
 	IBOutlet NSTextField*	mWakeImageText;
 }
 
+- (IBAction) onCheckButtonChange: (NSButton*) sender;
+- (IBAction) onTextFiedChange: (id) sender;
+
 + (AdvancedSetupController *)instance;
 
 @end
Index: trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm	(revision 46)
+++ trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm	(revision 47)
@@ -10,8 +10,8 @@
 #import "PeripheralsController.h"
 #import "AdvancedSetupController.h"
 
-#include <process.h>
-#include <property_list.h>
+#include "ShellProcess.h"
+#import "BootPropertyList.h"
 #include <string>
 
 //--------------------------------------------------------------------------
@@ -29,27 +29,15 @@
 };
 
 static const char* const szPropFileName = "com.apple.Boot.plist";
-static const char* const kDefaultPartition = "Default Partition";
-static const char* const kHidePartition = "Hide Partition";
-static const char* const kRenamePartition = "Rename Partition";
 
-static const NSString* const kPreferencesFilePath =  @"/Library/Preferences/com.chameleon.prefPane.plist";
-static const NSString* const keyPreferencesFileVersion =  @"version"; // for future back compatibility
 static const int CurrentPreferencesFileVersion =  0x01; // for future back compatibility
-static const NSString* const keyForceBootConfigPath =  @"forceBootConfigPath";
-static const NSString* const keySwapHD01 =  @"swapHD01";
-static const NSString* const keySwapHD02 =  @"swapHD02";
-static const NSString* const keyUseFrozenParts =  @"useFrozenParts";
-static const NSString* const keyPartitionsList =  @"partitionsList";
-static const char cPartDescSep = ';'; // partition descriptor separator
-static const char* sPartDescSep = ";"; // cstring version
 //--------------------------------------------------------------------------
 // Static file variables
 //--------------------------------------------------------------------------
 static std::string sCurrentDefaultPartition;
 
-static PartitionExtractor * partExtractor=NULL;
-static PropertyList * prop = NULL;
+PartitionExtractor * partExtractor=NULL;
+BootPropertyList * prop = NULL;
 static int currentRowSel = -1;
 static ChameleonPrefPane *gInstance = NULL;
 
@@ -73,16 +61,80 @@
 	mUnknownImage = [self getImageResource: @"Chameleon" ofType: @"tiff"];
 	
 	
+	// create the propertylist object that will handle com.apple.Boot.plist
+	if(!prop) prop = new BootPropertyList();
+	
+	// create the process that will extract the diskutil list infos
+	if(!partExtractor) partExtractor = new PartitionExtractor();
+	
 	// Retrieve the com.chameleon.prefPane.plist config
 	return self;
 }
 
-- (NSMutableDictionary*) getPreferencesFile
+- (NSMutableDictionary*) preferencesFile {	return mOptionsDict; }
+- (NSMutableDictionary*) preferencesParts {	return mPartitionsDict; }
+- (NSTableView*) partitionsTable { return mPartitionsTable;}
+
+//--------------------------------------------------------------------------
+-(bool) savePreferences: (NSDictionary*) dict
 {
-	return mOptionsDict;
+	std::string sPath = [kPreferencesFilePath UTF8String];
+	
+	if(dict==nil || sPath.length()==0) return false;
+	
+	AuthorizationRef auth = [self isUnlocked] ? [[authView authorization] authorizationRef] : NULL;
+	
+	PropertyList::chmodFile(sPath.c_str(), "0777", auth);
+	[dict writeToFile:kPreferencesFilePath atomically:YES];
+	PropertyList::chmodFile(sPath.c_str(), "0644", auth);
+	return true;
 }
 
 //--------------------------------------------------------------------------
+- (void) loadPreferences
+
+{
+	id oldGlobalPreferences = [ [NSDictionary dictionaryWithContentsOfFile: 
+								 kPreferencesFilePath ] retain];
+	
+	 mPartitionsDict = [[NSMutableDictionary alloc] init];
+	 [mPartitionsDict retain];
+	
+	// Initialize bootConfig desc dict
+	[[BootSetupController instance] addOptionsDesc];
+	[[BootFlagsController instance] addOptionsDesc];
+	[[PeripheralsController instance] addOptionsDesc];
+	[[AdvancedSetupController instance] addOptionsDesc];
+	
+	if (oldGlobalPreferences!=nil)
+	 {
+		 mPreferenceFileVersion= [[oldGlobalPreferences objectForKey: keyPreferencesFileVersion] intValue ];
+		 [PreferencesControllerBase setDefaultValues: oldGlobalPreferences];
+		 [mPartitionsDict addEntriesFromDictionary: [oldGlobalPreferences objectForKey: keyPartitionsList] ];
+	 }
+	 else 
+	 {  // Create a preference plist file with Defaults values
+		 oldGlobalPreferences = [[NSMutableDictionary alloc] init];
+		 [[BootSetupController instance]loadOptionsFromPreferencesFile: oldGlobalPreferences];
+		 [[BootSetupController instance]loadOptionsFromPreferencesFile: oldGlobalPreferences];
+		 [[BootSetupController instance]loadOptionsFromPreferencesFile: oldGlobalPreferences];
+		 [[BootSetupController instance]loadOptionsFromPreferencesFile: oldGlobalPreferences];
+		 // Initialize defaults
+		 [oldGlobalPreferences setObject: [[NSNumber alloc] initWithInt: CurrentPreferencesFileVersion] 
+								  forKey: keyPreferencesFileVersion];
+		 [oldGlobalPreferences setObject: mPartitionsDict forKey: keyPartitionsList];
+		 
+		 // Save the preferences file
+		 [ self savePreferences:oldGlobalPreferences ];
+	 }
+	 
+	 mOptionsDict = [[NSMutableDictionary alloc] init];
+	 [mOptionsDict addEntriesFromDictionary:oldGlobalPreferences];
+	 if (mPartitionsDict!=nil) [mPartitionsDict retain];
+	 [oldGlobalPreferences release];
+	 }
+	 
+//--------------------------------------------------------------------------
 /**
  * SFAuthorization delegates
  */
@@ -101,11 +153,7 @@
 - (void) refreshLockStates
 {
     [mPartitionsTable setEnabled:[self isUnlocked]];
-    [mSwapHD01 setEnabled:[self isUnlocked]];
-    [mSwapHD02 setEnabled:[self isUnlocked]];
     [mStatusText setEnabled:[self isUnlocked]];
-    [mFreezeParts setEnabled:[self isUnlocked]];
-    [mInjectFrozenParts setEnabled:[self isUnlocked]];
 	
 	// Refresh other panels
 	[[BootSetupController instance] refreshLockStates];
@@ -132,109 +180,8 @@
 	return img;
 }
 
-//--------------------------------------------------------------------------
--(bool) savePreferences: (NSDictionary*) dict
-{
-	std::string sPath = [kPreferencesFilePath UTF8String];
-	
-	if(dict==nil || sPath.length()==0) return false;
-	
-	AuthorizationRef auth = [self isUnlocked] ? [[authView authorization] authorizationRef] : NULL;
-	
-	PropertyList::chmodFile(sPath.c_str(), "0777", auth);
-	[dict writeToFile:kPreferencesFilePath atomically:YES];
-	PropertyList::chmodFile(sPath.c_str(), "0644", auth);
-	return true;
-}
-//--------------------------------------------------------------------------
-- (void) loadFrozenParts
-{
-	std::vector<PartitionInfo>& partList = partExtractor->editPartList(); //rw
-	// iterate for all entries to add
-	char keyPartN[32] = "";
-	char buffer[256]="";
-	int k=0;
-	partList.clear();
-	for (int i=0; i<[mPartitionsDict count]; i++)
-	{
-		// get the key
-		snprintf(keyPartN, sizeof(keyPartN)-1, "partition%02d",i);
-		NSString* obj = [mPartitionsDict objectForKey: [[NSString alloc] initWithUTF8String: keyPartN] ];
-		// assign this key if valid
-		if (obj!=nil && [obj length]>0)
-		{
-			PartitionInfo p;
-			// parse string
-			strncpy(buffer, [obj UTF8String], sizeof(buffer)-1);
-			k=0;
-			for(const char* word = strtok(buffer,";"); word; word=strtok(NULL,sPartDescSep),k++)
-			{
-				switch (k) {
-					case 0: // parse disk number
-						if (isdigit(*word)) p.disk(*word-'0');
-						break;
-					case 1: // parse partition number
-						if (isdigit(*word)) p.partition(*word-'0');
-						break;
-					case 2: // parse volume label
-						p.label(word);
-					case 3:
-						p.fsType(word);
-						break;
-					default:
-						break;
-				}
-			}
-			partList.push_back(p);
-		}
-	}
-	partExtractor->sortPartList();
 
-}
 //--------------------------------------------------------------------------
-- (void) loadPreferences
-
-{
-	id oldGlobalPreferences = [ [NSDictionary dictionaryWithContentsOfFile: 
-								kPreferencesFilePath ] retain];
-
-	mPartitionsDict = [[NSMutableDictionary alloc] init];
-	[mPartitionsDict retain];
-
-    if (oldGlobalPreferences!=nil)
-	{
-		mPreferenceFileVersion= [[oldGlobalPreferences objectForKey: keyPreferencesFileVersion] intValue ];
-		[mSwapHD01 setIntValue: [[oldGlobalPreferences objectForKey:	keySwapHD01] intValue]];
-		[mSwapHD02 setIntValue: [[oldGlobalPreferences objectForKey:	keySwapHD02] intValue]];
-		[mFreezeParts setIntValue: [[oldGlobalPreferences objectForKey: keyUseFrozenParts] intValue] ];
-		[mPartitionsDict addEntriesFromDictionary: [oldGlobalPreferences objectForKey: keyPartitionsList] ];
-	}
-	else 
-	{  // Create a preference plist file with Defaults values
-		[mSwapHD01 setIntValue: 0];
-		[mSwapHD02 setIntValue: 0];
-		[mFreezeParts setIntValue: 0];
-		// Initialize defaults
-		oldGlobalPreferences = [[NSMutableDictionary alloc] init];
-		[oldGlobalPreferences setObject: [[NSNumber alloc] initWithInt: CurrentPreferencesFileVersion] 
-								 forKey: keyPreferencesFileVersion];
-		[oldGlobalPreferences setObject: [[NSNumber alloc] initWithBool: false] forKey: keySwapHD01];
-		[oldGlobalPreferences setObject: [[NSNumber alloc] initWithBool: false] forKey: keySwapHD02];
-		[oldGlobalPreferences setObject:[[NSNumber alloc] initWithBool:  false] forKey: keyUseFrozenParts];
-		[oldGlobalPreferences setObject: mPartitionsDict forKey: keyPartitionsList];
-		
-		// Save the preferences file
-		[ self savePreferences:oldGlobalPreferences ];
-	}
-
-	mOptionsDict = [[NSMutableDictionary alloc] init];
-    [mOptionsDict addEntriesFromDictionary:oldGlobalPreferences];
-	if (mPartitionsDict!=nil) [mPartitionsDict retain];
-    [oldGlobalPreferences release];
-}
-
-
-//--------------------------------------------------------------------------
 /** When called here, all outlets references are initialized */
 - (void)awakeFromNib
 { // called more than once, we only need one resource init
@@ -242,7 +189,7 @@
 	if(ft)
 	{
 		ft=false;
-		[self loadPreferences];
+		[self	loadPreferences];
 		[self initBootConfig];
 	}
 }
@@ -261,12 +208,6 @@
     authView.delegate = self;
     [authView updateStatus:nil];
 
-	// create the propertylist object that will handle com.apple.Boot.plist
-	if(!prop) prop = new PropertyList();
-
-	// create the process that will extract the diskutil list infos
-	if(!partExtractor) partExtractor = new PartitionExtractor();
-	
 	if (!prop->isValid())
 	{
 		std::string sPath;
@@ -303,9 +244,10 @@
 		else
 		{ 
 			[mStatusText setTextColor: [NSColor grayColor] ];
-			NSString* ns = [ [NSString alloc] initWithUTF8String:prop->bootConfigPath() ];
+			NSString* ns = [ [NSString alloc] initWithUTF8String:prop->propFilePath() ];
 			[mStatusText setStringValue: [NSString stringWithFormat: @"bootConfig: %@", ns] ];
 		}
+		
 		if (prop->isValid())
 		{
 			// read options in the plist file
@@ -315,12 +257,12 @@
 			
 			// partExtractor->resetSwapping();
 			id val = [mOptionsDict valueForKey: keySwapHD01];
-			[mSwapHD01 setIntValue:  [val intValue] ];
-			[self doSwapHD: [val boolValue]  save: false src:0 dst:1];
+			[[BootSetupController instance]->mSwapHD01 setIntValue:  [val intValue] ];
+			[[BootSetupController instance] doSwapHD: [val boolValue]  save: false src:0 dst:1];
 			
 			val = [mOptionsDict valueForKey: keySwapHD02];
-			[mSwapHD02 setIntValue:  [val intValue] ];
-			[self doSwapHD: [val boolValue]  save: false src:0 dst:2];
+			[[BootSetupController instance]->mSwapHD02 setIntValue:  [val intValue] ];
+			[[BootSetupController instance] doSwapHD: [val boolValue]  save: false src:0 dst:2];
 			
 			[self selectDefaultPartition];
 		}
@@ -354,115 +296,6 @@
 }
 
 //--------------------------------------------------------------------------
-- (void) swapDisks: (bool) bSwap src: (int) iSrc dst: (int) iDst;
-{
-	if(!partExtractor || !prop || !prop->isValid()) return;
-	if (bSwap)
-	{
-		partExtractor->swapHD(iSrc, iDst);	
-	}
-	
-	if ([mFreezeParts intValue]==0) 
-		partExtractor->extractPartitions();
-	else 
-		[self loadFrozenParts ];
-	
-	[ self selectDefaultPartition];
-
-}
-
-//--------------------------------------------------------------------------
-- (void) doSwapHD: (int) val save: (bool) doSave src: (int) isrc dst: (int) idst
-{
-	
-	if( val>0 && ![mFreezeParts intValue]) //on
-	{
-		[self swapDisks: true src:isrc dst:idst ];
-	}
-	else
-	{
-		[self swapDisks: false src:isrc dst:idst ];
-	}
-	
-	if(doSave)
-	{
-		if (isrc==0 && idst==1)
-			[mOptionsDict setObject: [NSNumber numberWithBool: val ? true : false] forKey: keySwapHD01];
-		if (isrc==0 && idst==2)
-			[mOptionsDict setObject: [NSNumber numberWithBool: val ? true : false] forKey: keySwapHD02];
-		[ self savePreferences:mOptionsDict ];
-	}
-	
-	[mPartitionsTable reloadData];
-	[mPartitionsTable scrollRowToVisible: 0];
-	//[self tableViewSelectionDidChange: nil];
-	
-}
-//--------------------------------------------------------------------------
-- (IBAction)onSwapHD: (id)sender
-{
-	partExtractor->resetSwapping();
-	[self doSwapHD: [mSwapHD01 intValue] save:true src:0 dst:1];
-	[self doSwapHD: [mSwapHD02 intValue] save:true src:0 dst:2];
-}
-//--------------------------------------------------------------------------
-- (IBAction)onUseFrozenParts: (id)sender
-{
-	bool val = !![sender intValue];
-	[mOptionsDict setObject: [NSNumber numberWithBool:  val] forKey: keyUseFrozenParts];
-	[self savePreferences: mOptionsDict];
-	[self onSwapHD: nil];
-}
-
-//--------------------------------------------------------------------------
-- (IBAction)onInjectPartsToFreeze: (id)sender
-{
-	int size = partExtractor ? partExtractor->partList().size() : 0;
-	if (!size) 
-	{ // nothing to inject
-		NSRunAlertPanel(@"Inject Partitions to Freeze Configuration", 
-						@"No current partitions to inject, did you check boot config file ?",@"OK", nil,nil);
-		return;
-	}
-	//  generate the parts list in preferences proplist
-	NSInteger n = NSRunAlertPanel(@"Inject Partitions to Freeze Configuration", 
-								  @"Are you sure you want to overwrite your Freeze settings with current partition list ?",
-								  @"OK", @"Cancel",nil);
-	if (n==1)
-	{
-		// populate the dictionary with the current partitions
-		
-		// empty dictionary and update key in parent:
-		[mOptionsDict removeObjectForKey: keyPartitionsList];
-		[mPartitionsDict removeAllObjects ];
-		
-		// iterate for all entries to add
-		char partDesc[256]="";
-		char keyPartN[32] = "";
-		for (int i=0; i< size; i++)
-		{
-			
-			const PartitionInfo& p =partExtractor->partList()[i];
-			
-			// format the partition key and descriptor string
-			snprintf(keyPartN, sizeof(keyPartN)-1, "partition%02d",i);
-			
-			snprintf(partDesc, sizeof(partDesc)-1, "%d%c%d%c%s%c%s",
-					 p.disk(), cPartDescSep,
-					 p.partition(), cPartDescSep,
-					 p.clabel(), cPartDescSep,
-					 p.cfsType());
-			
-			// write it to the dictionary
-			NSString * key  = [[NSString alloc] initWithUTF8String: keyPartN];
-			NSString * desc = [[NSString alloc] initWithUTF8String: partDesc]; 
-			[mPartitionsDict setObject: desc forKey: key];
-		}
-		[mOptionsDict setObject: mPartitionsDict forKey: keyPartitionsList];
-		[self savePreferences: mOptionsDict];
-	}
-}
-//--------------------------------------------------------------------------
 // following DieBuch recommendation : using applescript and system events (thanks!):
 - (IBAction)onRestart: (id)sender
 {
@@ -542,7 +375,7 @@
 			case 2:
 				ret = mLinuxImage;
 				break;
-			defualt:
+			default:
 				ret = mUnknownImage;
 				break;
 				
Index: trunk/ChameleonPrefPane/Sources/BootPropertyList.cpp
===================================================================
--- trunk/ChameleonPrefPane/Sources/BootPropertyList.cpp	(revision 0)
+++ trunk/ChameleonPrefPane/Sources/BootPropertyList.cpp	(revision 47)
@@ -0,0 +1,24 @@
+/*
+ *  BootPropertyList.cpp
+ *  ChameleonPrefPane
+ *
+ *  Created by Rekursor on 1/22/10.
+ *
+ */
+
+#include "BootPropertyList.h"
+
+void  BootPropertyList::deleteOptionDesc()
+{
+	// delete all alloc'ed pointers
+	std::map<void*, BootOptionDesc*>::iterator bod;	
+	for (bod=_idToDescDict.begin(); bod!=_idToDescDict.end(); bod++)
+		if(bod->second) delete bod->second;
+}
+
+void  BootPropertyList::clearOptionDesc()
+{
+	deleteOptionDesc();
+	_idToDescDict.clear();	// now clear the pairs
+}
+
Index: trunk/ChameleonPrefPane/Sources/PreferencesControllerBase.h
===================================================================
--- trunk/ChameleonPrefPane/Sources/PreferencesControllerBase.h	(revision 46)
+++ trunk/ChameleonPrefPane/Sources/PreferencesControllerBase.h	(revision 47)
@@ -7,24 +7,59 @@
 
 #import <Cocoa/Cocoa.h>
 #import <ChameleonPrefPane.h>
+#import "BootPropertyList.h"
+#import <ShellProcess.h>
 
+// ENHANCE ME: remove this globals and integrate them in ChameleonPrefPan or at least 
+// add function accessor entry points
+extern PartitionExtractor * partExtractor;
+extern BootPropertyList * prop;
+
+// Defintion of the required protocol for any derived classes of PreferencesControllerBase
 @protocol PreferenceController
 
 @required
  // must be implemented in all derived classes
+
+// Called by all buttons of each group in therface
+- (IBAction) onCheckButtonChange: (NSButton*) sender;
+
+// Called by all text fields of each group in therface
+- (IBAction) onTextFiedChange: (NSTextField*) sender;
+
+// Add the boot config options descriptors to the consolidated dictionary
+- (void) addOptionsDesc;
+
+// Set refresh all group states {enabled | disabled} depending on the authorizations state
 - (void) refreshLockStates;
--(IBAction) onCheckButtonChange: (id) sender;
--(IBAction) onTextFiedChange: (id) sender;
--(void) loadOptionsFromPreferencesFile;
 
+
+// load the corresponding Options from the interface
+- (void) loadOptionsFromPreferencesFile: (NSMutableDictionary*) dict;
+
 @end
 
 // Define common expected behavior for all derived controllers
 @interface PreferencesControllerBase : NSObject 
 {
-	
 }
 
--(NSMutableDictionary*) getPreferencesDictionary;
+// from the id to desc map in prop, set all default values for dict
++ (void) setDefaultValues: (NSMutableDictionary*) dict; 
 
+// Set refresh state {enabled | disabled} depending on the authorizations state
+- (void) refreshLockState: (id) item;
+
+- (void) loadPreferences;
+- (bool) savePreferences;
+
+- (bool) handleSender: (id) sender withButton: (NSButton*) button forKey: (const char *) key;
+- (bool) handleSender: (id) sender withButton: (NSButton*) button andField:(NSTextField*) field 
+			   forKey: (const char *) key;
+
+-(NSMutableDictionary*) preferencesFile;
+-(NSMutableDictionary*) preferencesParts;
+
+-(ChameleonPrefPane*) chameleon;
+
 @end
Index: trunk/ChameleonPrefPane/Sources/ShellProcess.cpp
===================================================================
--- trunk/ChameleonPrefPane/Sources/ShellProcess.cpp	(revision 0)
+++ trunk/ChameleonPrefPane/Sources/ShellProcess.cpp	(revision 47)
@@ -0,0 +1,200 @@
+/*
+ *  shell_process.cpp
+ *
+ *  Created by Rekursor on 1/17/2010.
+ *
+ */
+
+#include "ShellProcess.h"
+#include <string.h>
+#include <sys/stat.h>
+#include <string_util.h>
+
+
+//----------------------------------------------------------------
+// portable open process:
+FILE * ShellProcess::open(const char *cmd, const char *mode) {
+	_fpt=::popen(cmd,mode);
+	return _fpt;
+}
+
+//----------------------------------------------------------------
+int ShellProcess::close() {
+	int ret = ::pclose(_fpt);
+	_fpt=NULL;
+	return ret;
+}
+
+//----------------------------------------------------------------
+void PartitionInfo::removeSpaces(std::string &str)
+{
+	if (!str.size()) return;
+	int posl=0,posr=0;
+	for (posl=0; posl<str.size()-1 && str[posl]==' '; posl++);
+	for (posr=str.size()-1; posr>0 && str[posr]==' '; posr--);
+	str = (posl>posr) ? "" : str.substr(posl, posr-posl+1);
+}
+//----------------------------------------------------------------
+/**
+ * 	return the image index corresponding to a fs:
+ */
+int PartitionInfo::imageIndexFromFs() const
+{
+	if (_fsType.find("Apple")!=std::string::npos ||
+		_fsType.find("HFS")!=std::string::npos)
+		return 0; // Windows
+	else if (_fsType.find("Windows")!=std::string::npos ||
+			 _fsType.find("Microsoft")!=std::string::npos ||
+			 _fsType.find("NTFS")!=std::string::npos ||
+			 _fsType.find("FAT")!=std::string::npos)
+		return 1; // Windows
+	else if (_fsType.find("Linux")!=std::string::npos)
+		return 2; // Unknown
+	return 10; //Unknown
+	
+}
+//----------------------------------------------------------------
+bool PartitionInfo::fromPartitionHdString(const char * inHdStr)
+{
+	if (!inHdStr || !(*inHdStr) || 
+		strlen(inHdStr)<7 || !strstr(inHdStr,"hd(")) return false;
+	
+	// enhance me here: should not assume that we have less than 10 partitions per disk/ disks
+	_disk = inHdStr[3]-'0'; 
+	_part = inHdStr[5]-'0';
+	return true;
+}
+//----------------------------------------------------------------
+const char * PartitionExtractor::checkForRename(const char * label, const char *szHd)
+{
+	const int MAX_ALIAS_SIZE=31;
+	static char szAlias[MAX_ALIAS_SIZE+1];
+	char *q=szAlias;
+	const char* szAliases = _renamedParts.c_str();
+	
+	if (!szHd || !*szHd || !szAliases || !*szAliases) return label; // no renaming wanted
+	
+	const char * p = strstr(szAliases, szHd);
+	if(!p || !(*p)) return label; // this volume must not be renamed, or option is malformed
+	
+	p+= strlen(szHd); // skip the "hd(n,m) " field
+	// multiple aliases can be found separated by a semi-column
+	while(*p && *p != ';' && q<(szAlias+MAX_ALIAS_SIZE)) *q++=*p++;
+	*q='\0';
+	
+	return szAlias;
+	
+}
+//----------------------------------------------------------------
+const std::vector<PartitionInfo>& 
+PartitionExtractor::extractPartitions(const char* szHide, const char* szRenamed)
+{
+	const char * const diskTag = "/dev/disk";
+	const char * const nameTag = "NAME";
+	const char * const sizeTag = "SIZE";
+
+	PartitionInfo partInfo;
+
+	char line[1024]="";
+	char label[32]="", fsType[32]="" ;
+	size_t len=0;
+	int disk =0, part=0;
+	int label_pos=0, size_pos=0;
+	char * p=0,*q=0;
+	int skipwhite=0;
+	
+	_partList.clear();
+	if (szHide) hidePartitions(szHide);
+	if (szRenamed) renamedPartitions(szRenamed);
+	this->open("diskutil list");
+	
+	while(get_line(line, sizeof(line)-1))
+	{
+		// printf("%s\n",line);
+		len = strlen(line);
+		for(skipwhite=0; line[skipwhite]==' ';skipwhite++);
+		
+		const char * sdisk = strstr(line, diskTag);
+		const char * sName = strstr(line, nameTag);
+		const char * sSize = strstr(line, sizeTag);
+		
+		if (sdisk)
+		{
+			// extract disk number
+			disk= sdisk[strlen(diskTag)]-'0';
+			if (disk>=0 && disk <MAX_HD)
+				disk = _hdRedirTable[disk];
+		}
+		else if (len && line[skipwhite]=='#' && line[skipwhite+1]==':')
+		{
+			label_pos = sName ? (sName - line) : 0;
+			size_pos = sSize ? (sSize - line) : 0;
+		}
+		else if (len && line[skipwhite+1]==':' && isdigit(line[skipwhite]))
+		{
+			for (p=&line[skipwhite+2], q=fsType; *p && p < &line[label_pos-1]; p++,q++) *q=*p;
+			for (p=&line[label_pos], q=label; *p && p < &line[size_pos]; p++,q++) *q=*p;
+			
+			*q='\0';
+			part = line[skipwhite]-'0';
+			partInfo.fsType(fsType);
+			partInfo.disk(disk);
+			partInfo.partition(part);
+			partInfo.label(checkForRename(label, partInfo.toHdStr().c_str()));
+			size_t len = partInfo.label().length();
+			// filter useless partitions:
+			if ( len > 0 && 
+				partInfo.clabel()[len-1] !='*' && 
+				partInfo.fsType()!="EFI" &&
+				partInfo.fsType()!="Apple_partition_scheme" &&
+				partInfo.fsType()!="Apple_partition_map" &&
+				partInfo.fsType()!="Apple_Free" 
+				)
+			{
+				std::string DiskLabel(label), UnixPath, WinPath; 
+				DiskLabel.erase( DiskLabel.find_last_not_of(" ") + 1);
+				bool found=false;
+				
+				// early bail out if we found what we need:
+				if (fileExists((UnixPath = "/Volumes/" + DiskLabel + "/usr/bin/man"))) 
+					found=true;
+				else if ((strstr(label,"System Reserved") ) || // don't filter system reserved windows 7 boot parts
+						 fileExists((WinPath="/Volumes/" + DiskLabel + "/Windows/system.ini")))
+					found=true;
+				else if (strstr(fsType,"Linux") && !strstr(fsType, "Linux_Swap"))
+					found=true; // Added Linux case
+				if (found)
+				{ //check if one of them exists
+					if (partInfo.label().size()==0) partInfo.label("Untitled");
+					if(_hiddenParts.length()==0 || 
+					   _hiddenParts.find(partInfo.toHdStr()) == std::string::npos)
+						_partList.push_back(partInfo);
+				}
+			}
+		}
+	}
+	close();
+	
+	sort(_partList.begin(), _partList.end(), isDiskIndexInf);
+	return _partList;
+}
+
+/** 
+ * Get the index in the internal partlist of the hd(n,m) partition specified by the input string
+ * return -1 if no match, >=0 if a match happens
+ */
+int PartitionExtractor::getIndexFromHdStringSpec(const char* inHDStr)
+{	
+	PartitionInfo info;
+	
+	if (info.fromPartitionHdString(inHDStr)) // try decode the partition disk and part infos
+	{
+		for (int i=0; i<_partList.size(); i++)
+		{
+			if (_partList[i].disk() == info.disk() && _partList[i].partition() == info.partition())
+				return i;
+		}
+	}
+	
+	return -1;
+}
Index: trunk/ChameleonPrefPane/Sources/BootPropertyList.h
===================================================================
--- trunk/ChameleonPrefPane/Sources/BootPropertyList.h	(revision 0)
+++ trunk/ChameleonPrefPane/Sources/BootPropertyList.h	(revision 47)
@@ -0,0 +1,87 @@
+/*
+ *  BootPropertyList.h
+ *  ChameleonPrefPane
+ *
+ *  Created by Rekursor on 1/22/10.
+ *
+ */
+#ifndef __CHBOOT_PROPERTYLIST_LIST_H
+#define __CHBOOT_PROPERTYLIST_LIST_H
+
+#include "PropertyList.h"
+#include <map>
+
+// Chameleon Boot options type
+typedef enum
+{
+	OptionYesNo=0,		// "Yes" or "No"
+	OptionString,		// String Content
+	OptionUnix,			// Unix like command option like -x, -v ...
+	OptionKernel,		// kernel cmd like "mach_kernel" or "blacklist=0"
+	OptionKernel1		// kernel cmd like "mach_kernel" or "blacklist=0"
+	
+} BootOptionType;
+
+// Boot Option descriptor : used by all derived class to permit parameters handling automation ...
+struct BootOptionDesc
+{
+	BootOptionDesc(void* i, void * cID, BootOptionType t, const char* n, const char* d) {
+		ID=i; contentID=cID, Type=t; Name=n; Default=d;
+	} 
+	void*				ID; // the corresponding button or textfield in the interface
+	void*				contentID; // the corresponding content ID (i.e: the string content for text fields)
+	BootOptionType		Type;
+	const char *		Name;
+	const char *		Default;
+	
+} ;
+
+/**
+ * Specialization of PropertyList with Chameleon Boot Config, fast id key to desc search features
+ */
+class BootPropertyList : public PropertyList
+{
+public:
+	BootPropertyList()   {	}
+	virtual ~BootPropertyList() {	deleteOptionDesc(); }
+	
+	// id to map BootOptionDesc handling
+	void addOptionDesc(void * ID, void* cID, BootOptionType t, const char * szName, const char* szDefault)
+	{
+		if (ID) _idToDescDict[ID] = new BootOptionDesc(ID, cID, t, szName? szName : "", szDefault ? szDefault : "");
+	}
+	
+	// find the desc corresponding to id:
+	const BootOptionDesc* findOption(void *ID) const 
+	{
+		std::map<void*, BootOptionDesc*>::const_iterator bod;	
+		if (!ID || (bod=_idToDescDict.find(ID))==_idToDescDict.end()) return NULL;
+		return bod->second;
+	}
+
+	// opaque enumeration for the map
+	const BootOptionDesc* firstOption() 
+	{
+		_bod=_idToDescDict.begin();
+		if (_bod!= _idToDescDict.end()) return _bod->second; else return NULL;
+	}
+	
+	const BootOptionDesc* nextOption() 
+	{
+		if(_bod++ ==_idToDescDict.end()) return NULL;
+		if (_bod != _idToDescDict.end()) return _bod->second; else return NULL;
+	}
+	
+	
+	// remove all elements in dict, calls deleteOptionsDesc()
+	void  clearOptionDesc();
+	
+protected:
+	void deleteOptionDesc();
+
+private:
+	std::map<void *, BootOptionDesc*> _idToDescDict; // dictionary  for id -> desc association type
+	std::map<void*, BootOptionDesc*>::const_iterator _bod;	
+};
+
+#endif
\ No newline at end of file
Index: trunk/ChameleonPrefPane/Sources/PeripheralsController.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/PeripheralsController.mm	(revision 46)
+++ trunk/ChameleonPrefPane/Sources/PeripheralsController.mm	(revision 47)
@@ -14,41 +14,51 @@
 - (id) init
 {
 	self = [super init];
-	gInstance = self;
-	
+	return (gInstance = self);
 }	
 
-// TODO implement a smart & reusable option modification, usable by all controllers
-// these pair of methods in each controller should all rely on a single external class instance (singleton)
-// that would implement in an opaque way the options streaming between the panels and the pref. file
+//--------------------------------------------------------------------------
+- (void) addOptionsDesc
+{
+    prop->addOptionDesc(mLegacyLogo, nil, OptionYesNo, "Legacy Logo", "No");
+    prop->addOptionDesc(mBootBanner, nil, OptionYesNo, "Boot Banner", "No");
+    prop->addOptionDesc(mVBIOS, nil, OptionYesNo, "VBIOS", "No");
+    prop->addOptionDesc(mVideoROM, mVideoROMText, OptionString, "VideoROM", "");
+    prop->addOptionDesc(mGraphicsMode, mGraphicsModeText, OptionString, "Graphics Mode", "");
+    prop->addOptionDesc(mGraphicsEnabler, nil, OptionYesNo, "GraphicsEnabler", "No");
+    prop->addOptionDesc(mUSBBusFix, nil, OptionYesNo, "USBBusFix", "No");
+    prop->addOptionDesc(mEHCIacquire, nil, OptionYesNo, "EHCIacquire", "No");
+    prop->addOptionDesc(mUHCIreset,  nil,OptionYesNo, "UHCIreset", "No");
+    prop->addOptionDesc(mEthernetBuiltIn, nil, OptionYesNo, "EthernetBuiltIn", "No");
+}
 
 - (void) refreshLockStates
 {
-    [mLegacyLogo setEnabled:[[ChameleonPrefPane instance] isUnlocked]];
-    [mBootBanner setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mVBIOS setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mVideoROM setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mVideoROMText setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mGraphicsMode setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mGraphicsModeText setEnabled:[[ChameleonPrefPane instance] isUnlocked]];
-    [mGraphicsEnabler setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mUSBBusFix setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mEHCIacquire setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mUHCIreset setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mEthernetBuiltIn setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
+    [self refreshLockState: mLegacyLogo ];
+    [self refreshLockState: mBootBanner ];
+    [self refreshLockState: mVBIOS ];
+    [self refreshLockState: mVideoROM ];
+    [self refreshLockState: mVideoROMText ];
+    [self refreshLockState: mGraphicsMode ];
+    [self refreshLockState: mGraphicsModeText ];
+    [self refreshLockState: mGraphicsEnabler ];
+    [self refreshLockState: mUSBBusFix ];
+    [self refreshLockState: mEHCIacquire ];
+    [self refreshLockState: mUHCIreset ];
+    [self refreshLockState: mEthernetBuiltIn ];
 }
 
--(IBAction) onCheckButtonChange: (id) sender
+-(void) loadOptionsFromPreferencesFile: (NSMutableDictionary*) dict
 {
 	
 }
 
--(IBAction) onTextFiedChange: (id) sender
+-(IBAction) onCheckButtonChange: (NSButton*) sender
 {
 	
 }
 
--(void) loadOptionsFromPreferencesFile
+-(IBAction) onTextFiedChange: (NSTextField*) sender
 {
 	
 }
Index: trunk/ChameleonPrefPane/Sources/ShellProcess.h
===================================================================
--- trunk/ChameleonPrefPane/Sources/ShellProcess.h	(revision 0)
+++ trunk/ChameleonPrefPane/Sources/ShellProcess.h	(revision 47)
@@ -0,0 +1,148 @@
+/*
+ *  shell_process.h
+ *
+ *  Created by Rekursor on 1/17/2010.
+ *
+ */
+#ifndef __CHSHELL_PROCESS_H
+#define __CHSHELL_PROCESS_H
+
+#include <Security/Authorization.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <vector>
+#include <string>
+
+//----------------------------------------------------------------
+const int MAX_HD = 10;
+
+//----------------------------------------------------------------
+
+/**
+ *  Check whether file exists:
+ */
+inline bool fileExists(const char * str) 
+{ 
+	struct stat stFileInfo; 
+	if((stat(str,&stFileInfo)) == 0)  return true; 
+	else return false;
+}
+
+inline bool fileExists(std::string str) {return fileExists(str.c_str());}
+
+//----------------------------------------------------------------
+class ShellProcess 
+{
+public:
+	// construction / destruction
+	ShellProcess() {_fpt= NULL;}
+	~ShellProcess() {if (_fpt) close();}
+	
+	FILE * open	(const char *cmd, const char *mode="r");
+	int  close();
+	FILE * desc() const { return _fpt;} // non null if file is open
+	char * get_line(char * line, size_t s) const {return _fpt ? fgets(line, s, _fpt) : NULL;}
+	
+protected:
+	FILE * _fpt;
+};
+
+//----------------------------------------------------------------
+class PartitionInfo
+{
+public:
+	PartitionInfo() : _disk(0), _part(0) {}
+	PartitionInfo(int disk, int part) {	set(disk, part);}
+	
+	void disk(int disk) { _disk=disk;}
+	int disk() const { return _disk;}
+	
+	void partition(int part) { _part=part;}
+	int partition () const { return _part;}
+	
+	const char * clabel() const { return _label.c_str();}
+	const std::string& label() const { return _label;	}
+	void label(const char * l) { 
+		if (l) _label = l; 
+		removeSpaces(_label);
+	}
+
+	const char * cfsType() const { return _fsType.c_str();}
+	const std::string& fsType() const { return _fsType;}
+	void fsType(const char * fs) { 
+		if (fs) _fsType = fs; 
+		removeSpaces(_fsType);
+	}
+		
+	void set(int disk, int part) { _disk =disk; _part = part;}
+	bool fromPartitionHdString(const char * inHdStr);
+	std::string toHdStr() const 
+	{
+		std::string buf = "hd(n,m)";
+		buf[3]= '0'+disk();
+		buf[5]='0'+partition();
+		return buf;
+	}
+	int imageIndexFromFs() const;
+protected:
+	void removeSpaces(std::string & s);
+
+private:
+	int _disk, _part;
+	std::string _fsType, _label;
+};
+
+static inline bool isDiskIndexInf(PartitionInfo i, PartitionInfo j) 
+{ 
+	return ((i.disk()*100+i.partition()) < (j.disk()*100 + j.partition()) ) ;
+}
+
+//----------------------------------------------------------------
+class PartitionExtractor : public ShellProcess
+{
+public:
+	PartitionExtractor() :	ShellProcess() 	{ init(); }
+	
+	const std::vector<PartitionInfo>& extractPartitions(
+														const char* szHide=NULL,
+														const char* szRenamed=NULL);
+	int getListCount() const {return (int) _partList.size();}
+	
+	const std::vector<PartitionInfo>& partList() const {return _partList;}
+	std::vector<PartitionInfo>& editPartList() {return _partList;}
+	
+	// get the index in the internal partlist of the hd(n,m) partition specified by the input string
+	// return -1 if no match, >=0 if a match happens
+	int getIndexFromHdStringSpec(const char*); 
+	
+	void hidePartitions(const char* szParts){ _hiddenParts = (szParts ? szParts : "");}
+	void renamedPartitions(const char* szParts){ _renamedParts = (szParts ? szParts : "");}
+	void sortPartList() {	sort(_partList.begin(), _partList.end(), isDiskIndexInf);	}
+
+	const char * checkForRename(const char * label, const char* szHd);
+
+	void swapHD(int src, int dst)
+	{
+		if(src < 0 || src > MAX_HD-1 || dst < 0 || dst > MAX_HD-1) return;
+		_hdRedirTable[src]=dst;
+		_hdRedirTable[dst]=src;
+	}
+	
+	void resetSwapping() { init();}
+	
+protected:
+	void init() {
+		for (int i=0; i<MAX_HD; i++) _hdRedirTable[i]=i;
+	}
+	
+private:
+	std::vector<PartitionInfo> _partList;
+	int _hdRedirTable[MAX_HD];
+	std::string _hiddenParts;
+	std::string _renamedParts;
+	
+};
+
+#endif
Index: trunk/ChameleonPrefPane/Sources/BootFlagsController.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/BootFlagsController.mm	(revision 46)
+++ trunk/ChameleonPrefPane/Sources/BootFlagsController.mm	(revision 47)
@@ -7,8 +7,12 @@
 
 #import "BootFlagsController.h"
 
+// Constants
+
+// File static variables
 static BootFlagsController *gInstance = NULL;
 
+
 @implementation BootFlagsController
 
 - (id) init
@@ -17,39 +21,48 @@
 	return (gInstance = self);
 }	
 
-// TODO implement a smart & reusable option modification, usable by all controllers
-// these pair of methods in each controller should all rely on a single external class instance (singleton)
-// that would implement in an opaque way the options streaming between the panels and the pref. file
+-(void) addOptionsDesc
+{
+	prop->addOptionDesc(mVerbose, nil, OptionUnix, "-v", "");
+	prop->addOptionDesc(mSafeBoot, nil, OptionUnix, "-x", "");
+	prop->addOptionDesc(mIgnoreBootConfig, nil, OptionUnix, "-F", "");
+	prop->addOptionDesc(mSingleUser, nil, OptionUnix, "-s", "");
+	prop->addOptionDesc(mTimeOut, mTimeOutText, OptionString,"Timeout", "5");
+	prop->addOptionDesc(mQuietBoot, nil, OptionYesNo, "Quiet Boot", "No");
+	prop->addOptionDesc(mInstantMenu, nil, OptionYesNo, "Instant Menu", "No");
+	prop->addOptionDesc(mWait, nil, OptionYesNo, "Wait", "No");
+	prop->addOptionDesc(mRescan, nil, OptionYesNo, "Rescan", "No");
+	prop->addOptionDesc(mRescanPrompt, nil, OptionYesNo, "Rescan Prompt", "No");
+	prop->addOptionDesc(mRescanSingleDrive, nil, OptionYesNo, "Rescan SingleDrive", "No");
+}
 
 - (void) refreshLockStates
 {
-    [mVerbose setEnabled:[[ChameleonPrefPane instance] isUnlocked]];
-    [mSafeBoot setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mIgnoreBootConfig setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mTimeOut setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mTimeOutText setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mSingleUser setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mQuietBoot setEnabled:[[ChameleonPrefPane instance] isUnlocked]];
-    [mInstantMenu setEnabled:[[ChameleonPrefPane instance] isUnlocked]];
-    [mWait setEnabled:[[ChameleonPrefPane instance] isUnlocked]];
-    [mSafeBoot setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mIgnoreBootConfig setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mRescan setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mRescanPrompt setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mRescanSingleDrive setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
+    [self refreshLockState: mVerbose];
+    [self refreshLockState: mSafeBoot];
+    [self refreshLockState: mIgnoreBootConfig];
+    [self refreshLockState: mTimeOut];
+    [self refreshLockState: mTimeOutText];
+    [self refreshLockState: mSingleUser];
+    [self refreshLockState: mQuietBoot];
+    [self refreshLockState: mInstantMenu];
+    [self refreshLockState: mWait];
+    [self refreshLockState: mRescan];
+    [self refreshLockState: mRescanPrompt];
+    [self refreshLockState: mRescanSingleDrive];
 }
 
--(IBAction) onCheckButtonChange: (id) sender
+-(void) loadOptionsFromPreferencesFile: (NSMutableDictionary*) dict
 {
 	
 }
 
--(IBAction) onTextFiedChange: (id) sender
+-(IBAction) onCheckButtonChange: (NSButton*) sender
 {
 	
 }
 
--(void) loadOptionsFromPreferencesFile
+-(IBAction) onTextFiedChange: (NSTextField*) sender
 {
 	
 }
Index: trunk/ChameleonPrefPane/Sources/BootSetupController.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/BootSetupController.mm	(revision 46)
+++ trunk/ChameleonPrefPane/Sources/BootSetupController.mm	(revision 47)
@@ -1,51 +1,249 @@
 //
-//  PartitionsSetupController.mm
+//  BootSetupController.mm
 //  ChameleonPrefPane
 //
 //  Created by Rekursor on 1/22/10.
 //
 
 #import "BootSetupController.h"
+#import "ChameleonPrefPane.h"
 
+static const char* sPartDescSep = ";"; // cstring version
+static const char cPartDescSep = ';'; // partition descriptor separator
 
 static BootSetupController *gInstance = NULL;
 
 @implementation BootSetupController
 
+//--------------------------------------------------------------------------
 - (id) init
 {
 	self = [super init];
 	return (gInstance = self);
 }	
 
-// TODO implement a smart & reusable option modification, usable by all controllers
-// these pair of methods in each controller should all rely on a single external class instance (singleton)
-// that would implement in an opaque way the options streaming between the panels and the pref. file
+//--------------------------------------------------------------------------
+- (void) addOptionsDesc
+{
+    prop->addOptionDesc(mDefaultPartition, nil, OptionString, "Default Partition", "");
+    prop->addOptionDesc(mHidePartition , mHidePartitionText, OptionString, "HidePartition", "");
+    prop->addOptionDesc(mRenamePartition , mRenamePartitionText, OptionString, "RenamePartition", "");
+}
+
+//--------------------------------------------------------------------------
 - (void) refreshLockStates
 {
-    [mDefaultPartition setEnabled:[[ChameleonPrefPane instance] isUnlocked]];
-    [mDefaultPartitionText setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mHidePartition setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mHidePartitionText setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mRenamePartition setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mRenamePartitionText setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
+    [self refreshLockState: mSwapHD01 ];
+    [self refreshLockState: mSwapHD02 ];
+    [self refreshLockState: mFreezeParts ];
+    [self refreshLockState: mInjectFrozenParts ];
+    [self refreshLockState: mDefaultPartition ];
+    [self refreshLockState: mDefaultPartitionText ];
+    [self refreshLockState: mHidePartition ];
+    [self refreshLockState: mHidePartitionText ];
+    [self refreshLockState: mRenamePartition ];
+    [self refreshLockState: mRenamePartitionText ];
 }
 
--(IBAction) onCheckButtonChange: (id) sender
+//--------------------------------------------------------------------------
+-(void) setDefaultsValues: (NSMutableDictionary*) dict
 {
+	[mSwapHD01 setIntValue: [[dict objectForKey:	keySwapHD01] intValue]];
+	[mSwapHD02 setIntValue: [[dict objectForKey:	keySwapHD02] intValue]];
+	[mFreezeParts setIntValue: [[dict objectForKey: keyUseFrozenParts] intValue] ];
+}
+
+//--------------------------------------------------------------------------
+-(void) loadOptionsFromPreferencesFile: (NSMutableDictionary*) dict
+{
+	[dict setObject: [[NSNumber alloc] initWithBool: false] forKey: keySwapHD01];
+	[dict setObject: [[NSNumber alloc] initWithBool: false] forKey: keySwapHD02];
+	[dict setObject:[[NSNumber alloc] initWithBool:  false] forKey: keyUseFrozenParts];
+}
+
+//--------------------------------------------------------------------------
+- (void) loadFrozenParts
+{
+	std::vector<PartitionInfo>& partList = partExtractor->editPartList(); //rw
+	// iterate for all entries to add
+	char keyPartN[32] = "";
+	char buffer[256]="";
+	int k=0;
+	partList.clear();
+	for (int i=0; i< [[self preferencesParts] count]; i++)
+	{
+		// get the key
+		snprintf(keyPartN, sizeof(keyPartN)-1, "partition%02d",i);
+		NSString* obj = [[self preferencesParts] objectForKey: [[NSString alloc] initWithUTF8String: keyPartN] ];
+		// assign this key if valid
+		if (obj!=nil && [obj length]>0)
+		{
+			PartitionInfo p;
+			// parse string
+			strncpy(buffer, [obj UTF8String], sizeof(buffer)-1);
+			k=0;
+			for(const char* word = strtok(buffer,";"); word; word=strtok(NULL,sPartDescSep),k++)
+			{
+				switch (k) {
+					case 0: // parse disk number
+						if (isdigit(*word)) p.disk(*word-'0');
+						break;
+					case 1: // parse partition number
+						if (isdigit(*word)) p.partition(*word-'0');
+						break;
+					case 2: // parse volume label
+						p.label(word);
+					case 3:
+						p.fsType(word);
+						break;
+					default:
+						break;
+				}
+			}
+			partList.push_back(p);
+		}
+	}
+	partExtractor->sortPartList();
 	
 }
 
--(IBAction) onTextFiedChange: (id) sender
+//--------------------------------------------------------------------------
+- (void) swapDisks: (bool) bSwap src: (int) iSrc dst: (int) iDst;
 {
+	if(!partExtractor || !prop || !prop->isValid()) return;
+	if (bSwap)
+	{
+		partExtractor->swapHD(iSrc, iDst);	
+	}
 	
+	if ([mFreezeParts intValue]==0) 
+		partExtractor->extractPartitions();
+	else 
+		[self loadFrozenParts ];
+	
+	[ [self chameleon] selectDefaultPartition];
+	
 }
 
--(void) loadOptionsFromPreferencesFile
+//--------------------------------------------------------------------------
+- (void) doSwapHD: (int) val save: (bool) doSave src: (int) isrc dst: (int) idst
 {
 	
+	if( val>0 && ![[BootSetupController instance]->mFreezeParts intValue]) //on
+	{
+		[self swapDisks: true src:isrc dst:idst ];
+	}
+	else
+	{
+		[self swapDisks: false src:isrc dst:idst ];
+	}
+	
+	if(doSave)
+	{
+		if (isrc==0 && idst==1)
+			[[self preferencesFile] setObject: [NSNumber numberWithBool: val ? true : false] forKey: keySwapHD01];
+		if (isrc==0 && idst==2)
+			[[self preferencesFile] setObject: [NSNumber numberWithBool: val ? true : false] forKey: keySwapHD02];
+		[ [self chameleon] savePreferences:[self preferencesFile] ];
+	}
+	
+	[[[ChameleonPrefPane instance] partitionsTable] reloadData];
+	[[[ChameleonPrefPane instance] partitionsTable] scrollRowToVisible: 0];
+	//[self tableViewSelectionDidChange: nil];
+	
 }
 
+
+//--------------------------------------------------------------------------
+- (IBAction)onInjectPartsToFreeze: (id)sender
+{
+	int size = partExtractor ? partExtractor->partList().size() : 0;
+	if (!size) 
+	{ // nothing to inject
+		NSRunAlertPanel(@"Inject Partitions to Freeze Configuration", 
+						@"No current partitions to inject, did you check boot config file ?",@"OK", nil,nil);
+		return;
+	}
+	//  generate the parts list in preferences proplist
+	NSInteger n = NSRunAlertPanel(@"Inject Partitions to Freeze Configuration", 
+								  @"Are you sure you want to overwrite your Freeze settings with current partition list ?",
+								  @"OK", @"Cancel",nil);
+	if (n==1)
+	{
+		// populate the dictionary with the current partitions
+		
+		// empty dictionary and update key in parent:
+		[[self preferencesFile]  removeObjectForKey: keyPartitionsList];
+		[[self preferencesParts] removeAllObjects ];
+		
+		// iterate for all entries to add
+		char partDesc[256]="";
+		char keyPartN[32] = "";
+		for (int i=0; i< size; i++)
+		{
+			
+			const PartitionInfo& p =partExtractor->partList()[i];
+			
+			// format the partition key and descriptor string
+			snprintf(keyPartN, sizeof(keyPartN)-1, "partition%02d",i);
+			
+			snprintf(partDesc, sizeof(partDesc)-1, "%d%c%d%c%s%c%s",
+					 p.disk(), cPartDescSep,
+					 p.partition(), cPartDescSep,
+					 p.clabel(), cPartDescSep,
+					 p.cfsType());
+			
+			// write it to the dictionary
+			NSString * key  = [[NSString alloc] initWithUTF8String: keyPartN];
+			NSString * desc = [[NSString alloc] initWithUTF8String: partDesc]; 
+			[[self preferencesParts] setObject: desc forKey: key];
+		}
+		[[self preferencesFile] setObject: [self preferencesParts] forKey: keyPartitionsList];
+		[self savePreferences ];
+	}
+}
+
+//--------------------------------------------------------------------------
+-(IBAction) onCheckButtonChange: (NSButton*) sender
+{
+	if (sender == mSwapHD01 || sender == mSwapHD01)
+	{
+		partExtractor->resetSwapping();
+		[self doSwapHD: [mSwapHD01 intValue] save:true src:0 dst:1];
+		[self doSwapHD: [mSwapHD02 intValue] save:true src:0 dst:2];
+	}
+	else if (sender == mFreezeParts)
+	{
+		bool val = !![sender intValue];
+		[[self preferencesFile] setObject: [NSNumber numberWithBool:  val] forKey: keyUseFrozenParts];
+		[[self chameleon] savePreferences: [self preferencesFile]];
+		[ self onCheckButtonChange: mSwapHD01];
+	}
+	else if (sender == mInjectFrozenParts)
+	{
+		[self onInjectPartsToFreeze: mInjectFrozenParts];
+	}	
+	else if ( [self handleSender:sender withButton: mDefaultPartition andField: mDefaultPartitionText 
+						  forKey: kDefaultPartition] )
+	{
+	}	
+	else if ( [self handleSender:sender withButton: mHidePartition andField: mHidePartitionText
+						  forKey: kHidePartition] )
+	{
+	}	
+	else if ( [self handleSender:sender withButton: mRenamePartition andField: mRenamePartitionText
+						  forKey: kHidePartition] )
+	{
+	}	
+}
+
+//--------------------------------------------------------------------------
+-(IBAction) onTextFiedChange: (id) sender
+{
+	
+}
+
+//--------------------------------------------------------------------------
 + (BootSetupController *)instance { return(gInstance);}
 
 @end
Index: trunk/ChameleonPrefPane/Sources/PropertyList.cpp
===================================================================
--- trunk/ChameleonPrefPane/Sources/PropertyList.cpp	(revision 0)
+++ trunk/ChameleonPrefPane/Sources/PropertyList.cpp	(revision 47)
@@ -0,0 +1,343 @@
+/*
+ *  property_list.cpp
+ *
+ *  Created by Rekursor on 1/17/10.
+ *
+ */
+
+#import "BootPropertyList.h"
+#include <string.h>
+#include <sys/stat.h>
+
+/****************************************************************************/
+/**
+ * Simple parsing and splitting args function, does handle env. vars 
+ */
+static void parseArgs(const char * args, const char* argv[], int argvlen)
+{
+	// Create a list of args fron the space delimited args parameters
+	int n=0;
+	if (args && *args) 
+	{
+		bool skipSpaces = true;
+		bool prevCharwasDelim =false;
+		char * buf = strdup(args);
+		char lastPriorityDelim=' ';
+		
+		printf("Parsing <%s>\n", args);
+		
+		int k=0;
+		for (int i=0; i< strlen(args); i++)
+		{
+			switch (args[i]) 
+			{
+				case ' ': case '\t':
+					if(!skipSpaces) {
+						buf[k++]=args[i];
+					}
+					else {
+						prevCharwasDelim = true; // // keep a track of delim to further split tokens
+					}
+					break;
+				case '\0':
+				case '\'': 
+				case '"': 
+					if (!skipSpaces &&lastPriorityDelim!=args[i])
+					{ // consider the imbricated delim as a simple char
+						buf[k++]=args[i];
+						break;
+					}
+					
+					if (!skipSpaces) // end of priority substr
+					{
+						skipSpaces = true;
+						lastPriorityDelim=' ';
+						buf[k]='\0'; 
+						argv[n++]=strdup(buf); // copy the priority substr
+						k=0; // reset the buf index for next token
+						buf[0]='\0';
+					}
+					else
+					{ // start of priority substr
+						skipSpaces=false;
+						lastPriorityDelim=args[i];
+						if(k>0) // previous string to store first
+						{
+							buf[k++]='\0'; // finish the substr
+							argv[n++]=strdup(buf); // copy the substr
+							k=0; // rest the index for next token
+							buf[0]='\0';
+						}
+						//if (args[i] !='\0') buf[k++] = args[i]; // start the new priority substr
+					}
+					break;
+				default: // non delimiters chars
+					if(skipSpaces && prevCharwasDelim)
+					{
+						if(k>0) // a previous substr was before the space
+						{ // store previous token
+							buf[k++]='\0'; // finish the substr
+							argv[n++]=strdup(buf); // copy the substr
+							k=0; // rest the index for next token
+							buf[0]='\0';
+						}
+					}
+					prevCharwasDelim = false;
+					buf[k++]=args[i];
+					break;
+			}
+		}
+		
+		if(*buf) 
+		{
+			buf[k]='\0';
+			argv[n++]=strdup(buf); // copy the last buffer	
+		}
+		free((void*) buf);
+	}
+	argv[n]=NULL;
+}
+
+/****************************************************************************/
+ bool executePrivilegedCmd(AuthorizationRef auth, 
+								 const char* pathToTool, 
+								 const char* args, 
+								 AuthorizationFlags flags)
+{
+	const char * argv[16];
+
+	parseArgs(args, argv, sizeof(argv)/sizeof(const char*));
+
+	// Execute Cmd
+	OSStatus status = AuthorizationExecuteWithPrivileges(auth, pathToTool,flags, (char**)argv, NULL);
+	
+	
+	// Cleanup mem
+	for (int i=0; argv[i]; i++) free ((void*) argv[i]);
+
+    return status ? false : true;
+}
+
+
+/****************************************************************************/
+/**
+ * Write a property list from a file
+ */
+bool WritePropertyListToFile( CFPropertyListRef propertyList, CFURLRef fileURL )
+{
+	CFDataRef xmlData;
+	Boolean status;
+	SInt32 errorCode;
+	
+	// Convert the property list into XML data.
+	xmlData = CFPropertyListCreateXMLData( kCFAllocatorDefault, propertyList );
+	
+	// Write the XML data to the file.
+	status = CFURLWriteDataAndPropertiesToResource (
+													fileURL,                  // URL to use
+													xmlData,                  // data to write
+													NULL,
+													&errorCode);
+	CFRelease(xmlData);
+	
+	return status ? true: false;
+}
+
+/****************************************************************************/
+/**
+ * Read a property list from a file
+ */
+static CFPropertyListRef CreatePropertyListFromFile( CFURLRef fileURL, CFStringRef * errorString ) {
+	CFPropertyListRef propertyList;
+	CFDataRef         resourceData;
+	Boolean           status;
+	SInt32            errorCode;
+	
+	// Read the XML file.
+	status = CFURLCreateDataAndPropertiesFromResource(
+													  kCFAllocatorDefault,
+													  fileURL,
+													  &resourceData,            // place to put file data
+													  NULL,
+													  NULL,
+													  &errorCode);
+	if (!status) return NULL;
+	
+	// Reconstitute the dictionary using the XML data.
+	propertyList = CFPropertyListCreateFromXMLData( kCFAllocatorDefault,
+												   resourceData,
+												   kCFPropertyListMutableContainersAndLeaves,
+												   errorString);
+
+						
+	CFRelease( resourceData );
+	return propertyList;
+}
+
+/****************************************************************************/
+static void show(CFStringRef formatString, ...) {
+    CFStringRef resultString;
+    CFDataRef data;
+    va_list argList;
+	
+    va_start(argList, formatString);
+    resultString = CFStringCreateWithFormatAndArguments(NULL, NULL, formatString, argList);
+    va_end(argList);
+	
+    data = CFStringCreateExternalRepresentation(NULL, resultString, CFStringGetSystemEncoding(), '?');
+	
+    if (data != NULL) {
+        printf ("%.*s\n\n", (int)CFDataGetLength(data), CFDataGetBytePtr(data));
+        CFRelease(data);
+    }
+	
+    CFRelease(resultString);
+}
+/****************************************************************************/
+/*
+ * Always return a valid static const string, if the CFSTR is not valid, then we return ""
+ */
+static const char * CfsToCs(CFStringRef inRef)
+{
+	static char buffer[512]="";
+	if(CFStringGetFileSystemRepresentation (inRef, buffer, sizeof(buffer)))
+	   return buffer;
+	return "";
+}
+	
+/****************************************************************************/
+/**
+ * Creates a PropertyList Incstance
+ */
+PropertyList::~PropertyList()
+{
+	if (_CFURLRef) CFRelease(_CFURLRef);
+	if (_proplistRef) CFRelease(_proplistRef);
+
+}
+bool PropertyList::chmodFile(const char * path, const char * chmodMask,
+									 AuthorizationRef auth, AuthorizationFlags flags)
+{
+	if (!path || !*path) return false;
+	
+	if (auth)
+	{ // give write temporary write rights to the file
+		std::string args = chmodMask;
+		args += ' ';
+		args += path;
+		if(!executePrivilegedCmd(auth, "/bin/chmod", args.c_str(), flags))	
+			return false;
+	}
+	return true;
+	
+}
+
+/****************************************************************************/
+/**
+ * Open a properlist from a path name
+ */
+bool PropertyList::open(const char * path, CFStringRef * errorString, AuthorizationRef auth, AuthorizationFlags flags)
+{
+	bool ret = false;
+	
+	if (!path || !*path) return false;
+	struct stat st;
+	if(stat(path,&st) != 0) return false; // file does not exist;
+
+	// give write temporary write rights to the file
+	if (!chmodFile(path,"0777", auth, flags)) return false;
+
+	_propFilePath = path;
+
+	CFStringRef cfPath = CFStringCreateWithCString (kCFAllocatorDefault, path, kCFStringEncodingUTF8);
+	CFURLRef inURL = CFURLCreateWithFileSystemPath( kCFAllocatorDefault,
+											cfPath, 
+											kCFURLPOSIXPathStyle,    // interpret as POSIX path
+											false );                 // is it a directory?
+	CFRelease(cfPath);
+	if (_CFURLRef) CFRelease(_CFURLRef);
+	_CFURLRef = inURL;
+	
+	if (_CFURLRef) 
+	{
+		_proplistRef = CreatePropertyListFromFile(inURL, errorString);
+		
+		if (_proplistRef) 
+			ret= true;
+	}
+	// restore rights
+	ret= chmodFile(path,"0644", auth, flags);
+	
+	return ret;
+}
+
+/****************************************************************************/
+/**
+ * Save the current property list
+ */
+bool PropertyList::save(AuthorizationRef auth, AuthorizationFlags flags)
+{
+	bool ret=false;
+	if (auth)
+	{ // give write temporary write rights to the file
+		std::string args = " 0777 "+ _propFilePath;
+		if(!executePrivilegedCmd(auth, "/bin/chmod", args.c_str(), flags))
+			return false;
+	}
+	if (_proplistRef && _CFURLRef) 
+		ret= WritePropertyListToFile(_proplistRef,_CFURLRef);
+	if (auth)
+	{ // give write temporary write rights to the file
+		std::string args = " 0644 "+ _propFilePath;
+		if(!executePrivilegedCmd(auth, "/bin/chmod", args.c_str(), flags))
+			return false;
+	}
+	return ret;
+}
+
+/****************************************************************************/
+/**
+ * Extract a sring value from a property list key, 
+ * value returned is not owned by caller, copy it necessary.
+ */
+const char * PropertyList::getStringForKey(const char *key)
+{
+	if (!_proplistRef) 	return 0;
+	CFDictionaryRef myDict = 
+	(CFGetTypeID(_proplistRef) == CFDictionaryGetTypeID()) ? (CFDictionaryRef) _proplistRef : NULL;
+	CFStringRef cfKey = CFStringCreateWithCString (kCFAllocatorDefault, key, kCFStringEncodingUTF8);
+	CFStringRef myString;
+	
+	if (myDict && CFDictionaryGetValueIfPresent(myDict, cfKey, (const void **) &myString))
+	{
+		// show(CFSTR("Key  '%@' found , value = <%@>\n"), cfKey, !myString ? CFSTR("") : myString);
+		CFRelease(cfKey);
+		return CfsToCs(myString);
+	}
+	
+	if(cfKey) CFRelease(cfKey);
+	return NULL;
+}
+/****************************************************************************/
+/**
+ * replace a sring value from a property list key, 
+ * value returned is not owned by caller, copy it necessary.
+ */
+bool PropertyList::setStringForKey(const char *key, const char * value)
+{
+	if (!_proplistRef) 	return false;
+	bool ret = false;
+	CFMutableDictionaryRef myDict = 
+	(CFGetTypeID(_proplistRef) == CFDictionaryGetTypeID()) ? (CFMutableDictionaryRef) _proplistRef : NULL;
+	CFStringRef cfKey = CFStringCreateWithCString (kCFAllocatorDefault, key, kCFStringEncodingUTF8);
+	CFStringRef myString = CFStringCreateWithCString (kCFAllocatorDefault, value, kCFStringEncodingUTF8);
+	
+	if (myDict) {
+		CFDictionaryReplaceValue(myDict, cfKey, myString);
+		ret=true;	
+	} 
+	if(cfKey) CFRelease(cfKey);
+	if(myString) CFRelease(myString);
+	return ret;
+}
+
Index: trunk/ChameleonPrefPane/Sources/AdvancedSetupController.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/AdvancedSetupController.mm	(revision 46)
+++ trunk/ChameleonPrefPane/Sources/AdvancedSetupController.mm	(revision 47)
@@ -17,53 +17,70 @@
 	return (gInstance = self);
 }	
 
-// TODO implement a smart & reusable option modification, usable by all controllers
-// these pair of methods in each controller should all rely on a single external class instance (singleton)
-// that would implement in an opaque way the options streaming between the panels and the pref. file
+//--------------------------------------------------------------------------
+- (void) addOptionsDesc
+{
+    prop->addOptionDesc(mKernel, mKernelText, OptionKernel1, "", "mach_kernel"); // empty field for 1 field only "i.e: mach_kernel" syntax 
+    prop->addOptionDesc(mDeviceRd, mDeviceRdText, OptionKernel, "rd", "disk0s1");
+    prop->addOptionDesc(mArch, mArchText, OptionKernel, "arch", "X86_64");
+    prop->addOptionDesc(mCPU, mCPUText, OptionKernel, "cpus", "4");
+    prop->addOptionDesc(mBusRatio, mBusRatioText, OptionKernel,  "busratio", "20");
+    prop->addOptionDesc(mDebug, mDebugText, OptionString, "debug", "0x144");
+    prop->addOptionDesc(mIO, mIOText, OptionString, "io", "0xffffffff");
+    prop->addOptionDesc(mDisableKextsBlacklisting, nil, OptionString, "blacklist", "1");
+    prop->addOptionDesc(mDSDTFile, mDSDTFileText, OptionString, "DSDT", "");
+    prop->addOptionDesc(mDSDTDrop, nil, OptionYesNo, "DropSSDT", "No");
+    prop->addOptionDesc(mSMBIOSFile,mSMBIOSFileText, OptionString, "SMBIOS", "");
+    prop->addOptionDesc(mSMBIOSDefaults, nil, OptionYesNo, "SMBIOSdefaults", "No");
+    prop->addOptionDesc(mWake, nil, OptionYesNo, "Wake", "No");
+    prop->addOptionDesc(mForceWake, nil, OptionYesNo, "ForceWake", "No");
+    prop->addOptionDesc(mWakeImage, mWakeImageText, OptionString, "WakeImage", "");
+}
 
 - (void) refreshLockStates
 {
-    [mKernel setEnabled:[[ChameleonPrefPane instance] isUnlocked]];
-    [mKernelText setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mDeviceRd setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mDeviceRdText setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mArch setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mArchText setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mCPU setEnabled:[[ChameleonPrefPane instance] isUnlocked]];
-    [mCPUText setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mBusRatio setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mBusRatioText setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mDebug setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mDebugText setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mIO setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mIOText setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mDisableKextsBlacklisting setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mDSDTFile setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mDSDTFileText setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mDSDTDrop setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mSMBIOSFile setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mSMBIOSFileText setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mSMBIOSDefaults setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mWake setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mForceWake setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mWakeImage setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
-    [mWakeImageText setEnabled:[[ChameleonPrefPane instance]  isUnlocked]];
+    [self refreshLockState: mKernel ];
+    [self refreshLockState: mKernelText ];
+    [self refreshLockState: mDeviceRd ];
+    [self refreshLockState: mDeviceRdText ];
+    [self refreshLockState: mArch ];
+    [self refreshLockState: mArchText ];
+    [self refreshLockState: mCPU ];
+    [self refreshLockState: mCPUText ];
+    [self refreshLockState: mBusRatio ];
+    [self refreshLockState: mBusRatioText ];
+    [self refreshLockState: mDebug ];
+    [self refreshLockState: mDebugText ];
+    [self refreshLockState: mIO ];
+    [self refreshLockState: mIOText ];
+    [self refreshLockState: mDisableKextsBlacklisting ];
+    [self refreshLockState: mDSDTFile ];
+    [self refreshLockState: mDSDTFileText ];
+    [self refreshLockState: mDSDTDrop ];
+    [self refreshLockState: mSMBIOSFile ];
+    [self refreshLockState: mSMBIOSFileText ];
+    [self refreshLockState: mSMBIOSDefaults ];
+    [self refreshLockState: mWake ];
+    [self refreshLockState: mForceWake ];
+    [self refreshLockState: mWakeImage ];
+    [self refreshLockState: mWakeImageText ];
 }
 
--(IBAction) onCheckButtonChange: (id) sender
+-(void) loadOptionsFromPreferencesFile: (NSMutableDictionary*) dict
 {
 	
 }
 
--(IBAction) onTextFiedChange: (id) sender
+-(IBAction) onCheckButtonChange: (NSButton*) sender
 {
 	
 }
 
--(void) loadOptionsFromPreferencesFile
+-(IBAction) onTextFiedChange: (NSTextField*) sender
 {
 	
 }
+
 + (AdvancedSetupController *)instance { return(gInstance);}
 
 @end
Index: trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.h
===================================================================
--- trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.h	(revision 46)
+++ trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.h	(revision 47)
@@ -9,9 +9,23 @@
 #import <SecurityFoundation/SFAuthorization.h>
 #import <SecurityInterface/SFAuthorizationView.h>
 
+// Constants
+static const NSString* const keyForceBootConfigPath =  @"forceBootConfigPath";
+static const NSString* const keySwapHD01 =  @"swapHD01";
+static const NSString* const keySwapHD02 =  @"swapHD02";
+static const NSString* const keyUseFrozenParts =  @"useFrozenParts";
+static const NSString* const keyPartitionsList =  @"partitionsList";
+static const NSString* const kPreferencesFilePath =  @"/Library/Preferences/com.chameleon.prefPane.plist";
+static const NSString* const keyPreferencesFileVersion =  @"version"; // for future back compatibility
 
+// Interface
+
 @interface ChameleonPrefPane : NSPreferencePane 
 {
+@public
+    IBOutlet SFAuthorizationView *authView;
+
+	
 @private
 	// Objects corresponding to the interface mapping:
 	IBOutlet NSTableView *		mPartitionsTable;
@@ -22,50 +36,43 @@
 	IBOutlet NSButton *			mSleepButton;
 	IBOutlet NSButton *			mShutDownButton;
 	IBOutlet NSButton *			mRestartButton;
-	IBOutlet NSButton *			mSwapHD01;
-	IBOutlet NSButton *			mSwapHD02;
-	IBOutlet NSButton *			mFreezeParts;
-	IBOutlet NSButton *			mInjectFrozenParts;
 	IBOutlet NSTextField*		mStatusText;
 	IBOutlet NSBox*				mOptions;
-    IBOutlet SFAuthorizationView *authView;
 
+
+	NSMutableDictionary*		mOptionsDict;
+	NSMutableDictionary*		mPartitionsDict;
+
 	NSImage*					mMacOSXImage;
 	NSImage*					mWindowsImage;
 	NSImage*					mLinuxImage;
 	NSImage*					mUnknownImage;
 	NSImage*					mCDROMImage;
-	NSMutableDictionary*		mOptionsDict;
-	NSMutableDictionary*		mPartitionsDict;
 	NSString*					mOptionsPlistPath;
 	int							mPreferenceFileVersion; 
 }
 
 + (ChameleonPrefPane*) instance; // return the current instance
+- (void) loadPreferences;
+- (bool) savePreferences: (NSDictionary*) dict;
+- (NSMutableDictionary*) preferencesFile;
+- (NSMutableDictionary*) preferencesParts;
 
+- (NSTableView*) partitionsTable;
+
 - (IBAction)onRestart: (id)sender;
 - (IBAction)onShutdown: (id)sender;
 - (IBAction)onSleep: (id)sender;
-- (IBAction)onSwapHD: (id)sender;
-- (IBAction)onUseFrozenParts: (id)sender;
-- (IBAction)onInjectPartsToFreeze: (id)sender;
 
-- (NSMutableDictionary*) getPreferencesFile;
-
 - (void)awakeFromNib;
 - (void)initBootConfig;
 - (id) getImageResource: (NSString *) str ofType: (NSString*) sType;
-- (void) loadPreferences;
-- (bool) savePreferences: (NSDictionary*) dict;
 
 - (void)tableViewSelectionDidChange:(NSNotification *)notification;
 - (void) selectDefaultPartition;
 
 - (bool)isUnlocked;
 - (void) refreshLockStates;
-- (void) doSwapHD: (int) val save: (bool) doSave src: (int)isrc dst: (int) idst;
 - (void)tableViewSelectionDidChange:(NSNotification *)notification;
 
-- (void) swapDisks: (bool) bSwap src: (int) iSrc dst: (int) iDst;
-
 @end
Index: trunk/ChameleonPrefPane/Sources/PropertyList.h
===================================================================
--- trunk/ChameleonPrefPane/Sources/PropertyList.h	(revision 0)
+++ trunk/ChameleonPrefPane/Sources/PropertyList.h	(revision 47)
@@ -0,0 +1,54 @@
+/*
+ *  property_list.h
+ *
+ *  Created by Rekursor on 1/17/10.
+ *
+ */
+#ifndef __CHPROPERTYLIST_LIST_H
+#define __CHPROPERTYLIST_LIST_H
+
+#include <CoreFoundation/CFPropertyList.h>
+#include <CoreFoundation/CFURLAccess.h>
+#include <Security/Authorization.h>
+#include <string>
+
+/****************************************************************/
+
+/**
+ * priviledged command run for cmds like property chmods and restard command
+ */
+bool executePrivilegedCmd(AuthorizationRef auth, 
+						  const char* pathToTool, 
+						  const char* args=NULL, 
+						  AuthorizationFlags flags=kAuthorizationFlagDefaults);
+
+/****************************************************************/
+
+/**
+ * Simple PropertyList Abstraction
+ */
+class PropertyList
+{
+	
+public:
+	PropertyList() : _proplistRef(0), _CFURLRef(0) {	}
+	virtual ~PropertyList();
+	
+	bool open(const char *propListPath, CFStringRef* errString,
+			  AuthorizationRef auth=NULL, AuthorizationFlags flags=kAuthorizationFlagDefaults);
+	bool save(AuthorizationRef auth=NULL, AuthorizationFlags flags=kAuthorizationFlagDefaults);
+	bool isValid() const { return _proplistRef!=NULL;}
+	
+	const char * getStringForKey(const char *key);
+	bool setStringForKey(const char* key, const char* value);
+	const char * propFilePath() const {	return _propFilePath.c_str(); }
+	
+	static bool chmodFile(const char * path, const char * chmodMask,
+						  AuthorizationRef auth, AuthorizationFlags flags=kAuthorizationFlagDefaults);
+protected:
+	CFPropertyListRef _proplistRef;
+	CFURLRef _CFURLRef;
+	std::string _propFilePath; // keep a track of the proplist filename
+};
+
+#endif
Index: trunk/ChameleonPrefPane/Sources/PreferencesControllerBase.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/PreferencesControllerBase.mm	(revision 46)
+++ trunk/ChameleonPrefPane/Sources/PreferencesControllerBase.mm	(revision 47)
@@ -6,15 +6,110 @@
 //
 
 #import "PreferencesControllerBase.h"
+#include <string>
 
 
 @implementation PreferencesControllerBase
 
--(NSMutableDictionary*) getPreferencesDictionary
+-(ChameleonPrefPane*) chameleon { return [ChameleonPrefPane instance]; }
+
+//--------------------------------------------------------------------------
+- (id) init
 {
-	if ([ChameleonPrefPane instance]==nil) return nil;
+	self = [super init];
+	return self;
+}	
+
+//--------------------------------------------------------------------------
+// from the id to desc map in prop, set all default values for dict
++ (void) setDefaultValues: (NSMutableDictionary*) dict 
+{
 	
-	return [[ChameleonPrefPane instance] getPreferencesFile];
+	for(const BootOptionDesc* bod = prop->firstOption();bod; bod=prop->nextOption())
+	{
+		switch (bod->Type) 
+		{
+			case OptionYesNo:
+				[(NSButton*)bod->ID setIntValue: (toupper(bod->Default[0])=='Y' ? 1 : 0) ];
+				break;
+			case OptionKernel:
+			case OptionString:
+				[(NSButton*)bod->ID setIntValue: 0 ];
+			case OptionKernel1:
+				[(NSTextField*)bod->contentID setStringValue: 
+					[[NSString alloc] initWithUTF8String: bod->Default] ];
+				break;
+			case OptionUnix:
+				[(NSButton*)bod->ID setIntValue: 0 ];
+				break;
+				
+			default:
+				break;
+		}
+	}
 }
+//--------------------------------------------------------------------------
+- (void) refreshLockState: (id) item
+{
+    [item setEnabled:[[ChameleonPrefPane instance] isUnlocked]];
+	
+}
 
+//--------------------------------------------------------------------------
+- (void) loadPreferences
+{
+	[ [ChameleonPrefPane instance] loadPreferences];
+}
+
+//--------------------------------------------------------------------------
+- (bool) savePreferences
+{
+	return [ [ChameleonPrefPane instance] savePreferences: [self preferencesFile] ];
+	
+}
+//--------------------------------------------------------------------------
+-(NSMutableDictionary*) preferencesFile
+{	
+	return [[ChameleonPrefPane instance] preferencesFile];
+}
+
+//--------------------------------------------------------------------------
+-(NSMutableDictionary*) preferencesParts 
+{ 
+	return [[ChameleonPrefPane instance] preferencesParts];
+}
+
+//--------------------------------------------------------------------------
+- (bool) handleSender: (id) sender withButton: (NSButton*) button forKey:(const char*) key
+{
+	return [self handleSender: sender withButton: button andField: nil forKey: key];
+}
+
+//--------------------------------------------------------------------------
+- (bool) handleSender: (id) sender withButton: (NSButton*) button andField:(NSTextField*) field forKey:(const char*) key
+{
+	if((NSButton*)sender!=button || (NSTextField*)sender !=field) return false;
+	if ((NSButton*)sender==button)
+	{
+		if (prop && prop->isValid())
+		{
+			std::string keyValue = 	prop->getStringForKey(key);
+			if ( !![button intValue])
+			{
+				
+			}
+			else
+			{
+				
+			}
+		}
+	}
+	else 
+	{ // field
+		
+	}
+
+	return true;
+}
+
 @end
Index: trunk/ChameleonPrefPane/Sources/PeripheralsController.h
===================================================================
--- trunk/ChameleonPrefPane/Sources/PeripheralsController.h	(revision 46)
+++ trunk/ChameleonPrefPane/Sources/PeripheralsController.h	(revision 47)
@@ -17,7 +17,7 @@
 	IBOutlet NSButton*		mBootBanner;
 	IBOutlet NSButton*		mVBIOS;
 	IBOutlet NSButton*		mVideoROM;
-	IBOutlet NSTextField*		mVideoROMText;
+	IBOutlet NSTextField*	mVideoROMText;
 	
 	IBOutlet NSButton*		mGraphicsMode;
 	IBOutlet NSTextField*	mGraphicsModeText;
@@ -30,6 +30,10 @@
 	IBOutlet NSButton*		mEthernetBuiltIn;
 	
 }
+
+- (IBAction) onCheckButtonChange: (NSButton*) sender;
+- (IBAction) onTextFiedChange: (id) sender;
+
 + (PeripheralsController *)instance;
 
 @end
Index: trunk/ChameleonPrefPane/Sources/BootFlagsController.h
===================================================================
--- trunk/ChameleonPrefPane/Sources/BootFlagsController.h	(revision 46)
+++ trunk/ChameleonPrefPane/Sources/BootFlagsController.h	(revision 47)
@@ -6,7 +6,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <PreferencesControllerBase.h>
+#import "PreferencesControllerBase.h"
 
 
 // TabView subpane controller definition
@@ -30,6 +30,9 @@
 	IBOutlet NSButton*		mRescanSingleDrive;
 }
 
+- (IBAction) onCheckButtonChange: (NSButton*) sender;
+- (IBAction) onTextFiedChange: (id) sender;
+
 + (BootFlagsController *)instance;
 
 @end
Index: trunk/ChameleonPrefPane/Sources/BootSetupController.h
===================================================================
--- trunk/ChameleonPrefPane/Sources/BootSetupController.h	(revision 46)
+++ trunk/ChameleonPrefPane/Sources/BootSetupController.h	(revision 47)
@@ -6,15 +6,22 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <PreferencesControllerBase.h>
+#import "PreferencesControllerBase.h"
 
+// Constants definitions
+static const char* const kDefaultPartition = "Default Partition";
+static const char* const kHidePartition = "Hide Partition";
+static const char* const kRenamePartition = "Rename Partition";
 
 // TabView subpane controller definition
 @interface BootSetupController : PreferencesControllerBase <PreferenceController> 
 {
-	
-	// TODO move swap hds and freeze buttons to this class
-	
+@public	
+	IBOutlet NSButton *		mSwapHD01;
+	IBOutlet NSButton *		mSwapHD02;
+	IBOutlet NSButton *		mFreezeParts;
+	IBOutlet NSButton *		mInjectFrozenParts;
+
 	IBOutlet NSButton*		mDefaultPartition;
 	IBOutlet NSTextField*	mDefaultPartitionText;
 	
@@ -26,7 +33,11 @@
 	
 }
 
+- (IBAction) onCheckButtonChange: (NSButton*) sender;
+- (IBAction) onTextFiedChange: (id) sender;
 
+- (void) doSwapHD: (int) val save: (bool) doSave src: (int) isrc dst: (int) idst;
+
 + (BootSetupController *)instance;
 
 @end
Index: trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj
===================================================================
--- trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj	(revision 46)
+++ trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj	(revision 47)
@@ -23,13 +23,15 @@
 		01993199110A2C61003B056E /* string_util.h in Headers */ = {isa = PBXBuildFile; fileRef = 01993198110A2C61003B056E /* string_util.h */; };
 		019931DD110A37FA003B056E /* PreferencesControllerBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 019931DB110A37FA003B056E /* PreferencesControllerBase.h */; };
 		019931DE110A37FA003B056E /* PreferencesControllerBase.mm in Sources */ = {isa = PBXBuildFile; fileRef = 019931DC110A37FA003B056E /* PreferencesControllerBase.mm */; };
+		01993567110AA9FA003B056E /* BootPropertyList.h in Headers */ = {isa = PBXBuildFile; fileRef = 01993565110AA9FA003B056E /* BootPropertyList.h */; };
+		01993568110AA9FA003B056E /* BootPropertyList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01993566110AA9FA003B056E /* BootPropertyList.cpp */; };
 		01A40F75110550F4002A74CD /* CHANGES in Resources */ = {isa = PBXBuildFile; fileRef = 01A40F74110550F4002A74CD /* CHANGES */; };
 		01B0E8141108B85A00ACF21B /* ChameleonPrefPane.h in Headers */ = {isa = PBXBuildFile; fileRef = 01B0E80E1108B85A00ACF21B /* ChameleonPrefPane.h */; };
 		01B0E8151108B85A00ACF21B /* ChameleonPrefPane.mm in Sources */ = {isa = PBXBuildFile; fileRef = 01B0E80F1108B85A00ACF21B /* ChameleonPrefPane.mm */; };
-		01B0E8161108B85A00ACF21B /* process.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01B0E8101108B85A00ACF21B /* process.cpp */; };
-		01B0E8171108B85A00ACF21B /* process.h in Headers */ = {isa = PBXBuildFile; fileRef = 01B0E8111108B85A00ACF21B /* process.h */; };
-		01B0E8181108B85A00ACF21B /* property_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01B0E8121108B85A00ACF21B /* property_list.cpp */; };
-		01B0E8191108B85A00ACF21B /* property_list.h in Headers */ = {isa = PBXBuildFile; fileRef = 01B0E8131108B85A00ACF21B /* property_list.h */; };
+		01B0E8161108B85A00ACF21B /* ShellProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01B0E8101108B85A00ACF21B /* ShellProcess.cpp */; };
+		01B0E8171108B85A00ACF21B /* ShellProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 01B0E8111108B85A00ACF21B /* ShellProcess.h */; };
+		01B0E8181108B85A00ACF21B /* PropertyList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01B0E8121108B85A00ACF21B /* PropertyList.cpp */; };
+		01B0E8191108B85A00ACF21B /* PropertyList.h in Headers */ = {isa = PBXBuildFile; fileRef = 01B0E8131108B85A00ACF21B /* PropertyList.h */; };
 		01B0E8201108B87A00ACF21B /* CDROM.png in Resources */ = {isa = PBXBuildFile; fileRef = 01B0E81A1108B87A00ACF21B /* CDROM.png */; };
 		01B0E8211108B87A00ACF21B /* Chameleon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 01B0E81B1108B87A00ACF21B /* Chameleon.icns */; };
 		01B0E8221108B87A00ACF21B /* Chameleon.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 01B0E81C1108B87A00ACF21B /* Chameleon.tiff */; };
@@ -63,13 +65,15 @@
 		01993198110A2C61003B056E /* string_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = string_util.h; path = Sources/string_util.h; sourceTree = SOURCE_ROOT; };
 		019931DB110A37FA003B056E /* PreferencesControllerBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreferencesControllerBase.h; path = Sources/PreferencesControllerBase.h; sourceTree = "<group>"; };
 		019931DC110A37FA003B056E /* PreferencesControllerBase.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PreferencesControllerBase.mm; path = Sources/PreferencesControllerBase.mm; sourceTree = "<group>"; };
+		01993565110AA9FA003B056E /* BootPropertyList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BootPropertyList.h; path = Sources/BootPropertyList.h; sourceTree = "<group>"; };
+		01993566110AA9FA003B056E /* BootPropertyList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BootPropertyList.cpp; path = Sources/BootPropertyList.cpp; sourceTree = "<group>"; };
 		01A40F74110550F4002A74CD /* CHANGES */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGES; sourceTree = "<group>"; };
 		01B0E80E1108B85A00ACF21B /* ChameleonPrefPane.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChameleonPrefPane.h; path = Sources/ChameleonPrefPane.h; sourceTree = "<group>"; };
 		01B0E80F1108B85A00ACF21B /* ChameleonPrefPane.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ChameleonPrefPane.mm; path = Sources/ChameleonPrefPane.mm; sourceTree = "<group>"; };
-		01B0E8101108B85A00ACF21B /* process.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = process.cpp; path = Sources/process.cpp; sourceTree = "<group>"; };
-		01B0E8111108B85A00ACF21B /* process.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = process.h; path = Sources/process.h; sourceTree = "<group>"; };
-		01B0E8121108B85A00ACF21B /* property_list.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = property_list.cpp; path = Sources/property_list.cpp; sourceTree = "<group>"; };
-		01B0E8131108B85A00ACF21B /* property_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = property_list.h; path = Sources/property_list.h; sourceTree = "<group>"; };
+		01B0E8101108B85A00ACF21B /* ShellProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ShellProcess.cpp; path = Sources/ShellProcess.cpp; sourceTree = "<group>"; };
+		01B0E8111108B85A00ACF21B /* ShellProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ShellProcess.h; path = Sources/ShellProcess.h; sourceTree = "<group>"; };
+		01B0E8121108B85A00ACF21B /* PropertyList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PropertyList.cpp; path = Sources/PropertyList.cpp; sourceTree = "<group>"; };
+		01B0E8131108B85A00ACF21B /* PropertyList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PropertyList.h; path = Sources/PropertyList.h; sourceTree = "<group>"; };
 		01B0E81A1108B87A00ACF21B /* CDROM.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CDROM.png; path = Resources/CDROM.png; sourceTree = "<group>"; };
 		01B0E81B1108B87A00ACF21B /* Chameleon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = Chameleon.icns; path = Resources/Chameleon.icns; sourceTree = "<group>"; };
 		01B0E81C1108B87A00ACF21B /* Chameleon.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Chameleon.tiff; path = Resources/Chameleon.tiff; sourceTree = "<group>"; };
@@ -148,10 +152,10 @@
 			isa = PBXGroup;
 			children = (
 				01993198110A2C61003B056E /* string_util.h */,
+				019931DB110A37FA003B056E /* PreferencesControllerBase.h */,
+				019931DC110A37FA003B056E /* PreferencesControllerBase.mm */,
 				01B0E80E1108B85A00ACF21B /* ChameleonPrefPane.h */,
 				01B0E80F1108B85A00ACF21B /* ChameleonPrefPane.mm */,
-				019931DB110A37FA003B056E /* PreferencesControllerBase.h */,
-				019931DC110A37FA003B056E /* PreferencesControllerBase.mm */,
 				019930DF110A0CB4003B056E /* BootSetupController.h */,
 				019930E0110A0CB4003B056E /* BootSetupController.mm */,
 				019930E6110A0D80003B056E /* BootFlagsController.h */,
@@ -160,10 +164,12 @@
 				019930FD110A0E6F003B056E /* PeripheralsController.mm */,
 				01993113110A0EB9003B056E /* AdvancedSetupController.h */,
 				01993114110A0EB9003B056E /* AdvancedSetupController.mm */,
-				01B0E8111108B85A00ACF21B /* process.h */,
-				01B0E8101108B85A00ACF21B /* process.cpp */,
-				01B0E8131108B85A00ACF21B /* property_list.h */,
-				01B0E8121108B85A00ACF21B /* property_list.cpp */,
+				01B0E8111108B85A00ACF21B /* ShellProcess.h */,
+				01B0E8101108B85A00ACF21B /* ShellProcess.cpp */,
+				01B0E8131108B85A00ACF21B /* PropertyList.h */,
+				01B0E8121108B85A00ACF21B /* PropertyList.cpp */,
+				01993565110AA9FA003B056E /* BootPropertyList.h */,
+				01993566110AA9FA003B056E /* BootPropertyList.cpp */,
 			);
 			name = Classes;
 			sourceTree = "<group>";
@@ -219,14 +225,15 @@
 			files = (
 				8D202CEA0486D31800D8A456 /* StartupPrefPane_Prefix.pch in Headers */,
 				01B0E8141108B85A00ACF21B /* ChameleonPrefPane.h in Headers */,
-				01B0E8171108B85A00ACF21B /* process.h in Headers */,
-				01B0E8191108B85A00ACF21B /* property_list.h in Headers */,
+				01B0E8171108B85A00ACF21B /* ShellProcess.h in Headers */,
+				01B0E8191108B85A00ACF21B /* PropertyList.h in Headers */,
 				019930E1110A0CB4003B056E /* BootSetupController.h in Headers */,
 				019930E8110A0D80003B056E /* BootFlagsController.h in Headers */,
 				019930FE110A0E6F003B056E /* PeripheralsController.h in Headers */,
 				01993115110A0EB9003B056E /* AdvancedSetupController.h in Headers */,
 				01993199110A2C61003B056E /* string_util.h in Headers */,
 				019931DD110A37FA003B056E /* PreferencesControllerBase.h in Headers */,
+				01993567110AA9FA003B056E /* BootPropertyList.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -311,13 +318,14 @@
 			buildActionMask = 2147483647;
 			files = (
 				01B0E8151108B85A00ACF21B /* ChameleonPrefPane.mm in Sources */,
-				01B0E8161108B85A00ACF21B /* process.cpp in Sources */,
-				01B0E8181108B85A00ACF21B /* property_list.cpp in Sources */,
+				01B0E8161108B85A00ACF21B /* ShellProcess.cpp in Sources */,
+				01B0E8181108B85A00ACF21B /* PropertyList.cpp in Sources */,
 				019930E2110A0CB4003B056E /* BootSetupController.mm in Sources */,
 				019930E9110A0D80003B056E /* BootFlagsController.mm in Sources */,
 				019930FF110A0E6F003B056E /* PeripheralsController.mm in Sources */,
 				01993116110A0EB9003B056E /* AdvancedSetupController.mm in Sources */,
 				019931DE110A37FA003B056E /* PreferencesControllerBase.mm in Sources */,
+				01993568110AA9FA003B056E /* BootPropertyList.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
Index: trunk/ChameleonPrefPane/English.lproj/Chameleon.xib
===================================================================
--- trunk/ChameleonPrefPane/English.lproj/Chameleon.xib	(revision 46)
+++ trunk/ChameleonPrefPane/English.lproj/Chameleon.xib	(revision 47)
@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="172"/>
+			<integer value="603"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -72,7 +72,7 @@
 								<object class="NSTabViewItem" id="210384195">
 									<string key="NSIdentifier">1</string>
 									<object class="NSView" key="NSView" id="389526238">
-										<reference key="NSNextResponder" ref="869599070"/>
+										<nil key="NSNextResponder"/>
 										<int key="NSvFlags">292</int>
 										<object class="NSMutableArray" key="NSSubviews">
 											<bool key="EncodedWithXMLCoder">YES</bool>
@@ -724,7 +724,6 @@
 											</object>
 										</object>
 										<string key="NSFrame">{{10, 33}, {640, 267}}</string>
-										<reference key="NSSuperview" ref="869599070"/>
 									</object>
 									<string key="NSLabel">Boot From ...</string>
 									<reference key="NSColor" ref="1061310622"/>
@@ -733,7 +732,7 @@
 								<object class="NSTabViewItem" id="1039429426">
 									<string key="NSIdentifier">2</string>
 									<object class="NSView" key="NSView" id="451295758">
-										<nil key="NSNextResponder"/>
+										<reference key="NSNextResponder" ref="869599070"/>
 										<int key="NSvFlags">256</int>
 										<object class="NSMutableArray" key="NSSubviews">
 											<bool key="EncodedWithXMLCoder">YES</bool>
@@ -762,7 +761,7 @@
 																	<reference key="NSControlView" ref="778294972"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<object class="NSCustomResource" key="NSNormalImage" id="934619686">
+																	<object class="NSCustomResource" key="NSNormalImage" id="459398604">
 																		<string key="NSClassName">NSImage</string>
 																		<string key="NSResourceName">NSSwitch</string>
 																	</object>
@@ -818,7 +817,7 @@
 																	<reference key="NSControlView" ref="276176519"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -859,7 +858,7 @@
 																	<reference key="NSControlView" ref="18675440"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -913,32 +912,32 @@
 												<int key="NSTitlePosition">2</int>
 												<bool key="NSTransparent">NO</bool>
 											</object>
-											<object class="NSBox" id="553496908">
+											<object class="NSBox" id="1043374456">
 												<reference key="NSNextResponder" ref="451295758"/>
 												<int key="NSvFlags">12</int>
 												<object class="NSMutableArray" key="NSSubviews">
 													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSView" id="1009386940">
-														<reference key="NSNextResponder" ref="553496908"/>
+													<object class="NSView" id="776534053">
+														<reference key="NSNextResponder" ref="1043374456"/>
 														<int key="NSvFlags">256</int>
 														<object class="NSMutableArray" key="NSSubviews">
 															<bool key="EncodedWithXMLCoder">YES</bool>
-															<object class="NSButton" id="292597271">
-																<reference key="NSNextResponder" ref="1009386940"/>
+															<object class="NSButton" id="37616634">
+																<reference key="NSNextResponder" ref="776534053"/>
 																<int key="NSvFlags">268</int>
 																<string key="NSFrame">{{12, 13}, {128, 18}}</string>
-																<reference key="NSSuperview" ref="1009386940"/>
+																<reference key="NSSuperview" ref="776534053"/>
 																<int key="NSViewLayerContentsRedrawPolicy">2</int>
 																<bool key="NSEnabled">YES</bool>
-																<object class="NSButtonCell" key="NSCell" id="202851389">
+																<object class="NSButtonCell" key="NSCell" id="268393823">
 																	<int key="NSCellFlags">67239424</int>
 																	<int key="NSCellFlags2">0</int>
 																	<string key="NSContents">Swap hd  0&lt;-&gt;1</string>
 																	<reference key="NSSupport" ref="930899267"/>
-																	<reference key="NSControlView" ref="292597271"/>
+																	<reference key="NSControlView" ref="37616634"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -946,22 +945,22 @@
 																	<int key="NSPeriodicInterval">25</int>
 																</object>
 															</object>
-															<object class="NSButton" id="142232122">
-																<reference key="NSNextResponder" ref="1009386940"/>
+															<object class="NSButton" id="399108788">
+																<reference key="NSNextResponder" ref="776534053"/>
 																<int key="NSvFlags">268</int>
 																<string key="NSFrame">{{150, 13}, {124, 18}}</string>
-																<reference key="NSSuperview" ref="1009386940"/>
+																<reference key="NSSuperview" ref="776534053"/>
 																<int key="NSViewLayerContentsRedrawPolicy">2</int>
 																<bool key="NSEnabled">YES</bool>
-																<object class="NSButtonCell" key="NSCell" id="849958821">
+																<object class="NSButtonCell" key="NSCell" id="909560157">
 																	<int key="NSCellFlags">67239424</int>
 																	<int key="NSCellFlags2">0</int>
 																	<string key="NSContents">Swap hd 0&lt;-&gt;2</string>
 																	<reference key="NSSupport" ref="930899267"/>
-																	<reference key="NSControlView" ref="142232122"/>
+																	<reference key="NSControlView" ref="399108788"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -969,22 +968,22 @@
 																	<int key="NSPeriodicInterval">25</int>
 																</object>
 															</object>
-															<object class="NSButton" id="102885086">
-																<reference key="NSNextResponder" ref="1009386940"/>
+															<object class="NSButton" id="1067138506">
+																<reference key="NSNextResponder" ref="776534053"/>
 																<int key="NSvFlags">268</int>
 																<string key="NSFrame">{{297, 13}, {161, 18}}</string>
-																<reference key="NSSuperview" ref="1009386940"/>
+																<reference key="NSSuperview" ref="776534053"/>
 																<int key="NSViewLayerContentsRedrawPolicy">2</int>
 																<bool key="NSEnabled">YES</bool>
-																<object class="NSButtonCell" key="NSCell" id="940283145">
+																<object class="NSButtonCell" key="NSCell" id="565603593">
 																	<int key="NSCellFlags">67239424</int>
 																	<int key="NSCellFlags2">0</int>
 																	<string key="NSContents">Use Freezed Parts List</string>
 																	<reference key="NSSupport" ref="930899267"/>
-																	<reference key="NSControlView" ref="102885086"/>
+																	<reference key="NSControlView" ref="1067138506"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -992,19 +991,19 @@
 																	<int key="NSPeriodicInterval">25</int>
 																</object>
 															</object>
-															<object class="NSButton" id="606405827">
-																<reference key="NSNextResponder" ref="1009386940"/>
+															<object class="NSButton" id="748817052">
+																<reference key="NSNextResponder" ref="776534053"/>
 																<int key="NSvFlags">268</int>
 																<string key="NSFrame">{{459, 7}, {159, 28}}</string>
-																<reference key="NSSuperview" ref="1009386940"/>
+																<reference key="NSSuperview" ref="776534053"/>
 																<int key="NSViewLayerContentsRedrawPolicy">2</int>
 																<bool key="NSEnabled">YES</bool>
-																<object class="NSButtonCell" key="NSCell" id="633046573">
+																<object class="NSButtonCell" key="NSCell" id="806094313">
 																	<int key="NSCellFlags">67239424</int>
 																	<int key="NSCellFlags2">134348800</int>
 																	<string key="NSContents">Inject Parts in Freeze File</string>
 																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="606405827"/>
+																	<reference key="NSControlView" ref="748817052"/>
 																	<int key="NSButtonFlags">-2038284033</int>
 																	<int key="NSButtonFlags2">129</int>
 																	<string key="NSAlternateContents"/>
@@ -1015,7 +1014,7 @@
 															</object>
 														</object>
 														<string key="NSFrame">{{1, 1}, {626, 47}}</string>
-														<reference key="NSSuperview" ref="553496908"/>
+														<reference key="NSSuperview" ref="1043374456"/>
 														<int key="NSViewLayerContentsRedrawPolicy">2</int>
 													</object>
 												</object>
@@ -1035,7 +1034,7 @@
 														<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
 													</object>
 												</object>
-												<reference key="NSContentView" ref="1009386940"/>
+												<reference key="NSContentView" ref="776534053"/>
 												<int key="NSBorderType">1</int>
 												<int key="NSBoxType">0</int>
 												<int key="NSTitlePosition">2</int>
@@ -1043,6 +1042,7 @@
 											</object>
 										</object>
 										<string key="NSFrame">{{10, 33}, {640, 267}}</string>
+										<reference key="NSSuperview" ref="869599070"/>
 									</object>
 									<string key="NSLabel">Boot Setup</string>
 									<reference key="NSColor" ref="1061310622"/>
@@ -1079,7 +1079,7 @@
 																	<reference key="NSControlView" ref="334542109"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1101,7 +1101,7 @@
 																	<reference key="NSControlView" ref="958084214"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1123,7 +1123,7 @@
 																	<reference key="NSControlView" ref="629897331"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1145,7 +1145,7 @@
 																	<reference key="NSControlView" ref="724579405"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1184,7 +1184,7 @@
 																	<reference key="NSControlView" ref="601436105"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1206,7 +1206,7 @@
 																	<reference key="NSControlView" ref="90016923"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1228,7 +1228,7 @@
 																	<reference key="NSControlView" ref="793808229"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1236,21 +1236,21 @@
 																	<int key="NSPeriodicInterval">25</int>
 																</object>
 															</object>
-															<object class="NSButton" id="642724982">
+															<object class="NSButton" id="744752273">
 																<reference key="NSNextResponder" ref="252867636"/>
 																<int key="NSvFlags">268</int>
 																<string key="NSFrame">{{141, 75}, {109, 18}}</string>
 																<reference key="NSSuperview" ref="252867636"/>
 																<bool key="NSEnabled">YES</bool>
-																<object class="NSButtonCell" key="NSCell" id="296462912">
+																<object class="NSButtonCell" key="NSCell" id="450162552">
 																	<int key="NSCellFlags">67239424</int>
 																	<int key="NSCellFlags2">0</int>
 																	<string key="NSContents">Safe Boot (-x)</string>
 																	<reference key="NSSupport" ref="930899267"/>
-																	<reference key="NSControlView" ref="642724982"/>
+																	<reference key="NSControlView" ref="744752273"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1307,7 +1307,7 @@
 																	<reference key="NSControlView" ref="1050615289"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1329,7 +1329,7 @@
 																	<reference key="NSControlView" ref="728009658"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1351,7 +1351,7 @@
 																	<reference key="NSControlView" ref="712902523"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1422,7 +1422,7 @@
 																	<reference key="NSControlView" ref="732855392"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1444,7 +1444,7 @@
 																	<reference key="NSControlView" ref="915217355"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1483,7 +1483,7 @@
 																	<reference key="NSControlView" ref="668416335"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1505,7 +1505,7 @@
 																	<reference key="NSControlView" ref="552874632"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1544,7 +1544,7 @@
 																	<reference key="NSControlView" ref="455218521"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1552,21 +1552,21 @@
 																	<int key="NSPeriodicInterval">25</int>
 																</object>
 															</object>
-															<object class="NSButton" id="452950132">
+															<object class="NSButton" id="628549159">
 																<reference key="NSNextResponder" ref="673251209"/>
 																<int key="NSvFlags">268</int>
 																<string key="NSFrame">{{316, 44}, {98, 18}}</string>
 																<reference key="NSSuperview" ref="673251209"/>
 																<bool key="NSEnabled">YES</bool>
-																<object class="NSButtonCell" key="NSCell" id="201615768">
+																<object class="NSButtonCell" key="NSCell" id="1025798338">
 																	<int key="NSCellFlags">67239424</int>
 																	<int key="NSCellFlags2">0</int>
 																	<string key="NSContents">Video ROM</string>
 																	<reference key="NSSupport" ref="930899267"/>
-																	<reference key="NSControlView" ref="452950132"/>
+																	<reference key="NSControlView" ref="628549159"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1623,7 +1623,7 @@
 																	<reference key="NSControlView" ref="512120668"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1645,7 +1645,7 @@
 																	<reference key="NSControlView" ref="498570608"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1667,7 +1667,7 @@
 																	<reference key="NSControlView" ref="767062089"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1724,7 +1724,7 @@
 																	<reference key="NSControlView" ref="698099005"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1795,7 +1795,7 @@
 																	<reference key="NSControlView" ref="317712564"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1817,7 +1817,7 @@
 																	<reference key="NSControlView" ref="366999"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1839,7 +1839,7 @@
 																	<reference key="NSControlView" ref="292282216"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1878,7 +1878,7 @@
 																	<reference key="NSControlView" ref="339794873"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1917,7 +1917,7 @@
 																	<reference key="NSControlView" ref="561126957"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1939,7 +1939,7 @@
 																	<reference key="NSControlView" ref="867800924"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -1978,7 +1978,7 @@
 																	<reference key="NSControlView" ref="323622459"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -2054,21 +2054,21 @@
 																	<reference key="NSTextColor" ref="866655721"/>
 																</object>
 															</object>
-															<object class="NSButton" id="600093947">
+															<object class="NSButton" id="489715876">
 																<reference key="NSNextResponder" ref="1000898384"/>
 																<int key="NSvFlags">268</int>
 																<string key="NSFrame">{{307, 15}, {184, 18}}</string>
 																<reference key="NSSuperview" ref="1000898384"/>
 																<bool key="NSEnabled">YES</bool>
-																<object class="NSButtonCell" key="NSCell" id="5664459">
+																<object class="NSButtonCell" key="NSCell" id="612718662">
 																	<int key="NSCellFlags">67239424</int>
 																	<int key="NSCellFlags2">0</int>
 																	<string key="NSContents">Disable kexts blacklisting</string>
 																	<reference key="NSSupport" ref="930899267"/>
-																	<reference key="NSControlView" ref="600093947"/>
+																	<reference key="NSControlView" ref="489715876"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -2125,7 +2125,7 @@
 																	<reference key="NSControlView" ref="969759846"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -2147,7 +2147,7 @@
 																	<reference key="NSControlView" ref="787406084"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -2238,7 +2238,7 @@
 																	<reference key="NSControlView" ref="100027946"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -2260,7 +2260,7 @@
 																	<reference key="NSControlView" ref="478279075"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -2317,7 +2317,7 @@
 																	<reference key="NSControlView" ref="353259796"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -2339,7 +2339,7 @@
 																	<reference key="NSControlView" ref="449337560"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -2364,21 +2364,21 @@
 																	<reference key="NSTextColor" ref="866655721"/>
 																</object>
 															</object>
-															<object class="NSButton" id="562928307">
+															<object class="NSButton" id="344346433">
 																<reference key="NSNextResponder" ref="59588505"/>
 																<int key="NSvFlags">268</int>
 																<string key="NSFrame">{{16, 12}, {63, 18}}</string>
 																<reference key="NSSuperview" ref="59588505"/>
 																<bool key="NSEnabled">YES</bool>
-																<object class="NSButtonCell" key="NSCell" id="267208272">
+																<object class="NSButtonCell" key="NSCell" id="836463679">
 																	<int key="NSCellFlags">67239424</int>
 																	<int key="NSCellFlags2">0</int>
 																	<string key="NSContents">Wake</string>
 																	<reference key="NSSupport" ref="930899267"/>
-																	<reference key="NSControlView" ref="562928307"/>
+																	<reference key="NSControlView" ref="344346433"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="934619686"/>
+																	<reference key="NSNormalImage" ref="459398604"/>
 																	<reference key="NSAlternateImage" ref="731537593"/>
 																	<string key="NSAlternateContents"/>
 																	<string key="NSKeyEquivalent"/>
@@ -2419,14 +2419,14 @@
 									<reference key="NSTabView" ref="869599070"/>
 								</object>
 							</object>
-							<reference key="NSSelectedTabViewItem" ref="210384195"/>
+							<reference key="NSSelectedTabViewItem" ref="1039429426"/>
 							<reference key="NSFont" ref="930899267"/>
 							<int key="NSTvFlags">0</int>
 							<bool key="NSAllowTruncatedLabels">YES</bool>
 							<bool key="NSDrawsBackground">YES</bool>
 							<object class="NSMutableArray" key="NSSubviews">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<reference ref="389526238"/>
+								<reference ref="451295758"/>
 							</object>
 						</object>
 						<object class="NSButton" id="474865121">
@@ -2465,7 +2465,7 @@
 				<string key="NSMinSize">{224.664, 32}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
 			</object>
-			<object class="NSWindowTemplate" id="702156620">
+			<object class="NSWindowTemplate" id="8349391">
 				<int key="NSWindowStyleMask">8223</int>
 				<int key="NSWindowBacking">2</int>
 				<string key="NSWindowRect">{{235, 265}, {464, 255}}</string>
@@ -2473,24 +2473,24 @@
 				<string key="NSWindowTitle">About the Chameleon Preferences Pane</string>
 				<string key="NSWindowClass">NSPanel</string>
 				<nil key="NSViewClass"/>
-				<object class="NSView" key="NSWindowView" id="887949744">
+				<object class="NSView" key="NSWindowView" id="908319067">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSTextField" id="391488284">
-							<reference key="NSNextResponder" ref="887949744"/>
+						<object class="NSTextField" id="807647820">
+							<reference key="NSNextResponder" ref="908319067"/>
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{245, 218}, {38, 17}}</string>
-							<reference key="NSSuperview" ref="887949744"/>
+							<reference key="NSSuperview" ref="908319067"/>
 							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="877262205">
+							<object class="NSTextFieldCell" key="NSCell" id="413394443">
 								<int key="NSCellFlags">68288064</int>
 								<int key="NSCellFlags2">272630784</int>
 								<string key="NSContents">2.0.0</string>
 								<reference key="NSSupport" ref="930899267"/>
-								<reference key="NSControlView" ref="391488284"/>
+								<reference key="NSControlView" ref="807647820"/>
 								<reference key="NSBackgroundColor" ref="1061310622"/>
 								<object class="NSColor" key="NSTextColor" id="781028059">
 									<int key="NSColorSpace">1</int>
@@ -2498,38 +2498,38 @@
 								</object>
 							</object>
 						</object>
-						<object class="NSTextField" id="454658438">
-							<reference key="NSNextResponder" ref="887949744"/>
+						<object class="NSTextField" id="329015339">
+							<reference key="NSNextResponder" ref="908319067"/>
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{182, 218}, {52, 17}}</string>
-							<reference key="NSSuperview" ref="887949744"/>
+							<reference key="NSSuperview" ref="908319067"/>
 							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="205055722">
+							<object class="NSTextFieldCell" key="NSCell" id="807339214">
 								<int key="NSCellFlags">68288064</int>
 								<int key="NSCellFlags2">272630784</int>
 								<string key="NSContents">Version</string>
 								<reference key="NSSupport" ref="930899267"/>
-								<reference key="NSControlView" ref="454658438"/>
+								<reference key="NSControlView" ref="329015339"/>
 								<reference key="NSBackgroundColor" ref="1061310622"/>
 								<reference key="NSTextColor" ref="781028059"/>
 							</object>
 						</object>
-						<object class="NSTextField" id="1013031189">
-							<reference key="NSNextResponder" ref="887949744"/>
+						<object class="NSTextField" id="417745275">
+							<reference key="NSNextResponder" ref="908319067"/>
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{46, 49}, {373, 154}}</string>
-							<reference key="NSSuperview" ref="887949744"/>
+							<reference key="NSSuperview" ref="908319067"/>
 							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="565613597">
+							<object class="NSTextFieldCell" key="NSCell" id="294587452">
 								<int key="NSCellFlags">-1805517311</int>
 								<int key="NSCellFlags2">272629760</int>
 								<string type="base64-UTF8" key="NSContents">ICBJbml0aWFsIENvbmNlcHRpb24gJiBEZXNpZ246ICAKCVJla3Vyc29yCiAgCiAgQ3JldyBNZW1iZXJz
 OiAgCglSZWt1cnNvciwgICBEaWVCdWNoZQogIAogIENvbnRyaWJ1dG9ycyAmIFRlc3RlcnM6ICAKCUJs
 YWNrT1NYLCAgTWFzdGVyQ2hpZWYsICBkaWdpdGFsX2RyZWFtZXIsICBzbWl0aEBAA</string>
 								<reference key="NSSupport" ref="930899267"/>
-								<reference key="NSControlView" ref="1013031189"/>
+								<reference key="NSControlView" ref="417745275"/>
 								<object class="NSColor" key="NSBackgroundColor">
 									<int key="NSColorSpace">1</int>
 									<bytes key="NSRGB">MCAwIDAAA</bytes>
@@ -2548,16 +2548,16 @@
 			<object class="NSCustomObject" id="513945847">
 				<string key="NSClassName">ChameleonPrefPane</string>
 			</object>
-			<object class="NSCustomObject" id="765871699">
+			<object class="NSCustomObject" id="770879448">
 				<string key="NSClassName">BootSetupController</string>
 			</object>
-			<object class="NSCustomObject" id="597359082">
+			<object class="NSCustomObject" id="276543394">
 				<string key="NSClassName">BootFlagsController</string>
 			</object>
-			<object class="NSCustomObject" id="225164805">
+			<object class="NSCustomObject" id="2692381">
 				<string key="NSClassName">PeripheralsController</string>
 			</object>
-			<object class="NSCustomObject" id="422539145">
+			<object class="NSCustomObject" id="523685185">
 				<string key="NSClassName">AdvancedSetupController</string>
 			</object>
 		</object>
@@ -2695,7 +2695,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mDefaultPartition</string>
-						<reference key="source" ref="765871699"/>
+						<reference key="source" ref="770879448"/>
 						<reference key="destination" ref="778294972"/>
 					</object>
 					<int key="connectionID">600</int>
@@ -2703,7 +2703,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mHidePartition</string>
-						<reference key="source" ref="765871699"/>
+						<reference key="source" ref="770879448"/>
 						<reference key="destination" ref="276176519"/>
 					</object>
 					<int key="connectionID">601</int>
@@ -2711,47 +2711,15 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mRenamePartition</string>
-						<reference key="source" ref="765871699"/>
+						<reference key="source" ref="770879448"/>
 						<reference key="destination" ref="18675440"/>
 					</object>
 					<int key="connectionID">602</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">onSwapHD:</string>
-						<reference key="source" ref="513945847"/>
-						<reference key="destination" ref="292597271"/>
-					</object>
-					<int key="connectionID">612</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">onSwapHD:</string>
-						<reference key="source" ref="513945847"/>
-						<reference key="destination" ref="142232122"/>
-					</object>
-					<int key="connectionID">613</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">onUseFrozenParts:</string>
-						<reference key="source" ref="513945847"/>
-						<reference key="destination" ref="102885086"/>
-					</object>
-					<int key="connectionID">614</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">onInjectPartsToFreeze:</string>
-						<reference key="source" ref="513945847"/>
-						<reference key="destination" ref="633046573"/>
-					</object>
-					<int key="connectionID">615</int>
-				</object>
-				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mVerbose</string>
-						<reference key="source" ref="597359082"/>
+						<reference key="source" ref="276543394"/>
 						<reference key="destination" ref="334542109"/>
 					</object>
 					<int key="connectionID">616</int>
@@ -2759,15 +2727,15 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mSafeBoot</string>
-						<reference key="source" ref="597359082"/>
-						<reference key="destination" ref="642724982"/>
+						<reference key="source" ref="276543394"/>
+						<reference key="destination" ref="744752273"/>
 					</object>
 					<int key="connectionID">617</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mIgnoreBootConfig</string>
-						<reference key="source" ref="597359082"/>
+						<reference key="source" ref="276543394"/>
 						<reference key="destination" ref="958084214"/>
 					</object>
 					<int key="connectionID">618</int>
@@ -2775,7 +2743,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mTimeOut</string>
-						<reference key="source" ref="597359082"/>
+						<reference key="source" ref="276543394"/>
 						<reference key="destination" ref="724579405"/>
 					</object>
 					<int key="connectionID">619</int>
@@ -2783,7 +2751,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mTimeOutText</string>
-						<reference key="source" ref="597359082"/>
+						<reference key="source" ref="276543394"/>
 						<reference key="destination" ref="390095704"/>
 					</object>
 					<int key="connectionID">620</int>
@@ -2791,7 +2759,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mSingleUser</string>
-						<reference key="source" ref="597359082"/>
+						<reference key="source" ref="276543394"/>
 						<reference key="destination" ref="629897331"/>
 					</object>
 					<int key="connectionID">621</int>
@@ -2799,7 +2767,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mQuietBoot</string>
-						<reference key="source" ref="597359082"/>
+						<reference key="source" ref="276543394"/>
 						<reference key="destination" ref="601436105"/>
 					</object>
 					<int key="connectionID">622</int>
@@ -2807,7 +2775,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mInstantMenu</string>
-						<reference key="source" ref="597359082"/>
+						<reference key="source" ref="276543394"/>
 						<reference key="destination" ref="90016923"/>
 					</object>
 					<int key="connectionID">623</int>
@@ -2815,7 +2783,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mWait</string>
-						<reference key="source" ref="597359082"/>
+						<reference key="source" ref="276543394"/>
 						<reference key="destination" ref="793808229"/>
 					</object>
 					<int key="connectionID">624</int>
@@ -2823,7 +2791,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mRescan</string>
-						<reference key="source" ref="597359082"/>
+						<reference key="source" ref="276543394"/>
 						<reference key="destination" ref="1050615289"/>
 					</object>
 					<int key="connectionID">625</int>
@@ -2831,7 +2799,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mRescanPrompt</string>
-						<reference key="source" ref="597359082"/>
+						<reference key="source" ref="276543394"/>
 						<reference key="destination" ref="712902523"/>
 					</object>
 					<int key="connectionID">626</int>
@@ -2839,7 +2807,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mRescanSingleDrive</string>
-						<reference key="source" ref="597359082"/>
+						<reference key="source" ref="276543394"/>
 						<reference key="destination" ref="728009658"/>
 					</object>
 					<int key="connectionID">627</int>
@@ -2847,7 +2815,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mLegacyLogo</string>
-						<reference key="source" ref="225164805"/>
+						<reference key="source" ref="2692381"/>
 						<reference key="destination" ref="455218521"/>
 					</object>
 					<int key="connectionID">628</int>
@@ -2855,7 +2823,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mBootBanner</string>
-						<reference key="source" ref="225164805"/>
+						<reference key="source" ref="2692381"/>
 						<reference key="destination" ref="732855392"/>
 					</object>
 					<int key="connectionID">629</int>
@@ -2863,7 +2831,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mVBIOS</string>
-						<reference key="source" ref="225164805"/>
+						<reference key="source" ref="2692381"/>
 						<reference key="destination" ref="552874632"/>
 					</object>
 					<int key="connectionID">631</int>
@@ -2871,15 +2839,15 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mVideoROM</string>
-						<reference key="source" ref="225164805"/>
-						<reference key="destination" ref="452950132"/>
+						<reference key="source" ref="2692381"/>
+						<reference key="destination" ref="628549159"/>
 					</object>
 					<int key="connectionID">632</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mGraphicsMode</string>
-						<reference key="source" ref="225164805"/>
+						<reference key="source" ref="2692381"/>
 						<reference key="destination" ref="915217355"/>
 					</object>
 					<int key="connectionID">633</int>
@@ -2887,7 +2855,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mGraphicsModeText</string>
-						<reference key="source" ref="225164805"/>
+						<reference key="source" ref="2692381"/>
 						<reference key="destination" ref="174976306"/>
 					</object>
 					<int key="connectionID">634</int>
@@ -2895,7 +2863,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mGraphicsEnabler</string>
-						<reference key="source" ref="225164805"/>
+						<reference key="source" ref="2692381"/>
 						<reference key="destination" ref="668416335"/>
 					</object>
 					<int key="connectionID">635</int>
@@ -2903,7 +2871,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mUSBBusFix</string>
-						<reference key="source" ref="225164805"/>
+						<reference key="source" ref="2692381"/>
 						<reference key="destination" ref="498570608"/>
 					</object>
 					<int key="connectionID">636</int>
@@ -2911,7 +2879,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mEHCIacquire</string>
-						<reference key="source" ref="225164805"/>
+						<reference key="source" ref="2692381"/>
 						<reference key="destination" ref="767062089"/>
 					</object>
 					<int key="connectionID">637</int>
@@ -2919,7 +2887,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mUHCIreset</string>
-						<reference key="source" ref="225164805"/>
+						<reference key="source" ref="2692381"/>
 						<reference key="destination" ref="512120668"/>
 					</object>
 					<int key="connectionID">638</int>
@@ -2927,7 +2895,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mEthernetBuiltIn</string>
-						<reference key="source" ref="225164805"/>
+						<reference key="source" ref="2692381"/>
 						<reference key="destination" ref="698099005"/>
 					</object>
 					<int key="connectionID">639</int>
@@ -2935,7 +2903,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mKernel</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="292282216"/>
 					</object>
 					<int key="connectionID">640</int>
@@ -2943,7 +2911,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mKernelText</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="971254835"/>
 					</object>
 					<int key="connectionID">641</int>
@@ -2951,7 +2919,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mDeviceRd</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="317712564"/>
 					</object>
 					<int key="connectionID">642</int>
@@ -2959,7 +2927,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mVideoROMText</string>
-						<reference key="source" ref="225164805"/>
+						<reference key="source" ref="2692381"/>
 						<reference key="destination" ref="961902576"/>
 					</object>
 					<int key="connectionID">643</int>
@@ -2967,7 +2935,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mHidePartitionText</string>
-						<reference key="source" ref="765871699"/>
+						<reference key="source" ref="770879448"/>
 						<reference key="destination" ref="316034842"/>
 					</object>
 					<int key="connectionID">644</int>
@@ -2975,7 +2943,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mRenamePartitionText</string>
-						<reference key="source" ref="765871699"/>
+						<reference key="source" ref="770879448"/>
 						<reference key="destination" ref="386809836"/>
 					</object>
 					<int key="connectionID">645</int>
@@ -2983,7 +2951,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mDefaultPartitionText</string>
-						<reference key="source" ref="765871699"/>
+						<reference key="source" ref="770879448"/>
 						<reference key="destination" ref="592293744"/>
 					</object>
 					<int key="connectionID">646</int>
@@ -2991,7 +2959,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mDeviceRdText</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="921716680"/>
 					</object>
 					<int key="connectionID">647</int>
@@ -2999,7 +2967,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mArch</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="323622459"/>
 					</object>
 					<int key="connectionID">648</int>
@@ -3007,7 +2975,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mArchText</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="955621909"/>
 					</object>
 					<int key="connectionID">649</int>
@@ -3015,7 +2983,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mCPU</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="561126957"/>
 					</object>
 					<int key="connectionID">650</int>
@@ -3023,7 +2991,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mCPUText</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="286479560"/>
 					</object>
 					<int key="connectionID">651</int>
@@ -3031,7 +2999,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mBusRatio</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="867800924"/>
 					</object>
 					<int key="connectionID">652</int>
@@ -3039,7 +3007,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mBusRatioText</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="706656551"/>
 					</object>
 					<int key="connectionID">653</int>
@@ -3047,7 +3015,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mDebug</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="366999"/>
 					</object>
 					<int key="connectionID">654</int>
@@ -3055,7 +3023,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mDebugText</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="515185243"/>
 					</object>
 					<int key="connectionID">655</int>
@@ -3063,7 +3031,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mIO</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="339794873"/>
 					</object>
 					<int key="connectionID">656</int>
@@ -3071,7 +3039,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mIOText</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="426436104"/>
 					</object>
 					<int key="connectionID">657</int>
@@ -3079,15 +3047,15 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mDisableKextsBlacklisting</string>
-						<reference key="source" ref="422539145"/>
-						<reference key="destination" ref="600093947"/>
+						<reference key="source" ref="523685185"/>
+						<reference key="destination" ref="489715876"/>
 					</object>
 					<int key="connectionID">658</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mDSDTFile</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="969759846"/>
 					</object>
 					<int key="connectionID">659</int>
@@ -3095,7 +3063,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mDSDTFileText</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="659879104"/>
 					</object>
 					<int key="connectionID">660</int>
@@ -3103,7 +3071,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mDSDTDrop</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="787406084"/>
 					</object>
 					<int key="connectionID">661</int>
@@ -3111,7 +3079,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mSMBIOSFile</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="478279075"/>
 					</object>
 					<int key="connectionID">662</int>
@@ -3119,7 +3087,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mSMBIOSFileText</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="343027692"/>
 					</object>
 					<int key="connectionID">663</int>
@@ -3127,7 +3095,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mSMBIOSDefaults</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="100027946"/>
 					</object>
 					<int key="connectionID">664</int>
@@ -3135,15 +3103,15 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mWake</string>
-						<reference key="source" ref="422539145"/>
-						<reference key="destination" ref="562928307"/>
+						<reference key="source" ref="523685185"/>
+						<reference key="destination" ref="344346433"/>
 					</object>
 					<int key="connectionID">665</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mForceWake</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="353259796"/>
 					</object>
 					<int key="connectionID">666</int>
@@ -3151,7 +3119,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mWakeImage</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="449337560"/>
 					</object>
 					<int key="connectionID">667</int>
@@ -3159,7 +3127,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mWakeImageText</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="824428292"/>
 					</object>
 					<int key="connectionID">668</int>
@@ -3167,7 +3135,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">onCheckButtonChange:</string>
-						<reference key="source" ref="765871699"/>
+						<reference key="source" ref="770879448"/>
 						<reference key="destination" ref="778294972"/>
 					</object>
 					<int key="connectionID">669</int>
@@ -3175,7 +3143,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">onTextFiedChange:</string>
-						<reference key="source" ref="765871699"/>
+						<reference key="source" ref="770879448"/>
 						<reference key="destination" ref="592293744"/>
 					</object>
 					<int key="connectionID">670</int>
@@ -3183,7 +3151,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">onCheckButtonChange:</string>
-						<reference key="source" ref="597359082"/>
+						<reference key="source" ref="276543394"/>
 						<reference key="destination" ref="958084214"/>
 					</object>
 					<int key="connectionID">671</int>
@@ -3191,7 +3159,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">onTextFiedChange:</string>
-						<reference key="source" ref="597359082"/>
+						<reference key="source" ref="276543394"/>
 						<reference key="destination" ref="390095704"/>
 					</object>
 					<int key="connectionID">672</int>
@@ -3199,7 +3167,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">onCheckButtonChange:</string>
-						<reference key="source" ref="597359082"/>
+						<reference key="source" ref="276543394"/>
 						<reference key="destination" ref="728009658"/>
 					</object>
 					<int key="connectionID">673</int>
@@ -3207,15 +3175,15 @@
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">onCheckButtonChange:</string>
-						<reference key="source" ref="225164805"/>
-						<reference key="destination" ref="452950132"/>
+						<reference key="source" ref="2692381"/>
+						<reference key="destination" ref="628549159"/>
 					</object>
 					<int key="connectionID">674</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">onTextFiedChange:</string>
-						<reference key="source" ref="225164805"/>
+						<reference key="source" ref="2692381"/>
 						<reference key="destination" ref="961902576"/>
 					</object>
 					<int key="connectionID">675</int>
@@ -3223,7 +3191,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">onCheckButtonChange:</string>
-						<reference key="source" ref="225164805"/>
+						<reference key="source" ref="2692381"/>
 						<reference key="destination" ref="512120668"/>
 					</object>
 					<int key="connectionID">676</int>
@@ -3231,7 +3199,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">onCheckButtonChange:</string>
-						<reference key="source" ref="225164805"/>
+						<reference key="source" ref="2692381"/>
 						<reference key="destination" ref="698099005"/>
 					</object>
 					<int key="connectionID">677</int>
@@ -3239,7 +3207,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">onCheckButtonChange:</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="317712564"/>
 					</object>
 					<int key="connectionID">678</int>
@@ -3247,7 +3215,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">onTextFiedChange:</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="921716680"/>
 					</object>
 					<int key="connectionID">679</int>
@@ -3255,7 +3223,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">onCheckButtonChange:</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="787406084"/>
 					</object>
 					<int key="connectionID">680</int>
@@ -3263,7 +3231,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">onTextFiedChange:</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="659879104"/>
 					</object>
 					<int key="connectionID">681</int>
@@ -3271,7 +3239,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">onCheckButtonChange:</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="100027946"/>
 					</object>
 					<int key="connectionID">682</int>
@@ -3279,7 +3247,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">onTextFiedChange:</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="343027692"/>
 					</object>
 					<int key="connectionID">683</int>
@@ -3287,7 +3255,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">onCheckButtonChange:</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="449337560"/>
 					</object>
 					<int key="connectionID">684</int>
@@ -3295,42 +3263,74 @@
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">onTextFiedChange:</string>
-						<reference key="source" ref="422539145"/>
+						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="824428292"/>
 					</object>
 					<int key="connectionID">685</int>
 				</object>
 				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">onCheckButtonChange:</string>
+						<reference key="source" ref="770879448"/>
+						<reference key="destination" ref="399108788"/>
+					</object>
+					<int key="connectionID">691</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">onCheckButtonChange:</string>
+						<reference key="source" ref="770879448"/>
+						<reference key="destination" ref="37616634"/>
+					</object>
+					<int key="connectionID">692</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">onCheckButtonChange:</string>
+						<reference key="source" ref="770879448"/>
+						<reference key="destination" ref="1067138506"/>
+					</object>
+					<int key="connectionID">693</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">onCheckButtonChange:</string>
+						<reference key="source" ref="770879448"/>
+						<reference key="destination" ref="748817052"/>
+					</object>
+					<int key="connectionID">694</int>
+				</object>
+				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mSwapHD01</string>
-						<reference key="source" ref="513945847"/>
-						<reference key="destination" ref="292597271"/>
+						<reference key="source" ref="770879448"/>
+						<reference key="destination" ref="37616634"/>
 					</object>
-					<int key="connectionID">686</int>
+					<int key="connectionID">695</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mSwapHD02</string>
-						<reference key="source" ref="513945847"/>
-						<reference key="destination" ref="142232122"/>
+						<reference key="source" ref="770879448"/>
+						<reference key="destination" ref="399108788"/>
 					</object>
-					<int key="connectionID">687</int>
+					<int key="connectionID">696</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mFreezeParts</string>
-						<reference key="source" ref="513945847"/>
-						<reference key="destination" ref="102885086"/>
+						<reference key="source" ref="770879448"/>
+						<reference key="destination" ref="1067138506"/>
 					</object>
-					<int key="connectionID">688</int>
+					<int key="connectionID">697</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">mInjectFrozenParts</string>
-						<reference key="source" ref="513945847"/>
-						<reference key="destination" ref="606405827"/>
+						<reference key="source" ref="770879448"/>
+						<reference key="destination" ref="748817052"/>
 					</object>
-					<int key="connectionID">689</int>
+					<int key="connectionID">698</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -3443,7 +3443,7 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="1030284511"/>
-							<reference ref="553496908"/>
+							<reference ref="1043374456"/>
 						</object>
 						<reference key="parent" ref="1039429426"/>
 					</object>
@@ -3644,7 +3644,7 @@
 							<reference ref="601436105"/>
 							<reference ref="90016923"/>
 							<reference ref="793808229"/>
-							<reference ref="642724982"/>
+							<reference ref="744752273"/>
 						</object>
 						<reference key="parent" ref="798772941"/>
 					</object>
@@ -3903,7 +3903,7 @@
 							<reference ref="915217355"/>
 							<reference ref="552874632"/>
 							<reference ref="455218521"/>
-							<reference ref="452950132"/>
+							<reference ref="628549159"/>
 							<reference ref="961902576"/>
 						</object>
 						<reference key="parent" ref="495127110"/>
@@ -4039,7 +4039,7 @@
 							<reference ref="366999"/>
 							<reference ref="292282216"/>
 							<reference ref="323622459"/>
-							<reference ref="600093947"/>
+							<reference ref="489715876"/>
 							<reference ref="921716680"/>
 							<reference ref="971254835"/>
 							<reference ref="955621909"/>
@@ -4436,7 +4436,7 @@
 							<reference ref="449337560"/>
 							<reference ref="824428292"/>
 							<reference ref="353259796"/>
-							<reference ref="562928307"/>
+							<reference ref="344346433"/>
 						</object>
 						<reference key="parent" ref="241622967"/>
 					</object>
@@ -4537,209 +4537,209 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">576</int>
-						<reference key="object" ref="702156620"/>
+						<reference key="object" ref="8349391"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="887949744"/>
+							<reference ref="908319067"/>
 						</object>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">577</int>
-						<reference key="object" ref="887949744"/>
+						<reference key="object" ref="908319067"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1013031189"/>
-							<reference ref="454658438"/>
-							<reference ref="391488284"/>
+							<reference ref="417745275"/>
+							<reference ref="329015339"/>
+							<reference ref="807647820"/>
 						</object>
-						<reference key="parent" ref="702156620"/>
+						<reference key="parent" ref="8349391"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">580</int>
-						<reference key="object" ref="1013031189"/>
+						<reference key="object" ref="417745275"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="565613597"/>
+							<reference ref="294587452"/>
 						</object>
-						<reference key="parent" ref="887949744"/>
+						<reference key="parent" ref="908319067"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">581</int>
-						<reference key="object" ref="565613597"/>
-						<reference key="parent" ref="1013031189"/>
+						<reference key="object" ref="294587452"/>
+						<reference key="parent" ref="417745275"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">579</int>
-						<reference key="object" ref="454658438"/>
+						<reference key="object" ref="329015339"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="205055722"/>
+							<reference ref="807339214"/>
 						</object>
-						<reference key="parent" ref="887949744"/>
+						<reference key="parent" ref="908319067"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">582</int>
-						<reference key="object" ref="205055722"/>
-						<reference key="parent" ref="454658438"/>
+						<reference key="object" ref="807339214"/>
+						<reference key="parent" ref="329015339"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">578</int>
-						<reference key="object" ref="391488284"/>
+						<reference key="object" ref="807647820"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="877262205"/>
+							<reference ref="413394443"/>
 						</object>
-						<reference key="parent" ref="887949744"/>
+						<reference key="parent" ref="908319067"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">583</int>
-						<reference key="object" ref="877262205"/>
-						<reference key="parent" ref="391488284"/>
+						<reference key="object" ref="413394443"/>
+						<reference key="parent" ref="807647820"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">584</int>
-						<reference key="object" ref="452950132"/>
+						<reference key="object" ref="628549159"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="201615768"/>
+							<reference ref="1025798338"/>
 						</object>
 						<reference key="parent" ref="71889788"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">585</int>
-						<reference key="object" ref="201615768"/>
-						<reference key="parent" ref="452950132"/>
+						<reference key="object" ref="1025798338"/>
+						<reference key="parent" ref="628549159"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">586</int>
-						<reference key="object" ref="600093947"/>
+						<reference key="object" ref="489715876"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="5664459"/>
+							<reference ref="612718662"/>
 						</object>
 						<reference key="parent" ref="138697471"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">587</int>
-						<reference key="object" ref="5664459"/>
-						<reference key="parent" ref="600093947"/>
+						<reference key="object" ref="612718662"/>
+						<reference key="parent" ref="489715876"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">588</int>
-						<reference key="object" ref="642724982"/>
+						<reference key="object" ref="744752273"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="296462912"/>
+							<reference ref="450162552"/>
 						</object>
 						<reference key="parent" ref="927992596"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">589</int>
-						<reference key="object" ref="296462912"/>
-						<reference key="parent" ref="642724982"/>
+						<reference key="object" ref="450162552"/>
+						<reference key="parent" ref="744752273"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">590</int>
-						<reference key="object" ref="562928307"/>
+						<reference key="object" ref="344346433"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="267208272"/>
+							<reference ref="836463679"/>
 						</object>
 						<reference key="parent" ref="965868050"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">591</int>
-						<reference key="object" ref="267208272"/>
-						<reference key="parent" ref="562928307"/>
+						<reference key="object" ref="836463679"/>
+						<reference key="parent" ref="344346433"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">596</int>
-						<reference key="object" ref="765871699"/>
+						<reference key="object" ref="770879448"/>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">597</int>
-						<reference key="object" ref="597359082"/>
+						<reference key="object" ref="276543394"/>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">598</int>
-						<reference key="object" ref="225164805"/>
+						<reference key="object" ref="2692381"/>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">599</int>
-						<reference key="object" ref="422539145"/>
+						<reference key="object" ref="523685185"/>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">603</int>
-						<reference key="object" ref="553496908"/>
+						<reference key="object" ref="1043374456"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="102885086"/>
-							<reference ref="142232122"/>
-							<reference ref="606405827"/>
-							<reference ref="292597271"/>
+							<reference ref="1067138506"/>
+							<reference ref="399108788"/>
+							<reference ref="748817052"/>
+							<reference ref="37616634"/>
 						</object>
 						<reference key="parent" ref="451295758"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">604</int>
-						<reference key="object" ref="102885086"/>
+						<reference key="object" ref="1067138506"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="940283145"/>
+							<reference ref="565603593"/>
 						</object>
-						<reference key="parent" ref="553496908"/>
+						<reference key="parent" ref="1043374456"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">605</int>
-						<reference key="object" ref="142232122"/>
+						<reference key="object" ref="399108788"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="849958821"/>
+							<reference ref="909560157"/>
 						</object>
-						<reference key="parent" ref="553496908"/>
+						<reference key="parent" ref="1043374456"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">606</int>
-						<reference key="object" ref="606405827"/>
+						<reference key="object" ref="748817052"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="633046573"/>
+							<reference ref="806094313"/>
 						</object>
-						<reference key="parent" ref="553496908"/>
+						<reference key="parent" ref="1043374456"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">607</int>
-						<reference key="object" ref="292597271"/>
+						<reference key="object" ref="37616634"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="202851389"/>
+							<reference ref="268393823"/>
 						</object>
-						<reference key="parent" ref="553496908"/>
+						<reference key="parent" ref="1043374456"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">608</int>
-						<reference key="object" ref="202851389"/>
-						<reference key="parent" ref="292597271"/>
+						<reference key="object" ref="268393823"/>
+						<reference key="parent" ref="37616634"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">609</int>
-						<reference key="object" ref="633046573"/>
-						<reference key="parent" ref="606405827"/>
+						<reference key="object" ref="806094313"/>
+						<reference key="parent" ref="748817052"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">610</int>
-						<reference key="object" ref="849958821"/>
-						<reference key="parent" ref="142232122"/>
+						<reference key="object" ref="909560157"/>
+						<reference key="parent" ref="399108788"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">611</int>
-						<reference key="object" ref="940283145"/>
-						<reference key="parent" ref="102885086"/>
+						<reference key="object" ref="565603593"/>
+						<reference key="parent" ref="1067138506"/>
 					</object>
 				</object>
 			</object>
@@ -5007,9 +5007,9 @@
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{107, 164}, {668, 368}}</string>
+					<string>{{62, 335}, {668, 368}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{107, 164}, {668, 368}}</string>
+					<string>{{62, 335}, {668, 368}}</string>
 					<integer value="1"/>
 					<integer value="1"/>
 					<string>{224.664, 10}</string>
@@ -5481,7 +5481,7 @@
 						<string key="NS.key.0">ToolTip</string>
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
-							<reference key="object" ref="452950132"/>
+							<reference key="object" ref="628549159"/>
 							<string key="toolTip">Define the GFX card video ROM file that should be loaded at boot</string>
 						</object>
 					</object>
@@ -5491,7 +5491,7 @@
 						<string key="NS.key.0">ToolTip</string>
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
-							<reference key="object" ref="600093947"/>
+							<reference key="object" ref="489715876"/>
 							<string key="toolTip">Disable the blacklist kexts filtering in voodoo based kernels. Has no effect on vanilla kernels. (Enabled by default)</string>
 						</object>
 					</object>
@@ -5501,7 +5501,7 @@
 						<string key="NS.key.0">ToolTip</string>
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
-							<reference key="object" ref="642724982"/>
+							<reference key="object" ref="744752273"/>
 							<string key="toolTip">Force displaying the partition selection menu (default=No)</string>
 						</object>
 					</object>
@@ -5520,7 +5520,7 @@
 						<string key="NS.key.0">ToolTip</string>
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
-							<reference key="object" ref="102885086"/>
+							<reference key="object" ref="1067138506"/>
 							<string key="toolTip">Use the freezed partitions list in located in the preference file for locking and manual handling purpose</string>
 						</object>
 					</object>
@@ -5529,7 +5529,7 @@
 						<string key="NS.key.0">ToolTip</string>
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
-							<reference key="object" ref="142232122"/>
+							<reference key="object" ref="399108788"/>
 							<string key="toolTip">Swap disks indexes 0&lt;-&gt;2, use this option if your disk sequence in osx does not match the chameleon boot disk sequence</string>
 						</object>
 					</object>
@@ -5538,7 +5538,7 @@
 						<string key="NS.key.0">ToolTip</string>
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
-							<reference key="object" ref="606405827"/>
+							<reference key="object" ref="748817052"/>
 							<string key="toolTip">Use this feature to initially inject the current dynamically listed partitions. Then you can  change manually the partition disk numbers and labels in the preference file</string>
 						</object>
 					</object>
@@ -5547,7 +5547,7 @@
 						<string key="NS.key.0">ToolTip</string>
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
-							<reference key="object" ref="292597271"/>
+							<reference key="object" ref="37616634"/>
 							<string key="toolTip">Swap disks indexes 0&lt;-&gt;1, use this option if your disk sequence in osx does not match the chameleon boot disk sequence</string>
 						</object>
 					</object>
@@ -5583,7 +5583,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">689</int>
+			<int key="maxID">698</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -5600,8 +5600,8 @@
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSButton</string>
 							<string>id</string>
-							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -5680,8 +5680,8 @@
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSButton</string>
 							<string>id</string>
-							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -5734,8 +5734,8 @@
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSButton</string>
 							<string>id</string>
-							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -5744,19 +5744,27 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>mDefaultPartition</string>
 							<string>mDefaultPartitionText</string>
+							<string>mFreezeParts</string>
 							<string>mHidePartition</string>
 							<string>mHidePartitionText</string>
+							<string>mInjectFrozenParts</string>
 							<string>mRenamePartition</string>
 							<string>mRenamePartitionText</string>
+							<string>mSwapHD01</string>
+							<string>mSwapHD02</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NSButton</string>
 							<string>NSTextField</string>
 							<string>NSButton</string>
+							<string>NSButton</string>
 							<string>NSTextField</string>
 							<string>NSButton</string>
+							<string>NSButton</string>
 							<string>NSTextField</string>
+							<string>NSButton</string>
+							<string>NSButton</string>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -5771,21 +5779,15 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>onInjectPartsToFreeze:</string>
 							<string>onRestart:</string>
 							<string>onShutdown:</string>
 							<string>onSleep:</string>
-							<string>onSwapHD:</string>
-							<string>onUseFrozenParts:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -5794,8 +5796,6 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>authView</string>
 							<string>mFileSystemColumn</string>
-							<string>mFreezeParts</string>
-							<string>mInjectFrozenParts</string>
 							<string>mOptions</string>
 							<string>mPartitionIDColumn</string>
 							<string>mPartitionImgColumn</string>
@@ -5805,15 +5805,11 @@
 							<string>mShutDownButton</string>
 							<string>mSleepButton</string>
 							<string>mStatusText</string>
-							<string>mSwapHD01</string>
-							<string>mSwapHD02</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>SFAuthorizationView</string>
 							<string>NSTableColumn</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
 							<string>NSBox</string>
 							<string>NSTableColumn</string>
 							<string>NSTableColumn</string>
@@ -5823,8 +5819,6 @@
 							<string>NSButton</string>
 							<string>NSButton</string>
 							<string>NSTextField</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -5860,8 +5854,8 @@
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSButton</string>
 							<string>id</string>
-							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">