From bd17ec56e4c0bd84204e5f68ca65eb1015322ee2 Mon Sep 17 00:00:00 2001
From: meancoot <jasonfetters@gmail.com>
Date: Thu, 12 Dec 2013 21:14:14 -0500
Subject: [PATCH] (OSX) First pass at settings menu compatible with OS X <
 10.7; set Xcode deployment target to 10.6.

---
 apple/OSX/en.lproj/InputBinder.xib            |  384 ----
 apple/OSX/en.lproj/MainMenu.xib               |  289 +--
 apple/OSX/en.lproj/Settings.xib               | 1789 +++--------------
 apple/OSX/settings.m                          |  301 ++-
 apple/RetroArch_OSX.xcodeproj/project.pbxproj |   17 +-
 5 files changed, 434 insertions(+), 2346 deletions(-)
 delete mode 100644 apple/OSX/en.lproj/InputBinder.xib

diff --git a/apple/OSX/en.lproj/InputBinder.xib b/apple/OSX/en.lproj/InputBinder.xib
deleted file mode 100644
index 1dc324d900..0000000000
--- a/apple/OSX/en.lproj/InputBinder.xib
+++ /dev/null
@@ -1,384 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1080</int>
-		<string key="IBDocument.SystemVersion">12E55</string>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.39</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">3084</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBNSLayoutConstraint</string>
-			<string>NSButton</string>
-			<string>NSButtonCell</string>
-			<string>NSCustomObject</string>
-			<string>NSTextField</string>
-			<string>NSTextFieldCell</string>
-			<string>NSView</string>
-			<string>NSWindowTemplate</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="NSCustomObject" id="1001">
-				<string key="NSClassName">NSWindowController</string>
-			</object>
-			<object class="NSCustomObject" id="1003">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1004">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSWindowTemplate" id="1005">
-				<int key="NSWindowStyleMask">15</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 240}, {480, 109}}</string>
-				<int key="NSWTFlags">544735232</int>
-				<string key="NSWindowTitle">Window</string>
-				<string key="NSWindowClass">RAInputBinder</string>
-				<nil key="NSViewClass"/>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<object class="NSView" key="NSWindowView" id="1006">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<array class="NSMutableArray" key="NSSubviews">
-						<object class="NSTextField" id="693377980">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{17, 72}, {446, 17}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="606338068"/>
-							<string key="NSReuseIdentifierKey">_NS:1535</string>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="270729776">
-								<int key="NSCellFlags">68157504</int>
-								<int key="NSCellFlags2">138413056</int>
-								<string key="NSContents">Press a Key, Joystick Button, or move a Joystick Axis</string>
-								<object class="NSFont" key="NSSupport" id="965449829">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">13</double>
-									<int key="NSfFlags">1044</int>
-								</object>
-								<string key="NSCellIdentifier">_NS:1535</string>
-								<reference key="NSControlView" ref="693377980"/>
-								<object class="NSColor" key="NSBackgroundColor">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">controlColor</string>
-									<object class="NSColor" key="NSColor">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-									</object>
-								</object>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">controlTextColor</string>
-									<object class="NSColor" key="NSColor">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MAA</bytes>
-									</object>
-								</object>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSButton" id="606338068">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{384, 13}, {82, 32}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="548104382">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Cancel</string>
-								<reference key="NSSupport" ref="965449829"/>
-								<string key="NSCellIdentifier">_NS:9</string>
-								<reference key="NSControlView" ref="606338068"/>
-								<int key="NSButtonFlags">-2038284288</int>
-								<int key="NSButtonFlags2">129</int>
-								<reference key="NSAlternateImage" ref="965449829"/>
-								<string key="NSAlternateContents"/>
-								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-					</array>
-					<string key="NSFrameSize">{480, 109}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
-					<reference key="NSNextKeyView" ref="693377980"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<bool key="NSWindowIsRestorable">YES</bool>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="1005"/>
-					</object>
-					<int key="connectionID">3</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">goAway:</string>
-						<reference key="source" ref="1005"/>
-						<reference key="destination" ref="606338068"/>
-					</object>
-					<int key="connectionID">20</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1001"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1003"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1004"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="1005"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1006"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2</int>
-						<reference key="object" ref="1006"/>
-						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="952757161">
-								<reference key="firstItem" ref="1006"/>
-								<int key="firstAttribute">4</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="606338068"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1006"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="1024300700">
-								<reference key="firstItem" ref="1006"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="606338068"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1006"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="547048879">
-								<reference key="firstItem" ref="693377980"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="1006"/>
-								<int key="secondAttribute">3</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1006"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="101981711">
-								<reference key="firstItem" ref="1006"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="693377980"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1006"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="362753409">
-								<reference key="firstItem" ref="693377980"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="1006"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1006"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<reference ref="693377980"/>
-							<reference ref="606338068"/>
-						</array>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4</int>
-						<reference key="object" ref="693377980"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="270729776"/>
-						</array>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="270729776"/>
-						<reference key="parent" ref="693377980"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">9</int>
-						<reference key="object" ref="362753409"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">10</int>
-						<reference key="object" ref="101981711"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">11</int>
-						<reference key="object" ref="547048879"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">12</int>
-						<reference key="object" ref="606338068"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="548104382"/>
-						</array>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">13</int>
-						<reference key="object" ref="548104382"/>
-						<reference key="parent" ref="606338068"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">14</int>
-						<reference key="object" ref="1024300700"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">15</int>
-						<reference key="object" ref="952757161"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1.IBWindowTemplateEditedContentRect">{{357, 418}, {480, 270}}</string>
-				<boolean value="NO" key="1.NSWindowTemplate.visibleAtLaunch"/>
-				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="12.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array key="2.IBNSViewMetadataConstraints">
-					<reference ref="362753409"/>
-					<reference ref="101981711"/>
-					<reference ref="547048879"/>
-					<reference ref="1024300700"/>
-					<reference ref="952757161"/>
-				</array>
-				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="4.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">20</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">NSLayoutConstraint</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">RAInputBinder</string>
-					<string key="superclassName">NSWindow</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/RAInputBinder.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<bool key="IBDocument.UseAutolayout">YES</bool>
-	</data>
-</archive>
diff --git a/apple/OSX/en.lproj/MainMenu.xib b/apple/OSX/en.lproj/MainMenu.xib
index 908154abc8..3a77f31350 100644
--- a/apple/OSX/en.lproj/MainMenu.xib
+++ b/apple/OSX/en.lproj/MainMenu.xib
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1080</int>
-		<string key="IBDocument.SystemVersion">12E55</string>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.39</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<int key="IBDocument.SystemTarget">1090</int>
+		<string key="IBDocument.SystemVersion">13A603</string>
+		<string key="IBDocument.InterfaceBuilderVersion">4514</string>
+		<string key="IBDocument.AppKitVersion">1265</string>
+		<string key="IBDocument.HIToolboxVersion">695.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">3084</string>
+			<string key="NS.object.0">4514</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBNSLayoutConstraint</string>
 			<string>NSButton</string>
 			<string>NSButtonCell</string>
 			<string>NSComboBox</string>
@@ -59,6 +58,7 @@
 							<string key="NSResourceName">NSMenuMixedState</string>
 						</object>
 						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="110575045"/>
 						<object class="NSMenu" key="NSSubmenu" id="110575045">
 							<string key="NSTitle">RetroArch</string>
 							<array class="NSMutableArray" key="NSMenuItems">
@@ -110,6 +110,7 @@
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
 									<string key="NSAction">submenuAction:</string>
+									<reference key="NSTarget" ref="752062318"/>
 									<object class="NSMenu" key="NSSubmenu" id="752062318">
 										<string key="NSTitle">Services</string>
 										<array class="NSMutableArray" key="NSMenuItems"/>
@@ -187,6 +188,7 @@
 						<reference key="NSOnImage" ref="35465992"/>
 						<reference key="NSMixedImage" ref="502551668"/>
 						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="720053764"/>
 						<object class="NSMenu" key="NSSubmenu" id="720053764">
 							<string key="NSTitle">File</string>
 							<array class="NSMutableArray" key="NSMenuItems">
@@ -208,6 +210,7 @@
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
 									<string key="NSAction">submenuAction:</string>
+									<reference key="NSTarget" ref="1065607017"/>
 									<object class="NSMenu" key="NSSubmenu" id="1065607017">
 										<string key="NSTitle">Open Recent</string>
 										<array class="NSMutableArray" key="NSMenuItems">
@@ -255,6 +258,7 @@
 						<reference key="NSOnImage" ref="35465992"/>
 						<reference key="NSMixedImage" ref="502551668"/>
 						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="604031057"/>
 						<object class="NSMenu" key="NSSubmenu" id="604031057">
 							<string key="NSTitle">Core</string>
 							<array class="NSMutableArray" key="NSMenuItems">
@@ -305,6 +309,7 @@
 						<reference key="NSOnImage" ref="35465992"/>
 						<reference key="NSMixedImage" ref="502551668"/>
 						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="715293634"/>
 						<object class="NSMenu" key="NSSubmenu" id="715293634">
 							<string key="NSTitle">Go</string>
 							<array class="NSMutableArray" key="NSMenuItems">
@@ -328,6 +333,7 @@
 						<reference key="NSOnImage" ref="35465992"/>
 						<reference key="NSMixedImage" ref="502551668"/>
 						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="835318025"/>
 						<object class="NSMenu" key="NSSubmenu" id="835318025">
 							<string key="NSTitle">Window</string>
 							<array class="NSMutableArray" key="NSMenuItems">
@@ -390,6 +396,7 @@
 						<reference key="NSOnImage" ref="35465992"/>
 						<reference key="NSMixedImage" ref="502551668"/>
 						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="992780483"/>
 						<object class="NSMenu" key="NSSubmenu" id="992780483">
 							<string key="NSTitle">Help</string>
 							<array class="NSMutableArray" key="NSMenuItems">
@@ -440,14 +447,15 @@
 				<nil key="NSViewClass"/>
 				<nil key="NSUserInterfaceItemIdentifier"/>
 				<object class="NSView" key="NSWindowView" id="327272550">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<array class="NSMutableArray" key="NSSubviews">
 						<object class="NSTextField" id="981013832">
 							<reference key="NSNextResponder" ref="327272550"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{17, 72}, {242, 17}}</string>
+							<string key="NSFrame">{{18, 72}, {240, 17}}</string>
 							<reference key="NSSuperview" ref="327272550"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="481701893"/>
 							<string key="NSReuseIdentifierKey">_NS:1535</string>
 							<bool key="NSEnabled">YES</bool>
@@ -456,7 +464,7 @@
 								<int key="NSCellFlags2">138413056</int>
 								<string key="NSContents">Select Core</string>
 								<object class="NSFont" key="NSSupport" id="698260743">
-									<string key="NSName">LucidaGrande</string>
+									<string key="NSName">.LucidaGrandeUI</string>
 									<double key="NSSize">13</double>
 									<int key="NSfFlags">1044</int>
 								</object>
@@ -483,12 +491,14 @@
 								</object>
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 						</object>
 						<object class="NSComboBox" id="481701893">
 							<reference key="NSNextResponder" ref="327272550"/>
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{20, 45}, {239, 26}}</string>
 							<reference key="NSSuperview" ref="327272550"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="59737118"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<int key="NSTag">1</int>
@@ -517,7 +527,7 @@
 								<object class="NSComboTableView" key="NSTableView" id="845451530">
 									<reference key="NSNextResponder"/>
 									<int key="NSvFlags">274</int>
-									<string key="NSFrameSize">{15, 0}</string>
+									<string key="NSFrameSize">{13, 0}</string>
 									<reference key="NSSuperview"/>
 									<reference key="NSWindow"/>
 									<string key="NSReuseIdentifierKey">_NS:24</string>
@@ -526,7 +536,7 @@
 									<bool key="NSControlAllowsExpansionToolTips">YES</bool>
 									<array class="NSMutableArray" key="NSTableColumns">
 										<object class="NSTableColumn">
-											<double key="NSWidth">12</double>
+											<double key="NSWidth">10</double>
 											<double key="NSMinWidth">10</double>
 											<double key="NSMaxWidth">1000</double>
 											<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -546,7 +556,7 @@
 											</object>
 											<object class="NSTextFieldCell" key="NSDataCell">
 												<int key="NSCellFlags">338690112</int>
-												<int key="NSCellFlags2">1024</int>
+												<int key="NSCellFlags2">268436480</int>
 												<reference key="NSSupport" ref="698260743"/>
 												<reference key="NSControlView" ref="845451530"/>
 												<bool key="NSDrawsBackground">YES</bool>
@@ -577,7 +587,7 @@
 									</object>
 									<double key="NSRowHeight">19</double>
 									<string key="NSAction">tableViewAction:</string>
-									<int key="NSTvFlags">-767524864</int>
+									<int key="NSTvFlags">-765427712</int>
 									<reference key="NSDelegate" ref="50876060"/>
 									<reference key="NSDataSource" ref="50876060"/>
 									<reference key="NSTarget" ref="50876060"/>
@@ -590,12 +600,14 @@
 								</object>
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 						</object>
 						<object class="NSButton" id="59737118">
 							<reference key="NSNextResponder" ref="327272550"/>
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{180, 13}, {82, 32}}</string>
 							<reference key="NSSuperview" ref="327272550"/>
+							<reference key="NSWindow"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="404714727">
@@ -616,6 +628,8 @@
 						</object>
 					</array>
 					<string key="NSFrameSize">{276, 89}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="981013832"/>
 					<string key="NSReuseIdentifierKey">_NS:21</string>
 				</object>
@@ -1126,134 +1140,6 @@
 						<array class="NSMutableArray" key="children">
 							<reference ref="481701893"/>
 							<reference ref="981013832"/>
-							<object class="IBNSLayoutConstraint" id="598502388">
-								<reference key="firstItem" ref="327272550"/>
-								<int key="firstAttribute">4</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="59737118"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="327272550"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="440045210">
-								<reference key="firstItem" ref="327272550"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="59737118"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="327272550"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="349729298">
-								<reference key="firstItem" ref="481701893"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="327272550"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="327272550"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="771451666">
-								<reference key="firstItem" ref="327272550"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="481701893"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="327272550"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="921535294">
-								<reference key="firstItem" ref="481701893"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="327272550"/>
-								<int key="secondAttribute">3</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="327272550"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="1063787951">
-								<reference key="firstItem" ref="327272550"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="981013832"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="327272550"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="1065663450">
-								<reference key="firstItem" ref="981013832"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="327272550"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="327272550"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="819043808">
-								<reference key="firstItem" ref="981013832"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="327272550"/>
-								<int key="secondAttribute">3</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="327272550"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
 							<reference ref="59737118"/>
 						</array>
 						<reference key="parent" ref="361653618"/>
@@ -1274,36 +1160,6 @@
 						</array>
 						<reference key="parent" ref="327272550"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">561</int>
-						<reference key="object" ref="819043808"/>
-						<reference key="parent" ref="327272550"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">562</int>
-						<reference key="object" ref="1065663450"/>
-						<reference key="parent" ref="327272550"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">563</int>
-						<reference key="object" ref="1063787951"/>
-						<reference key="parent" ref="327272550"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">564</int>
-						<reference key="object" ref="921535294"/>
-						<reference key="parent" ref="327272550"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">565</int>
-						<reference key="object" ref="771451666"/>
-						<reference key="parent" ref="327272550"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">566</int>
-						<reference key="object" ref="349729298"/>
-						<reference key="parent" ref="327272550"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">567</int>
 						<reference key="object" ref="45342161"/>
@@ -1319,22 +1175,6 @@
 						<reference key="object" ref="59737118"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="404714727"/>
-							<object class="IBNSLayoutConstraint" id="756403335">
-								<reference key="firstItem" ref="59737118"/>
-								<int key="firstAttribute">7</int>
-								<int key="relation">0</int>
-								<nil key="secondItem"/>
-								<int key="secondAttribute">0</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">70</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="59737118"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">1</int>
-							</object>
 						</array>
 						<reference key="parent" ref="327272550"/>
 					</object>
@@ -1343,21 +1183,6 @@
 						<reference key="object" ref="404714727"/>
 						<reference key="parent" ref="59737118"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">572</int>
-						<reference key="object" ref="440045210"/>
-						<reference key="parent" ref="327272550"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">578</int>
-						<reference key="object" ref="598502388"/>
-						<reference key="parent" ref="327272550"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">579</int>
-						<reference key="object" ref="756403335"/>
-						<reference key="parent" ref="59737118"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">582</int>
 						<reference key="object" ref="257009827"/>
@@ -1426,40 +1251,15 @@
 				<string key="555.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="557.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="557.NSWindowTemplate.visibleAtLaunch"/>
-				<array class="NSMutableArray" key="558.IBNSViewMetadataConstraints">
-					<reference ref="819043808"/>
-					<reference ref="1065663450"/>
-					<reference ref="1063787951"/>
-					<reference ref="921535294"/>
-					<reference ref="771451666"/>
-					<reference ref="349729298"/>
-					<reference ref="440045210"/>
-					<reference ref="598502388"/>
-				</array>
 				<string key="558.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="559.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="559.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="560.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="560.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="561.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="562.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="563.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="564.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="565.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="566.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="567.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="568.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array key="570.IBNSViewMetadataConstraints">
-					<reference ref="756403335"/>
-				</array>
-				<boolean value="NO" key="570.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="570.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="571.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="572.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="578.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="579.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="582.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="585.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1480,23 +1280,20 @@
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">NSLayoutConstraint</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">RetroArch_OSX</string>
 					<string key="superclassName">NSObject</string>
 					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="basicEvent:">id</string>
 						<string key="coreWasChosen:">id</string>
 						<string key="showCoresDirectory:">id</string>
 						<string key="showPreferences:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="basicEvent:">
+							<string key="name">basicEvent:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="coreWasChosen:">
 							<string key="name">coreWasChosen:</string>
 							<string key="candidateClassName">id</string>
@@ -1510,20 +1307,6 @@
 							<string key="candidateClassName">id</string>
 						</object>
 					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="_coreSelectSheet">NSWindow</string>
-						<string key="window">NSWindow</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="_coreSelectSheet">
-							<string key="name">_coreSelectSheet</string>
-							<string key="candidateClassName">NSWindow</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="window">
-							<string key="name">window</string>
-							<string key="candidateClassName">NSWindow</string>
-						</object>
-					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">./Classes/RetroArch_OSX.h</string>
@@ -1533,12 +1316,16 @@
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+			<integer value="4600" key="NS.object.0"/>
+		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<string key="NSMenuCheckmark">{11, 11}</string>
 			<string key="NSMenuMixedState">{10, 3}</string>
 		</dictionary>
-		<bool key="IBDocument.UseAutolayout">YES</bool>
 	</data>
 </archive>
diff --git a/apple/OSX/en.lproj/Settings.xib b/apple/OSX/en.lproj/Settings.xib
index 03a3147273..8e2612ca7f 100644
--- a/apple/OSX/en.lproj/Settings.xib
+++ b/apple/OSX/en.lproj/Settings.xib
@@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1080</int>
-		<string key="IBDocument.SystemVersion">12E55</string>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.39</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<int key="IBDocument.SystemTarget">1060</int>
+		<string key="IBDocument.SystemVersion">13A603</string>
+		<string key="IBDocument.InterfaceBuilderVersion">4514</string>
+		<string key="IBDocument.AppKitVersion">1265</string>
+		<string key="IBDocument.HIToolboxVersion">695.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">3084</string>
+			<string key="NS.object.0">4514</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBNSLayoutConstraint</string>
 			<string>NSButton</string>
 			<string>NSButtonCell</string>
 			<string>NSCustomObject</string>
 			<string>NSOutlineView</string>
 			<string>NSScrollView</string>
 			<string>NSScroller</string>
-			<string>NSTableCellView</string>
 			<string>NSTableColumn</string>
 			<string>NSTableHeaderView</string>
 			<string>NSTableView</string>
@@ -63,7 +61,7 @@
 							<array class="NSMutableArray" key="NSSubviews">
 								<object class="NSClipView" id="1047819253">
 									<reference key="NSNextResponder" ref="74170807"/>
-									<int key="NSvFlags">2304</int>
+									<int key="NSvFlags">2322</int>
 									<array class="NSMutableArray" key="NSSubviews">
 										<object class="NSTableView" id="223530966">
 											<reference key="NSNextResponder" ref="1047819253"/>
@@ -72,7 +70,7 @@
 											<string key="NSFrameSize">{148, 555}</string>
 											<reference key="NSSuperview" ref="1047819253"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="531097376"/>
+											<reference key="NSNextKeyView" ref="189192509"/>
 											<string key="NSReuseIdentifierKey">_NS:13</string>
 											<bool key="NSEnabled">YES</bool>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -95,7 +93,7 @@
 														<int key="NSCellFlags2">2048</int>
 														<string key="NSContents"/>
 														<object class="NSFont" key="NSSupport" id="26">
-															<string key="NSName">LucidaGrande</string>
+															<string key="NSName">.LucidaGrandeUI</string>
 															<double key="NSSize">11</double>
 															<int key="NSfFlags">3100</int>
 														</object>
@@ -114,11 +112,11 @@
 														</object>
 													</object>
 													<object class="NSTextFieldCell" key="NSDataCell" id="109586057">
-														<int key="NSCellFlags">337641536</int>
+														<int key="NSCellFlags">67108928</int>
 														<int key="NSCellFlags2">2048</int>
-														<string key="NSContents">Text Cell</string>
+														<string key="NSContents"/>
 														<object class="NSFont" key="NSSupport" id="893645100">
-															<string key="NSName">LucidaGrande</string>
+															<string key="NSName">.LucidaGrandeUI</string>
 															<double key="NSSize">13</double>
 															<int key="NSfFlags">1044</int>
 														</object>
@@ -164,7 +162,7 @@
 													<bytes key="NSWhite">MC41AA</bytes>
 												</object>
 											</object>
-											<double key="NSRowHeight">30</double>
+											<double key="NSRowHeight">17</double>
 											<int key="NSTvFlags">104857600</int>
 											<reference key="NSDelegate"/>
 											<reference key="NSDataSource"/>
@@ -222,7 +220,7 @@
 							<reference key="NSVScroller" ref="189192509"/>
 							<reference key="NSHScroller" ref="404182997"/>
 							<reference key="NSContentView" ref="1047819253"/>
-							<bytes key="NSScrollAmts">QSAAAEEgAABCAAAAQgAAAA</bytes>
+							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
 							<double key="NSMinMagnification">0.25</double>
 							<double key="NSMaxMagnification">4</double>
 							<double key="NSMagnification">1</double>
@@ -233,7 +231,7 @@
 							<array class="NSMutableArray" key="NSSubviews">
 								<object class="NSClipView" id="119087162">
 									<reference key="NSNextResponder" ref="46895506"/>
-									<int key="NSvFlags">2304</int>
+									<int key="NSvFlags">2322</int>
 									<array class="NSMutableArray" key="NSSubviews">
 										<object class="NSOutlineView" id="962679450">
 											<reference key="NSNextResponder" ref="119087162"/>
@@ -242,7 +240,7 @@
 											<string key="NSFrameSize">{559, 539}</string>
 											<reference key="NSSuperview" ref="119087162"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="877229867"/>
+											<reference key="NSNextKeyView" ref="899143711"/>
 											<string key="NSReuseIdentifierKey">_NS:13</string>
 											<bool key="NSEnabled">YES</bool>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -253,21 +251,19 @@
 												<string key="NSFrameSize">{559, 17}</string>
 												<reference key="NSSuperview" ref="176799935"/>
 												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="93646331"/>
+												<reference key="NSNextKeyView" ref="119087162"/>
 												<reference key="NSTableView" ref="962679450"/>
 											</object>
-											<object class="_NSCornerView" key="NSCornerView" id="93646331">
-												<reference key="NSNextResponder" ref="46895506"/>
+											<object class="_NSCornerView" key="NSCornerView">
+												<nil key="NSNextResponder"/>
 												<int key="NSvFlags">-2147483392</int>
 												<string key="NSFrame">{{224, 0}, {16, 17}}</string>
-												<reference key="NSSuperview" ref="46895506"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="119087162"/>
 												<string key="NSReuseIdentifierKey">_NS:18</string>
 											</object>
 											<array class="NSMutableArray" key="NSTableColumns">
 												<object class="NSTableColumn" id="608751962">
-													<string key="NSIdentifier">title</string>
+													<string key="NSIdentifier">left</string>
 													<double key="NSWidth">276</double>
 													<double key="NSMinWidth">16</double>
 													<double key="NSMaxWidth">1000</double>
@@ -283,9 +279,9 @@
 														<reference key="NSTextColor" ref="255729133"/>
 													</object>
 													<object class="NSTextFieldCell" key="NSDataCell" id="443600383">
-														<int key="NSCellFlags">337641536</int>
+														<int key="NSCellFlags">67108928</int>
 														<int key="NSCellFlags2">2048</int>
-														<string key="NSContents">Text Cell</string>
+														<string key="NSContents"/>
 														<reference key="NSSupport" ref="893645100"/>
 														<reference key="NSControlView" ref="962679450"/>
 														<reference key="NSBackgroundColor" ref="348195430"/>
@@ -297,7 +293,7 @@
 													<reference key="NSTableView" ref="962679450"/>
 												</object>
 												<object class="NSTableColumn" id="186493342">
-													<string key="NSIdentifier">accessory</string>
+													<string key="NSIdentifier">right</string>
 													<double key="NSWidth">277</double>
 													<double key="NSMinWidth">40</double>
 													<double key="NSMaxWidth">1000</double>
@@ -312,7 +308,7 @@
 													<object class="NSTextFieldCell" key="NSDataCell" id="482758307">
 														<int key="NSCellFlags">337641536</int>
 														<int key="NSCellFlags2">2048</int>
-														<string key="NSContents">Text Cell</string>
+														<string key="NSContents"/>
 														<reference key="NSSupport" ref="893645100"/>
 														<reference key="NSControlView" ref="962679450"/>
 														<reference key="NSBackgroundColor" ref="348195430"/>
@@ -328,7 +324,7 @@
 											<double key="NSIntercellSpacingHeight">2</double>
 											<reference key="NSBackgroundColor" ref="1031424908"/>
 											<reference key="NSGridColor" ref="961535139"/>
-											<double key="NSRowHeight">30</double>
+											<double key="NSRowHeight">17</double>
 											<int key="NSTvFlags">306216960</int>
 											<reference key="NSDelegate"/>
 											<reference key="NSDataSource"/>
@@ -380,7 +376,7 @@
 								</object>
 								<object class="NSClipView" id="176799935">
 									<reference key="NSNextResponder" ref="46895506"/>
-									<int key="NSvFlags">2304</int>
+									<int key="NSvFlags">2338</int>
 									<array class="NSMutableArray" key="NSSubviews">
 										<reference ref="95545597"/>
 									</array>
@@ -392,7 +388,6 @@
 									<reference key="NSBGColor" ref="348195430"/>
 									<int key="NScvFlags">4</int>
 								</object>
-								<reference ref="93646331"/>
 							</array>
 							<string key="NSFrame">{{178, 20}, {561, 557}}</string>
 							<reference key="NSSuperview" ref="1006"/>
@@ -404,8 +399,7 @@
 							<reference key="NSHScroller" ref="366883407"/>
 							<reference key="NSContentView" ref="119087162"/>
 							<reference key="NSHeaderClipView" ref="176799935"/>
-							<reference key="NSCornerView" ref="93646331"/>
-							<bytes key="NSScrollAmts">QSAAAEEgAABCAAAAQgAAAA</bytes>
+							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
 							<double key="NSMinMagnification">0.25</double>
 							<double key="NSMaxMagnification">4</double>
 							<double key="NSMagnification">1</double>
@@ -423,6 +417,111 @@
 			<object class="NSCustomObject" id="897541637">
 				<string key="NSClassName">RASettingsDelegate</string>
 			</object>
+			<object class="NSButtonCell" id="650936754">
+				<int key="NSCellFlags">67108864</int>
+				<int key="NSCellFlags2">131072</int>
+				<string key="NSContents"/>
+				<reference key="NSSupport" ref="26"/>
+				<string key="NSCellIdentifier">_NS:9</string>
+				<int key="NSButtonFlags">1211912448</int>
+				<int key="NSButtonFlags2">2</int>
+				<object class="NSCustomResource" key="NSNormalImage">
+					<string key="NSClassName">NSImage</string>
+					<string key="NSResourceName">NSSwitch</string>
+				</object>
+				<object class="NSButtonImageSource" key="NSAlternateImage">
+					<string key="NSImageName">NSSwitch</string>
+				</object>
+				<string key="NSAlternateContents"/>
+				<string key="NSKeyEquivalent"/>
+				<int key="NSPeriodicDelay">200</int>
+				<int key="NSPeriodicInterval">25</int>
+			</object>
+			<object class="NSWindowTemplate" id="326824969">
+				<int key="NSWindowStyleMask">15</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{196, 240}, {480, 109}}</string>
+				<int key="NSWTFlags">544735232</int>
+				<string key="NSWindowTitle">Window</string>
+				<string key="NSWindowClass">RAInputBinder</string>
+				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<object class="NSView" key="NSWindowView" id="729831377">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSTextField" id="69518648">
+							<reference key="NSNextResponder" ref="729831377"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{18, 72}, {444, 17}}</string>
+							<reference key="NSSuperview" ref="729831377"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="220704537"/>
+							<string key="NSReuseIdentifierKey">_NS:1535</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="239741779">
+								<int key="NSCellFlags">68157504</int>
+								<int key="NSCellFlags2">138413056</int>
+								<string key="NSContents">Press a Key, Joystick Button, or move a Joystick Axis</string>
+								<reference key="NSSupport" ref="893645100"/>
+								<string key="NSCellIdentifier">_NS:1535</string>
+								<reference key="NSControlView" ref="69518648"/>
+								<object class="NSColor" key="NSBackgroundColor" id="838999407">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlColor</string>
+									<reference key="NSColor" ref="618044500"/>
+								</object>
+								<reference key="NSTextColor" ref="342788135"/>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+						</object>
+						<object class="NSButton" id="220704537">
+							<reference key="NSNextResponder" ref="729831377"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{384, 13}, {82, 32}}</string>
+							<reference key="NSSuperview" ref="729831377"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="637914132">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="893645100"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="220704537"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<reference key="NSAlternateImage" ref="893645100"/>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+					</array>
+					<string key="NSFrameSize">{480, 109}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="69518648"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+			<object class="NSTextFieldCell" id="735920642">
+				<int key="NSCellFlags">67108928</int>
+				<int key="NSCellFlags2">272762880</int>
+				<string key="NSContents"/>
+				<reference key="NSSupport" ref="26"/>
+				<string key="NSCellIdentifier">_NS:9</string>
+				<reference key="NSBackgroundColor" ref="838999407"/>
+				<reference key="NSTextColor" ref="342788135"/>
+			</object>
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<array class="NSMutableArray" key="connectionRecords">
@@ -482,6 +581,38 @@
 					</object>
 					<int key="connectionID">180</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">booleanCell</string>
+						<reference key="source" ref="897541637"/>
+						<reference key="destination" ref="650936754"/>
+					</object>
+					<int key="connectionID">586</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">binderWindow</string>
+						<reference key="source" ref="897541637"/>
+						<reference key="destination" ref="326824969"/>
+					</object>
+					<int key="connectionID">596</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">binderCell</string>
+						<reference key="source" ref="897541637"/>
+						<reference key="destination" ref="735920642"/>
+					</object>
+					<int key="connectionID">601</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">outlineViewClicked:</string>
+						<reference key="source" ref="897541637"/>
+						<reference key="destination" ref="962679450"/>
+					</object>
+					<int key="connectionID">603</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">dataSource</string>
@@ -498,420 +629,13 @@
 					</object>
 					<int key="connectionID">182</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">textField</string>
-						<object class="NSTableCellView" key="source" id="877229867">
-							<nil key="NSNextResponder"/>
-							<int key="NSvFlags">274</int>
-							<array class="NSMutableArray" key="NSSubviews">
-								<object class="NSTextField" id="523975582">
-									<reference key="NSNextResponder" ref="877229867"/>
-									<int key="NSvFlags">266</int>
-									<string key="NSFrame">{{0, 7}, {276, 17}}</string>
-									<reference key="NSSuperview" ref="877229867"/>
-									<reference key="NSNextKeyView" ref="77832011"/>
-									<string key="NSAntiCompressionPriority">{250, 750}</string>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSTextFieldCell" key="NSCell" id="734768720">
-										<int key="NSCellFlags">67108928</int>
-										<int key="NSCellFlags2">272631808</int>
-										<string key="NSContents"/>
-										<reference key="NSSupport" ref="893645100"/>
-										<reference key="NSControlView" ref="523975582"/>
-										<object class="NSColor" key="NSBackgroundColor" id="838999407">
-											<int key="NSColorSpace">6</int>
-											<string key="NSCatalogName">System</string>
-											<string key="NSColorName">controlColor</string>
-											<reference key="NSColor" ref="618044500"/>
-										</object>
-										<reference key="NSTextColor" ref="342788135"/>
-									</object>
-									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-								</object>
-							</array>
-							<string key="NSFrame">{{1, 1}, {276, 30}}</string>
-							<reference key="NSNextKeyView" ref="523975582"/>
-						</object>
-						<reference key="destination" ref="523975582"/>
-					</object>
-					<int key="connectionID">168</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: stringValue</string>
-						<reference key="source" ref="523975582"/>
-						<reference key="destination" ref="877229867"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="523975582"/>
-							<reference key="NSDestination" ref="877229867"/>
-							<string key="NSLabel">value: stringValue</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">stringValue</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">319</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">textField</string>
-						<object class="NSTableCellView" key="source" id="77832011">
-							<nil key="NSNextResponder"/>
-							<int key="NSvFlags">274</int>
-							<array class="NSMutableArray" key="NSSubviews">
-								<object class="NSTextField" id="146951220">
-									<reference key="NSNextResponder" ref="77832011"/>
-									<int key="NSvFlags">266</int>
-									<string key="NSFrame">{{0, 7}, {277, 17}}</string>
-									<reference key="NSSuperview" ref="77832011"/>
-									<reference key="NSNextKeyView" ref="115706725"/>
-									<string key="NSAntiCompressionPriority">{250, 750}</string>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSTextFieldCell" key="NSCell" id="316554001">
-										<int key="NSCellFlags">337641537</int>
-										<int key="NSCellFlags2">272631872</int>
-										<string key="NSContents">String</string>
-										<reference key="NSSupport" ref="893645100"/>
-										<reference key="NSControlView" ref="146951220"/>
-										<reference key="NSBackgroundColor" ref="838999407"/>
-										<reference key="NSTextColor" ref="342788135"/>
-									</object>
-									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-								</object>
-							</array>
-							<string key="NSFrame">{{280, 1}, {277, 30}}</string>
-							<reference key="NSNextKeyView" ref="146951220"/>
-						</object>
-						<reference key="destination" ref="146951220"/>
-					</object>
-					<int key="connectionID">172</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: stringValue</string>
-						<reference key="source" ref="146951220"/>
-						<reference key="destination" ref="77832011"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="146951220"/>
-							<reference key="NSDestination" ref="77832011"/>
-							<string key="NSLabel">value: stringValue</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">stringValue</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">240</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">textField</string>
-						<object class="NSTableCellView" key="source" id="331589340">
-							<nil key="NSNextResponder"/>
-							<int key="NSvFlags">274</int>
-							<array class="NSMutableArray" key="NSSubviews">
-								<object class="NSTextField" id="101981447">
-									<reference key="NSNextResponder" ref="331589340"/>
-									<int key="NSvFlags">266</int>
-									<string key="NSFrame">{{0, 7}, {277, 17}}</string>
-									<reference key="NSSuperview" ref="331589340"/>
-									<reference key="NSNextKeyView" ref="707493728"/>
-									<string key="NSAntiCompressionPriority">{250, 750}</string>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSTextFieldCell" key="NSCell" id="999711511">
-										<int key="NSCellFlags">337641537</int>
-										<int key="NSCellFlags2">272631872</int>
-										<string key="NSContents">Int</string>
-										<reference key="NSSupport" ref="893645100"/>
-										<reference key="NSControlView" ref="101981447"/>
-										<reference key="NSBackgroundColor" ref="838999407"/>
-										<reference key="NSTextColor" ref="342788135"/>
-									</object>
-									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-								</object>
-							</array>
-							<string key="NSFrame">{{280, 65}, {277, 30}}</string>
-							<reference key="NSNextKeyView" ref="101981447"/>
-						</object>
-						<reference key="destination" ref="101981447"/>
-					</object>
-					<int key="connectionID">227</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: numericValue</string>
-						<reference key="source" ref="101981447"/>
-						<reference key="destination" ref="331589340"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="101981447"/>
-							<reference key="NSDestination" ref="331589340"/>
-							<string key="NSLabel">value: numericValue</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">numericValue</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">241</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: booleanValue</string>
-						<object class="NSButton" key="source" id="933894899">
-							<reference key="NSNextResponder" ref="115706725"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{1, 6}, {61, 18}}</string>
-							<reference key="NSSuperview" ref="115706725"/>
-							<reference key="NSNextKeyView" ref="331589340"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="440208282">
-								<int key="NSCellFlags">-2080374784</int>
-								<int key="NSCellFlags2">268435456</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="893645100"/>
-								<string key="NSCellIdentifier">_NS:9</string>
-								<reference key="NSControlView" ref="933894899"/>
-								<int key="NSButtonFlags">1211912448</int>
-								<int key="NSButtonFlags2">2</int>
-								<object class="NSCustomResource" key="NSNormalImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSSwitch</string>
-								</object>
-								<object class="NSButtonImageSource" key="NSAlternateImage">
-									<string key="NSImageName">NSSwitch</string>
-								</object>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTableCellView" key="destination" id="115706725">
-							<nil key="NSNextResponder"/>
-							<int key="NSvFlags">274</int>
-							<array class="NSMutableArray" key="NSSubviews">
-								<reference ref="933894899"/>
-							</array>
-							<string key="NSFrame">{{280, 33}, {277, 30}}</string>
-							<reference key="NSNextKeyView" ref="933894899"/>
-						</object>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="933894899"/>
-							<reference key="NSDestination" ref="115706725"/>
-							<string key="NSLabel">value: booleanValue</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">booleanValue</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">255</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">textField</string>
-						<object class="NSTableCellView" key="source" id="707493728">
-							<nil key="NSNextResponder"/>
-							<int key="NSvFlags">274</int>
-							<array class="NSMutableArray" key="NSSubviews">
-								<object class="NSTextField" id="507602039">
-									<reference key="NSNextResponder" ref="707493728"/>
-									<int key="NSvFlags">266</int>
-									<string key="NSFrame">{{0, 7}, {233, 17}}</string>
-									<reference key="NSSuperview" ref="707493728"/>
-									<reference key="NSNextKeyView" ref="208507536"/>
-									<string key="NSAntiCompressionPriority">{250, 750}</string>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSTextFieldCell" key="NSCell" id="850247494">
-										<int key="NSCellFlags">337641537</int>
-										<int key="NSCellFlags2">272631872</int>
-										<string key="NSContents"/>
-										<reference key="NSSupport" ref="893645100"/>
-										<reference key="NSControlView" ref="507602039"/>
-										<reference key="NSBackgroundColor" ref="838999407"/>
-										<reference key="NSTextColor" ref="342788135"/>
-									</object>
-									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-								</object>
-								<object class="NSButton" id="208507536">
-									<reference key="NSNextResponder" ref="707493728"/>
-									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{232, -2}, {48, 32}}</string>
-									<reference key="NSSuperview" ref="707493728"/>
-									<reference key="NSNextKeyView" ref="168424691"/>
-									<string key="NSReuseIdentifierKey">_NS:9</string>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSButtonCell" key="NSCell" id="64737193">
-										<int key="NSCellFlags">67108864</int>
-										<int key="NSCellFlags2">134217728</int>
-										<string key="NSContents">...</string>
-										<reference key="NSSupport" ref="893645100"/>
-										<string key="NSCellIdentifier">_NS:9</string>
-										<reference key="NSControlView" ref="208507536"/>
-										<int key="NSButtonFlags">-2038284288</int>
-										<int key="NSButtonFlags2">129</int>
-										<string key="NSAlternateContents"/>
-										<string key="NSKeyEquivalent"/>
-										<int key="NSPeriodicDelay">200</int>
-										<int key="NSPeriodicInterval">25</int>
-									</object>
-									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-								</object>
-							</array>
-							<string key="NSFrame">{{280, 97}, {277, 30}}</string>
-							<reference key="NSNextKeyView" ref="507602039"/>
-						</object>
-						<reference key="destination" ref="507602039"/>
-					</object>
-					<int key="connectionID">298</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">doBrowse:</string>
-						<reference key="source" ref="707493728"/>
-						<reference key="destination" ref="208507536"/>
+						<string key="label">goAway:</string>
+						<reference key="source" ref="326824969"/>
+						<reference key="destination" ref="220704537"/>
 					</object>
-					<int key="connectionID">312</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: stringValue</string>
-						<reference key="source" ref="507602039"/>
-						<reference key="destination" ref="707493728"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="507602039"/>
-							<reference key="NSDestination" ref="707493728"/>
-							<string key="NSLabel">value: stringValue</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">stringValue</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">314</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">textField</string>
-						<object class="NSTableCellView" key="source" id="531097376">
-							<nil key="NSNextResponder"/>
-							<int key="NSvFlags">274</int>
-							<array class="NSMutableArray" key="NSSubviews">
-								<object class="NSTextField" id="420623386">
-									<reference key="NSNextResponder" ref="531097376"/>
-									<int key="NSvFlags">266</int>
-									<string key="NSFrame">{{0, 7}, {145, 17}}</string>
-									<reference key="NSSuperview" ref="531097376"/>
-									<reference key="NSNextKeyView" ref="189192509"/>
-									<string key="NSAntiCompressionPriority">{250, 750}</string>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSTextFieldCell" key="NSCell" id="200666622">
-										<int key="NSCellFlags">67108928</int>
-										<int key="NSCellFlags2">272631808</int>
-										<string key="NSContents"/>
-										<reference key="NSSupport" ref="893645100"/>
-										<reference key="NSControlView" ref="420623386"/>
-										<reference key="NSBackgroundColor" ref="838999407"/>
-										<reference key="NSTextColor" ref="342788135"/>
-									</object>
-									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-								</object>
-							</array>
-							<string key="NSFrame">{{1, 1}, {145, 30}}</string>
-							<reference key="NSNextKeyView" ref="420623386"/>
-						</object>
-						<reference key="destination" ref="420623386"/>
-					</object>
-					<int key="connectionID">326</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: stringValue</string>
-						<reference key="source" ref="420623386"/>
-						<reference key="destination" ref="531097376"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="420623386"/>
-							<reference key="NSDestination" ref="531097376"/>
-							<string key="NSLabel">value: stringValue</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">stringValue</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">327</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">doGetBind:</string>
-						<object class="NSTableCellView" key="source" id="168424691">
-							<nil key="NSNextResponder"/>
-							<int key="NSvFlags">274</int>
-							<array class="NSMutableArray" key="NSSubviews">
-								<object class="NSButton" id="930736557">
-									<reference key="NSNextResponder" ref="168424691"/>
-									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{232, -2}, {48, 32}}</string>
-									<reference key="NSSuperview" ref="168424691"/>
-									<reference key="NSNextKeyView" ref="899143711"/>
-									<string key="NSReuseIdentifierKey">_NS:9</string>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSButtonCell" key="NSCell" id="280331005">
-										<int key="NSCellFlags">67108864</int>
-										<int key="NSCellFlags2">134217728</int>
-										<string key="NSContents">...</string>
-										<reference key="NSSupport" ref="893645100"/>
-										<string key="NSCellIdentifier">_NS:9</string>
-										<reference key="NSControlView" ref="930736557"/>
-										<int key="NSButtonFlags">-2038284288</int>
-										<int key="NSButtonFlags2">129</int>
-										<string key="NSAlternateContents"/>
-										<string key="NSKeyEquivalent"/>
-										<int key="NSPeriodicDelay">200</int>
-										<int key="NSPeriodicInterval">25</int>
-									</object>
-									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-								</object>
-								<object class="NSTextField" id="385039470">
-									<reference key="NSNextResponder" ref="168424691"/>
-									<int key="NSvFlags">266</int>
-									<string key="NSFrame">{{0, 7}, {233, 17}}</string>
-									<reference key="NSSuperview" ref="168424691"/>
-									<reference key="NSNextKeyView" ref="930736557"/>
-									<string key="NSAntiCompressionPriority">{250, 750}</string>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSTextFieldCell" key="NSCell" id="186989977">
-										<int key="NSCellFlags">67108928</int>
-										<int key="NSCellFlags2">272631872</int>
-										<string key="NSContents"/>
-										<reference key="NSSupport" ref="893645100"/>
-										<reference key="NSControlView" ref="385039470"/>
-										<reference key="NSBackgroundColor" ref="838999407"/>
-										<reference key="NSTextColor" ref="342788135"/>
-									</object>
-									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-								</object>
-							</array>
-							<string key="NSFrame">{{280, 129}, {277, 30}}</string>
-							<reference key="NSNextKeyView" ref="385039470"/>
-						</object>
-						<reference key="destination" ref="930736557"/>
-					</object>
-					<int key="connectionID">564</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: stringValue</string>
-						<reference key="source" ref="385039470"/>
-						<reference key="destination" ref="168424691"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="385039470"/>
-							<reference key="NSDestination" ref="168424691"/>
-							<string key="NSLabel">value: stringValue</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">stringValue</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">578</int>
+					<int key="connectionID">595</int>
 				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -953,134 +677,6 @@
 						<reference key="object" ref="1006"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="74170807"/>
-							<object class="IBNSLayoutConstraint" id="847141628">
-								<reference key="firstItem" ref="1006"/>
-								<int key="firstAttribute">4</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="46895506"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1006"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="512055753">
-								<reference key="firstItem" ref="1006"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="46895506"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1006"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="209942979">
-								<reference key="firstItem" ref="46895506"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="74170807"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">8</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1006"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="582813510">
-								<reference key="firstItem" ref="46895506"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="1006"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">178</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1006"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="749930481">
-								<reference key="firstItem" ref="46895506"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="1006"/>
-								<int key="secondAttribute">3</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1006"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="553676529">
-								<reference key="firstItem" ref="1006"/>
-								<int key="firstAttribute">4</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="74170807"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1006"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="377742960">
-								<reference key="firstItem" ref="74170807"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="1006"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1006"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="671578616">
-								<reference key="firstItem" ref="74170807"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="1006"/>
-								<int key="secondAttribute">3</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1006"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
 							<reference ref="46895506"/>
 						</array>
 						<reference key="parent" ref="1005"/>
@@ -1118,7 +714,6 @@
 						<reference key="object" ref="846241792"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="109586057"/>
-							<reference ref="531097376"/>
 						</array>
 						<reference key="parent" ref="223530966"/>
 					</object>
@@ -1167,7 +762,6 @@
 						<reference key="object" ref="608751962"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="443600383"/>
-							<reference ref="877229867"/>
 						</array>
 						<reference key="parent" ref="962679450"/>
 					</object>
@@ -1176,810 +770,76 @@
 						<reference key="object" ref="443600383"/>
 						<reference key="parent" ref="608751962"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">165</int>
-						<reference key="object" ref="877229867"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="523975582"/>
-							<object class="IBNSLayoutConstraint" id="255675372">
-								<reference key="firstItem" ref="877229867"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="523975582"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">3</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="877229867"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="602446115">
-								<reference key="firstItem" ref="523975582"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="877229867"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">3</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="877229867"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="955321124">
-								<reference key="firstItem" ref="523975582"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="877229867"/>
-								<int key="secondAttribute">10</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="877229867"/>
-								<int key="scoringType">5</int>
-								<float key="scoringTypeFloat">22</float>
-								<int key="contentType">2</int>
-							</object>
-						</array>
-						<reference key="parent" ref="608751962"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">166</int>
-						<reference key="object" ref="523975582"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="734768720"/>
-						</array>
-						<reference key="parent" ref="877229867"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">167</int>
-						<reference key="object" ref="734768720"/>
-						<reference key="parent" ref="523975582"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">320</int>
-						<reference key="object" ref="531097376"/>
-						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="93784692">
-								<reference key="firstItem" ref="420623386"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="531097376"/>
-								<int key="secondAttribute">10</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="531097376"/>
-								<int key="scoringType">5</int>
-								<float key="scoringTypeFloat">22</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="724005911">
-								<reference key="firstItem" ref="420623386"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="531097376"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">3</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="531097376"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="968608696">
-								<reference key="firstItem" ref="531097376"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="420623386"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">3</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="531097376"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<reference ref="420623386"/>
-						</array>
-						<reference key="parent" ref="846241792"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">324</int>
-						<reference key="object" ref="420623386"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="200666622"/>
-						</array>
-						<reference key="parent" ref="531097376"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">325</int>
-						<reference key="object" ref="200666622"/>
-						<reference key="parent" ref="420623386"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">179</int>
 						<reference key="object" ref="95545597"/>
 						<reference key="parent" ref="46895506"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">353</int>
-						<reference key="object" ref="847141628"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">276</int>
-						<reference key="object" ref="512055753"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">272</int>
-						<reference key="object" ref="209942979"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">271</int>
-						<reference key="object" ref="582813510"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">267</int>
-						<reference key="object" ref="749930481"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">354</int>
-						<reference key="object" ref="553676529"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">273</int>
-						<reference key="object" ref="377742960"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">268</int>
-						<reference key="object" ref="671578616"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">317</int>
-						<reference key="object" ref="255675372"/>
-						<reference key="parent" ref="877229867"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">281</int>
-						<reference key="object" ref="602446115"/>
-						<reference key="parent" ref="877229867"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">280</int>
-						<reference key="object" ref="955321124"/>
-						<reference key="parent" ref="877229867"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">323</int>
-						<reference key="object" ref="968608696"/>
-						<reference key="parent" ref="531097376"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">322</int>
-						<reference key="object" ref="724005911"/>
-						<reference key="parent" ref="531097376"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">321</int>
-						<reference key="object" ref="93784692"/>
-						<reference key="parent" ref="531097376"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">154</int>
 						<reference key="object" ref="186493342"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="482758307"/>
-							<reference ref="331589340"/>
-							<reference ref="77832011"/>
-							<reference ref="115706725"/>
-							<reference ref="707493728"/>
-							<reference ref="168424691"/>
 						</array>
 						<reference key="parent" ref="962679450"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">328</int>
-						<reference key="object" ref="168424691"/>
-						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="472900573">
-								<reference key="firstItem" ref="930736557"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="385039470"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">8</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="168424691"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="674376687">
-								<reference key="firstItem" ref="168424691"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="930736557"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">3</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="168424691"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="1053502993">
-								<reference key="firstItem" ref="385039470"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="168424691"/>
-								<int key="secondAttribute">10</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="168424691"/>
-								<int key="scoringType">5</int>
-								<float key="scoringTypeFloat">22</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="870877630">
-								<reference key="firstItem" ref="385039470"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="168424691"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">3</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="168424691"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="945595807">
-								<reference key="firstItem" ref="385039470"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="930736557"/>
-								<int key="secondAttribute">10</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="168424691"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-							</object>
-							<reference ref="930736557"/>
-							<reference ref="385039470"/>
-						</array>
-						<reference key="parent" ref="186493342"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">335</int>
-						<reference key="object" ref="930736557"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="280331005"/>
-							<object class="IBNSLayoutConstraint" id="706118975">
-								<reference key="firstItem" ref="930736557"/>
-								<int key="firstAttribute">7</int>
-								<int key="relation">0</int>
-								<nil key="secondItem"/>
-								<int key="secondAttribute">0</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">36</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="930736557"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">1</int>
-							</object>
-						</array>
-						<reference key="parent" ref="168424691"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">345</int>
-						<reference key="object" ref="706118975"/>
-						<reference key="parent" ref="930736557"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">336</int>
-						<reference key="object" ref="280331005"/>
-						<reference key="parent" ref="930736557"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">242</int>
-						<reference key="object" ref="115706725"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="933894899"/>
-							<object class="IBNSLayoutConstraint" id="946740600">
-								<reference key="firstItem" ref="933894899"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="115706725"/>
-								<int key="secondAttribute">10</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="115706725"/>
-								<int key="scoringType">5</int>
-								<float key="scoringTypeFloat">22</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="705630986">
-								<reference key="firstItem" ref="933894899"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="115706725"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">3</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="115706725"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-						</array>
-						<reference key="parent" ref="186493342"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">249</int>
-						<reference key="object" ref="933894899"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="440208282"/>
-							<object class="IBNSLayoutConstraint" id="142754766">
-								<reference key="firstItem" ref="933894899"/>
-								<int key="firstAttribute">7</int>
-								<int key="relation">0</int>
-								<nil key="secondItem"/>
-								<int key="secondAttribute">0</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">57</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="933894899"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">1</int>
-							</object>
-						</array>
-						<reference key="parent" ref="115706725"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">291</int>
-						<reference key="object" ref="946740600"/>
-						<reference key="parent" ref="115706725"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">290</int>
-						<reference key="object" ref="705630986"/>
-						<reference key="parent" ref="115706725"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">292</int>
-						<reference key="object" ref="142754766"/>
-						<reference key="parent" ref="933894899"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">250</int>
-						<reference key="object" ref="440208282"/>
-						<reference key="parent" ref="933894899"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">295</int>
-						<reference key="object" ref="707493728"/>
-						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="688497638">
-								<reference key="firstItem" ref="208507536"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="507602039"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">8</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="707493728"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="3573639">
-								<reference key="firstItem" ref="707493728"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="208507536"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">3</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="707493728"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="925514808">
-								<reference key="firstItem" ref="208507536"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="707493728"/>
-								<int key="secondAttribute">10</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="707493728"/>
-								<int key="scoringType">5</int>
-								<float key="scoringTypeFloat">22</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="425218490">
-								<reference key="firstItem" ref="507602039"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="208507536"/>
-								<int key="secondAttribute">10</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="707493728"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="923315160">
-								<reference key="firstItem" ref="507602039"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="707493728"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">3</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="707493728"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<reference ref="507602039"/>
-							<reference ref="208507536"/>
-						</array>
-						<reference key="parent" ref="186493342"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">296</int>
-						<reference key="object" ref="507602039"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="850247494"/>
-						</array>
-						<reference key="parent" ref="707493728"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">297</int>
-						<reference key="object" ref="850247494"/>
-						<reference key="parent" ref="507602039"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">303</int>
-						<reference key="object" ref="208507536"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="64737193"/>
-							<object class="IBNSLayoutConstraint" id="357173376">
-								<reference key="firstItem" ref="208507536"/>
-								<int key="firstAttribute">7</int>
-								<int key="relation">0</int>
-								<nil key="secondItem"/>
-								<int key="secondAttribute">0</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">36</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="208507536"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">1</int>
-							</object>
-						</array>
-						<reference key="parent" ref="707493728"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">309</int>
-						<reference key="object" ref="357173376"/>
-						<reference key="parent" ref="208507536"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">304</int>
-						<reference key="object" ref="64737193"/>
-						<reference key="parent" ref="208507536"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">169</int>
-						<reference key="object" ref="77832011"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="146951220"/>
-							<object class="IBNSLayoutConstraint" id="226988110">
-								<reference key="firstItem" ref="146951220"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="77832011"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">3</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="77832011"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="853095268">
-								<reference key="firstItem" ref="146951220"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="77832011"/>
-								<int key="secondAttribute">10</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="77832011"/>
-								<int key="scoringType">5</int>
-								<float key="scoringTypeFloat">22</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="956263079">
-								<reference key="firstItem" ref="77832011"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="146951220"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">3</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="77832011"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-						</array>
-						<reference key="parent" ref="186493342"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">170</int>
-						<reference key="object" ref="146951220"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="316554001"/>
-						</array>
-						<reference key="parent" ref="77832011"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">289</int>
-						<reference key="object" ref="226988110"/>
-						<reference key="parent" ref="77832011"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">288</int>
-						<reference key="object" ref="853095268"/>
-						<reference key="parent" ref="77832011"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">287</int>
-						<reference key="object" ref="956263079"/>
-						<reference key="parent" ref="77832011"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">171</int>
-						<reference key="object" ref="316554001"/>
-						<reference key="parent" ref="146951220"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">224</int>
-						<reference key="object" ref="331589340"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="101981447"/>
-							<object class="IBNSLayoutConstraint" id="204586117">
-								<reference key="firstItem" ref="331589340"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="101981447"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">3</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="331589340"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="821334713">
-								<reference key="firstItem" ref="101981447"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="331589340"/>
-								<int key="secondAttribute">10</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="331589340"/>
-								<int key="scoringType">5</int>
-								<float key="scoringTypeFloat">22</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="558428559">
-								<reference key="firstItem" ref="101981447"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="331589340"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">3</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="331589340"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-						</array>
-						<reference key="parent" ref="186493342"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">225</int>
-						<reference key="object" ref="101981447"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="999711511"/>
-						</array>
-						<reference key="parent" ref="331589340"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">294</int>
-						<reference key="object" ref="204586117"/>
-						<reference key="parent" ref="331589340"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">293</int>
-						<reference key="object" ref="821334713"/>
-						<reference key="parent" ref="331589340"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">285</int>
-						<reference key="object" ref="558428559"/>
-						<reference key="parent" ref="331589340"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">226</int>
-						<reference key="object" ref="999711511"/>
-						<reference key="parent" ref="101981447"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">155</int>
 						<reference key="object" ref="482758307"/>
 						<reference key="parent" ref="186493342"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">311</int>
-						<reference key="object" ref="425218490"/>
-						<reference key="parent" ref="707493728"/>
+						<int key="objectID">585</int>
+						<reference key="object" ref="650936754"/>
+						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">300</int>
-						<reference key="object" ref="923315160"/>
-						<reference key="parent" ref="707493728"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">476</int>
-						<reference key="object" ref="925514808"/>
-						<reference key="parent" ref="707493728"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">547</int>
-						<reference key="object" ref="3573639"/>
-						<reference key="parent" ref="707493728"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">548</int>
-						<reference key="object" ref="688497638"/>
-						<reference key="parent" ref="707493728"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">561</int>
-						<reference key="object" ref="674376687"/>
-						<reference key="parent" ref="168424691"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">565</int>
-						<reference key="object" ref="385039470"/>
+						<int key="objectID">589</int>
+						<reference key="object" ref="326824969"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="186989977"/>
+							<reference ref="729831377"/>
 						</array>
-						<reference key="parent" ref="168424691"/>
+						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">566</int>
-						<reference key="object" ref="186989977"/>
-						<reference key="parent" ref="385039470"/>
+						<int key="objectID">590</int>
+						<reference key="object" ref="729831377"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="220704537"/>
+							<reference ref="69518648"/>
+						</array>
+						<reference key="parent" ref="326824969"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">574</int>
-						<reference key="object" ref="472900573"/>
-						<reference key="parent" ref="168424691"/>
+						<int key="objectID">591</int>
+						<reference key="object" ref="220704537"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="637914132"/>
+						</array>
+						<reference key="parent" ref="729831377"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">575</int>
-						<reference key="object" ref="870877630"/>
-						<reference key="parent" ref="168424691"/>
+						<int key="objectID">592</int>
+						<reference key="object" ref="69518648"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="239741779"/>
+						</array>
+						<reference key="parent" ref="729831377"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">576</int>
-						<reference key="object" ref="1053502993"/>
-						<reference key="parent" ref="168424691"/>
+						<int key="objectID">593</int>
+						<reference key="object" ref="239741779"/>
+						<reference key="parent" ref="69518648"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">572</int>
-						<reference key="object" ref="945595807"/>
-						<reference key="parent" ref="168424691"/>
+						<int key="objectID">594</int>
+						<reference key="object" ref="637914132"/>
+						<reference key="parent" ref="220704537"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">597</int>
+						<reference key="object" ref="735920642"/>
+						<reference key="parent" ref="0"/>
 					</object>
 				</array>
 			</object>
@@ -1990,227 +850,82 @@
 				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1.IBWindowTemplateEditedContentRect">{{357, 418}, {480, 270}}</string>
 				<boolean value="NO" key="1.NSWindowTemplate.visibleAtLaunch"/>
-				<boolean value="NO" key="148.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="148.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="YES" key="149.ibExternalAutomaticallyCalculatesRowSizeFromViewHeight"/>
 				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="152.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="153.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="YES" key="153.isInViewBasedMode"/>
-				<array key="153.prototypeCellViews">
-					<reference ref="877229867"/>
-				</array>
 				<string key="154.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="YES" key="154.isInViewBasedMode"/>
-				<array key="154.prototypeCellViews">
-					<reference ref="77832011"/>
-					<reference ref="115706725"/>
-					<reference ref="331589340"/>
-					<reference ref="707493728"/>
-					<reference ref="168424691"/>
-				</array>
 				<string key="155.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="156.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="165.CustomClassName">RASettingCell</string>
-				<array key="165.IBNSViewMetadataConstraints">
-					<reference ref="955321124"/>
-					<reference ref="602446115"/>
-					<reference ref="255675372"/>
-				</array>
-				<string key="165.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="165.userInterfaceItemIdentifier">RALabelSetting</string>
-				<boolean value="NO" key="166.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="166.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="167.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="169.CustomClassName">RASettingCell</string>
-				<array key="169.IBNSViewMetadataConstraints">
-					<reference ref="956263079"/>
-					<reference ref="853095268"/>
-					<reference ref="226988110"/>
-				</array>
-				<string key="169.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="169.userInterfaceItemIdentifier">RAStringSetting</string>
-				<boolean value="NO" key="170.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="170.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="171.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="179.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array class="NSMutableArray" key="2.IBNSViewMetadataConstraints">
-					<reference ref="671578616"/>
-					<reference ref="377742960"/>
-					<reference ref="553676529"/>
-					<reference ref="749930481"/>
-					<reference ref="582813510"/>
-					<reference ref="209942979"/>
-					<reference ref="512055753"/>
-					<reference ref="847141628"/>
-				</array>
 				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="224.CustomClassName">RASettingCell</string>
-				<array key="224.IBNSViewMetadataConstraints">
-					<reference ref="558428559"/>
-					<reference ref="821334713"/>
-					<reference ref="204586117"/>
-				</array>
-				<string key="224.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="224.userInterfaceItemIdentifier">RANumericSetting</string>
-				<boolean value="NO" key="225.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="225.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="226.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="242.CustomClassName">RASettingCell</string>
-				<array key="242.IBNSViewMetadataConstraints">
-					<reference ref="705630986"/>
-					<reference ref="946740600"/>
-				</array>
-				<string key="242.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="242.userInterfaceItemIdentifier">RABooleanSetting</string>
-				<array key="249.IBNSViewMetadataConstraints">
-					<reference ref="142754766"/>
-				</array>
-				<boolean value="NO" key="249.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="249.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="250.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="267.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="268.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="271.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="272.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="273.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="276.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="280.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="281.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="285.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="287.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="288.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="289.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="290.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="291.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="292.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="294.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="295.CustomClassName">RASettingCell</string>
-				<array class="NSMutableArray" key="295.IBNSViewMetadataConstraints">
-					<reference ref="923315160"/>
-					<reference ref="425218490"/>
-					<reference ref="925514808"/>
-					<reference ref="3573639"/>
-					<reference ref="688497638"/>
-				</array>
-				<string key="295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="295.userInterfaceItemIdentifier">RAPathSetting</string>
-				<boolean value="NO" key="296.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="296.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="297.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="300.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array key="303.IBNSViewMetadataConstraints">
-					<reference ref="357173376"/>
-				</array>
-				<boolean value="NO" key="303.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="303.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="304.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="309.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="311.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="317.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="320.CustomClassName">RASettingCell</string>
-				<array key="320.IBNSViewMetadataConstraints">
-					<reference ref="93784692"/>
-					<reference ref="724005911"/>
-					<reference ref="968608696"/>
-				</array>
-				<string key="320.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="320.userInterfaceItemIdentifier">RALabelSetting</string>
-				<string key="321.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="322.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="323.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="324.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="324.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="325.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="328.CustomClassName">RASettingCell</string>
-				<dictionary class="NSMutableDictionary" key="328.IBAttributePlaceholdersKey"/>
-				<array class="NSMutableArray" key="328.IBNSViewMetadataConstraints">
-					<reference ref="945595807"/>
-					<reference ref="870877630"/>
-					<reference ref="1053502993"/>
-					<reference ref="674376687"/>
-					<reference ref="472900573"/>
-				</array>
-				<string key="328.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="328.userInterfaceItemIdentifier">RABindSetting</string>
-				<array class="NSMutableArray" key="335.IBNSViewMetadataConstraints">
-					<reference ref="706118975"/>
-				</array>
-				<boolean value="NO" key="335.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="335.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="336.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="345.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="353.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="354.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="476.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="48.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="48.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="49.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="YES" key="49.ibExternalAutomaticallyCalculatesRowSizeFromViewHeight"/>
 				<string key="50.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="52.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="53.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="YES" key="53.isInViewBasedMode"/>
-				<array key="53.prototypeCellViews">
-					<reference ref="531097376"/>
-				</array>
-				<string key="547.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="548.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="561.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="565.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="565.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="566.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="572.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="574.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="575.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="576.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="585.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="589.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="589.IBWindowTemplateEditedContentRect">{{357, 418}, {480, 270}}</string>
+				<boolean value="NO" key="589.NSWindowTemplate.visibleAtLaunch"/>
+				<string key="590.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="591.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="592.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="593.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="594.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="597.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="99.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">581</int>
+			<int key="maxID">603</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<object class="IBPartialClassDescription">
-					<string key="className">NSLayoutConstraint</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
+					<string key="className">RAInputBinder</string>
+					<string key="superclassName">NSWindow</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">goAway:</string>
+						<string key="NS.object.0">id</string>
 					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">RASettingCell</string>
-					<string key="superclassName">NSTableCellView</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">numericValue</string>
-						<string key="NS.object.0">NSNumber</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">numericValue</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">numericValue</string>
-							<string key="candidateClassName">NSNumber</string>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">goAway:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">goAway:</string>
+							<string key="candidateClassName">id</string>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/RASettingCell.h</string>
+						<string key="minorKey">./Classes/RAInputBinder.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">RASettingsDelegate</string>
 					<string key="superclassName">NSObject</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">outlineViewClicked:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">outlineViewClicked:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">outlineViewClicked:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="_inputWindow">NSWindow</string>
 						<string key="_outline">NSOutlineView</string>
 						<string key="_table">NSTableView</string>
+						<string key="binderCell">NSTextFieldCell</string>
+						<string key="binderWindow">RAInputBinder</string>
+						<string key="booleanCell">NSButtonCell</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
 						<object class="IBToOneOutletInfo" key="_inputWindow">
@@ -2225,6 +940,18 @@
 							<string key="name">_table</string>
 							<string key="candidateClassName">NSTableView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="binderCell">
+							<string key="name">binderCell</string>
+							<string key="candidateClassName">NSTextFieldCell</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="binderWindow">
+							<string key="name">binderWindow</string>
+							<string key="candidateClassName">RAInputBinder</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="booleanCell">
+							<string key="name">booleanCell</string>
+							<string key="candidateClassName">NSButtonCell</string>
+						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
@@ -2235,12 +962,20 @@
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1060" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+			<integer value="4600" key="NS.object.0"/>
+		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<string key="NS.key.0">NSSwitch</string>
 			<string key="NS.object.0">{15, 15}</string>
 		</object>
-		<bool key="IBDocument.UseAutolayout">YES</bool>
 	</data>
 </archive>
diff --git a/apple/OSX/settings.m b/apple/OSX/settings.m
index 8a3b25c08f..79b16e2aea 100644
--- a/apple/OSX/settings.m
+++ b/apple/OSX/settings.m
@@ -24,121 +24,44 @@
 static const void* associated_name_tag = (void*)&associated_name_tag;
 
 @interface RAInputBinder : NSWindow
+@property (nonatomic, retain) NSTimer* timer;
+@property (nonatomic, assign) const rarch_setting_t* setting;
 @end
 
 @implementation RAInputBinder
 
+#if 0
+- (void)dealloc
+{
+   [_timer release];
+   [super dealloc];
+}
+#endif
+
+- (void)runForSetting:(const rarch_setting_t*)setting onWindow:(NSWindow*)window
+{
+   self.setting = setting;
+ 
+   self.timer = [NSTimer timerWithTimeInterval:.1f target:self selector:@selector(checkBind:) userInfo:nil repeats:YES];
+   [[NSRunLoop currentRunLoop] addTimer:self.timer forMode:NSModalPanelRunLoopMode];
+   
+   [NSApp beginSheet:self modalForWindow:window modalDelegate:nil didEndSelector:nil contextInfo:nil];
+}
+
 - (IBAction)goAway:(id)sender
 {
+   [self.timer invalidate];
+   self.timer = nil;
+   
    [NSApp endSheet:self];
    [self orderOut:nil];
 }
 
-// Stop the annoying sound when pressing a key
-- (void)keyDown:(NSEvent*)theEvent
-{
-}
-
-@end
-
-@interface RASettingCell : NSTableCellView
-@property (nonatomic) const rarch_setting_t* setting;
-
-@property (nonatomic) NSString* stringValue;
-@property (nonatomic) IBOutlet NSNumber* numericValue;
-@property (nonatomic) bool booleanValue;
-
-@property (nonatomic) NSTimer* bindTimer;
-@end
-
-@implementation RASettingCell
-- (void)setSetting:(const rarch_setting_t *)aSetting
-{
-   _setting = aSetting;
-   
-   if (!_setting)
-      return;
-   
-   if (aSetting->type == ST_INT || aSetting->type == ST_UINT || aSetting->type == ST_FLOAT)
-   {
-      self.textField.formatter = [[RANumberFormatter alloc] initWithSetting:aSetting];
-   }
-   else
-      self.textField.formatter = nil;
-
-   // Set value
-   switch (aSetting->type)
-   {
-      case ST_INT:    self.numericValue = BOXINT   (*aSetting->value.integer); break;
-      case ST_UINT:   self.numericValue = BOXUINT  (*aSetting->value.unsigned_integer); break;
-      case ST_FLOAT:  self.numericValue = BOXFLOAT (*aSetting->value.fraction); break;
-      case ST_STRING: self.stringValue =  BOXSTRING( aSetting->value.string); break;
-      case ST_PATH:   self.stringValue =  BOXSTRING( aSetting->value.string); break;
-      case ST_BOOL:   self.booleanValue =  *aSetting->value.boolean; break;
-      case ST_BIND:   [self updateInputString]; break;
-      default:        break;
-   }
-}
-
-- (IBAction)doBrowse:(id)sender
-{
-   NSOpenPanel* panel = [NSOpenPanel new];
-   [panel runModal];
-   
-   if (panel.URLs.count == 1)
-      self.stringValue = panel.URL.path;
-}
-
-- (void)setNumericValue:(NSNumber *)numericValue
-{
-   _numericValue = numericValue;
-   
-   if (_setting && _setting->type == ST_INT)
-      *_setting->value.integer = _numericValue.intValue;
-   else if (_setting && _setting->type == ST_UINT)
-      *_setting->value.unsigned_integer = _numericValue.intValue;
-   else if (_setting && _setting->type == ST_FLOAT)
-      *_setting->value.fraction = _numericValue.floatValue;
-}
-
-- (void)setBooleanValue:(bool)booleanValue
-{
-   _booleanValue = booleanValue;
-   
-   if (_setting && _setting->type == ST_BOOL)
-      *_setting->value.boolean= _booleanValue;
-}
-
-- (void)setStringValue:(NSString *)stringValue
-{
-   _stringValue = stringValue ? stringValue : @"";
-   
-   if (_setting && (_setting->type == ST_STRING || _setting->type == ST_PATH))
-      strlcpy(_setting->value.string, _stringValue.UTF8String, _setting->size);
-}
-
-// Input Binding
-- (void)updateInputString
-{
-   char buffer[256];
-   self.stringValue = BOXSTRING(setting_data_get_string_representation(_setting, buffer, sizeof(buffer)));
-}
-
-- (void)dismissBinder
-{
-   [self.bindTimer invalidate];
-   self.bindTimer = nil;
-
-   [self updateInputString];
-
-   [(id)self.window.attachedSheet goAway:nil];
-}
-
 - (void)checkBind:(NSTimer*)send
 {
    int32_t value = 0;
    int32_t index = _setting->index ? _setting->index - 1 : 0;
-
+   
    if ((value = apple_input_find_any_key()))
       BINDFOR(*_setting).key = input_translate_keysym_to_rk(value);
    else if ((value = apple_input_find_any_button(index)) >= 0)
@@ -148,37 +71,45 @@ static const void* associated_name_tag = (void*)&associated_name_tag;
    else
       return;
    
-   [self dismissBinder];
+   [self goAway:self];
 }
 
-- (IBAction)doGetBind:(id)sender
+// Stop the annoying sound when pressing a key
+- (void)keyDown:(NSEvent*)theEvent
 {
-   static NSWindowController* controller;
-   if (!controller)
-      controller = [[NSWindowController alloc] initWithWindowNibName:@"InputBinder"];
-   
-   self.bindTimer = [NSTimer timerWithTimeInterval:.1f target:self selector:@selector(checkBind:) userInfo:nil repeats:YES];
-   [[NSRunLoop currentRunLoop] addTimer:self.bindTimer forMode:NSModalPanelRunLoopMode];
-
-   [NSApp beginSheet:controller.window modalForWindow:self.window modalDelegate:nil didEndSelector:nil contextInfo:nil];
 }
 
 @end
 
+
 @interface RASettingsDelegate : NSObject<NSTableViewDataSource,   NSTableViewDelegate,
                                          NSOutlineViewDataSource, NSOutlineViewDelegate,
                                          NSWindowDelegate>
+@property (nonatomic, retain) RAInputBinder IBOutlet* binderWindow;
+@property (nonatomic, retain) NSButtonCell IBOutlet* booleanCell;
+@property (nonatomic, retain) NSTextFieldCell IBOutlet* binderCell;
+@property (nonatomic, retain) NSTableView IBOutlet* table;
+@property (nonatomic, retain) NSOutlineView IBOutlet* outline;
+@property (nonatomic, retain) NSMutableArray* settings;
+@property (nonatomic, retain) NSMutableArray* currentGroup;
 @end
 
 @implementation RASettingsDelegate
+
+#if 0
+- (void)dealloc
 {
-   NSWindow IBOutlet* _inputWindow;
-   NSTableView IBOutlet* _table;
-   NSOutlineView IBOutlet* _outline;
+   [_binderWindow release];
+   [_booleanCell release];
+   [_binderCell release];
+   [_table release];
+   [_outline release];
+   [_settings release];
+   [_currentGroup release];
    
-   NSMutableArray* _settings;
-   NSMutableArray* _currentGroup;
+   [super dealloc];
 }
+#endif
 
 - (void)awakeFromNib
 {
@@ -186,7 +117,7 @@ static const void* associated_name_tag = (void*)&associated_name_tag;
 
    NSMutableArray* thisGroup = nil;
    NSMutableArray* thisSubGroup = nil;
-   _settings = [NSMutableArray array];
+   self.settings = [NSMutableArray array];
 
    setting_data_load_current();
 
@@ -205,7 +136,7 @@ static const void* associated_name_tag = (void*)&associated_name_tag;
          
          case ST_END_GROUP:
          {
-            [_settings addObject:thisGroup];
+            [self.settings addObject:thisGroup];
             thisGroup = nil;
             break;
          }
@@ -244,40 +175,32 @@ static const void* associated_name_tag = (void*)&associated_name_tag;
    [NSApp stopModal];
 }
 
-#pragma mark View Builders
-- (NSView*)labelAccessoryFor:(NSString*)text onTable:(NSTableView*)table
-{
-   RASettingCell* result = [table makeViewWithIdentifier:@"RALabelSetting" owner:nil];
-   result.stringValue = text;
-   return result;
-}
-
 #pragma mark Section Table
 - (NSInteger)numberOfRowsInTableView:(NSTableView*)view
 {
-   return _settings.count;
+   return self.settings.count;
 }
 
-- (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
+- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
 {
-   return [self labelAccessoryFor:objc_getAssociatedObject(_settings[row], associated_name_tag) onTable:tableView];
+   return objc_getAssociatedObject(self.settings[row], associated_name_tag);
 }
 
 - (void)tableViewSelectionDidChange:(NSNotification *)aNotification
 {
-   _currentGroup = _settings[_table.selectedRow];
-   [_outline reloadData];
+   self.currentGroup = self.settings[self.table.selectedRow];
+   [self.outline reloadData];
 }
 
 #pragma mark Setting Outline
 - (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
 {
-   return (item == nil) ? _currentGroup.count : [item count];
+   return (item == nil) ? self.currentGroup.count : [item count];
 }
 
 - (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item
 {
-   return (item == nil) ? _currentGroup[index] : [item objectAtIndex:index];
+   return (item == nil) ? self.currentGroup[index] : [item objectAtIndex:index];
 }
 
 - (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
@@ -285,61 +208,101 @@ static const void* associated_name_tag = (void*)&associated_name_tag;
    return [item isKindOfClass:[NSArray class]];
 }
 
-- (BOOL)validateProposedFirstResponder:(NSResponder *)responder forEvent:(NSEvent *)event {
+- (BOOL)validateProposedFirstResponder:(NSResponder*)responder forEvent:(NSEvent*)event
+{
     return YES;
 }
 
-- (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTableColumn *)tableColumn item:(id)item
+- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
 {
+   if (!tableColumn)
+      return nil;
+
    if ([item isKindOfClass:[NSArray class]])
    {
-      if ([tableColumn.identifier isEqualToString:@"title"])
-         return [self labelAccessoryFor:objc_getAssociatedObject(item, associated_name_tag) onTable:outlineView];
+      if ([tableColumn.identifier isEqualToString:@"left"])
+         return objc_getAssociatedObject(item, associated_name_tag);
       else
-         return [self labelAccessoryFor:[NSString stringWithFormat:@"%d items", (int)[item count]] onTable:outlineView];
+         return @"";
    }
    else
    {
       const rarch_setting_t* setting_data = setting_data_get_list();
       const rarch_setting_t* setting = &setting_data[[item intValue]];
-
-      if ([tableColumn.identifier isEqualToString:@"title"])
-         return [self labelAccessoryFor:BOXSTRING(setting->short_description) onTable:outlineView];
-      else if([tableColumn.identifier isEqualToString:@"accessory"])
+      char buffer[PATH_MAX];
+      
+      if ([tableColumn.identifier isEqualToString:@"left"])
+         return BOXSTRING(setting->short_description);
+      else
       {
-         RASettingCell* s = nil;
          switch (setting->type)
          {
-            case ST_BOOL:
-               s = [outlineView makeViewWithIdentifier:@"RABooleanSetting" owner:nil];
-               break;
-            case ST_INT:
-               s = [outlineView makeViewWithIdentifier:@"RANumericSetting" owner:nil];
-               break;
-            case ST_UINT:
-               s = [outlineView makeViewWithIdentifier:@"RANumericSetting" owner:nil];
-               break;
-            case ST_FLOAT:
-               s = [outlineView makeViewWithIdentifier:@"RANumericSetting" owner:nil];
-               break;
-            case ST_PATH:
-               s = [outlineView makeViewWithIdentifier:@"RAPathSetting"    owner:nil];
-               break;
-            case ST_STRING:
-               s = [outlineView makeViewWithIdentifier:@"RAStringSetting"  owner:nil];
-               break;
-            case ST_BIND:
-               s = [outlineView makeViewWithIdentifier:@"RABindSetting"    owner:nil];
-               break;
-            default:
-               break;
+            case ST_BOOL: return BOXINT(*setting->value.boolean);
+            default:      return BOXSTRING(setting_data_get_string_representation(setting, buffer, sizeof(buffer)));
          }
-         s.setting = setting;
-         return s;
       }
    }
+}
+
+- (NSCell*)outlineView:(NSOutlineView *)outlineView dataCellForTableColumn:(NSTableColumn *)tableColumn item:(id)item
+{
+   if (!tableColumn)
+      return nil;
    
-   return nil;
+   if ([item isKindOfClass:[NSArray class]])
+      return tableColumn.dataCell;
+   
+   if ([tableColumn.identifier isEqualToString:@"left"])
+      return tableColumn.dataCell;
+
+   const rarch_setting_t* setting_data = setting_data_get_list();
+   const rarch_setting_t* setting = &setting_data[[item intValue]];
+
+   switch (setting->type)
+   {
+      case ST_BOOL: return self.booleanCell;
+      case ST_BIND: return self.binderCell;
+      default:      return tableColumn.dataCell;
+   }
+}
+
+- (IBAction)outlineViewClicked:(id)sender
+{
+   if (self.outline.clickedColumn == 1)
+   {
+      id item = [self.outline itemAtRow:self.outline.clickedRow];
+      
+      if ([item isKindOfClass:[NSNumber class]])
+      {
+         const rarch_setting_t* setting_data = setting_data_get_list();
+         const rarch_setting_t* setting = &setting_data[[item intValue]];
+   
+         switch (setting->type)
+         {
+            case ST_BOOL: *setting->value.boolean = !*setting->value.boolean; return;
+            case ST_BIND: [self.binderWindow runForSetting:setting onWindow:self.outline.window]; return;
+            default: return;
+         }
+      }
+   }
+}
+
+- (void)controlTextDidEndEditing:(NSNotification*)notification
+{
+   if (notification.object == self.outline)
+   {
+      NSText* editor = [[notification userInfo] objectForKey:@"NSFieldEditor"];
+      
+      id item = [self.outline itemAtRow:self.outline.selectedRow];
+
+      if ([item isKindOfClass:[NSNumber class]])
+      {
+         const rarch_setting_t* setting_data = setting_data_get_list();
+         const rarch_setting_t* setting = &setting_data[[item intValue]];
+         
+         setting_data_set_with_string_representation(setting, editor.string.UTF8String);
+      }
+   }
 }
 
 @end
diff --git a/apple/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/RetroArch_OSX.xcodeproj/project.pbxproj
index c05be1a65f..4af4c3c6c6 100644
--- a/apple/RetroArch_OSX.xcodeproj/project.pbxproj
+++ b/apple/RetroArch_OSX.xcodeproj/project.pbxproj
@@ -11,7 +11,6 @@
 		962EE0E2178B3DF6004224FF /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 962EE0E1178B3DF6004224FF /* IOKit.framework */; };
 		96355CE31788E72A0010DBFA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96355CE21788E72A0010DBFA /* Cocoa.framework */; };
 		9646869817BBC14E00C5EA69 /* platform.m in Sources */ = {isa = PBXBuildFile; fileRef = 9646869617BBC14E00C5EA69 /* platform.m */; };
-		964DE7C117D84B34001CBB6C /* InputBinder.xib in Resources */ = {isa = PBXBuildFile; fileRef = 964DE7C317D84B34001CBB6C /* InputBinder.xib */; };
 		964DE7C417D84B57001CBB6C /* Settings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 964DE7C617D84B57001CBB6C /* Settings.xib */; };
 		967894931788ECDB00D6CA69 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9678948F1788ECDB00D6CA69 /* InfoPlist.strings */; };
 		967894941788ECDB00D6CA69 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 967894911788ECDB00D6CA69 /* MainMenu.xib */; };
@@ -37,7 +36,6 @@
 		96355CE71788E72A0010DBFA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		9646869617BBC14E00C5EA69 /* platform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = platform.m; path = OSX/platform.m; sourceTree = SOURCE_ROOT; };
 		9646869717BBC14E00C5EA69 /* platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform.h; path = OSX/platform.h; sourceTree = SOURCE_ROOT; };
-		964DE7C217D84B34001CBB6C /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/InputBinder.xib; sourceTree = "<group>"; };
 		964DE7C517D84B57001CBB6C /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/Settings.xib; sourceTree = "<group>"; };
 		9678948D1788ECCA00D6CA69 /* RetroArch-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "RetroArch-Info.plist"; path = "OSX/RetroArch-Info.plist"; sourceTree = SOURCE_ROOT; };
 		967894901788ECDB00D6CA69 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = OSX/en.lproj/InfoPlist.strings; sourceTree = SOURCE_ROOT; };
@@ -141,7 +139,6 @@
 				967894911788ECDB00D6CA69 /* MainMenu.xib */,
 				C15874EE178F2094001171D4 /* RetroArch.icns */,
 				964DE7C617D84B57001CBB6C /* Settings.xib */,
-				964DE7C317D84B34001CBB6C /* InputBinder.xib */,
 			);
 			name = Assets;
 			sourceTree = "<group>";
@@ -201,7 +198,6 @@
 				967894E9178A2EB400D6CA69 /* modules in Resources */,
 				C15874EF178F2094001171D4 /* RetroArch.icns in Resources */,
 				964DE7C417D84B57001CBB6C /* Settings.xib in Resources */,
-				964DE7C117D84B34001CBB6C /* InputBinder.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -224,15 +220,6 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXVariantGroup section */
-		964DE7C317D84B34001CBB6C /* InputBinder.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				964DE7C217D84B34001CBB6C /* en */,
-			);
-			name = InputBinder.xib;
-			path = OSX;
-			sourceTree = "<group>";
-		};
 		964DE7C617D84B57001CBB6C /* Settings.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -304,7 +291,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/OSX/RetroArch-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = "";
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-DHAVE_RARCH_MAIN_WRAP",
@@ -355,7 +342,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/OSX/RetroArch-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = "";
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-DNS_BLOCK_ASSERTIONS=1",