Index: branches/rekursor/ChameleonPrefPane/Sources/ChameleonPrefPane.mm
===================================================================
--- branches/rekursor/ChameleonPrefPane/Sources/ChameleonPrefPane.mm	(revision 91)
+++ branches/rekursor/ChameleonPrefPane/Sources/ChameleonPrefPane.mm	(revision 92)
@@ -372,7 +372,7 @@
 	}
 		
 }
-
+ 
 //--------------------------------------------------------------------------
 - (NSInteger) numberOfRowsInTableView:(NSTableView *)tableView
 {
Index: branches/rekursor/ChameleonPrefPane/Sources/AdvancedSetupController.mm
===================================================================
--- branches/rekursor/ChameleonPrefPane/Sources/AdvancedSetupController.mm	(revision 91)
+++ branches/rekursor/ChameleonPrefPane/Sources/AdvancedSetupController.mm	(revision 92)
@@ -37,6 +37,7 @@
     BootProp::instance().addOptionDesc(mForceWake, nil, OptionYesNo, "ForceWake", "No");
     BootProp::instance().addOptionDesc(mWakeImage, mWakeImageText, OptionFileString, "WakeImage", "");
     BootProp::instance().addOptionDesc(mSystemId, mSystemIdText, OptionString, "SystemId", "");
+    BootProp::instance().addOptionDesc(mSystemType, mSystemTypeText, OptionString, "SystemType", "");
     BootProp::instance().addOptionDesc(mRestartFix, nil, OptionYesNo, "RestartFix", "Yes");
 }
 
Index: branches/rekursor/ChameleonPrefPane/Sources/AdvancedSetupController.h
===================================================================
--- branches/rekursor/ChameleonPrefPane/Sources/AdvancedSetupController.h	(revision 91)
+++ branches/rekursor/ChameleonPrefPane/Sources/AdvancedSetupController.h	(revision 92)
@@ -24,6 +24,8 @@
 	IBOutlet NSComboBox*	mCPUText;
 	IBOutlet NSButton*		mBusRatio;
 	IBOutlet NSComboBox*	mBusRatioText;
+	IBOutlet NSButton*		mSystemType;
+	IBOutlet NSComboBox*	mSystemTypeText;
 	
 	IBOutlet NSButton*		mDebug;
 	IBOutlet NSComboBox*	mDebugText;
Index: branches/rekursor/ChameleonPrefPane/Sources/PeripheralsController.mm
===================================================================
--- branches/rekursor/ChameleonPrefPane/Sources/PeripheralsController.mm	(revision 91)
+++ branches/rekursor/ChameleonPrefPane/Sources/PeripheralsController.mm	(revision 92)
@@ -24,7 +24,8 @@
     BootProp::instance().addOptionDesc(mLegacyLogo, nil, OptionYesNo, "Legacy Logo", "No");
     BootProp::instance().addOptionDesc(mBootBanner, nil, OptionYesNo, "Boot Banner", "Yes");
     BootProp::instance().addOptionDesc(mVBIOS, nil, OptionYesNo, "VBIOS", "No");
-    BootProp::instance().addOptionDesc(mVideoROM, mVideoROMText, OptionFileString, "VideoROM", "");
+    BootProp::instance().addOptionDesc(mAtiVideoROM, nil, OptionYesNo, "UseAtiVideoROM", "No");
+    BootProp::instance().addOptionDesc(mNvidiaVideoROM, nil, OptionYesNo, "UseAtiVideoROM", "No");
     BootProp::instance().addOptionDesc(mGraphicsMode, mGraphicsModeText, OptionString, "Graphics Mode", "");
     BootProp::instance().addOptionDesc(mGraphicsEnabler, nil, OptionYesNo, "GraphicsEnabler", "No");
     BootProp::instance().addOptionDesc(mUSBBusFix, nil, OptionYesNo, "USBBusFix", "No");
Index: branches/rekursor/ChameleonPrefPane/Sources/PeripheralsController.h
===================================================================
--- branches/rekursor/ChameleonPrefPane/Sources/PeripheralsController.h	(revision 91)
+++ branches/rekursor/ChameleonPrefPane/Sources/PeripheralsController.h	(revision 92)
@@ -16,8 +16,8 @@
 	IBOutlet NSButton*		mLegacyLogo;
 	IBOutlet NSButton*		mBootBanner;
 	IBOutlet NSButton*		mVBIOS;
-	IBOutlet NSButton*		mVideoROM;
-	IBOutlet NSTextField*	mVideoROMText;
+	IBOutlet NSButton*		mAtiVideoROM;
+	IBOutlet NSButton*		mNvidiaVideoROM;
 	
 	IBOutlet NSButton*		mGraphicsMode;
 	IBOutlet NSComboBox*	mGraphicsModeText;
Index: branches/rekursor/ChameleonPrefPane/English.lproj/Chameleon.xib
===================================================================
--- branches/rekursor/ChameleonPrefPane/English.lproj/Chameleon.xib	(revision 91)
+++ branches/rekursor/ChameleonPrefPane/English.lproj/Chameleon.xib	(revision 92)
@@ -13,7 +13,7 @@
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<integer value="577"/>
-			<integer value="12"/>
+			<integer value="511"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -73,7 +73,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>
@@ -733,7 +733,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"/>
@@ -1707,7 +1706,7 @@
 															<object class="NSButton" id="668416335">
 																<reference key="NSNextResponder" ref="673251209"/>
 																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{316, 42}, {134, 23}}</string>
+																<string key="NSFrame">{{333, 42}, {134, 23}}</string>
 																<reference key="NSSuperview" ref="673251209"/>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSButtonCell" key="NSCell" id="453809578">
@@ -1729,7 +1728,7 @@
 															<object class="NSButton" id="552874632">
 																<reference key="NSNextResponder" ref="673251209"/>
 																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{541, 42}, {59, 23}}</string>
+																<string key="NSFrame">{{471, 42}, {59, 23}}</string>
 																<reference key="NSSuperview" ref="673251209"/>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSButtonCell" key="NSCell" id="1052310275">
@@ -1748,23 +1747,6 @@
 																	<int key="NSPeriodicInterval">25</int>
 																</object>
 															</object>
-															<object class="NSTextField" id="961902576">
-																<reference key="NSNextResponder" ref="673251209"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{420, 12}, {178, 22}}</string>
-																<reference key="NSSuperview" ref="673251209"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="803716621">
-																	<int key="NSCellFlags">611450433</int>
-																	<int key="NSCellFlags2">272630784</int>
-																	<string key="NSContents"/>
-																	<reference key="NSSupport" ref="930899267"/>
-																	<reference key="NSControlView" ref="961902576"/>
-																	<bool key="NSDrawsBackground">YES</bool>
-																	<reference key="NSBackgroundColor" ref="501125233"/>
-																	<reference key="NSTextColor" ref="866655721"/>
-																</object>
-															</object>
 															<object class="NSButton" id="455218521">
 																<reference key="NSNextResponder" ref="673251209"/>
 																<int key="NSvFlags">12</int>
@@ -1790,13 +1772,13 @@
 															<object class="NSButton" id="628549159">
 																<reference key="NSNextResponder" ref="673251209"/>
 																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{316, 15}, {98, 18}}</string>
+																<string key="NSFrame">{{333, 15}, {109, 18}}</string>
 																<reference key="NSSuperview" ref="673251209"/>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSButtonCell" key="NSCell" id="1025798338">
 																	<int key="NSCellFlags">67239424</int>
 																	<int key="NSCellFlags2">0</int>
-																	<string key="NSContents">Video ROM</string>
+																	<string key="NSContents">Use Ati ROM</string>
 																	<reference key="NSSupport" ref="930899267"/>
 																	<reference key="NSControlView" ref="628549159"/>
 																	<int key="NSButtonFlags">1211912703</int>
@@ -1896,6 +1878,28 @@
 																	</object>
 																</object>
 															</object>
+															<object class="NSButton" id="462385057">
+																<reference key="NSNextResponder" ref="673251209"/>
+																<int key="NSvFlags">268</int>
+																<string key="NSFrame">{{471, 15}, {131, 18}}</string>
+																<reference key="NSSuperview" ref="673251209"/>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSButtonCell" key="NSCell" id="909224470">
+																	<int key="NSCellFlags">67239424</int>
+																	<int key="NSCellFlags2">0</int>
+																	<string key="NSContents">Use Nvidia ROM</string>
+																	<reference key="NSSupport" ref="930899267"/>
+																	<reference key="NSControlView" ref="462385057"/>
+																	<int key="NSButtonFlags">1211912703</int>
+																	<int key="NSButtonFlags2">2</int>
+																	<reference key="NSNormalImage" ref="459398604"/>
+																	<reference key="NSAlternateImage" ref="731537593"/>
+																	<string key="NSAlternateContents"/>
+																	<string key="NSKeyEquivalent"/>
+																	<int key="NSPeriodicDelay">200</int>
+																	<int key="NSPeriodicInterval">25</int>
+																</object>
+															</object>
 														</object>
 														<string key="NSFrame">{{1, 1}, {610, 76}}</string>
 														<reference key="NSSuperview" ref="71889788"/>
@@ -2150,7 +2154,7 @@
 								<object class="NSTabViewItem" id="645910071">
 									<string key="NSIdentifier">Item 8</string>
 									<object class="NSView" key="NSView" id="241622967">
-										<nil key="NSNextResponder"/>
+										<reference key="NSNextResponder" ref="869599070"/>
 										<int key="NSvFlags">256</int>
 										<object class="NSMutableArray" key="NSSubviews">
 											<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2311,7 +2315,7 @@
 															<object class="NSButton" id="867800924">
 																<reference key="NSNextResponder" ref="1000898384"/>
 																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{297, 48}, {74, 23}}</string>
+																<string key="NSFrame">{{294, 49}, {74, 23}}</string>
 																<reference key="NSSuperview" ref="1000898384"/>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSButtonCell" key="NSCell" id="384254593">
@@ -2374,32 +2378,6 @@
 																	<int key="NSPeriodicInterval">25</int>
 																</object>
 															</object>
-															<object class="NSButton" id="489715876">
-																<reference key="NSNextResponder" ref="1000898384"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{437, 15}, {157, 18}}</string>
-																<reference key="NSSuperview" ref="1000898384"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSButtonCell" key="NSCell" id="612718662">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">0</int>
-																	<string key="NSContents">Disable kext blacklist</string>
-																	<object class="NSFont" key="NSSupport" id="507434950">
-																		<string key="NSName">LucidaGrande</string>
-																		<double key="NSSize">13</double>
-																		<int key="NSfFlags">16</int>
-																	</object>
-																	<reference key="NSControlView" ref="489715876"/>
-																	<int key="NSButtonFlags">1211912703</int>
-																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="459398604"/>
-																	<reference key="NSAlternateImage" ref="731537593"/>
-																	<string key="NSAlternateContents"/>
-																	<string key="NSKeyEquivalent"/>
-																	<int key="NSPeriodicDelay">200</int>
-																	<int key="NSPeriodicInterval">25</int>
-																</object>
-															</object>
 															<object class="NSTextField" id="999034340">
 																<reference key="NSNextResponder" ref="1000898384"/>
 																<int key="NSvFlags">12</int>
@@ -2424,14 +2402,18 @@
 															<object class="NSButton" id="906728368">
 																<reference key="NSNextResponder" ref="1000898384"/>
 																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{297, 15}, {90, 18}}</string>
+																<string key="NSFrame">{{520, 14}, {90, 18}}</string>
 																<reference key="NSSuperview" ref="1000898384"/>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSButtonCell" key="NSCell" id="55438299">
 																	<int key="NSCellFlags">67239424</int>
 																	<int key="NSCellFlags2">0</int>
 																	<string key="NSContents">Restart Fix</string>
-																	<reference key="NSSupport" ref="507434950"/>
+																	<object class="NSFont" key="NSSupport">
+																		<string key="NSName">LucidaGrande</string>
+																		<double key="NSSize">13</double>
+																		<int key="NSfFlags">16</int>
+																	</object>
 																	<reference key="NSControlView" ref="906728368"/>
 																	<int key="NSButtonFlags">1211912703</int>
 																	<int key="NSButtonFlags2">2</int>
@@ -2526,7 +2508,7 @@
 															<object class="NSComboBox" id="435619385">
 																<reference key="NSNextResponder" ref="1000898384"/>
 																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{377, 46}, {54, 26}}</string>
+																<string key="NSFrame">{{374, 46}, {54, 26}}</string>
 																<reference key="NSSuperview" ref="1000898384"/>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSComboBoxCell" key="NSCell" id="653891483">
@@ -2606,7 +2588,7 @@
 															<object class="NSComboBox" id="940855934">
 																<reference key="NSNextResponder" ref="1000898384"/>
 																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{227, 46}, {59, 26}}</string>
+																<string key="NSFrame">{{214, 46}, {59, 26}}</string>
 																<reference key="NSSuperview" ref="1000898384"/>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSComboBoxCell" key="NSCell" id="911187373">
@@ -2772,7 +2754,7 @@
 															<object class="NSComboBox" id="201669805">
 																<reference key="NSNextResponder" ref="1000898384"/>
 																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{200, 10}, {86, 26}}</string>
+																<string key="NSFrame">{{200, 13}, {84, 23}}</string>
 																<reference key="NSSuperview" ref="1000898384"/>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSComboBoxCell" key="NSCell" id="794470440">
@@ -2849,6 +2831,112 @@
 																	</object>
 																</object>
 															</object>
+															<object class="NSButton" id="341539778">
+																<reference key="NSNextResponder" ref="1000898384"/>
+																<int key="NSvFlags">268</int>
+																<string key="NSFrame">{{294, 16}, {102, 18}}</string>
+																<reference key="NSSuperview" ref="1000898384"/>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSButtonCell" key="NSCell" id="745080730">
+																	<int key="NSCellFlags">67239424</int>
+																	<int key="NSCellFlags2">0</int>
+																	<string key="NSContents">System Type</string>
+																	<reference key="NSSupport" ref="930899267"/>
+																	<reference key="NSControlView" ref="341539778"/>
+																	<int key="NSButtonFlags">1211912703</int>
+																	<int key="NSButtonFlags2">2</int>
+																	<reference key="NSNormalImage" ref="459398604"/>
+																	<reference key="NSAlternateImage" ref="731537593"/>
+																	<string key="NSAlternateContents"/>
+																	<string key="NSKeyEquivalent"/>
+																	<int key="NSPeriodicDelay">200</int>
+																	<int key="NSPeriodicInterval">25</int>
+																</object>
+															</object>
+															<object class="NSComboBox" id="486779354">
+																<reference key="NSNextResponder" ref="1000898384"/>
+																<int key="NSvFlags">268</int>
+																<string key="NSFrame">{{410, 11}, {59, 26}}</string>
+																<reference key="NSSuperview" ref="1000898384"/>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSComboBoxCell" key="NSCell" id="89217355">
+																	<int key="NSCellFlags">343014976</int>
+																	<int key="NSCellFlags2">272630784</int>
+																	<string key="NSContents"/>
+																	<reference key="NSSupport" ref="930899267"/>
+																	<reference key="NSControlView" ref="486779354"/>
+																	<bool key="NSDrawsBackground">YES</bool>
+																	<reference key="NSBackgroundColor" ref="501125233"/>
+																	<reference key="NSTextColor" ref="560934093"/>
+																	<int key="NSVisibleItemCount">5</int>
+																	<bool key="NSHasVerticalScroller">YES</bool>
+																	<object class="NSMutableArray" key="NSPopUpListData">
+																		<bool key="EncodedWithXMLCoder">YES</bool>
+																		<string>1</string>
+																		<string>2</string>
+																		<string>3</string>
+																		<string>4</string>
+																		<string>5</string>
+																		<string>6</string>
+																	</object>
+																	<reference key="NSDelegate" ref="486779354"/>
+																	<object class="NSComboTableView" key="NSTableView" id="756779558">
+																		<reference key="NSNextResponder"/>
+																		<int key="NSvFlags">274</int>
+																		<string key="NSFrameSize">{13, 63}</string>
+																		<reference key="NSSuperview"/>
+																		<reference key="NSWindow"/>
+																		<bool key="NSEnabled">YES</bool>
+																		<object class="NSMutableArray" key="NSTableColumns">
+																			<bool key="EncodedWithXMLCoder">YES</bool>
+																			<object class="NSTableColumn">
+																				<integer value="0" key="NSIdentifier"/>
+																				<double key="NSWidth">10</double>
+																				<double key="NSMinWidth">10</double>
+																				<double key="NSMaxWidth">1000</double>
+																				<object class="NSTableHeaderCell" key="NSHeaderCell">
+																					<int key="NSCellFlags">75628032</int>
+																					<int key="NSCellFlags2">0</int>
+																					<string key="NSContents"/>
+																					<reference key="NSSupport" ref="445094936"/>
+																					<object class="NSColor" key="NSBackgroundColor">
+																						<int key="NSColorSpace">3</int>
+																						<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+																					</object>
+																					<reference key="NSTextColor" ref="732916706"/>
+																				</object>
+																				<object class="NSTextFieldCell" key="NSDataCell">
+																					<int key="NSCellFlags">338820672</int>
+																					<int key="NSCellFlags2">268436480</int>
+																					<reference key="NSSupport" ref="930899267"/>
+																					<reference key="NSControlView" ref="756779558"/>
+																					<bool key="NSDrawsBackground">YES</bool>
+																					<reference key="NSBackgroundColor" ref="694251928"/>
+																					<reference key="NSTextColor" ref="560934093"/>
+																				</object>
+																				<int key="NSResizingMask">3</int>
+																				<bool key="NSIsResizeable">YES</bool>
+																				<reference key="NSTableView" ref="756779558"/>
+																			</object>
+																		</object>
+																		<double key="NSIntercellSpacingWidth">3</double>
+																		<double key="NSIntercellSpacingHeight">2</double>
+																		<reference key="NSBackgroundColor" ref="694251928"/>
+																		<reference key="NSGridColor" ref="178056349"/>
+																		<double key="NSRowHeight">19</double>
+																		<string key="NSAction">tableViewAction:</string>
+																		<int key="NSTvFlags">-765427712</int>
+																		<reference key="NSDelegate" ref="89217355"/>
+																		<reference key="NSDataSource" ref="89217355"/>
+																		<reference key="NSTarget" ref="89217355"/>
+																		<int key="NSColumnAutoresizingStyle">1</int>
+																		<int key="NSDraggingSourceMaskForLocal">15</int>
+																		<int key="NSDraggingSourceMaskForNonLocal">0</int>
+																		<bool key="NSAllowsTypeSelect">YES</bool>
+																		<int key="NSTableViewDraggingDestinationStyle">0</int>
+																	</object>
+																</object>
+															</object>
 														</object>
 														<string key="NSFrame">{{1, 1}, {626, 117}}</string>
 														<reference key="NSSuperview" ref="138697471"/>
@@ -3186,6 +3274,7 @@
 											</object>
 										</object>
 										<string key="NSFrame">{{10, 33}, {640, 267}}</string>
+										<reference key="NSSuperview" ref="869599070"/>
 									</object>
 									<string key="NSLabel">Advanced</string>
 									<reference key="NSColor" ref="1061310622"/>
@@ -3399,14 +3488,14 @@
 									<reference key="NSTabView" ref="869599070"/>
 								</object>
 							</object>
-							<reference key="NSSelectedTabViewItem" ref="210384195"/>
+							<reference key="NSSelectedTabViewItem" ref="645910071"/>
 							<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="241622967"/>
 							</object>
 						</object>
 						<object class="NSButton" id="474865121">
@@ -3809,14 +3898,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">mVideoROM</string>
-						<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="2692381"/>
 						<reference key="destination" ref="915217355"/>
@@ -3889,14 +3970,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">mVideoROMText</string>
-						<reference key="source" ref="2692381"/>
-						<reference key="destination" ref="961902576"/>
-					</object>
-					<int key="connectionID">643</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
 						<string key="label">mHidePartitionText</string>
 						<reference key="source" ref="770879448"/>
 						<reference key="destination" ref="316034842"/>
@@ -3969,14 +4042,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">mDisableKextsBlacklisting</string>
-						<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="523685185"/>
 						<reference key="destination" ref="969759846"/>
@@ -4097,14 +4162,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">onTextFiedChange:</string>
-						<reference key="source" ref="2692381"/>
-						<reference key="destination" ref="961902576"/>
-					</object>
-					<int key="connectionID">675</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
 						<string key="label">onCheckButtonChange:</string>
 						<reference key="source" ref="2692381"/>
 						<reference key="destination" ref="512120668"/>
@@ -4299,14 +4356,6 @@
 					<object class="IBActionConnection" key="connection">
 						<string key="label">onCheckButtonChange:</string>
 						<reference key="source" ref="523685185"/>
-						<reference key="destination" ref="489715876"/>
-					</object>
-					<int key="connectionID">705</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">onCheckButtonChange:</string>
-						<reference key="source" ref="523685185"/>
 						<reference key="destination" ref="969759846"/>
 					</object>
 					<int key="connectionID">706</int>
@@ -4935,6 +4984,62 @@
 					</object>
 					<int key="connectionID">904</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">onCheckButtonChange:</string>
+						<reference key="source" ref="2692381"/>
+						<reference key="destination" ref="462385057"/>
+					</object>
+					<int key="connectionID">907</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">mAtiVideoROM</string>
+						<reference key="source" ref="2692381"/>
+						<reference key="destination" ref="628549159"/>
+					</object>
+					<int key="connectionID">908</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">mNvidiaVideoROM</string>
+						<reference key="source" ref="2692381"/>
+						<reference key="destination" ref="462385057"/>
+					</object>
+					<int key="connectionID">909</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">onCheckButtonChange:</string>
+						<reference key="source" ref="523685185"/>
+						<reference key="destination" ref="341539778"/>
+					</object>
+					<int key="connectionID">914</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">onTextFiedChange:</string>
+						<reference key="source" ref="523685185"/>
+						<reference key="destination" ref="486779354"/>
+					</object>
+					<int key="connectionID">915</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">mSystemTypeText</string>
+						<reference key="source" ref="523685185"/>
+						<reference key="destination" ref="486779354"/>
+					</object>
+					<int key="connectionID">916</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">mSystemType</string>
+						<reference key="source" ref="523685185"/>
+						<reference key="destination" ref="341539778"/>
+					</object>
+					<int key="connectionID">917</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -5480,10 +5585,10 @@
 							<reference ref="455218521"/>
 							<reference ref="992653788"/>
 							<reference ref="915217355"/>
-							<reference ref="628549159"/>
-							<reference ref="961902576"/>
 							<reference ref="732855392"/>
 							<reference ref="668416335"/>
+							<reference ref="628549159"/>
+							<reference ref="462385057"/>
 							<reference ref="552874632"/>
 						</object>
 						<reference key="parent" ref="495127110"/>
@@ -5545,20 +5650,6 @@
 						<reference key="parent" ref="552874632"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">460</int>
-						<reference key="object" ref="961902576"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="803716621"/>
-						</object>
-						<reference key="parent" ref="71889788"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">461</int>
-						<reference key="object" ref="803716621"/>
-						<reference key="parent" ref="961902576"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">478</int>
 						<reference key="object" ref="645910071"/>
 						<object class="NSMutableArray" key="children">
@@ -5600,22 +5691,23 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="292282216"/>
 							<reference ref="971254835"/>
-							<reference ref="999034340"/>
-							<reference ref="867800924"/>
-							<reference ref="435619385"/>
-							<reference ref="940855934"/>
 							<reference ref="561126957"/>
 							<reference ref="115918076"/>
 							<reference ref="323622459"/>
-							<reference ref="721224995"/>
 							<reference ref="317712564"/>
 							<reference ref="921716680"/>
 							<reference ref="366999"/>
-							<reference ref="489715876"/>
-							<reference ref="906728368"/>
 							<reference ref="95085986"/>
 							<reference ref="201669805"/>
 							<reference ref="339794873"/>
+							<reference ref="721224995"/>
+							<reference ref="999034340"/>
+							<reference ref="940855934"/>
+							<reference ref="867800924"/>
+							<reference ref="435619385"/>
+							<reference ref="341539778"/>
+							<reference ref="486779354"/>
+							<reference ref="906728368"/>
 						</object>
 						<reference key="parent" ref="241622967"/>
 					</object>
@@ -6085,20 +6177,6 @@
 						<reference key="parent" ref="628549159"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">586</int>
-						<reference key="object" ref="489715876"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="612718662"/>
-						</object>
-						<reference key="parent" ref="138697471"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">587</int>
-						<reference key="object" ref="612718662"/>
-						<reference key="parent" ref="489715876"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">588</int>
 						<reference key="object" ref="744752273"/>
 						<object class="NSMutableArray" key="children">
@@ -6655,6 +6733,48 @@
 						<reference key="object" ref="721424701"/>
 						<reference key="parent" ref="0"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">905</int>
+						<reference key="object" ref="462385057"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="909224470"/>
+						</object>
+						<reference key="parent" ref="71889788"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">906</int>
+						<reference key="object" ref="909224470"/>
+						<reference key="parent" ref="462385057"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">910</int>
+						<reference key="object" ref="341539778"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="745080730"/>
+						</object>
+						<reference key="parent" ref="138697471"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">911</int>
+						<reference key="object" ref="486779354"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="89217355"/>
+						</object>
+						<reference key="parent" ref="138697471"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">912</int>
+						<reference key="object" ref="89217355"/>
+						<reference key="parent" ref="486779354"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">913</int>
+						<reference key="object" ref="745080730"/>
+						<reference key="parent" ref="341539778"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -6758,9 +6878,6 @@
 					<string>457.IBPluginDependency</string>
 					<string>458.IBAttributePlaceholdersKey</string>
 					<string>458.IBPluginDependency</string>
-					<string>460.IBAttributePlaceholdersKey</string>
-					<string>460.IBPluginDependency</string>
-					<string>461.IBPluginDependency</string>
 					<string>463.IBPluginDependency</string>
 					<string>464.IBPluginDependency</string>
 					<string>478.IBPluginDependency</string>
@@ -6862,9 +6979,6 @@
 					<string>584.IBAttributePlaceholdersKey</string>
 					<string>584.IBPluginDependency</string>
 					<string>585.IBPluginDependency</string>
-					<string>586.IBAttributePlaceholdersKey</string>
-					<string>586.IBPluginDependency</string>
-					<string>587.IBPluginDependency</string>
 					<string>588.IBAttributePlaceholdersKey</string>
 					<string>588.IBPluginDependency</string>
 					<string>589.IBPluginDependency</string>
@@ -6951,7 +7065,15 @@
 					<string>870.IBPluginDependency</string>
 					<string>872.IBPluginDependency</string>
 					<string>873.IBPluginDependency</string>
-					<string>893.IBPluginDependency</string>
+					<string>897.IBPluginDependency</string>
+					<string>905.IBAttributePlaceholdersKey</string>
+					<string>905.IBPluginDependency</string>
+					<string>906.IBPluginDependency</string>
+					<string>910.IBAttributePlaceholdersKey</string>
+					<string>910.IBPluginDependency</string>
+					<string>911.IBPluginDependency</string>
+					<string>912.IBPluginDependency</string>
+					<string>913.IBPluginDependency</string>
 					<string>99.IBAttributePlaceholdersKey</string>
 					<string>99.IBPluginDependency</string>
 				</object>
@@ -6977,9 +7099,9 @@
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{142, 78}, {668, 368}}</string>
+					<string>{{148, 191}, {668, 368}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{142, 78}, {668, 368}}</string>
+					<string>{{148, 191}, {668, 368}}</string>
 					<integer value="1"/>
 					<integer value="1"/>
 					<string>{224.664, 10}</string>
@@ -7190,24 +7312,14 @@
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
 							<reference key="object" ref="552874632"/>
-							<string key="toolTip">NVidia only. Inject Video BIOS to from a file in /Extra/ named [vendorid][devid].rom where vendorid and devid are 4 digits hexadecimal values(default=No)</string>
+							<string key="toolTip">Inject VBIOS to device-properties</string>
 						</object>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<string key="NS.key.0">ToolTip</string>
-						<object class="IBToolTipAttribute" key="NS.object.0">
-							<string key="name">ToolTip</string>
-							<reference key="object" ref="961902576"/>
-							<string key="toolTip">Define the GFX card video ROM file that should be loaded at boot</string>
-						</object>
-					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
 						<string key="NS.key.0">ToolTip</string>
 						<object class="IBToolTipAttribute" key="NS.object.0">
@@ -7489,7 +7601,7 @@
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
 							<reference key="object" ref="628549159"/>
-							<string key="toolTip">NVidia only. (obsolete) Define the GFX card video ROM file that should be loaded at boot. Superseded by VBIOS</string>
+							<string key="toolTip">Use an alternate ATI ROM image (path: /Extra/&lt;vendorid&gt;_&lt;devid&gt;.rom)</string>
 						</object>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -7498,16 +7610,6 @@
 						<string key="NS.key.0">ToolTip</string>
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
-							<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>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<string key="NS.key.0">ToolTip</string>
-						<object class="IBToolTipAttribute" key="NS.object.0">
-							<string key="name">ToolTip</string>
 							<reference key="object" ref="744752273"/>
 							<string key="toolTip">Force to boot in safe mode. Useful in certains situations (i.e: when one  kexts hangs the system)</string>
 						</object>
@@ -7712,6 +7814,28 @@
 						<string key="NS.key.0">ToolTip</string>
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
+							<reference key="object" ref="462385057"/>
+							<string key="toolTip"> Use an alternate Nvidia ROM image (path: /Extra/&lt;vendorid&gt;_&lt;devid&gt;.rom)</string>
+						</object>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSMutableDictionary">
+						<string key="NS.key.0">ToolTip</string>
+						<object class="IBToolTipAttribute" key="NS.object.0">
+							<string key="name">ToolTip</string>
+							<reference key="object" ref="341539778"/>
+							<string key="toolTip">Force physical cpus count (all cores in all cpus), automatically detected by default. Use this override only if autodetection doesn't work for your cpu.</string>
+						</object>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSMutableDictionary">
+						<string key="NS.key.0">ToolTip</string>
+						<object class="IBToolTipAttribute" key="NS.object.0">
+							<string key="name">ToolTip</string>
 							<reference key="object" ref="303493593"/>
 							<string key="toolTip">Click on a partition to make it the default boot partition.</string>
 						</object>
@@ -7735,7 +7859,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">904</int>
+			<int key="maxID">917</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -7753,7 +7877,7 @@
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/AboutController.h</string>
+						<string key="minorKey">../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/AboutController.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -7801,6 +7925,8 @@
 							<string>mSMBIOSFileText</string>
 							<string>mSystemId</string>
 							<string>mSystemIdText</string>
+							<string>mSystemType</string>
+							<string>mSystemTypeText</string>
 							<string>mWake</string>
 							<string>mWakeImage</string>
 							<string>mWakeImageText</string>
@@ -7833,7 +7959,9 @@
 							<string>NSButton</string>
 							<string>NSTextField</string>
 							<string>NSButton</string>
+							<string>NSComboBox</string>
 							<string>NSButton</string>
+							<string>NSButton</string>
 							<string>NSTextField</string>
 						</object>
 					</object>
@@ -7965,7 +8093,6 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>onAbout:</string>
 							<string>onRestart:</string>
 							<string>onShutdown:</string>
 							<string>onSleep:</string>
@@ -7975,7 +8102,6 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -8019,7 +8145,7 @@
 					<string key="superclassName">NSTableView</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/CustomTableView.h</string>
+						<string key="minorKey">../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/CustomTableView.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -8055,7 +8181,7 @@
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/EfiInjectController.h</string>
+						<string key="minorKey">../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/EfiInjectController.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -8094,6 +8220,7 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>mAtiVideoROM</string>
 							<string>mBootBanner</string>
 							<string>mEHCIacquire</string>
 							<string>mEthernetBuiltIn</string>
@@ -8102,13 +8229,12 @@
 							<string>mGraphicsMode</string>
 							<string>mGraphicsModeText</string>
 							<string>mLegacyLogo</string>
+							<string>mNvidiaVideoROM</string>
 							<string>mPciRoot</string>
 							<string>mPciRootText</string>
 							<string>mUHCIreset</string>
 							<string>mUSBBusFix</string>
 							<string>mVBIOS</string>
-							<string>mVideoROM</string>
-							<string>mVideoROMText</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -8118,15 +8244,15 @@
 							<string>NSButton</string>
 							<string>NSButton</string>
 							<string>NSButton</string>
+							<string>NSButton</string>
 							<string>NSComboBox</string>
 							<string>NSButton</string>
 							<string>NSButton</string>
+							<string>NSButton</string>
 							<string>NSTextField</string>
 							<string>NSButton</string>
 							<string>NSButton</string>
 							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -8164,7 +8290,7 @@
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/SmbiosController.h</string>
+						<string key="minorKey">../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/SmbiosController.h</string>
 					</object>
 				</object>
 			</object>