diff --git a/apple/OSX/InputBinder.xib b/apple/OSX/InputBinder.xib
new file mode 100644
index 0000000000..1dc324d900
--- /dev/null
+++ b/apple/OSX/InputBinder.xib
@@ -0,0 +1,384 @@
+<?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/Settings.xib b/apple/OSX/Settings.xib
index 4d9255c61f..03a3147273 100644
--- a/apple/OSX/Settings.xib
+++ b/apple/OSX/Settings.xib
@@ -36,7 +36,7 @@
 		</object>
 		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 			<object class="NSCustomObject" id="1001">
-				<string key="NSClassName">NSObject</string>
+				<string key="NSClassName">NSWindowController</string>
 			</object>
 			<object class="NSCustomObject" id="1003">
 				<string key="NSClassName">FirstResponder</string>
@@ -45,11 +45,11 @@
 				<string key="NSClassName">NSApplication</string>
 			</object>
 			<object class="NSWindowTemplate" id="1005">
-				<int key="NSWindowStyleMask">15</int>
+				<int key="NSWindowStyleMask">3</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 240}, {671, 597}}</string>
+				<string key="NSWindowRect">{{196, 240}, {759, 597}}</string>
 				<int key="NSWTFlags">544735232</int>
-				<string key="NSWindowTitle">Window</string>
+				<string key="NSWindowTitle">RetroArch Settings</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
 				<nil key="NSUserInterfaceItemIdentifier"/>
@@ -69,10 +69,10 @@
 											<reference key="NSNextResponder" ref="1047819253"/>
 											<int key="NSvFlags">256</int>
 											<array class="NSMutableArray" key="NSSubviews"/>
-											<string key="NSFrameSize">{148, 514}</string>
+											<string key="NSFrameSize">{148, 555}</string>
 											<reference key="NSSuperview" ref="1047819253"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="536766661"/>
+											<reference key="NSNextKeyView" ref="531097376"/>
 											<string key="NSReuseIdentifierKey">_NS:13</string>
 											<bool key="NSEnabled">YES</bool>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -176,7 +176,7 @@
 											<int key="NSTableViewGroupRowStyle">1</int>
 										</object>
 									</array>
-									<string key="NSFrame">{{1, 1}, {148, 514}}</string>
+									<string key="NSFrame">{{1, 1}, {148, 555}}</string>
 									<reference key="NSSuperview" ref="74170807"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="223530966"/>
@@ -213,7 +213,7 @@
 									<double key="NSPercent">0.99404761904761907</double>
 								</object>
 							</array>
-							<string key="NSFrame">{{20, 61}, {150, 516}}</string>
+							<string key="NSFrame">{{20, 20}, {150, 557}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="1047819253"/>
@@ -227,31 +227,6 @@
 							<double key="NSMaxMagnification">4</double>
 							<double key="NSMagnification">1</double>
 						</object>
-						<object class="NSButton" id="630134028">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{582, 13}, {75, 32}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="947533879">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Close</string>
-								<reference key="NSSupport" ref="893645100"/>
-								<string key="NSCellIdentifier">_NS:9</string>
-								<reference key="NSControlView" ref="630134028"/>
-								<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="NSScrollView" id="46895506">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
@@ -264,7 +239,7 @@
 											<reference key="NSNextResponder" ref="119087162"/>
 											<int key="NSvFlags">256</int>
 											<array class="NSMutableArray" key="NSSubviews"/>
-											<string key="NSFrameSize">{471, 498}</string>
+											<string key="NSFrameSize">{559, 539}</string>
 											<reference key="NSSuperview" ref="119087162"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="877229867"/>
@@ -273,10 +248,10 @@
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											<bool key="NSControlAllowsExpansionToolTips">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="95545597">
-												<reference key="NSNextResponder" ref="487176444"/>
+												<reference key="NSNextResponder" ref="176799935"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrameSize">{471, 17}</string>
-												<reference key="NSSuperview" ref="487176444"/>
+												<string key="NSFrameSize">{559, 17}</string>
+												<reference key="NSSuperview" ref="176799935"/>
 												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="93646331"/>
 												<reference key="NSTableView" ref="962679450"/>
@@ -293,7 +268,7 @@
 											<array class="NSMutableArray" key="NSTableColumns">
 												<object class="NSTableColumn" id="608751962">
 													<string key="NSIdentifier">title</string>
-													<double key="NSWidth">101</double>
+													<double key="NSWidth">276</double>
 													<double key="NSMinWidth">16</double>
 													<double key="NSMaxWidth">1000</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -323,7 +298,7 @@
 												</object>
 												<object class="NSTableColumn" id="186493342">
 													<string key="NSIdentifier">accessory</string>
-													<double key="NSWidth">364</double>
+													<double key="NSWidth">277</double>
 													<double key="NSMinWidth">40</double>
 													<double key="NSMaxWidth">1000</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -364,9 +339,10 @@
 											<int key="NSTableViewDraggingDestinationStyle">0</int>
 											<int key="NSTableViewGroupRowStyle">1</int>
 											<bool key="NSOutlineViewAutoresizesOutlineColumnKey">NO</bool>
+											<float key="NSOutlineViewIndentationPerLevelKey">4</float>
 										</object>
 									</array>
-									<string key="NSFrame">{{1, 17}, {471, 498}}</string>
+									<string key="NSFrame">{{1, 17}, {559, 539}}</string>
 									<reference key="NSSuperview" ref="46895506"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="962679450"/>
@@ -386,29 +362,29 @@
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 									<reference key="NSTarget" ref="46895506"/>
 									<string key="NSAction">_doScroller:</string>
-									<double key="NSPercent">0.99799599198396793</double>
+									<double key="NSPercent">0.9721706864564007</double>
 								</object>
 								<object class="NSScroller" id="366883407">
 									<reference key="NSNextResponder" ref="46895506"/>
 									<int key="NSvFlags">-2147483392</int>
-									<string key="NSFrame">{{1, 499}, {471, 16}}</string>
+									<string key="NSFrame">{{1, 541}, {486, 15}}</string>
 									<reference key="NSSuperview" ref="46895506"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="630134028"/>
+									<reference key="NSNextKeyView"/>
 									<string key="NSReuseIdentifierKey">_NS:60</string>
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="46895506"/>
 									<string key="NSAction">_doScroller:</string>
-									<double key="NSPercent">0.82055749128919864</double>
+									<double key="NSPercent">0.55290102389078499</double>
 								</object>
-								<object class="NSClipView" id="487176444">
+								<object class="NSClipView" id="176799935">
 									<reference key="NSNextResponder" ref="46895506"/>
 									<int key="NSvFlags">2304</int>
 									<array class="NSMutableArray" key="NSSubviews">
 										<reference ref="95545597"/>
 									</array>
-									<string key="NSFrame">{{1, 0}, {471, 17}}</string>
+									<string key="NSFrame">{{1, 0}, {559, 17}}</string>
 									<reference key="NSSuperview" ref="46895506"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="95545597"/>
@@ -418,16 +394,16 @@
 								</object>
 								<reference ref="93646331"/>
 							</array>
-							<string key="NSFrame">{{178, 61}, {473, 516}}</string>
+							<string key="NSFrame">{{178, 20}, {561, 557}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="487176444"/>
+							<reference key="NSNextKeyView" ref="176799935"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<int key="NSsFlags">133682</int>
 							<reference key="NSVScroller" ref="899143711"/>
 							<reference key="NSHScroller" ref="366883407"/>
 							<reference key="NSContentView" ref="119087162"/>
-							<reference key="NSHeaderClipView" ref="487176444"/>
+							<reference key="NSHeaderClipView" ref="176799935"/>
 							<reference key="NSCornerView" ref="93646331"/>
 							<bytes key="NSScrollAmts">QSAAAEEgAABCAAAAQgAAAA</bytes>
 							<double key="NSMinMagnification">0.25</double>
@@ -435,7 +411,7 @@
 							<double key="NSMagnification">1</double>
 						</object>
 					</array>
-					<string key="NSFrameSize">{671, 597}</string>
+					<string key="NSFrameSize">{759, 597}</string>
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="74170807"/>
@@ -450,6 +426,22 @@
 		</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">422</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="1005"/>
+						<reference key="destination" ref="897541637"/>
+					</object>
+					<int key="connectionID">356</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">dataSource</string>
@@ -482,14 +474,6 @@
 					</object>
 					<int key="connectionID">104</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">close:</string>
-						<reference key="source" ref="897541637"/>
-						<reference key="destination" ref="630134028"/>
-					</object>
-					<int key="connectionID">122</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">_outline</string>
@@ -524,7 +508,7 @@
 								<object class="NSTextField" id="523975582">
 									<reference key="NSNextResponder" ref="877229867"/>
 									<int key="NSvFlags">266</int>
-									<string key="NSFrame">{{0, 7}, {101, 17}}</string>
+									<string key="NSFrame">{{0, 7}, {276, 17}}</string>
 									<reference key="NSSuperview" ref="877229867"/>
 									<reference key="NSNextKeyView" ref="77832011"/>
 									<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -546,7 +530,7 @@
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								</object>
 							</array>
-							<string key="NSFrame">{{1, 1}, {101, 30}}</string>
+							<string key="NSFrame">{{1, 1}, {276, 30}}</string>
 							<reference key="NSNextKeyView" ref="523975582"/>
 						</object>
 						<reference key="destination" ref="523975582"/>
@@ -579,7 +563,7 @@
 								<object class="NSTextField" id="146951220">
 									<reference key="NSNextResponder" ref="77832011"/>
 									<int key="NSvFlags">266</int>
-									<string key="NSFrame">{{0, 7}, {364, 17}}</string>
+									<string key="NSFrame">{{0, 7}, {277, 17}}</string>
 									<reference key="NSSuperview" ref="77832011"/>
 									<reference key="NSNextKeyView" ref="115706725"/>
 									<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -596,7 +580,7 @@
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								</object>
 							</array>
-							<string key="NSFrame">{{105, 1}, {364, 30}}</string>
+							<string key="NSFrame">{{280, 1}, {277, 30}}</string>
 							<reference key="NSNextKeyView" ref="146951220"/>
 						</object>
 						<reference key="destination" ref="146951220"/>
@@ -629,7 +613,7 @@
 								<object class="NSTextField" id="101981447">
 									<reference key="NSNextResponder" ref="331589340"/>
 									<int key="NSvFlags">266</int>
-									<string key="NSFrame">{{0, 7}, {364, 17}}</string>
+									<string key="NSFrame">{{0, 7}, {277, 17}}</string>
 									<reference key="NSSuperview" ref="331589340"/>
 									<reference key="NSNextKeyView" ref="707493728"/>
 									<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -646,7 +630,7 @@
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								</object>
 							</array>
-							<string key="NSFrame">{{105, 65}, {364, 30}}</string>
+							<string key="NSFrame">{{280, 65}, {277, 30}}</string>
 							<reference key="NSNextKeyView" ref="101981447"/>
 						</object>
 						<reference key="destination" ref="101981447"/>
@@ -709,7 +693,7 @@
 							<array class="NSMutableArray" key="NSSubviews">
 								<reference ref="933894899"/>
 							</array>
-							<string key="NSFrame">{{105, 33}, {364, 30}}</string>
+							<string key="NSFrame">{{280, 33}, {277, 30}}</string>
 							<reference key="NSNextKeyView" ref="933894899"/>
 						</object>
 						<object class="NSNibBindingConnector" key="connector">
@@ -733,7 +717,7 @@
 								<object class="NSTextField" id="507602039">
 									<reference key="NSNextResponder" ref="707493728"/>
 									<int key="NSvFlags">266</int>
-									<string key="NSFrame">{{0, 7}, {320, 17}}</string>
+									<string key="NSFrame">{{0, 7}, {233, 17}}</string>
 									<reference key="NSSuperview" ref="707493728"/>
 									<reference key="NSNextKeyView" ref="208507536"/>
 									<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -752,9 +736,9 @@
 								<object class="NSButton" id="208507536">
 									<reference key="NSNextResponder" ref="707493728"/>
 									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{319, -2}, {48, 32}}</string>
+									<string key="NSFrame">{{232, -2}, {48, 32}}</string>
 									<reference key="NSSuperview" ref="707493728"/>
-									<reference key="NSNextKeyView" ref="899143711"/>
+									<reference key="NSNextKeyView" ref="168424691"/>
 									<string key="NSReuseIdentifierKey">_NS:9</string>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="64737193">
@@ -774,7 +758,7 @@
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								</object>
 							</array>
-							<string key="NSFrame">{{105, 97}, {364, 30}}</string>
+							<string key="NSFrame">{{280, 97}, {277, 30}}</string>
 							<reference key="NSNextKeyView" ref="507602039"/>
 						</object>
 						<reference key="destination" ref="507602039"/>
@@ -808,24 +792,24 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">textField</string>
-						<object class="NSTableCellView" key="source" id="536766661">
+						<object class="NSTableCellView" key="source" id="531097376">
 							<nil key="NSNextResponder"/>
 							<int key="NSvFlags">274</int>
 							<array class="NSMutableArray" key="NSSubviews">
-								<object class="NSTextField" id="532619873">
-									<reference key="NSNextResponder" ref="536766661"/>
+								<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="536766661"/>
+									<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="638446936">
+									<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="532619873"/>
+										<reference key="NSControlView" ref="420623386"/>
 										<reference key="NSBackgroundColor" ref="838999407"/>
 										<reference key="NSTextColor" ref="342788135"/>
 									</object>
@@ -833,20 +817,20 @@
 								</object>
 							</array>
 							<string key="NSFrame">{{1, 1}, {145, 30}}</string>
-							<reference key="NSNextKeyView" ref="532619873"/>
+							<reference key="NSNextKeyView" ref="420623386"/>
 						</object>
-						<reference key="destination" ref="532619873"/>
+						<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="532619873"/>
-						<reference key="destination" ref="536766661"/>
+						<reference key="source" ref="420623386"/>
+						<reference key="destination" ref="531097376"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="532619873"/>
-							<reference key="NSDestination" ref="536766661"/>
+							<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>
@@ -855,6 +839,80 @@
 					</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>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -894,29 +952,11 @@
 						<int key="objectID">2</int>
 						<reference key="object" ref="1006"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="630134028"/>
 							<reference ref="74170807"/>
-							<reference ref="46895506"/>
 							<object class="IBNSLayoutConstraint" id="847141628">
 								<reference key="firstItem" ref="1006"/>
 								<int key="firstAttribute">4</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="630134028"/>
-								<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="221987484">
-								<reference key="firstItem" ref="630134028"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
 								<reference key="secondItem" ref="46895506"/>
 								<int key="secondAttribute">4</int>
 								<float key="multiplier">1</float>
@@ -925,22 +965,6 @@
 								</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="10442957">
-								<reference key="firstItem" ref="1006"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="630134028"/>
-								<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>
@@ -961,22 +985,6 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="414624954">
-								<reference key="firstItem" ref="46895506"/>
-								<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="IBLayoutConstant" key="constant">
-									<double key="value">0.0</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">2</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="209942979">
 								<reference key="firstItem" ref="46895506"/>
 								<int key="firstAttribute">5</int>
@@ -1025,6 +1033,22 @@
 								<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>
@@ -1057,6 +1081,7 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
+							<reference ref="46895506"/>
 						</array>
 						<reference key="parent" ref="1005"/>
 					</object>
@@ -1093,7 +1118,7 @@
 						<reference key="object" ref="846241792"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="109586057"/>
-							<reference ref="536766661"/>
+							<reference ref="531097376"/>
 						</array>
 						<reference key="parent" ref="223530966"/>
 					</object>
@@ -1107,19 +1132,6 @@
 						<reference key="object" ref="897541637"/>
 						<reference key="parent" ref="0"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">116</int>
-						<reference key="object" ref="630134028"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="947533879"/>
-						</array>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">117</int>
-						<reference key="object" ref="947533879"/>
-						<reference key="parent" ref="630134028"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">148</int>
 						<reference key="object" ref="46895506"/>
@@ -1159,23 +1171,6 @@
 						</array>
 						<reference key="parent" ref="962679450"/>
 					</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"/>
-						</array>
-						<reference key="parent" ref="962679450"/>
-					</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">156</int>
 						<reference key="object" ref="443600383"/>
@@ -1251,73 +1246,73 @@
 						<reference key="parent" ref="523975582"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">169</int>
-						<reference key="object" ref="77832011"/>
+						<int key="objectID">320</int>
+						<reference key="object" ref="531097376"/>
 						<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"/>
+							<object class="IBNSLayoutConstraint" id="93784692">
+								<reference key="firstItem" ref="420623386"/>
 								<int key="firstAttribute">10</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="77832011"/>
+								<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="77832011"/>
+								<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="956263079">
-								<reference key="firstItem" ref="77832011"/>
+							<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="146951220"/>
+								<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="77832011"/>
+								<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="186493342"/>
+						<reference key="parent" ref="846241792"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">170</int>
-						<reference key="object" ref="146951220"/>
+						<int key="objectID">324</int>
+						<reference key="object" ref="420623386"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="316554001"/>
+							<reference ref="200666622"/>
 						</array>
-						<reference key="parent" ref="77832011"/>
+						<reference key="parent" ref="531097376"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">171</int>
-						<reference key="object" ref="316554001"/>
-						<reference key="parent" ref="146951220"/>
+						<int key="objectID">325</int>
+						<reference key="object" ref="200666622"/>
+						<reference key="parent" ref="420623386"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">179</int>
@@ -1325,73 +1320,210 @@
 						<reference key="parent" ref="46895506"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">224</int>
-						<reference key="object" ref="331589340"/>
+						<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="101981447"/>
-							<object class="IBNSLayoutConstraint" id="204586117">
-								<reference key="firstItem" ref="331589340"/>
+							<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="101981447"/>
+								<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="331589340"/>
+								<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="821334713">
-								<reference key="firstItem" ref="101981447"/>
+							<object class="IBNSLayoutConstraint" id="1053502993">
+								<reference key="firstItem" ref="385039470"/>
 								<int key="firstAttribute">10</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="331589340"/>
+								<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="331589340"/>
+								<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="558428559">
-								<reference key="firstItem" ref="101981447"/>
+							<object class="IBNSLayoutConstraint" id="870877630">
+								<reference key="firstItem" ref="385039470"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="331589340"/>
+								<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="331589340"/>
+								<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">225</int>
-						<reference key="object" ref="101981447"/>
+						<int key="objectID">335</int>
+						<reference key="object" ref="930736557"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="999711511"/>
+							<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="331589340"/>
+						<reference key="parent" ref="168424691"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">226</int>
-						<reference key="object" ref="999711511"/>
-						<reference key="parent" ref="101981447"/>
+						<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>
@@ -1458,120 +1590,30 @@
 						<reference key="parent" ref="115706725"/>
 					</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">267</int>
-						<reference key="object" ref="749930481"/>
-						<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">269</int>
-						<reference key="object" ref="10442957"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">270</int>
-						<reference key="object" ref="221987484"/>
-						<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">272</int>
-						<reference key="object" ref="209942979"/>
-						<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">274</int>
-						<reference key="object" ref="847141628"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">275</int>
-						<reference key="object" ref="414624954"/>
-						<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">280</int>
-						<reference key="object" ref="955321124"/>
-						<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">285</int>
-						<reference key="object" ref="558428559"/>
-						<reference key="parent" ref="331589340"/>
-					</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">288</int>
-						<reference key="object" ref="853095268"/>
-						<reference key="parent" ref="77832011"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">289</int>
-						<reference key="object" ref="226988110"/>
-						<reference key="parent" ref="77832011"/>
+						<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">291</int>
-						<reference key="object" ref="946740600"/>
-						<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">293</int>
-						<reference key="object" ref="821334713"/>
-						<reference key="parent" ref="331589340"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">294</int>
-						<reference key="object" ref="204586117"/>
-						<reference key="parent" ref="331589340"/>
+						<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="472900573">
+							<object class="IBNSLayoutConstraint" id="688497638">
 								<reference key="firstItem" ref="208507536"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
@@ -1587,7 +1629,7 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="1058754031">
+							<object class="IBNSLayoutConstraint" id="3573639">
 								<reference key="firstItem" ref="707493728"/>
 								<int key="firstAttribute">6</int>
 								<int key="relation">0</int>
@@ -1603,6 +1645,22 @@
 								<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>
@@ -1619,22 +1677,6 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="1064447705">
-								<reference key="firstItem" ref="507602039"/>
-								<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="923315160">
 								<reference key="firstItem" ref="507602039"/>
 								<int key="firstAttribute">5</int>
@@ -1651,8 +1693,8 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<reference ref="208507536"/>
 							<reference ref="507602039"/>
+							<reference ref="208507536"/>
 						</array>
 						<reference key="parent" ref="186493342"/>
 					</object>
@@ -1669,11 +1711,6 @@
 						<reference key="object" ref="850247494"/>
 						<reference key="parent" ref="507602039"/>
 					</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">303</int>
 						<reference key="object" ref="208507536"/>
@@ -1698,25 +1735,188 @@
 						</array>
 						<reference key="parent" ref="707493728"/>
 					</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">308</int>
-						<reference key="object" ref="1058754031"/>
-						<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">310</int>
-						<reference key="object" ref="1064447705"/>
-						<reference key="parent" ref="707493728"/>
+						<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>
@@ -1724,98 +1924,62 @@
 						<reference key="parent" ref="707493728"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">316</int>
-						<reference key="object" ref="472900573"/>
+						<int key="objectID">300</int>
+						<reference key="object" ref="923315160"/>
 						<reference key="parent" ref="707493728"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">317</int>
-						<reference key="object" ref="255675372"/>
-						<reference key="parent" ref="877229867"/>
+						<int key="objectID">476</int>
+						<reference key="object" ref="925514808"/>
+						<reference key="parent" ref="707493728"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">320</int>
-						<reference key="object" ref="536766661"/>
+						<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"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="93784692">
-								<reference key="firstItem" ref="532619873"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="536766661"/>
-								<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="536766661"/>
-								<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="532619873"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="536766661"/>
-								<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="536766661"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="951723453">
-								<reference key="firstItem" ref="536766661"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="532619873"/>
-								<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="536766661"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<reference ref="532619873"/>
+							<reference ref="186989977"/>
 						</array>
-						<reference key="parent" ref="846241792"/>
+						<reference key="parent" ref="168424691"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">321</int>
-						<reference key="object" ref="93784692"/>
-						<reference key="parent" ref="536766661"/>
+						<int key="objectID">566</int>
+						<reference key="object" ref="186989977"/>
+						<reference key="parent" ref="385039470"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">322</int>
-						<reference key="object" ref="724005911"/>
-						<reference key="parent" ref="536766661"/>
+						<int key="objectID">574</int>
+						<reference key="object" ref="472900573"/>
+						<reference key="parent" ref="168424691"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">323</int>
-						<reference key="object" ref="951723453"/>
-						<reference key="parent" ref="536766661"/>
+						<int key="objectID">575</int>
+						<reference key="object" ref="870877630"/>
+						<reference key="parent" ref="168424691"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">324</int>
-						<reference key="object" ref="532619873"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="638446936"/>
-						</array>
-						<reference key="parent" ref="536766661"/>
+						<int key="objectID">576</int>
+						<reference key="object" ref="1053502993"/>
+						<reference key="parent" ref="168424691"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">325</int>
-						<reference key="object" ref="638446936"/>
-						<reference key="parent" ref="532619873"/>
+						<int key="objectID">572</int>
+						<reference key="object" ref="945595807"/>
+						<reference key="parent" ref="168424691"/>
 					</object>
 				</array>
 			</object>
@@ -1826,9 +1990,6 @@
 				<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="116.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="116.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="117.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="148.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="148.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1847,6 +2008,7 @@
 					<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>
@@ -1873,16 +2035,14 @@
 				<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 key="2.IBNSViewMetadataConstraints">
+				<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="414624954"/>
 					<reference ref="512055753"/>
-					<reference ref="10442957"/>
-					<reference ref="221987484"/>
 					<reference ref="847141628"/>
 				</array>
 				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1912,13 +2072,9 @@
 				<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="269.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="270.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="274.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="275.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>
@@ -1932,12 +2088,12 @@
 				<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 key="295.IBNSViewMetadataConstraints">
+				<array class="NSMutableArray" key="295.IBNSViewMetadataConstraints">
 					<reference ref="923315160"/>
-					<reference ref="1064447705"/>
 					<reference ref="425218490"/>
-					<reference ref="1058754031"/>
-					<reference ref="472900573"/>
+					<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>
@@ -1951,17 +2107,14 @@
 				<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="308.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="309.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="311.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="316.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="951723453"/>
+					<reference ref="968608696"/>
 				</array>
 				<string key="320.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="320.userInterfaceItemIdentifier">RALabelSetting</string>
@@ -1971,6 +2124,27 @@
 				<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>
@@ -1980,16 +2154,26 @@
 				<string key="53.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="YES" key="53.isInViewBasedMode"/>
 				<array key="53.prototypeCellViews">
-					<reference ref="536766661"/>
+					<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="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">327</int>
+			<int key="maxID">581</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2004,20 +2188,6 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">RASettingCell</string>
 					<string key="superclassName">NSTableCellView</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="doBrowse:">id</string>
-						<string key="valueChanged:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="doBrowse:">
-							<string key="name">doBrowse:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="valueChanged:">
-							<string key="name">valueChanged:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
 					<object class="NSMutableDictionary" key="outlets">
 						<string key="NS.key.0">numericValue</string>
 						<string key="NS.object.0">NSNumber</string>
@@ -2037,23 +2207,16 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">RASettingsDelegate</string>
 					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">close:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">close:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">close:</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="_window">NSWindow</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="_inputWindow">
+							<string key="name">_inputWindow</string>
+							<string key="candidateClassName">NSWindow</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="_outline">
 							<string key="name">_outline</string>
 							<string key="candidateClassName">NSOutlineView</string>
@@ -2062,10 +2225,6 @@
 							<string key="name">_table</string>
 							<string key="candidateClassName">NSTableView</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>
diff --git a/apple/OSX/hid_pad.c b/apple/OSX/hid_pad.c
index 33bb819b9e..59904f8996 100644
--- a/apple/OSX/hid_pad.c
+++ b/apple/OSX/hid_pad.c
@@ -94,7 +94,7 @@ static void hid_device_attached(void* inContext, IOReturn inResult, void* inSend
    }
 
    IOHIDDeviceOpen(inDevice, kIOHIDOptionsTypeNone);
-   IOHIDDeviceScheduleWithRunLoop(inDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+   IOHIDDeviceScheduleWithRunLoop(inDevice, CFRunLoopGetCurrent(), kCFRunLoopCommonModes);
    IOHIDDeviceRegisterInputValueCallback(inDevice, hid_input_callback, context);
 }
 
@@ -139,7 +139,7 @@ void osx_pad_init()
 
       IOHIDManagerRegisterDeviceMatchingCallback(g_hid_manager, hid_device_attached, 0);
       IOHIDManagerRegisterDeviceRemovalCallback(g_hid_manager, hid_device_removed, 0);
-      IOHIDManagerScheduleWithRunLoop(g_hid_manager, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+      IOHIDManagerScheduleWithRunLoop(g_hid_manager, CFRunLoopGetMain(), kCFRunLoopCommonModes);
 
       IOHIDManagerOpen(g_hid_manager, kIOHIDOptionsTypeNone);
    }
@@ -150,7 +150,7 @@ void osx_pad_quit()
    if (g_hid_manager)
    {
       IOHIDManagerClose(g_hid_manager, kIOHIDOptionsTypeNone);
-      IOHIDManagerUnscheduleFromRunLoop(g_hid_manager, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+      IOHIDManagerUnscheduleFromRunLoop(g_hid_manager, CFRunLoopGetCurrent(), kCFRunLoopCommonModes);
       
       CFRelease(g_hid_manager);
    }
diff --git a/apple/OSX/platform.h b/apple/OSX/platform.h
index b35cf774af..8078979caf 100644
--- a/apple/OSX/platform.h
+++ b/apple/OSX/platform.h
@@ -36,6 +36,7 @@
 
 - (void)loadingCore:(RAModuleInfo*)core withFile:(const char*)file;
 - (void)unloadingCore:(RAModuleInfo*)core;
+- (NSString*)configPath;
 
 @end
 
diff --git a/apple/OSX/platform.m b/apple/OSX/platform.m
index 1f21d5aae8..41f1c6e516 100644
--- a/apple/OSX/platform.m
+++ b/apple/OSX/platform.m
@@ -227,6 +227,11 @@
    _wantReload = false;
 }
 
+- (NSString*)configPath
+{
+   return [[self retroarchConfigPath] stringByAppendingPathComponent:@"retroarch.cfg"];
+}
+
 - (NSString*)retroarchConfigPath
 {
    NSArray* paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
@@ -246,7 +251,8 @@
 
 - (IBAction)showPreferences:(id)sender
 {
-   [[[NSWindowController alloc] initWithWindowNibName:@"Settings"] window];
+   NSWindowController* wc = [[NSWindowController alloc] initWithWindowNibName:@"Settings"];
+   [NSApp runModalForWindow:wc.window];
 }
 
 - (IBAction)basicEvent:(id)sender
diff --git a/apple/OSX/settings.m b/apple/OSX/settings.m
index e24d3bf7f9..1bf695befc 100644
--- a/apple/OSX/settings.m
+++ b/apple/OSX/settings.m
@@ -16,17 +16,99 @@
 #import <objc/runtime.h>
 #import "../RetroArch/RetroArch_Apple.h"
 #include "../RetroArch/setting_data.h"
+#include "../RetroArch/apple_input.h"
+
+#include "driver.h"
+#include "input/input_common.h"
 
 struct settings fake_settings;
 struct global fake_extern;
 
 static const void* associated_name_tag = (void*)&associated_name_tag;
 
+#define BINDFOR(s) (*(struct retro_keybind*)(&s)->value)
+
+static const char* key_name_for_id(uint32_t hidkey)
+{
+   for (int i = 0; apple_key_name_map[i].hid_id; i ++)
+      if (apple_key_name_map[i].hid_id == hidkey)
+         return apple_key_name_map[i].keyname;
+
+   return "nul";
+}
+
+static uint32_t key_id_for_name(const char* name)
+{
+   for (int i = 0; apple_key_name_map[i].hid_id; i ++)
+      if (strcmp(name, apple_key_name_map[i].keyname) == 0)
+         return apple_key_name_map[i].hid_id;
+   
+   return 0;
+}
+
+#define key_name_for_rk(X) key_name_for_id(input_translate_rk_to_keysym(X))
+#define key_rk_for_name(X) input_translate_keysym_to_rk(key_id_for_name(X))
+
+static const char* get_input_config_key(const rarch_setting_t* setting, const char* type)
+{
+   static char buffer[32];
+   snprintf(buffer, 32, "input_player%d_%s%c%s", setting->input_player, setting->name, type ? '_' : '\0', type);
+   return buffer;
+}
+
+static const char* get_button_name(const rarch_setting_t* setting)
+{
+   static char buffer[32];
+
+   if (BINDFOR(*setting).joykey == NO_BTN)
+      return "nul";
+
+   snprintf(buffer, 32, "%lld", BINDFOR(*setting).joykey);
+   return buffer;
+}
+
+static const char* get_axis_name(const rarch_setting_t* setting)
+{
+   static char buffer[32];
+   
+   uint32_t joyaxis = BINDFOR(*setting).joyaxis;
+   
+   if (AXIS_NEG_GET(joyaxis) != AXIS_DIR_NONE)
+      snprintf(buffer, 8, "-%d", AXIS_NEG_GET(joyaxis));
+   else if (AXIS_POS_GET(joyaxis) != AXIS_DIR_NONE)
+      snprintf(buffer, 8, "+%d", AXIS_POS_GET(joyaxis));
+   else
+      return "nul";
+   
+   return buffer;
+}
+
+@interface RAInputBinder : NSWindow
+@end
+
+@implementation RAInputBinder
+
+- (IBAction)goAway:(id)sender
+{
+   [NSApp endSheet:self];
+   [self orderOut:nil];
+}
+
+// Stop the annoying sound when pressing a key
+- (void)keyDown:(NSEvent*)theEvent
+{
+}
+
+@end
+
 @interface RASettingCell : NSTableCellView
-@property (strong) NSString* stringValue;
+@property (nonatomic) const rarch_setting_t* setting;
+
+@property (nonatomic) NSString* stringValue;
 @property (nonatomic) IBOutlet NSNumber* numericValue;
 @property (nonatomic) bool booleanValue;
-@property (nonatomic) const rarch_setting_t* setting;
+
+@property (nonatomic) NSTimer* bindTimer;
 @end
 
 @implementation RASettingCell
@@ -34,6 +116,9 @@ static const void* associated_name_tag = (void*)&associated_name_tag;
 {
    _setting = aSetting;
    
+   if (!_setting)
+      return;
+   
    switch (aSetting->type)
    {
       case ST_INT:    self.numericValue = @(*(int*)aSetting->value); break;
@@ -41,6 +126,7 @@ static const void* associated_name_tag = (void*)&associated_name_tag;
       case ST_STRING: self.stringValue = @((const char*)aSetting->value); break;
       case ST_PATH:   self.stringValue = @((const char*)aSetting->value); break;
       case ST_BOOL:   self.booleanValue = *(bool*)aSetting->value; break;
+      case ST_BIND:   [self updateInputString]; break;
    }
 }
 
@@ -53,9 +139,101 @@ static const void* associated_name_tag = (void*)&associated_name_tag;
       self.stringValue = panel.URL.path;
 }
 
-- (IBAction)valueChanged:(id)sender
+- (void)setNumericValue:(NSNumber *)numericValue
 {
-   printf("GABOR\n");
+   _numericValue = numericValue;
+   
+   if (_setting && _setting->type == ST_INT)
+      *(int*)_setting->value = _numericValue.intValue;
+   else if (_setting && _setting->type == ST_FLOAT)
+      *(float*)_setting->value = _numericValue.floatValue;
+}
+
+- (void)setBooleanValue:(bool)booleanValue
+{
+   _booleanValue = booleanValue;
+   
+   if (_setting && _setting->type == ST_BOOL)
+      *(bool*)_setting->value = _booleanValue;
+}
+
+- (void)setStringValue:(NSString *)stringValue
+{
+   _stringValue = stringValue;
+   
+   if (_setting && (_setting->type == ST_STRING || _setting->type == ST_PATH))
+      strlcpy(_setting->value, _stringValue.UTF8String, _setting->size);
+}
+
+// Input Binding
+- (void)updateInputString
+{
+   self.stringValue = [NSString stringWithFormat:@"[KB:%s] [JS:%s] [AX:%s]", key_name_for_rk(BINDFOR(*_setting).key),
+                                                                              get_button_name(_setting),
+                                                                              get_axis_name(_setting)];
+}
+
+- (void)dismissBinder
+{
+   [self.bindTimer invalidate];
+   self.bindTimer = nil;
+
+   [self updateInputString];
+
+   [(id)self.window.attachedSheet goAway:nil];
+}
+
+- (void)checkBind:(NSTimer*)send
+{
+   // Keyboard
+   for (int i = 0; apple_key_name_map[i].hid_id; i++)
+   {
+      if (g_current_input_data.keys[apple_key_name_map[i].hid_id])
+      {
+         BINDFOR(*_setting).key = input_translate_keysym_to_rk(apple_key_name_map[i].hid_id);
+         [self dismissBinder];
+         return;
+      }
+   }
+
+   // Joystick
+   if (g_current_input_data.pad_buttons[0])
+   {
+      for (int i = 0; i != 32; i ++)
+      {
+         if (g_current_input_data.pad_buttons[0] & (1 << i))
+         {
+            BINDFOR(*_setting).joykey = i;
+            [self dismissBinder];
+            return;
+         }
+      }
+   }
+   
+   // Pad Axis
+   for (int i = 0; i < 4; i++)
+   {
+      int16_t value = g_current_input_data.pad_axis[0][i];
+      
+      if (abs(value) > 0x4000)
+      {
+         BINDFOR(*_setting).joyaxis = (value > 0x1000) ? AXIS_POS(i) : AXIS_NEG(i);
+         [self dismissBinder];
+         break;
+      }
+   }
+}
+
+- (IBAction)doGetBind:(id)sender
+{
+   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
@@ -65,12 +243,13 @@ static const void* associated_name_tag = (void*)&associated_name_tag;
 @end
 
 @interface RASettingsDelegate : NSObject<NSTableViewDataSource,   NSTableViewDelegate,
-                                         NSOutlineViewDataSource, NSOutlineViewDelegate>
+                                         NSOutlineViewDataSource, NSOutlineViewDelegate,
+                                         NSWindowDelegate>
 @end
 
 @implementation RASettingsDelegate
 {
-   NSWindow IBOutlet* _window;
+   NSWindow IBOutlet* _inputWindow;
    NSTableView IBOutlet* _table;
    NSOutlineView IBOutlet* _outline;
    
@@ -83,10 +262,10 @@ static const void* associated_name_tag = (void*)&associated_name_tag;
    NSMutableArray* thisGroup = nil;
    NSMutableArray* thisSubGroup = nil;
    _settings = [NSMutableArray array];
-   
+
    memcpy(&fake_settings, &g_settings, sizeof(struct settings));
    memcpy(&fake_extern, &g_extern, sizeof(struct global));
-   
+
    for (int i = 0; setting_data[i].type; i ++)
    {
       switch (setting_data[i].type)
@@ -127,14 +306,43 @@ static const void* associated_name_tag = (void*)&associated_name_tag;
       }
    }
    
-   [NSApplication.sharedApplication beginSheet:_window modalForWindow:RetroArch_OSX.get->window modalDelegate:nil didEndSelector:nil contextInfo:nil];
-   [NSApplication.sharedApplication runModalForWindow:_window];
+   [self load];
 }
 
-- (IBAction)close:(id)sender
+- (void)load
 {
-#if 0
-   config_file_t* conf = config_file_new(0);
+   config_file_t* conf = config_file_new([RetroArch_OSX get].configPath.UTF8String);
+
+   for (int i = 0; setting_data[i].type; i ++)
+   {
+      switch (setting_data[i].type)
+      {
+         case ST_BOOL:   config_get_bool  (conf, setting_data[i].name,  (bool*)setting_data[i].value); break;
+         case ST_INT:    config_get_int   (conf, setting_data[i].name,   (int*)setting_data[i].value); break;
+         case ST_FLOAT:  config_get_float (conf, setting_data[i].name, (float*)setting_data[i].value); break;
+         case ST_PATH:   config_get_array (conf, setting_data[i].name,  (char*)setting_data[i].value, setting_data[i].size); break;
+         case ST_STRING: config_get_array (conf, setting_data[i].name,  (char*)setting_data[i].value, setting_data[i].size); break;
+         
+         case ST_BIND:
+         {
+            input_config_parse_key       (conf, "input_player1", setting_data[i].name, setting_data[i].value);
+            input_config_parse_joy_button(conf, "input_player1", setting_data[i].name, setting_data[i].value);
+            input_config_parse_joy_axis  (conf, "input_player1", setting_data[i].name, setting_data[i].value);
+            break;
+         }
+         
+         case ST_HEX:    break;
+         default:        break;
+      }
+   }
+   config_file_free(conf);
+}
+
+- (void)windowWillClose:(NSNotification *)notification
+{
+   config_file_t* conf = config_file_new([RetroArch_OSX get].configPath.UTF8String);
+   conf = conf ? conf : config_file_new(0);
+   
    for (int i = 0; setting_data[i].type; i ++)
    {
       switch (setting_data[i].type)
@@ -144,39 +352,25 @@ static const void* associated_name_tag = (void*)&associated_name_tag;
          case ST_FLOAT:  config_set_float (conf, setting_data[i].name, *(float*)setting_data[i].value); break;
          case ST_PATH:   config_set_string(conf, setting_data[i].name,   (char*)setting_data[i].value); break;
          case ST_STRING: config_set_string(conf, setting_data[i].name,   (char*)setting_data[i].value); break;
+         
+         case ST_BIND:
+         {
+            config_set_string(conf, get_input_config_key(&setting_data[i], 0     ), key_name_for_rk(BINDFOR(setting_data[i]).key));
+            config_set_string(conf, get_input_config_key(&setting_data[i], "btn" ), get_button_name(&setting_data[i]));
+            config_set_string(conf, get_input_config_key(&setting_data[i], "axis"), get_axis_name(&setting_data[i]));
+            break;
+         }
+         
          case ST_HEX:    break;
          default:        break;
       }
    }
+   config_file_write(conf, [RetroArch_OSX get].configPath.UTF8String);
    config_file_free(conf);
-#endif
 
-   [NSApplication.sharedApplication stopModal];
-   [NSApplication.sharedApplication endSheet:_window returnCode:0];
-   [_window orderOut:nil];
-}
+   apple_refresh_config();
 
-- (void)readConfigFile:(const char*)path
-{
-   config_file_t* conf = config_file_new(path);
-   if (conf)
-   {
-      for (int i = 0; setting_data[i].type; i ++)
-      {
-         switch (setting_data[i].type)
-         {
-            case ST_BOOL:   config_get_bool (conf, setting_data[i].name,  (bool*)setting_data[i].value); break;
-            case ST_INT:    config_get_int  (conf, setting_data[i].name,   (int*)setting_data[i].value); break;
-            case ST_FLOAT:  config_get_float(conf, setting_data[i].name, (float*)setting_data[i].value); break;
-            case ST_PATH:   config_get_array(conf, setting_data[i].name,  (char*)setting_data[i].value, setting_data[i].size); break;
-            case ST_STRING: config_get_array(conf, setting_data[i].name,  (char*)setting_data[i].value, setting_data[i].size); break;
-            case ST_HEX:    break;
-            default:        break;
-         }
-      }
-
-      config_file_free(conf);
-   }
+   [NSApp stopModal];
 }
 
 #pragma mark View Builders
@@ -249,6 +443,7 @@ static const void* associated_name_tag = (void*)&associated_name_tag;
             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;
          }
          s.setting = setting;
          return s;
diff --git a/apple/RetroArch/setting_data.h b/apple/RetroArch/setting_data.h
index 409c22e24b..3fcac23459 100644
--- a/apple/RetroArch/setting_data.h
+++ b/apple/RetroArch/setting_data.h
@@ -18,8 +18,8 @@
 
 #include "general.h"
 
-enum setting_type { ST_NONE, ST_BOOL, ST_INT, ST_FLOAT, ST_PATH, ST_STRING, ST_HEX, ST_GROUP, ST_SUB_GROUP,
-                    ST_END_GROUP, ST_END_SUB_GROUP };
+enum setting_type { ST_NONE, ST_BOOL, ST_INT, ST_FLOAT, ST_PATH, ST_STRING, ST_HEX, ST_BIND,
+                    ST_GROUP, ST_SUB_GROUP, ST_END_GROUP, ST_END_SUB_GROUP };
 
 typedef struct
 {
@@ -31,11 +31,9 @@ typedef struct
    uint32_t size;
    
    const char* short_description;
-   const char* long_description;
-
-   const char** values;
 
    uint32_t input_player;
+
    double min;
    double max;
    bool allow_blank;
@@ -52,14 +50,14 @@ extern struct global fake_extern;
 #define END_GROUP()                        { ST_END_GROUP },
 #define START_SUB_GROUP(NAME)              { ST_SUB_GROUP,     NAME },
 #define END_SUB_GROUP()                    { ST_END_SUB_GROUP },
-#define START_GROUP(NAME)                  { ST_GROUP,         NAME, 0,       0,              0,     0, 0, 0, 0.0, 0.0, false },
-#define END_GROUP()                        { ST_END_GROUP,     0,    0,       0,              0,     0, 0, 0, 0.0, 0.0, false },
-#define CONFIG_BOOL(TARGET, NAME, SHORT)   { ST_BOOL,          NAME, &TARGET, sizeof(TARGET), SHORT, 0, 0, 0, 0.0, 0.0, false },
-#define CONFIG_INT(TARGET, NAME, SHORT)    { ST_INT,           NAME, &TARGET, sizeof(TARGET), SHORT, 0, 0, 0, 0.0, 0.0, false },
-#define CONFIG_FLOAT(TARGET, NAME, SHORT)  { ST_FLOAT,         NAME, &TARGET, sizeof(TARGET), SHORT, 0, 0, 0, 0.0, 0.0, false },
-#define CONFIG_PATH(TARGET, NAME, SHORT)   { ST_PATH,          NAME, &TARGET, sizeof(TARGET), SHORT, 0, 0, 0, 0.0, 0.0, false },
-#define CONFIG_STRING(TARGET, NAME, SHORT) { ST_STRING,        NAME, &TARGET, sizeof(TARGET), SHORT, 0, 0, 0, 0.0, 0.0, false },
-#define CONFIG_HEX(TARGET, NAME, SHORT)    { ST_HEX,           NAME, &TARGET, sizeof(TARGET), SHORT, 0, 0, 0, 0.0, 0.0, false },
+#define CONFIG_BOOL(TARGET, NAME, SHORT)   { ST_BOOL,          NAME, &TARGET, sizeof(TARGET), SHORT },
+#define CONFIG_INT(TARGET, NAME, SHORT)    { ST_INT,           NAME, &TARGET, sizeof(TARGET), SHORT },
+#define CONFIG_FLOAT(TARGET, NAME, SHORT)  { ST_FLOAT,         NAME, &TARGET, sizeof(TARGET), SHORT },
+#define CONFIG_PATH(TARGET, NAME, SHORT)   { ST_PATH,          NAME, &TARGET, sizeof(TARGET), SHORT },
+#define CONFIG_STRING(TARGET, NAME, SHORT) { ST_STRING,        NAME, &TARGET, sizeof(TARGET), SHORT },
+#define CONFIG_HEX(TARGET, NAME, SHORT)    { ST_HEX,           NAME, &TARGET, sizeof(TARGET), SHORT },
+
+#define CONFIG_BIND(TARGET, PLAYER, NAME, SHORT)   { ST_BIND,          NAME, &TARGET, sizeof(TARGET), SHORT, PLAYER },
 
 const rarch_setting_t setting_data[] = 
 {
@@ -100,7 +98,6 @@ const rarch_setting_t setting_data[] =
    END_GROUP()
 
 
-
    /*************/
    /* EMULATION */
    /*************/
@@ -183,6 +180,34 @@ const rarch_setting_t setting_data[] =
             CONFIG_INT(g_settings.input.icade_profile[3], "input_autodetect_icade_profile_pad4", "iCade 4")
          #endif
       END_SUB_GROUP()
+
+      START_SUB_GROUP("Player 1")
+         CONFIG_BIND(g_settings.input.binds[0][ 0], 1, "b", "B button (down)")
+         CONFIG_BIND(g_settings.input.binds[0][ 1], 1, "y", "Y button (left)")
+         CONFIG_BIND(g_settings.input.binds[0][ 2], 1, "select", "Select button")
+         CONFIG_BIND(g_settings.input.binds[0][ 3], 1, "start", "Start button")
+         CONFIG_BIND(g_settings.input.binds[0][ 4], 1, "up", "Up D-pad")
+         CONFIG_BIND(g_settings.input.binds[0][ 5], 1, "down", "Down D-pad")
+         CONFIG_BIND(g_settings.input.binds[0][ 6], 1, "left", "Left D-pad")
+         CONFIG_BIND(g_settings.input.binds[0][ 7], 1, "right", "Right D-pad")
+         CONFIG_BIND(g_settings.input.binds[0][ 8], 1, "a", "A button (right)")
+         CONFIG_BIND(g_settings.input.binds[0][ 9], 1, "x", "X button (top)")
+         CONFIG_BIND(g_settings.input.binds[0][10], 1, "l", "L button (left shoulder)")
+         CONFIG_BIND(g_settings.input.binds[0][11], 1, "r", "R button (right shoulder)")
+         CONFIG_BIND(g_settings.input.binds[0][12], 1, "l2", "L2 button (left shoulder #2)")
+         CONFIG_BIND(g_settings.input.binds[0][13], 1, "r2", "R2 button (right shoulder #2)")
+         CONFIG_BIND(g_settings.input.binds[0][14], 1, "l3", "L3 button (left analog button)")
+         CONFIG_BIND(g_settings.input.binds[0][15], 1, "r3", "R3 button (right analog button)")
+         CONFIG_BIND(g_settings.input.binds[0][16], 1, "turbo", "Turbo enable")
+         CONFIG_BIND(g_settings.input.binds[0][17], 1, "l_x_plus", "Left analog X+ (right)")
+         CONFIG_BIND(g_settings.input.binds[0][18], 1, "l_x_minus", "Left analog X- (left)")
+         CONFIG_BIND(g_settings.input.binds[0][19], 1, "l_y_plus", "Left analog Y+ (down)")
+         CONFIG_BIND(g_settings.input.binds[0][20], 1, "l_y_minus", "Left analog Y- (up)")
+         CONFIG_BIND(g_settings.input.binds[0][21], 1, "r_x_plus", "Right analog X+ (right)")
+         CONFIG_BIND(g_settings.input.binds[0][22], 1, "r_x_minus", "Right analog X- (left)")
+         CONFIG_BIND(g_settings.input.binds[0][23], 1, "r_y_plus", "Right analog Y+ (down)")
+         CONFIG_BIND(g_settings.input.binds[0][24], 1, "r_y_minus", "Right analog Y- (up)")
+      END_SUB_GROUP()
    END_GROUP()
 
    /*********/
@@ -275,7 +300,63 @@ const rarch_setting_t setting_data[] =
 };
 
 // HACK
-#undef g_settings fake_settings
-#undef g_extern fake_extern
+#undef g_settings
+#undef g_extern
+
+// Keyboard
+#include "keycode.h"
+static const struct
+{
+   const char* const keyname;
+   const uint32_t hid_id;
+} apple_key_name_map[] = {
+   { "left", KEY_Left },               { "right", KEY_Right },
+   { "up", KEY_Up },                   { "down", KEY_Down },
+   { "enter", KEY_Enter },             { "kp_enter", KP_Enter },
+   { "space", KEY_Space },             { "tab", KEY_Tab },
+   { "shift", KEY_LeftShift },         { "rshift", KEY_RightShift },
+   { "ctrl", KEY_LeftControl },        { "alt", KEY_LeftAlt },
+   { "escape", KEY_Escape },           { "backspace", KEY_DeleteForward },
+   { "backquote", KEY_Grave },         { "pause", KEY_Pause },
+
+   { "f1", KEY_F1 },                   { "f2", KEY_F2 },
+   { "f3", KEY_F3 },                   { "f4", KEY_F4 },
+   { "f5", KEY_F5 },                   { "f6", KEY_F6 },
+   { "f7", KEY_F7 },                   { "f8", KEY_F8 },
+   { "f9", KEY_F9 },                   { "f10", KEY_F10 },
+   { "f11", KEY_F11 },                 { "f12", KEY_F12 },
+
+   { "num0", KEY_0 },                  { "num1", KEY_1 },
+   { "num2", KEY_2 },                  { "num3", KEY_3 },
+   { "num4", KEY_4 },                  { "num5", KEY_5 },
+   { "num6", KEY_6 },                  { "num7", KEY_7 },
+   { "num8", KEY_8 },                  { "num9", KEY_9 },
+
+   { "insert", KEY_Insert },           { "del", KEY_DeleteForward },
+   { "home", KEY_Home },               { "end", KEY_End },
+   { "pageup", KEY_PageUp },           { "pagedown", KEY_PageDown },
+
+   { "add", KP_Add },                  { "subtract", KP_Subtract },
+   { "multiply", KP_Multiply },        { "divide", KP_Divide },
+   { "keypad0", KP_0 },                { "keypad1", KP_1 },
+   { "keypad2", KP_2 },                { "keypad3", KP_3 },
+   { "keypad4", KP_4 },                { "keypad5", KP_5 },
+   { "keypad6", KP_6 },                { "keypad7", KP_7 },
+   { "keypad8", KP_8 },                { "keypad9", KP_9 },
+
+   { "period", KEY_Period },           { "capslock", KEY_CapsLock },
+   { "numlock", KP_NumLock },          { "print_screen", KEY_PrintScreen },
+   { "scroll_lock", KEY_ScrollLock },
+
+   { "a", KEY_A }, { "b", KEY_B }, { "c", KEY_C }, { "d", KEY_D },
+   { "e", KEY_E }, { "f", KEY_F }, { "g", KEY_G }, { "h", KEY_H },
+   { "i", KEY_I }, { "j", KEY_J }, { "k", KEY_K }, { "l", KEY_L },
+   { "m", KEY_M }, { "n", KEY_N }, { "o", KEY_O }, { "p", KEY_P },
+   { "q", KEY_Q }, { "r", KEY_R }, { "s", KEY_S }, { "t", KEY_T },
+   { "u", KEY_U }, { "v", KEY_V }, { "w", KEY_W }, { "x", KEY_X },
+   { "y", KEY_Y }, { "z", KEY_Z },
+
+   { "nul", 0x00},
+};
 
 #endif
\ No newline at end of file
diff --git a/apple/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/RetroArch_OSX.xcodeproj/project.pbxproj
index 67e0df9ae7..c67900681c 100644
--- a/apple/RetroArch_OSX.xcodeproj/project.pbxproj
+++ b/apple/RetroArch_OSX.xcodeproj/project.pbxproj
@@ -12,6 +12,7 @@
 		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 */; };
+		965A44C817CC114D0086F78F /* InputBinder.xib in Resources */ = {isa = PBXBuildFile; fileRef = 965A44C717CC114D0086F78F /* InputBinder.xib */; };
 		967894931788ECDB00D6CA69 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9678948F1788ECDB00D6CA69 /* InfoPlist.strings */; };
 		967894941788ECDB00D6CA69 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 967894911788ECDB00D6CA69 /* MainMenu.xib */; };
 		967894961788ED1100D6CA69 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 967894951788ED1100D6CA69 /* main.m */; };
@@ -38,6 +39,7 @@
 		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; };
+		965A44C717CC114D0086F78F /* InputBinder.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = InputBinder.xib; path = OSX/InputBinder.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; };
 		967894921788ECDB00D6CA69 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = OSX/en.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; };
@@ -144,6 +146,7 @@
 				967894911788ECDB00D6CA69 /* MainMenu.xib */,
 				C15874EE178F2094001171D4 /* RetroArch.icns */,
 				9620F6641790004F001B3B81 /* Settings.xib */,
+				965A44C717CC114D0086F78F /* InputBinder.xib */,
 			);
 			name = Assets;
 			sourceTree = "<group>";
@@ -203,6 +206,7 @@
 				967894E9178A2EB400D6CA69 /* modules in Resources */,
 				C15874EF178F2094001171D4 /* RetroArch.icns in Resources */,
 				9620F6651790004F001B3B81 /* Settings.xib in Resources */,
+				965A44C817CC114D0086F78F /* InputBinder.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};