Moving most of the OS X preferences to auto layout, and all to 10.7.

Changing some lists of independent checkbox buttons to matrices.
Fix a discrepancy between SDL versions 1.2 and 2.0 APIs in OS X's input preferences.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86849 e17a0e51-4ae3-4d35-97c3-1a29b211df97

5 files changed, 2228 insertions, 697 deletions

diff --git a/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.xib b/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.xib
index 77c86ba9..f21ac836 100644
--- a/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.xib
+++ b/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.xib
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">12D78</string>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">12E55</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.37</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>NSBox</string>
 			<string>NSButton</string>
 			<string>NSButtonCell</string>
 			<string>NSCustomObject</string>
+			<string>NSMatrix</string>
 			<string>NSMenu</string>
 			<string>NSMenuItem</string>
 			<string>NSPopUpButton</string>
@@ -44,7 +46,7 @@
 			<object class="NSWindowTemplate" id="367816088">
 				<int key="NSWindowStyleMask">1</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{411, 163}, {466, 516}}</string>
+				<string key="NSWindowRect">{{411, 163}, {466, 564}}</string>
 				<int key="NSWTFlags">1886912512</int>
 				<string key="NSWindowTitle">GPU Configuration</string>
 				<string key="NSWindowClass">NSWindow</string>
@@ -57,81 +59,6 @@
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<array class="NSMutableArray" key="NSSubviews">
-						<object class="NSButton" id="12107374">
-							<reference key="NSNextResponder" ref="683836898"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{208, 13}, {122, 32}}</string>
-							<reference key="NSSuperview" ref="683836898"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="4274411"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="318083727">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Cancel</string>
-								<object class="NSFont" key="NSSupport" id="85522599">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">13</double>
-									<int key="NSfFlags">1044</int>
-								</object>
-								<reference key="NSControlView" ref="12107374"/>
-								<int key="NSButtonFlags">-2038284288</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="85522599"/>
-								<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>
-						<object class="NSButton" id="4274411">
-							<reference key="NSNextResponder" ref="683836898"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{330, 13}, {122, 32}}</string>
-							<reference key="NSSuperview" ref="683836898"/>
-							<reference key="NSWindow"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="1004944998">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">OK</string>
-								<reference key="NSSupport" ref="85522599"/>
-								<reference key="NSControlView" ref="4274411"/>
-								<int key="NSButtonFlags">-2038284288</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="85522599"/>
-								<string key="NSAlternateContents"/>
-								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSButton" id="77688835">
-							<reference key="NSNextResponder" ref="683836898"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{14, 13}, {122, 32}}</string>
-							<reference key="NSSuperview" ref="683836898"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="12107374"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="530507040">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Reset</string>
-								<reference key="NSSupport" ref="85522599"/>
-								<reference key="NSControlView" ref="77688835"/>
-								<int key="NSButtonFlags">-2038284288</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="85522599"/>
-								<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="NSBox" id="863974442">
 							<reference key="NSNextResponder" ref="683836898"/>
 							<int key="NSvFlags">256</int>
@@ -140,175 +67,14 @@
 									<reference key="NSNextResponder" ref="863974442"/>
 									<int key="NSvFlags">274</int>
 									<array class="NSMutableArray" key="NSSubviews">
-										<object class="NSButton" id="828054736">
-											<reference key="NSNextResponder" ref="550029143"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{17, 23}, {144, 18}}</string>
-											<reference key="NSSuperview" ref="550029143"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="714935571"/>
-											<int key="NSTag">6</int>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="48017917">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">131072</int>
-												<string key="NSContents">Use PC FPS calculation</string>
-												<object class="NSFont" key="NSSupport" id="26">
-													<string key="NSName">LucidaGrande</string>
-													<double key="NSSize">11</double>
-													<int key="NSfFlags">3100</int>
-												</object>
-												<reference key="NSControlView" ref="828054736"/>
-												<int key="NSTag">6</int>
-												<int key="NSButtonFlags">1211912448</int>
-												<int key="NSButtonFlags2">2</int>
-												<object class="NSButtonImageSource" key="NSAlternateImage" id="642079005">
-													<string key="NSImageName">NSSwitch</string>
-												</object>
-												<string key="NSAlternateContents"/>
-												<string key="NSKeyEquivalent"/>
-												<int key="NSPeriodicDelay">200</int>
-												<int key="NSPeriodicInterval">25</int>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-										<object class="NSButton" id="857867473">
-											<reference key="NSNextResponder" ref="550029143"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{17, 83}, {135, 18}}</string>
-											<reference key="NSSuperview" ref="550029143"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="1024009464"/>
-											<int key="NSTag">2</int>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="818004199">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">131072</int>
-												<string key="NSContents">Expand screen width</string>
-												<reference key="NSSupport" ref="26"/>
-												<reference key="NSControlView" ref="857867473"/>
-												<int key="NSTag">2</int>
-												<int key="NSButtonFlags">1211912448</int>
-												<int key="NSButtonFlags2">2</int>
-												<reference key="NSAlternateImage" ref="642079005"/>
-												<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="NSButton" id="1024009464">
-											<reference key="NSNextResponder" ref="550029143"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{219, 83}, {159, 18}}</string>
-											<reference key="NSSuperview" ref="550029143"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="918426212"/>
-											<int key="NSTag">8</int>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="114998115">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">131072</int>
-												<string key="NSContents">Use old frame skipping</string>
-												<reference key="NSSupport" ref="26"/>
-												<reference key="NSControlView" ref="1024009464"/>
-												<int key="NSTag">8</int>
-												<int key="NSButtonFlags">1211912448</int>
-												<int key="NSButtonFlags2">2</int>
-												<reference key="NSAlternateImage" ref="642079005"/>
-												<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="NSButton" id="98880635">
-											<reference key="NSNextResponder" ref="550029143"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{219, 103}, {132, 18}}</string>
-											<reference key="NSSuperview" ref="550029143"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="857867473"/>
-											<int key="NSTag">7</int>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="487164406">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">131072</int>
-												<string key="NSContents">Lazy screen updates</string>
-												<reference key="NSSupport" ref="26"/>
-												<reference key="NSControlView" ref="98880635"/>
-												<int key="NSTag">7</int>
-												<int key="NSButtonFlags">1211912448</int>
-												<int key="NSButtonFlags2">2</int>
-												<reference key="NSAlternateImage" ref="642079005"/>
-												<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="NSButton" id="630354728">
-											<reference key="NSNextResponder" ref="550029143"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{17, 43}, {135, 18}}</string>
-											<reference key="NSSuperview" ref="550029143"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="1025975821"/>
-											<int key="NSTag">4</int>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="459195947">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">131072</int>
-												<string key="NSContents">Disable coord check</string>
-												<reference key="NSSupport" ref="26"/>
-												<reference key="NSControlView" ref="630354728"/>
-												<int key="NSTag">4</int>
-												<int key="NSButtonFlags">1211912448</int>
-												<int key="NSButtonFlags2">2</int>
-												<reference key="NSAlternateImage" ref="642079005"/>
-												<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="NSButton" id="918426212">
-											<reference key="NSNextResponder" ref="550029143"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{17, 63}, {180, 18}}</string>
-											<reference key="NSSuperview" ref="550029143"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="439147488"/>
-											<int key="NSTag">3</int>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="998491539">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">131072</int>
-												<string key="NSContents">Ignore black brightness color</string>
-												<reference key="NSSupport" ref="26"/>
-												<reference key="NSControlView" ref="918426212"/>
-												<int key="NSTag">3</int>
-												<int key="NSButtonFlags">1211912448</int>
-												<int key="NSButtonFlags2">2</int>
-												<reference key="NSAlternateImage" ref="642079005"/>
-												<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="116814744">
 											<reference key="NSNextResponder" ref="550029143"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{17, 127}, {362, 28}}</string>
+											<string key="NSFrame">{{33, 137}, {362, 28}}</string>
 											<reference key="NSSuperview" ref="550029143"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="287498159"/>
+											<reference key="NSNextKeyView" ref="777359600"/>
+											<string key="NSAntiCompressionPriority">{250, 750}</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="161898211">
 												<int key="NSCellFlags">67108864</int>
@@ -316,7 +82,11 @@
 												<string type="base64-UTF8" key="NSContents">T25seSBlbmFibGUgYSBoYWNrIHRvIGZpeCBhIHNwZWNpZmljIHByb2JsZW0gaW4gYSBnYW1lLgpIb2xk
 IHRoZSBtb3VzZSBvdmVyIGEgY2hlY2tib3ggdG8gZ2V0IG1vcmUgaW5mb3JtYXRpb24gYWJvdXQgaXQu
 A</string>
-												<reference key="NSSupport" ref="26"/>
+												<object class="NSFont" key="NSSupport" id="26">
+													<string key="NSName">LucidaGrande</string>
+													<double key="NSSize">11</double>
+													<int key="NSfFlags">3100</int>
+												</object>
 												<reference key="NSControlView" ref="116814744"/>
 												<object class="NSColor" key="NSBackgroundColor" id="523712963">
 													<int key="NSColorSpace">6</int>
@@ -339,109 +109,192 @@ A</string>
 											</object>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
-										<object class="NSButton" id="287498159">
+										<object class="NSMatrix" id="777359600">
 											<reference key="NSNextResponder" ref="550029143"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{17, 103}, {130, 18}}</string>
+											<string key="NSFrame">{{20, 31}, {388, 98}}</string>
 											<reference key="NSSuperview" ref="550029143"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="98880635"/>
-											<int key="NSTag">1</int>
+											<reference key="NSNextKeyView" ref="318614234"/>
 											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="367879922">
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											<int key="NSNumRows">5</int>
+											<int key="NSNumCols">2</int>
+											<array class="NSMutableArray" key="NSCells">
+												<object class="NSButtonCell" id="367879922">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Odd/even bit hack</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">1</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<object class="NSButtonImageSource" key="NSAlternateImage" id="642079005">
+														<string key="NSImageName">NSSwitch</string>
+													</object>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="487164406">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Lazy screen updates</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">7</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="642079005"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="818004199">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Expand screen width</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">2</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="642079005"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="114998115">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Use old frame skipping</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">8</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="642079005"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="998491539">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Ignore black brightness color</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">3</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="642079005"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="89478486">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Repeated flat tex triangles</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">9</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="642079005"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="459195947">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Disable coord check</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">4</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="642079005"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="154283413">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Draw tex-quads as triangles</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">10</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="642079005"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="48017917">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Use PC FPS calculation</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">6</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="642079005"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="352584485">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Fake 'gpu busy' states</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">11</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="642079005"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</array>
+											<string key="NSCellSize">{192, 18}</string>
+											<string key="NSIntercellSpacing">{4, 2}</string>
+											<int key="NSMatrixFlags">-2080366592</int>
+											<nil key="NSCellClass"/>
+											<object class="NSButtonCell" key="NSProtoCell" id="325618545">
 												<int key="NSCellFlags">67108864</int>
 												<int key="NSCellFlags2">131072</int>
 												<string key="NSContents">Odd/even bit hack</string>
 												<reference key="NSSupport" ref="26"/>
-												<reference key="NSControlView" ref="287498159"/>
 												<int key="NSTag">1</int>
 												<int key="NSButtonFlags">1211912448</int>
 												<int key="NSButtonFlags2">2</int>
 												<reference key="NSAlternateImage" ref="642079005"/>
 												<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="NSButton" id="1025975821">
-											<reference key="NSNextResponder" ref="550029143"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{219, 43}, {189, 18}}</string>
-											<reference key="NSSuperview" ref="550029143"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="828054736"/>
-											<int key="NSTag">10</int>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="154283413">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">131072</int>
-												<string key="NSContents">Draw tex-quads as triangles</string>
-												<reference key="NSSupport" ref="26"/>
-												<reference key="NSControlView" ref="1025975821"/>
-												<int key="NSTag">10</int>
-												<int key="NSButtonFlags">1211912448</int>
-												<int key="NSButtonFlags2">2</int>
-												<reference key="NSAlternateImage" ref="642079005"/>
-												<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="NSButton" id="439147488">
-											<reference key="NSNextResponder" ref="550029143"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{219, 63}, {195, 18}}</string>
-											<reference key="NSSuperview" ref="550029143"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="630354728"/>
-											<int key="NSTag">9</int>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="89478486">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">131072</int>
-												<string key="NSContents">Repeated flat tex triangles</string>
-												<reference key="NSSupport" ref="26"/>
-												<reference key="NSControlView" ref="439147488"/>
-												<int key="NSTag">9</int>
-												<int key="NSButtonFlags">1211912448</int>
-												<int key="NSButtonFlags2">2</int>
-												<reference key="NSAlternateImage" ref="642079005"/>
-												<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="NSButton" id="714935571">
-											<reference key="NSNextResponder" ref="550029143"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{219, 23}, {189, 18}}</string>
-											<reference key="NSSuperview" ref="550029143"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="318614234"/>
-											<int key="NSTag">11</int>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="352584485">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">131072</int>
-												<string key="NSContents">Fake 'gpu busy' states</string>
-												<reference key="NSSupport" ref="26"/>
-												<reference key="NSControlView" ref="714935571"/>
-												<int key="NSTag">11</int>
-												<int key="NSButtonFlags">1211912448</int>
-												<int key="NSButtonFlags2">2</int>
-												<reference key="NSAlternateImage" ref="642079005"/>
-												<string key="NSAlternateContents"/>
-												<string key="NSKeyEquivalent"/>
 												<int key="NSPeriodicDelay">200</int>
 												<int key="NSPeriodicInterval">25</int>
 											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											<int key="NSSelectedRow">-1</int>
+											<int key="NSSelectedCol">-1</int>
+											<reference key="NSBackgroundColor" ref="523712963"/>
+											<reference key="NSCellBackgroundColor" ref="523712963"/>
 										</object>
 									</array>
 									<string key="NSFrame">{{2, 2}, {428, 175}}</string>
@@ -450,7 +303,7 @@ A</string>
 									<reference key="NSNextKeyView" ref="116814744"/>
 								</object>
 							</array>
-							<string key="NSFrame">{{17, 179}, {432, 192}}</string>
+							<string key="NSFrame">{{17, 213}, {432, 192}}</string>
 							<reference key="NSSuperview" ref="683836898"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="550029143"/>
@@ -491,7 +344,7 @@ A</string>
 										<object class="NSButton" id="982425799">
 											<reference key="NSNextResponder" ref="748477628"/>
 											<int key="NSvFlags">-2147483392</int>
-											<string key="NSFrame">{{18, 16}, {189, 18}}</string>
+											<string key="NSFrame">{{18, 32}, {189, 18}}</string>
 											<reference key="NSSuperview" ref="748477628"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="956302290"/>
@@ -500,7 +353,11 @@ A</string>
 												<int key="NSCellFlags">67108864</int>
 												<int key="NSCellFlags2">0</int>
 												<string key="NSContents">Sync to Monitor Refresh</string>
-												<reference key="NSSupport" ref="85522599"/>
+												<object class="NSFont" key="NSSupport" id="85522599">
+													<string key="NSName">LucidaGrande</string>
+													<double key="NSSize">13</double>
+													<int key="NSfFlags">1044</int>
+												</object>
 												<reference key="NSControlView" ref="982425799"/>
 												<int key="NSButtonFlags">1211912448</int>
 												<int key="NSButtonFlags2">2</int>
@@ -515,7 +372,7 @@ A</string>
 										<object class="NSButton" id="229535697">
 											<reference key="NSNextResponder" ref="748477628"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{18, 60}, {147, 18}}</string>
+											<string key="NSFrame">{{18, 72}, {147, 18}}</string>
 											<reference key="NSSuperview" ref="748477628"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="1058448386"/>
@@ -539,7 +396,7 @@ A</string>
 										<object class="NSButton" id="1001322100">
 											<reference key="NSNextResponder" ref="748477628"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{18, 82}, {148, 18}}</string>
+											<string key="NSFrame">{{18, 92}, {148, 18}}</string>
 											<reference key="NSSuperview" ref="748477628"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="229535697"/>
@@ -563,7 +420,7 @@ A</string>
 										<object class="NSButton" id="1058448386">
 											<reference key="NSNextResponder" ref="748477628"/>
 											<int key="NSvFlags">-2147483392</int>
-											<string key="NSFrame">{{18, 38}, {125, 18}}</string>
+											<string key="NSFrame">{{18, 52}, {125, 18}}</string>
 											<reference key="NSSuperview" ref="748477628"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="982425799"/>
@@ -585,13 +442,13 @@ A</string>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 									</array>
-									<string key="NSFrame">{{2, 2}, {207, 118}}</string>
+									<string key="NSFrame">{{2, 2}, {216, 118}}</string>
 									<reference key="NSSuperview" ref="883494424"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="1001322100"/>
 								</object>
 							</array>
-							<string key="NSFrame">{{17, 375}, {211, 135}}</string>
+							<string key="NSFrame">{{17, 409}, {220, 135}}</string>
 							<reference key="NSSuperview" ref="683836898"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="748477628"/>
@@ -624,10 +481,11 @@ A</string>
 										<object class="NSTextField" id="574316115">
 											<reference key="NSNextResponder" ref="562355593"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{15, 95}, {144, 17}}</string>
+											<string key="NSFrame">{{14, 95}, {144, 17}}</string>
 											<reference key="NSSuperview" ref="562355593"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="851261397"/>
+											<string key="NSAntiCompressionPriority">{250, 750}</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="495746919">
 												<int key="NSCellFlags">67108864</int>
@@ -728,7 +586,7 @@ A</string>
 										<object class="NSButton" id="48200887">
 											<reference key="NSNextResponder" ref="562355593"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{16, 36}, {131, 18}}</string>
+											<string key="NSFrame">{{15, 44}, {118, 18}}</string>
 											<reference key="NSSuperview" ref="562355593"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="1070447769"/>
@@ -752,7 +610,7 @@ A</string>
 										<object class="NSButton" id="1070447769">
 											<reference key="NSNextResponder" ref="562355593"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{16, 16}, {118, 18}}</string>
+											<string key="NSFrame">{{15, 24}, {118, 18}}</string>
 											<reference key="NSSuperview" ref="562355593"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="863974442"/>
@@ -780,13 +638,13 @@ A</string>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 									</array>
-									<string key="NSFrame">{{2, 2}, {206, 118}}</string>
+									<string key="NSFrame">{{2, 2}, {203, 118}}</string>
 									<reference key="NSSuperview" ref="956302290"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="574316115"/>
 								</object>
 							</array>
-							<string key="NSFrame">{{239, 375}, {210, 135}}</string>
+							<string key="NSFrame">{{242, 409}, {207, 135}}</string>
 							<reference key="NSSuperview" ref="683836898"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="562355593"/>
@@ -819,7 +677,7 @@ A</string>
 										<object class="NSButton" id="374928377">
 											<reference key="NSNextResponder" ref="931431086"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{333, 64}, {89, 32}}</string>
+											<string key="NSFrame">{{333, 88}, {89, 32}}</string>
 											<reference key="NSSuperview" ref="931431086"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="929478763"/>
@@ -845,10 +703,10 @@ A</string>
 										<object class="NSButton" id="285922344">
 											<reference key="NSNextResponder" ref="931431086"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{333, 31}, {89, 32}}</string>
+											<string key="NSFrame">{{333, 55}, {89, 32}}</string>
 											<reference key="NSSuperview" ref="931431086"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="77688835"/>
+											<reference key="NSNextKeyView" ref="637092375"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<int key="NSTag">2</int>
 											<bool key="NSEnabled">YES</bool>
@@ -871,7 +729,7 @@ A</string>
 										<object class="NSTextField" id="1013340557">
 											<reference key="NSNextResponder" ref="931431086"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{85, 73}, {249, 17}}</string>
+											<string key="NSFrame">{{85, 98}, {249, 17}}</string>
 											<reference key="NSSuperview" ref="931431086"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="374928377"/>
@@ -892,7 +750,7 @@ A</string>
 										<object class="NSTextField" id="145781561">
 											<reference key="NSNextResponder" ref="931431086"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{85, 43}, {249, 17}}</string>
+											<string key="NSFrame">{{85, 65}, {249, 17}}</string>
 											<reference key="NSSuperview" ref="931431086"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="524625855"/>
@@ -913,7 +771,7 @@ A</string>
 										<object class="NSTextField" id="828910870">
 											<reference key="NSNextResponder" ref="931431086"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{15, 73}, {50, 17}}</string>
+											<string key="NSFrame">{{15, 98}, {50, 17}}</string>
 											<reference key="NSSuperview" ref="931431086"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="1013340557"/>
@@ -934,7 +792,7 @@ A</string>
 										<object class="NSTextField" id="929478763">
 											<reference key="NSNextResponder" ref="931431086"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{15, 43}, {68, 17}}</string>
+											<string key="NSFrame">{{15, 65}, {68, 17}}</string>
 											<reference key="NSSuperview" ref="931431086"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="145781561"/>
@@ -955,10 +813,10 @@ A</string>
 										<object class="NSPopUpButton" id="637092375">
 											<reference key="NSNextResponder" ref="931431086"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{85, 11}, {100, 26}}</string>
+											<string key="NSFrame">{{86, 26}, {100, 26}}</string>
 											<reference key="NSSuperview" ref="931431086"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="285922344"/>
+											<reference key="NSNextKeyView" ref="619692665"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSPopUpButtonCell" key="NSCell" id="377783502">
@@ -1036,10 +894,10 @@ A</string>
 										<object class="NSTextField" id="524625855">
 											<reference key="NSNextResponder" ref="931431086"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{15, 17}, {53, 17}}</string>
+											<string key="NSFrame">{{15, 32}, {53, 17}}</string>
 											<reference key="NSSuperview" ref="931431086"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="637092375"/>
+											<reference key="NSNextKeyView" ref="285922344"/>
 											<string key="NSReuseIdentifierKey">_NS:1535</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="848824354">
@@ -1055,14 +913,14 @@ A</string>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 									</array>
-									<string key="NSFrame">{{1, 1}, {430, 102}}</string>
+									<string key="NSFrame">{{1, 1}, {430, 126}}</string>
 									<reference key="NSSuperview" ref="318614234"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="828910870"/>
 									<string key="NSReuseIdentifierKey">_NS:11</string>
 								</object>
 							</array>
-							<string key="NSFrame">{{17, 57}, {432, 118}}</string>
+							<string key="NSFrame">{{17, 67}, {432, 142}}</string>
 							<reference key="NSSuperview" ref="683836898"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="931431086"/>
@@ -1085,8 +943,82 @@ A</string>
 							<int key="NSTitlePosition">2</int>
 							<bool key="NSTransparent">NO</bool>
 						</object>
+						<object class="NSButton" id="484880929">
+							<reference key="NSNextResponder" ref="683836898"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{393, 13}, {59, 32}}</string>
+							<reference key="NSSuperview" ref="683836898"/>
+							<reference key="NSWindow"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="1013802244">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">OK</string>
+								<reference key="NSSupport" ref="85522599"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="484880929"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="680584236">
+							<reference key="NSNextResponder" ref="683836898"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{311, 13}, {82, 32}}</string>
+							<reference key="NSSuperview" ref="683836898"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="484880929"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="907298013">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="85522599"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="680584236"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<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>
+						<object class="NSButton" id="619692665">
+							<reference key="NSNextResponder" ref="683836898"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{14, 13}, {75, 32}}</string>
+							<reference key="NSSuperview" ref="683836898"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="680584236"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="391924434">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Reset</string>
+								<reference key="NSSupport" ref="85522599"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="619692665"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
 					</array>
-					<string key="NSFrameSize">{466, 516}</string>
+					<string key="NSFrameSize">{466, 564}</string>
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="883494424"/>
@@ -1100,30 +1032,6 @@ A</string>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<array class="NSMutableArray" key="connectionRecords">
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">ok:</string>
-						<reference key="source" ref="331818130"/>
-						<reference key="destination" ref="4274411"/>
-					</object>
-					<int key="connectionID">133</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">cancel:</string>
-						<reference key="source" ref="331818130"/>
-						<reference key="destination" ref="12107374"/>
-					</object>
-					<int key="connectionID">134</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">reset:</string>
-						<reference key="source" ref="331818130"/>
-						<reference key="destination" ref="77688835"/>
-					</object>
-					<int key="connectionID">135</int>
-				</object>
-				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">hacksView</string>
 						<reference key="source" ref="331818130"/>
@@ -1276,6 +1184,38 @@ A</string>
 					<int key="connectionID">234</int>
 				</object>
 				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">reset:</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="619692665"/>
+					</object>
+					<int key="connectionID">391</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cancel:</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="680584236"/>
+					</object>
+					<int key="connectionID">392</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">ok:</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="484880929"/>
+					</object>
+					<int key="connectionID">393</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">hacksMatrix</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="777359600"/>
+					</object>
+					<int key="connectionID">606</int>
+				</object>
+				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
 						<reference key="source" ref="367816088"/>
@@ -1291,14 +1231,6 @@ A</string>
 					</object>
 					<int key="connectionID">145</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">nextKeyView</string>
-						<reference key="source" ref="4274411"/>
-						<reference key="destination" ref="12107374"/>
-					</object>
-					<int key="connectionID">9</int>
-				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -1333,55 +1265,438 @@ A</string>
 						<int key="objectID">6</int>
 						<reference key="object" ref="683836898"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="863974442"/>
+							<object class="IBNSLayoutConstraint" id="76343754">
+								<reference key="firstItem" ref="484880929"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="680584236"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="365869440">
+								<reference key="firstItem" ref="683836898"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="484880929"/>
+								<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="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="891689175">
+								<reference key="firstItem" ref="683836898"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="484880929"/>
+								<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="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="78758977">
+								<reference key="firstItem" ref="683836898"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="680584236"/>
+								<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="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="879969680">
+								<reference key="firstItem" ref="683836898"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="619692665"/>
+								<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="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="699144108">
+								<reference key="firstItem" ref="619692665"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="683836898"/>
+								<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="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="230637279">
+								<reference key="firstItem" ref="683836898"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="318614234"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">71</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="967936593">
+								<reference key="firstItem" ref="318614234"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="863974442"/>
+								<int key="secondAttribute">4</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="683836898"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="146632946">
+								<reference key="firstItem" ref="318614234"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="683836898"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">355</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="220377133">
+								<reference key="firstItem" ref="318614234"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="683836898"/>
+								<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="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="887117513">
+								<reference key="firstItem" ref="683836898"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="318614234"/>
+								<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="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="3999403">
+								<reference key="firstItem" ref="956302290"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="683836898"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">245</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="14804683">
+								<reference key="firstItem" ref="683836898"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="956302290"/>
+								<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="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="823335103">
+								<reference key="firstItem" ref="956302290"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="683836898"/>
+								<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="683836898"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="166580245">
+								<reference key="firstItem" ref="683836898"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="863974442"/>
+								<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="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1071787734">
+								<reference key="firstItem" ref="863974442"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="683836898"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">159</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="800422064">
+								<reference key="firstItem" ref="863974442"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="683836898"/>
+								<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="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="556810728">
+								<reference key="firstItem" ref="863974442"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="883494424"/>
+								<int key="secondAttribute">4</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="683836898"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="71261534">
+								<reference key="firstItem" ref="683836898"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="883494424"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">232</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="696447352">
+								<reference key="firstItem" ref="883494424"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="956302290"/>
+								<int key="secondAttribute">11</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="683836898"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="333219008">
+								<reference key="firstItem" ref="883494424"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="683836898"/>
+								<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="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="36160955">
+								<reference key="firstItem" ref="883494424"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="683836898"/>
+								<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="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="484880929"/>
+							<reference ref="680584236"/>
+							<reference ref="619692665"/>
 							<reference ref="883494424"/>
-							<reference ref="956302290"/>
+							<reference ref="863974442"/>
 							<reference ref="318614234"/>
-							<reference ref="12107374"/>
-							<reference ref="4274411"/>
-							<reference ref="77688835"/>
+							<reference ref="956302290"/>
 						</array>
 						<reference key="parent" ref="367816088"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">7</int>
-						<reference key="object" ref="12107374"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="318083727"/>
-						</array>
-						<reference key="parent" ref="683836898"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">8</int>
-						<reference key="object" ref="4274411"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1004944998"/>
-						</array>
-						<reference key="parent" ref="683836898"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">10</int>
-						<reference key="object" ref="77688835"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="530507040"/>
-						</array>
-						<reference key="parent" ref="683836898"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">76</int>
 						<reference key="object" ref="863974442"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="828054736"/>
-							<reference ref="857867473"/>
-							<reference ref="1024009464"/>
-							<reference ref="98880635"/>
-							<reference ref="630354728"/>
-							<reference ref="918426212"/>
+							<object class="IBNSLayoutConstraint" id="361778500">
+								<reference key="firstItem" ref="777359600"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="116814744"/>
+								<int key="secondAttribute">9</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="863974442"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="367009079">
+								<reference key="firstItem" ref="777359600"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="863974442"/>
+								<int key="secondAttribute">9</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="863974442"/>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="457907902">
+								<reference key="firstItem" ref="777359600"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="116814744"/>
+								<int key="secondAttribute">4</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="863974442"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="644534212">
+								<reference key="firstItem" ref="116814744"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="863974442"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">25</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="863974442"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="777359600"/>
 							<reference ref="116814744"/>
-							<reference ref="287498159"/>
-							<reference ref="1025975821"/>
-							<reference ref="439147488"/>
-							<reference ref="714935571"/>
 						</array>
 						<reference key="parent" ref="683836898"/>
 					</object>
@@ -1389,9 +1704,137 @@ A</string>
 						<int key="objectID">89</int>
 						<reference key="object" ref="883494424"/>
 						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="477021466">
+								<reference key="firstItem" ref="982425799"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1058448386"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">6</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="883494424"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="873575955">
+								<reference key="firstItem" ref="1058448386"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="229535697"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">6</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="883494424"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="204167271">
+								<reference key="firstItem" ref="1058448386"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="982425799"/>
+								<int key="secondAttribute">5</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="883494424"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="47544967">
+								<reference key="firstItem" ref="229535697"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1001322100"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">6</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="883494424"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="667983891">
+								<reference key="firstItem" ref="229535697"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1058448386"/>
+								<int key="secondAttribute">5</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="883494424"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="970464449">
+								<reference key="firstItem" ref="1001322100"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="883494424"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">25</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="883494424"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1027953460">
+								<reference key="firstItem" ref="1001322100"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="229535697"/>
+								<int key="secondAttribute">5</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="883494424"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="462217783">
+								<reference key="firstItem" ref="1001322100"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="883494424"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">19</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="883494424"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="1001322100"/>
 							<reference ref="982425799"/>
 							<reference ref="229535697"/>
-							<reference ref="1001322100"/>
 							<reference ref="1058448386"/>
 						</array>
 						<reference key="parent" ref="683836898"/>
@@ -1400,29 +1843,174 @@ A</string>
 						<int key="objectID">107</int>
 						<reference key="object" ref="956302290"/>
 						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="938511662">
+								<reference key="firstItem" ref="1070447769"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="48200887"/>
+								<int key="secondAttribute">6</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="956302290"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="271321341">
+								<reference key="firstItem" ref="1070447769"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="48200887"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">6</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="956302290"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="650656989">
+								<reference key="firstItem" ref="1070447769"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="956302290"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="956302290"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="546588228">
+								<reference key="firstItem" ref="48200887"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="956302290"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">73</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="956302290"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="331262919">
+								<reference key="firstItem" ref="48200887"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="956302290"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="956302290"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="229597616">
+								<reference key="firstItem" ref="956302290"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="851261397"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="956302290"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="334669851">
+								<reference key="firstItem" ref="851261397"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="956302290"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="956302290"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="229464180">
+								<reference key="firstItem" ref="851261397"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="574316115"/>
+								<int key="secondAttribute">4</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="956302290"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="396043426">
+								<reference key="firstItem" ref="574316115"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="956302290"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="956302290"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="652395458">
+								<reference key="firstItem" ref="574316115"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="956302290"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">21</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="956302290"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="851261397"/>
+							<reference ref="574316115"/>
 							<reference ref="48200887"/>
 							<reference ref="1070447769"/>
-							<reference ref="574316115"/>
-							<reference ref="851261397"/>
 						</array>
 						<reference key="parent" ref="683836898"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">158</int>
-						<reference key="object" ref="318083727"/>
-						<reference key="parent" ref="12107374"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">159</int>
-						<reference key="object" ref="1004944998"/>
-						<reference key="parent" ref="4274411"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">160</int>
-						<reference key="object" ref="530507040"/>
-						<reference key="parent" ref="77688835"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">-3</int>
 						<reference key="object" ref="162766117"/>
 						<reference key="parent" ref="0"/>
@@ -1433,6 +2021,22 @@ A</string>
 						<reference key="object" ref="116814744"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="161898211"/>
+							<object class="IBNSLayoutConstraint" id="50241852">
+								<reference key="firstItem" ref="116814744"/>
+								<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">356</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="116814744"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
 						</array>
 						<reference key="parent" ref="863974442"/>
 					</object>
@@ -1446,6 +2050,22 @@ A</string>
 						<reference key="object" ref="982425799"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="961583499"/>
+							<object class="IBNSLayoutConstraint" id="721537428">
+								<reference key="firstItem" ref="982425799"/>
+								<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">185</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="982425799"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
 						</array>
 						<reference key="parent" ref="883494424"/>
 					</object>
@@ -1498,6 +2118,22 @@ A</string>
 						<reference key="object" ref="574316115"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="495746919"/>
+							<object class="IBNSLayoutConstraint" id="70292189">
+								<reference key="firstItem" ref="574316115"/>
+								<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">138</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="574316115"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
 						</array>
 						<reference key="parent" ref="956302290"/>
 					</object>
@@ -1564,14 +2200,286 @@ A</string>
 						<int key="objectID">179</int>
 						<reference key="object" ref="318614234"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="374928377"/>
-							<reference ref="285922344"/>
+							<object class="IBNSLayoutConstraint" id="796423661">
+								<reference key="firstItem" ref="285922344"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="374928377"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="759085687">
+								<reference key="firstItem" ref="285922344"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="145781561"/>
+								<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="318614234"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="167515528">
+								<reference key="firstItem" ref="374928377"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="318614234"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">25</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="979897562">
+								<reference key="firstItem" ref="374928377"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1013340557"/>
+								<int key="secondAttribute">11</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="318614234"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1047688829">
+								<reference key="firstItem" ref="374928377"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="285922344"/>
+								<int key="secondAttribute">5</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="318614234"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="813270801">
+								<reference key="firstItem" ref="374928377"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1013340557"/>
+								<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="318614234"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="36865134">
+								<reference key="firstItem" ref="637092375"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="145781561"/>
+								<int key="secondAttribute">5</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="318614234"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="123885723">
+								<reference key="firstItem" ref="637092375"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="524625855"/>
+								<int key="secondAttribute">11</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="318614234"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1000527200">
+								<reference key="firstItem" ref="145781561"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="285922344"/>
+								<int key="secondAttribute">11</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="318614234"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1058134985">
+								<reference key="firstItem" ref="145781561"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="929478763"/>
+								<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="318614234"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="677836831">
+								<reference key="firstItem" ref="1013340557"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="145781561"/>
+								<int key="secondAttribute">5</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="318614234"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1049222427">
+								<reference key="firstItem" ref="524625855"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="929478763"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="565776234">
+								<reference key="firstItem" ref="524625855"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="318614234"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="683513340">
+								<reference key="firstItem" ref="929478763"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="145781561"/>
+								<int key="secondAttribute">11</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="318614234"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="453358692">
+								<reference key="firstItem" ref="929478763"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="318614234"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="514101239">
+								<reference key="firstItem" ref="828910870"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1013340557"/>
+								<int key="secondAttribute">11</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="318614234"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="258396404">
+								<reference key="firstItem" ref="828910870"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="318614234"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
 							<reference ref="1013340557"/>
 							<reference ref="145781561"/>
 							<reference ref="828910870"/>
 							<reference ref="929478763"/>
-							<reference ref="637092375"/>
+							<reference ref="374928377"/>
+							<reference ref="285922344"/>
 							<reference ref="524625855"/>
+							<reference ref="637092375"/>
 						</array>
 						<reference key="parent" ref="683836898"/>
 					</object>
@@ -1606,6 +2514,22 @@ A</string>
 						<reference key="object" ref="1013340557"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="195480730"/>
+							<object class="IBNSLayoutConstraint" id="519390690">
+								<reference key="firstItem" ref="1013340557"/>
+								<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">243</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1013340557"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
 						</array>
 						<reference key="parent" ref="318614234"/>
 					</object>
@@ -1667,194 +2591,522 @@ A</string>
 						<reference key="parent" ref="1070447769"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">82</int>
-						<reference key="object" ref="98880635"/>
+						<int key="objectID">219</int>
+						<reference key="object" ref="637092375"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="487164406"/>
+							<reference ref="377783502"/>
+							<object class="IBNSLayoutConstraint" id="365430198">
+								<reference key="firstItem" ref="637092375"/>
+								<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">95</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="637092375"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
 						</array>
-						<reference key="parent" ref="863974442"/>
+						<reference key="parent" ref="318614234"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">167</int>
-						<reference key="object" ref="487164406"/>
-						<reference key="parent" ref="98880635"/>
+						<int key="objectID">220</int>
+						<reference key="object" ref="377783502"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="111861017"/>
+						</array>
+						<reference key="parent" ref="637092375"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">147</int>
-						<reference key="object" ref="287498159"/>
+						<int key="objectID">221</int>
+						<reference key="object" ref="111861017"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="367879922"/>
+							<reference ref="922750945"/>
+							<reference ref="406832684"/>
+							<reference ref="458639587"/>
+							<reference ref="445311213"/>
 						</array>
-						<reference key="parent" ref="863974442"/>
+						<reference key="parent" ref="377783502"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">168</int>
-						<reference key="object" ref="367879922"/>
-						<reference key="parent" ref="287498159"/>
+						<int key="objectID">222</int>
+						<reference key="object" ref="922750945"/>
+						<reference key="parent" ref="111861017"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">79</int>
-						<reference key="object" ref="1024009464"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="114998115"/>
-						</array>
-						<reference key="parent" ref="863974442"/>
+						<int key="objectID">223</int>
+						<reference key="object" ref="406832684"/>
+						<reference key="parent" ref="111861017"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">165</int>
-						<reference key="object" ref="114998115"/>
-						<reference key="parent" ref="1024009464"/>
+						<int key="objectID">224</int>
+						<reference key="object" ref="458639587"/>
+						<reference key="parent" ref="111861017"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">80</int>
-						<reference key="object" ref="857867473"/>
+						<int key="objectID">225</int>
+						<reference key="object" ref="524625855"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="818004199"/>
+							<reference ref="848824354"/>
 						</array>
-						<reference key="parent" ref="863974442"/>
+						<reference key="parent" ref="318614234"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">166</int>
-						<reference key="object" ref="818004199"/>
-						<reference key="parent" ref="857867473"/>
+						<int key="objectID">226</int>
+						<reference key="object" ref="848824354"/>
+						<reference key="parent" ref="524625855"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">227</int>
+						<reference key="object" ref="445311213"/>
+						<reference key="parent" ref="111861017"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">237</int>
+						<reference key="object" ref="677836831"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">240</int>
+						<reference key="object" ref="813270801"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">241</int>
+						<reference key="object" ref="759085687"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">242</int>
+						<reference key="object" ref="1058134985"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">244</int>
+						<reference key="object" ref="1047688829"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">247</int>
+						<reference key="object" ref="453358692"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">248</int>
+						<reference key="object" ref="258396404"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">250</int>
+						<reference key="object" ref="514101239"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">251</int>
+						<reference key="object" ref="565776234"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">254</int>
+						<reference key="object" ref="70292189"/>
+						<reference key="parent" ref="574316115"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">255</int>
+						<reference key="object" ref="519390690"/>
+						<reference key="parent" ref="1013340557"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">149</int>
-						<reference key="object" ref="439147488"/>
+						<int key="objectID">258</int>
+						<reference key="object" ref="887117513"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">261</int>
+						<reference key="object" ref="220377133"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">268</int>
+						<reference key="object" ref="36160955"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">279</int>
+						<reference key="object" ref="365430198"/>
+						<reference key="parent" ref="637092375"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">308</int>
+						<reference key="object" ref="721537428"/>
+						<reference key="parent" ref="982425799"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">311</int>
+						<reference key="object" ref="334669851"/>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">318</int>
+						<reference key="object" ref="50241852"/>
+						<reference key="parent" ref="116814744"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">319</int>
+						<reference key="object" ref="462217783"/>
+						<reference key="parent" ref="883494424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">320</int>
+						<reference key="object" ref="1027953460"/>
+						<reference key="parent" ref="883494424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">321</int>
+						<reference key="object" ref="204167271"/>
+						<reference key="parent" ref="883494424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">324</int>
+						<reference key="object" ref="667983891"/>
+						<reference key="parent" ref="883494424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">333</int>
+						<reference key="object" ref="979897562"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">336</int>
+						<reference key="object" ref="796423661"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">337</int>
+						<reference key="object" ref="1000527200"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">339</int>
+						<reference key="object" ref="683513340"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">347</int>
+						<reference key="object" ref="167515528"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">358</int>
+						<reference key="object" ref="333219008"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">310</int>
+						<reference key="object" ref="229464180"/>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">309</int>
+						<reference key="object" ref="652395458"/>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">371</int>
+						<reference key="object" ref="484880929"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="89478486"/>
+							<reference ref="1013802244"/>
 						</array>
-						<reference key="parent" ref="863974442"/>
+						<reference key="parent" ref="683836898"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">170</int>
-						<reference key="object" ref="89478486"/>
-						<reference key="parent" ref="439147488"/>
+						<int key="objectID">372</int>
+						<reference key="object" ref="1013802244"/>
+						<reference key="parent" ref="484880929"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">73</int>
-						<reference key="object" ref="918426212"/>
+						<int key="objectID">375</int>
+						<reference key="object" ref="680584236"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="998491539"/>
+							<reference ref="907298013"/>
 						</array>
-						<reference key="parent" ref="863974442"/>
+						<reference key="parent" ref="683836898"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">161</int>
-						<reference key="object" ref="998491539"/>
-						<reference key="parent" ref="918426212"/>
+						<int key="objectID">376</int>
+						<reference key="object" ref="907298013"/>
+						<reference key="parent" ref="680584236"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">148</int>
-						<reference key="object" ref="1025975821"/>
+						<int key="objectID">381</int>
+						<reference key="object" ref="619692665"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="154283413"/>
+							<reference ref="391924434"/>
 						</array>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">382</int>
+						<reference key="object" ref="391924434"/>
+						<reference key="parent" ref="619692665"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">383</int>
+						<reference key="object" ref="699144108"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">386</int>
+						<reference key="object" ref="891689175"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">387</int>
+						<reference key="object" ref="365869440"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">388</int>
+						<reference key="object" ref="78758977"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">389</int>
+						<reference key="object" ref="76343754"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">390</int>
+						<reference key="object" ref="879969680"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">396</int>
+						<reference key="object" ref="644534212"/>
 						<reference key="parent" ref="863974442"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">169</int>
-						<reference key="object" ref="154283413"/>
-						<reference key="parent" ref="1025975821"/>
+						<int key="objectID">517</int>
+						<reference key="object" ref="146632946"/>
+						<reference key="parent" ref="683836898"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">78</int>
-						<reference key="object" ref="630354728"/>
+						<int key="objectID">530</int>
+						<reference key="object" ref="777359600"/>
 						<array class="NSMutableArray" key="children">
+							<reference ref="325618545"/>
+							<reference ref="48017917"/>
+							<reference ref="352584485"/>
 							<reference ref="459195947"/>
+							<reference ref="154283413"/>
+							<reference ref="998491539"/>
+							<reference ref="89478486"/>
+							<reference ref="818004199"/>
+							<reference ref="114998115"/>
+							<reference ref="367879922"/>
+							<reference ref="487164406"/>
 						</array>
 						<reference key="parent" ref="863974442"/>
 					</object>
 					<object class="IBObjectRecord">
+						<int key="objectID">531</int>
+						<reference key="object" ref="325618545"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">163</int>
+						<reference key="object" ref="48017917"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">171</int>
+						<reference key="object" ref="352584485"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
 						<int key="objectID">164</int>
 						<reference key="object" ref="459195947"/>
-						<reference key="parent" ref="630354728"/>
+						<reference key="parent" ref="777359600"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">150</int>
-						<reference key="object" ref="714935571"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="352584485"/>
-						</array>
+						<int key="objectID">169</int>
+						<reference key="object" ref="154283413"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">161</int>
+						<reference key="object" ref="998491539"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">170</int>
+						<reference key="object" ref="89478486"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">166</int>
+						<reference key="object" ref="818004199"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">165</int>
+						<reference key="object" ref="114998115"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">168</int>
+						<reference key="object" ref="367879922"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">167</int>
+						<reference key="object" ref="487164406"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">545</int>
+						<reference key="object" ref="457907902"/>
 						<reference key="parent" ref="863974442"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">171</int>
-						<reference key="object" ref="352584485"/>
-						<reference key="parent" ref="714935571"/>
+						<int key="objectID">548</int>
+						<reference key="object" ref="367009079"/>
+						<reference key="parent" ref="863974442"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">75</int>
-						<reference key="object" ref="828054736"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="48017917"/>
-						</array>
+						<int key="objectID">549</int>
+						<reference key="object" ref="361778500"/>
 						<reference key="parent" ref="863974442"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">163</int>
-						<reference key="object" ref="48017917"/>
-						<reference key="parent" ref="828054736"/>
+						<int key="objectID">560</int>
+						<reference key="object" ref="823335103"/>
+						<reference key="parent" ref="683836898"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">219</int>
-						<reference key="object" ref="637092375"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="377783502"/>
-						</array>
-						<reference key="parent" ref="318614234"/>
+						<int key="objectID">561</int>
+						<reference key="object" ref="14804683"/>
+						<reference key="parent" ref="683836898"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">220</int>
-						<reference key="object" ref="377783502"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="111861017"/>
-						</array>
-						<reference key="parent" ref="637092375"/>
+						<int key="objectID">563</int>
+						<reference key="object" ref="696447352"/>
+						<reference key="parent" ref="683836898"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">221</int>
-						<reference key="object" ref="111861017"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="922750945"/>
-							<reference ref="406832684"/>
-							<reference ref="458639587"/>
-							<reference ref="445311213"/>
-						</array>
-						<reference key="parent" ref="377783502"/>
+						<int key="objectID">565</int>
+						<reference key="object" ref="873575955"/>
+						<reference key="parent" ref="883494424"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">222</int>
-						<reference key="object" ref="922750945"/>
-						<reference key="parent" ref="111861017"/>
+						<int key="objectID">566</int>
+						<reference key="object" ref="477021466"/>
+						<reference key="parent" ref="883494424"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">223</int>
-						<reference key="object" ref="406832684"/>
-						<reference key="parent" ref="111861017"/>
+						<int key="objectID">574</int>
+						<reference key="object" ref="650656989"/>
+						<reference key="parent" ref="956302290"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">224</int>
-						<reference key="object" ref="458639587"/>
-						<reference key="parent" ref="111861017"/>
+						<int key="objectID">575</int>
+						<reference key="object" ref="3999403"/>
+						<reference key="parent" ref="683836898"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">225</int>
-						<reference key="object" ref="524625855"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="848824354"/>
-						</array>
+						<int key="objectID">576</int>
+						<reference key="object" ref="71261534"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">577</int>
+						<reference key="object" ref="556810728"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">578</int>
+						<reference key="object" ref="800422064"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">579</int>
+						<reference key="object" ref="1071787734"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">580</int>
+						<reference key="object" ref="166580245"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">581</int>
+						<reference key="object" ref="967936593"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">582</int>
+						<reference key="object" ref="331262919"/>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">583</int>
+						<reference key="object" ref="396043426"/>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">590</int>
+						<reference key="object" ref="546588228"/>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">591</int>
+						<reference key="object" ref="271321341"/>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">592</int>
+						<reference key="object" ref="229597616"/>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">593</int>
+						<reference key="object" ref="938511662"/>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">594</int>
+						<reference key="object" ref="970464449"/>
+						<reference key="parent" ref="883494424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">595</int>
+						<reference key="object" ref="47544967"/>
+						<reference key="parent" ref="883494424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">600</int>
+						<reference key="object" ref="230637279"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">602</int>
+						<reference key="object" ref="1049222427"/>
 						<reference key="parent" ref="318614234"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">226</int>
-						<reference key="object" ref="848824354"/>
-						<reference key="parent" ref="524625855"/>
+						<int key="objectID">604</int>
+						<reference key="object" ref="123885723"/>
+						<reference key="parent" ref="318614234"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">227</int>
-						<reference key="object" ref="445311213"/>
-						<reference key="parent" ref="111861017"/>
+						<int key="objectID">605</int>
+						<reference key="object" ref="36865134"/>
+						<reference key="parent" ref="318614234"/>
 					</object>
 				</array>
 			</object>
@@ -1862,7 +3114,19 @@ A</string>
 				<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="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="107.IBNSViewMetadataConstraints">
+					<reference ref="652395458"/>
+					<reference ref="396043426"/>
+					<reference ref="229464180"/>
+					<reference ref="334669851"/>
+					<reference ref="229597616"/>
+					<reference ref="331262919"/>
+					<reference ref="546588228"/>
+					<reference ref="650656989"/>
+					<reference ref="271321341"/>
+					<reference ref="938511662"/>
+				</array>
+				<boolean value="NO" key="107.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="107.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="111.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<object class="NSMutableDictionary" key="112.IBAttributePlaceholdersKey">
@@ -1873,6 +3137,10 @@ A</string>
 						<string key="toolTip">Specify when to use dithering to render colors</string>
 					</object>
 				</object>
+				<array key="112.IBNSViewMetadataConstraints">
+					<reference ref="70292189"/>
+				</array>
+				<boolean value="NO" key="112.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="112.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="113.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="114.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1885,6 +3153,7 @@ A</string>
 						<string key="toolTip">Specify when to use dithering to render colors</string>
 					</object>
 				</object>
+				<boolean value="NO" key="116.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="116.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<object class="NSMutableDictionary" key="117.IBAttributePlaceholdersKey">
 					<string key="NS.key.0">ToolTip</string>
@@ -1894,56 +3163,98 @@ A</string>
 						<string key="toolTip">Enable use of the hacks specified below</string>
 					</object>
 				</object>
+				<boolean value="NO" key="117.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="117.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSMutableDictionary" key="147.IBAttributePlaceholdersKey">
+				<object class="NSMutableDictionary" key="161.IBAttributePlaceholdersKey">
 					<string key="NS.key.0">ToolTip</string>
 					<object class="IBToolTipAttribute" key="NS.object.0">
 						<string key="name">ToolTip</string>
-						<reference key="object" ref="287498159"/>
-						<string key="toolTip">Chrono Cross</string>
+						<reference key="object" ref="998491539"/>
+						<string key="toolTip">Fixes black screens in Lunar</string>
 					</object>
 				</object>
-				<string key="147.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSMutableDictionary" key="148.IBAttributePlaceholdersKey">
+				<string key="161.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="162.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="163.IBAttributePlaceholdersKey">
 					<string key="NS.key.0">ToolTip</string>
 					<object class="IBToolTipAttribute" key="NS.object.0">
 						<string key="name">ToolTip</string>
-						<reference key="object" ref="1025975821"/>
-						<string key="toolTip">Slightly distorted textures can happen</string>
+						<reference key="object" ref="48017917"/>
+						<string key="toolTip">Better fps limitation with some games</string>
 					</object>
 				</object>
-				<string key="148.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSMutableDictionary" key="149.IBAttributePlaceholdersKey">
+				<string key="163.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="164.IBAttributePlaceholdersKey">
 					<string key="NS.key.0">ToolTip</string>
 					<object class="IBToolTipAttribute" key="NS.object.0">
 						<string key="name">ToolTip</string>
-						<reference key="object" ref="439147488"/>
-						<string key="toolTip">Needed by Dark Forces</string>
+						<reference key="object" ref="459195947"/>
+						<string key="toolTip">Old compatibility mode</string>
 					</object>
 				</object>
-				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSMutableDictionary" key="150.IBAttributePlaceholdersKey">
+				<string key="164.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="165.IBAttributePlaceholdersKey">
 					<string key="NS.key.0">ToolTip</string>
 					<object class="IBToolTipAttribute" key="NS.object.0">
 						<string key="name">ToolTip</string>
-						<reference key="object" ref="714935571"/>
-						<string key="toolTip">Toggles busy flags after drawing</string>
+						<reference key="object" ref="114998115"/>
+						<string key="toolTip">Better fps limitation with some games</string>
 					</object>
 				</object>
-				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="158.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="159.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="160.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="161.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="162.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="163.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="164.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="165.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="166.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="818004199"/>
+						<string key="toolTip">Shows the full area in Capcom 2D fighters</string>
+					</object>
+				</object>
 				<string key="166.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="167.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="487164406"/>
+						<string key="toolTip">Maybe faster, needed for Pandemonium 2</string>
+					</object>
+				</object>
 				<string key="167.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="168.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="367879922"/>
+						<string key="toolTip">Chrono Cross</string>
+					</object>
+				</object>
 				<string key="168.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="169.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="154283413"/>
+						<string key="toolTip">Slightly distorted textures can happen</string>
+					</object>
+				</object>
 				<string key="169.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="170.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="89478486"/>
+						<string key="toolTip">Needed by Dark Forces</string>
+					</object>
+				</object>
 				<string key="170.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="171.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="352584485"/>
+						<string key="toolTip">Toggles busy flags after drawing</string>
+					</object>
+				</object>
 				<string key="171.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="172.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="173.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1952,90 +3263,193 @@ A</string>
 				<string key="176.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="177.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="178.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="179.IBNSViewMetadataConstraints">
+					<reference ref="258396404"/>
+					<reference ref="514101239"/>
+					<reference ref="453358692"/>
+					<reference ref="683513340"/>
+					<reference ref="565776234"/>
+					<reference ref="1049222427"/>
+					<reference ref="677836831"/>
+					<reference ref="1058134985"/>
+					<reference ref="1000527200"/>
+					<reference ref="123885723"/>
+					<reference ref="36865134"/>
+					<reference ref="813270801"/>
+					<reference ref="1047688829"/>
+					<reference ref="979897562"/>
+					<reference ref="167515528"/>
+					<reference ref="759085687"/>
+					<reference ref="796423661"/>
+				</array>
+				<boolean value="NO" key="179.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="179.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="180.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="180.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="181.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="182.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="182.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="183.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="184.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="184.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="185.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="186.IBNSViewMetadataConstraints">
+					<reference ref="519390690"/>
+				</array>
+				<boolean value="NO" key="186.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="186.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="187.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="188.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="188.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="189.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="194.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="194.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="195.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="196.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="196.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="197.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="219.IBNSViewMetadataConstraints">
+					<reference ref="365430198"/>
+				</array>
+				<boolean value="NO" key="219.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="219.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="220.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="221.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="222.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="223.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="224.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="225.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="225.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="226.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="227.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="237.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="240.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="241.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="242.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="244.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="247.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="248.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="250.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="251.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="254.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="255.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="258.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="261.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="268.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="279.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="318.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="319.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="320.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="321.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="324.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="333.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="336.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="337.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="339.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="347.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="358.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="371.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="372.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="375.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="381.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="381.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="383.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="387.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="388.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="389.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="390.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="396.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="517.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="530.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="530.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="531.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="545.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="548.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="549.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="560.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="561.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="563.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="565.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="566.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="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="577.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="578.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="579.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="580.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="581.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="582.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="583.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="590.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="591.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="592.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="593.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="594.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="595.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="6.IBNSViewMetadataConstraints">
+					<reference ref="36160955"/>
+					<reference ref="333219008"/>
+					<reference ref="696447352"/>
+					<reference ref="71261534"/>
+					<reference ref="556810728"/>
+					<reference ref="800422064"/>
+					<reference ref="1071787734"/>
+					<reference ref="166580245"/>
+					<reference ref="823335103"/>
+					<reference ref="14804683"/>
+					<reference ref="3999403"/>
+					<reference ref="887117513"/>
+					<reference ref="220377133"/>
+					<reference ref="146632946"/>
+					<reference ref="967936593"/>
+					<reference ref="230637279"/>
+					<reference ref="699144108"/>
+					<reference ref="879969680"/>
+					<reference ref="78758977"/>
+					<reference ref="891689175"/>
+					<reference ref="365869440"/>
+					<reference ref="76343754"/>
+				</array>
 				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSMutableDictionary" key="73.IBAttributePlaceholdersKey">
-					<string key="NS.key.0">ToolTip</string>
-					<object class="IBToolTipAttribute" key="NS.object.0">
-						<string key="name">ToolTip</string>
-						<reference key="object" ref="918426212"/>
-						<string key="toolTip">Fixes black screens in Lunar</string>
-					</object>
-				</object>
-				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="600.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="602.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="604.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="605.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="74.IBNSViewMetadataConstraints">
+					<reference ref="50241852"/>
+				</array>
+				<boolean value="NO" key="74.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSMutableDictionary" key="75.IBAttributePlaceholdersKey">
-					<string key="NS.key.0">ToolTip</string>
-					<object class="IBToolTipAttribute" key="NS.object.0">
-						<string key="name">ToolTip</string>
-						<reference key="object" ref="828054736"/>
-						<string key="toolTip">Better fps limitation with some games</string>
-					</object>
-				</object>
-				<string key="75.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="76.IBNSViewMetadataConstraints">
+					<reference ref="644534212"/>
+					<reference ref="457907902"/>
+					<reference ref="367009079"/>
+					<reference ref="361778500"/>
+				</array>
+				<boolean value="NO" key="76.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="76.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSMutableDictionary" key="78.IBAttributePlaceholdersKey">
-					<string key="NS.key.0">ToolTip</string>
-					<object class="IBToolTipAttribute" key="NS.object.0">
-						<string key="name">ToolTip</string>
-						<reference key="object" ref="630354728"/>
-						<string key="toolTip">Old compatibility mode</string>
-					</object>
-				</object>
-				<string key="78.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSMutableDictionary" key="79.IBAttributePlaceholdersKey">
-					<string key="NS.key.0">ToolTip</string>
-					<object class="IBToolTipAttribute" key="NS.object.0">
-						<string key="name">ToolTip</string>
-						<reference key="object" ref="1024009464"/>
-						<string key="toolTip">Better fps limitation with some games</string>
-					</object>
-				</object>
-				<string key="79.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSMutableDictionary" key="80.IBAttributePlaceholdersKey">
-					<string key="NS.key.0">ToolTip</string>
-					<object class="IBToolTipAttribute" key="NS.object.0">
-						<string key="name">ToolTip</string>
-						<reference key="object" ref="857867473"/>
-						<string key="toolTip">Shows the full area in Capcom 2D fighters</string>
-					</object>
-				</object>
-				<string key="80.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSMutableDictionary" key="82.IBAttributePlaceholdersKey">
-					<string key="NS.key.0">ToolTip</string>
-					<object class="IBToolTipAttribute" key="NS.object.0">
-						<string key="name">ToolTip</string>
-						<reference key="object" ref="98880635"/>
-						<string key="toolTip">Maybe faster, needed for Pandemonium 2</string>
-					</object>
-				</object>
-				<string key="82.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="89.IBNSViewMetadataConstraints">
+					<reference ref="462217783"/>
+					<reference ref="1027953460"/>
+					<reference ref="970464449"/>
+					<reference ref="667983891"/>
+					<reference ref="47544967"/>
+					<reference ref="204167271"/>
+					<reference ref="873575955"/>
+					<reference ref="477021466"/>
+				</array>
+				<boolean value="NO" key="89.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="89.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<object class="NSMutableDictionary" key="93.IBAttributePlaceholdersKey">
 					<string key="NS.key.0">ToolTip</string>
@@ -2045,6 +3459,10 @@ A</string>
 						<string key="toolTip">Removes tearing artifacts by waiting for the monitor to sync. Will cause a slight performance loss. This setting has no effect on LCD monitors.</string>
 					</object>
 				</object>
+				<array key="93.IBNSViewMetadataConstraints">
+					<reference ref="721537428"/>
+				</array>
+				<boolean value="NO" key="93.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="93.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<object class="NSMutableDictionary" key="96.IBAttributePlaceholdersKey">
 					<string key="NS.key.0">ToolTip</string>
@@ -2054,6 +3472,7 @@ A</string>
 						<string key="toolTip">Skip rendering frames to improve overall speed when needed. This setting might cause compatibility problems</string>
 					</object>
 				</object>
+				<boolean value="NO" key="96.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="96.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<object class="NSMutableDictionary" key="97.IBAttributePlaceholdersKey">
 					<string key="NS.key.0">ToolTip</string>
@@ -2063,6 +3482,7 @@ A</string>
 						<string key="toolTip">When Enabled a small counter will show the current performance of the rendering measured in Frames Per Second (FPS)</string>
 					</object>
 				</object>
+				<boolean value="NO" key="97.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="97.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<object class="NSMutableDictionary" key="99.IBAttributePlaceholdersKey">
 					<string key="NS.key.0">ToolTip</string>
@@ -2072,17 +3492,26 @@ A</string>
 						<string key="toolTip">Automatically enter full screen mode</string>
 					</object>
 				</object>
+				<boolean value="NO" key="99.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<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">234</int>
+			<int key="maxID">606</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">NetSfPeopsSoftGPUPluginConfigController</string>
 					<string key="superclassName">NSWindowController</string>
 					<dictionary class="NSMutableDictionary" key="actions">
@@ -2127,6 +3556,7 @@ A</string>
 						<string key="fragmentShaderViewablePath">NSTextField</string>
 						<string key="frameSkipping">NSControl</string>
 						<string key="hackEnable">NSControl</string>
+						<string key="hacksMatrix">NSMatrix</string>
 						<string key="hacksView">NSView</string>
 						<string key="shaderQualitySelector">NSPopUpButton</string>
 						<string key="shaders">NSControl</string>
@@ -2164,6 +3594,10 @@ A</string>
 							<string key="name">hackEnable</string>
 							<string key="candidateClassName">NSControl</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="hacksMatrix">
+							<string key="name">hacksMatrix</string>
+							<string key="candidateClassName">NSMatrix</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="hacksView">
 							<string key="name">hacksView</string>
 							<string key="candidateClassName">NSView</string>
@@ -2204,7 +3638,7 @@ A</string>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<real value="1060" key="NS.object.0"/>
+			<real value="1070" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
@@ -2213,5 +3647,6 @@ A</string>
 			<string key="NSMenuMixedState">{10, 3}</string>
 			<string key="NSSwitch">{15, 15}</string>
 		</dictionary>
+		<bool key="IBDocument.UseAutolayout">YES</bool>
 	</data>
 </archive>
diff --git a/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.xib b/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.xib
index 5e7d9597..d5d1ba50 100644
--- a/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.xib
+++ b/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.xib
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">11C74</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1138.23</string>
-		<string key="IBDocument.HIToolboxVersion">567.00</string>
+		<int key="IBDocument.SystemTarget">1070</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">1938</string>
+			<string key="NS.object.0">3084</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSWindowTemplate</string>
-			<string>NSView</string>
-			<string>NSOpenGLView</string>
+			<string>IBNSLayoutConstraint</string>
 			<string>NSCustomObject</string>
+			<string>NSOpenGLView</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -66,7 +67,7 @@
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1024, 746}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
 				<string key="NSMinSize">{213, 129}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -133,6 +134,70 @@
 						<reference key="object" ref="421016096"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="169050778"/>
+							<object class="IBNSLayoutConstraint" id="1014403038">
+								<reference key="firstItem" ref="169050778"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="421016096"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="421016096"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1599615">
+								<reference key="firstItem" ref="169050778"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="421016096"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">4</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="421016096"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1047065543">
+								<reference key="firstItem" ref="421016096"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="169050778"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">4</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="421016096"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="574511182">
+								<reference key="firstItem" ref="169050778"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="421016096"/>
+								<int key="secondAttribute">9</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="421016096"/>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
+								<int key="contentType">2</int>
+							</object>
 						</array>
 						<reference key="parent" ref="663103883"/>
 					</object>
@@ -147,6 +212,26 @@
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Application</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">18</int>
+						<reference key="object" ref="574511182"/>
+						<reference key="parent" ref="421016096"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="1047065543"/>
+						<reference key="parent" ref="421016096"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">20</int>
+						<reference key="object" ref="1599615"/>
+						<reference key="parent" ref="421016096"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">21</int>
+						<reference key="object" ref="1014403038"/>
+						<reference key="parent" ref="421016096"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -154,19 +239,38 @@
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="15.CustomClassName">NetSfPeopsSoftGPUPluginGLView</string>
+				<boolean value="NO" key="15.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="6.IBNSViewMetadataConstraints">
+					<reference ref="574511182"/>
+					<reference ref="1047065543"/>
+					<reference ref="1599615"/>
+					<reference ref="1014403038"/>
+				</array>
 				<string key="6.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">17</int>
+			<int key="maxID">21</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">NetSfPeopsSoftGPUPluginWindow</string>
 					<string key="superclassName">NSWindow</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -188,13 +292,10 @@
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<real value="1060" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<real value="1060" key="NS.object.0"/>
+			<real value="1070" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<bool key="IBDocument.UseAutolayout">YES</bool>
 	</data>
 </archive>
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.h b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.h
index d4bac705..3a8ac98a 100755
--- a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.h
+++ b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.h
@@ -3,6 +3,7 @@
 #define PluginConfigController NetSfPeopsSoftGPUPluginConfigController
 
 #import <Cocoa/Cocoa.h>
+#import "ARCBridge.h"
 
 @interface NetSfPeopsSoftGPUPluginConfigController : NSWindowController
 {
@@ -12,6 +13,7 @@
     IBOutlet NSControl *frameSkipping;
     IBOutlet NSControl *hackEnable;
     IBOutlet NSView *hacksView;
+	IBOutlet NSMatrix *hacksMatrix;
     IBOutlet NSControl *vSync;
 	IBOutlet NSControl *shaders;
 	IBOutlet NSTextField *vertexShaderViewablePath;
@@ -27,8 +29,8 @@
 	NSMutableDictionary *keyValues;
 }
 
-@property (retain) NSURL *vertexPath;
-@property (retain) NSURL *fragmentPath;
+@property (arcretain) NSURL *vertexPath;
+@property (arcretain) NSURL *fragmentPath;
 
 - (IBAction)cancel:(id)sender;
 - (IBAction)ok:(id)sender;
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
index cbdbda74..d20849fb 100755
--- a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
+++ b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
@@ -5,6 +5,7 @@
 #include "externals.h"
 #import "SGPUPreferences.h"
 #import "ARCBridge.h"
+#import "PluginGLView.h"
 
 #ifdef ENABLE_NLS
 #include <libintl.h>
@@ -81,18 +82,20 @@ void AboutDlgProc()
 
 void SoftDlgProc()
 {
-	NSWindow *window;
-	
-	if (windowController == nil) {
-		windowController = [[PluginConfigController alloc] initWithWindowNibName:@"NetSfPeopsSoftGPUConfig"];
-	}
-	window = [windowController window];
-	
-	/* load values */
-	[windowController loadValues];
-	
-	[window center];
-	[window makeKeyAndOrderFront:nil];
+	RunOnMainThreadSync(^{
+		NSWindow *window;
+		
+		if (windowController == nil) {
+			windowController = [[PluginConfigController alloc] initWithWindowNibName:@"NetSfPeopsSoftGPUConfig"];
+		}
+		window = [windowController window];
+		
+		/* load values */
+		[windowController loadValues];
+		
+		[window center];
+		[window makeKeyAndOrderFront:nil];
+	});
 }
 
 BOOL isShaderEnabled()
@@ -211,11 +214,8 @@ void ReadConfig(void)
 	[writeDic setObject:@([ditherMode indexOfSelectedItem]) forKey:@"Dither Mode"];
 	
 	unsigned int hackValues = 0;
-	NSArray *views = [hacksView subviews];
-	for (NSView *control in views) {
-		if ([control isKindOfClass:[NSButton class]]) {
-			hackValues |= [(NSControl *)control intValue] << ([control tag] - 1);
-		}
+	for (NSCell *control in [hacksMatrix cells]) {
+			hackValues |= [control intValue] << ([control tag] - 1);
 	}
 	
 	[writeDic setObject:@(hackValues) forKey:@"Hacks"];
@@ -243,10 +243,13 @@ void ReadConfig(void)
 - (IBAction)hackToggle:(id)sender
 {
 	BOOL enable = [sender intValue] ? YES : NO;
-	NSArray *views = [hacksView subviews];
+	NSArray *views = [[[hacksView subviews] objectAtIndex:0] subviews];
 
 	for (NSView *control in views) {
-		if ([control isKindOfClass:[NSButton class]]) {
+		if ([control isKindOfClass:[NSControl class]]) {
+			if ([control isKindOfClass:[NSTextField class]]) {
+				[(NSTextField*)control setTextColor:enable ? [NSColor controlTextColor] : [NSColor disabledControlTextColor] ];
+			}
 			[(NSControl *)control setEnabled:enable];
 		}
 	}
@@ -254,10 +257,15 @@ void ReadConfig(void)
 
 - (IBAction)toggleShader:(id)sender {
 	BOOL enable = [sender intValue] ? YES : NO;
-	NSArray *views = [shadersView subviews];
+	NSArray *views = [[[shadersView subviews] objectAtIndex:0] subviews];
 	
 	for (NSView *control in views) {
-		[(NSControl *)control setEnabled:enable];
+		if ([control isKindOfClass:[NSControl class]]) {
+			if ([control isKindOfClass:[NSTextField class]]) {
+				[(NSTextField*)control setTextColor:enable ? [NSColor controlTextColor] : [NSColor disabledControlTextColor] ];
+			}
+			[(NSControl *)control setEnabled:enable];
+		}
 	}
 }
 
@@ -334,24 +342,14 @@ void ReadConfig(void)
 	
 	unsigned int hackValues = [[keyValues objectForKey:@"Hacks"] unsignedIntValue];
 	
-	NSArray *views = [hacksView subviews];
-	for (NSView *control in views) {
-		if ([control isKindOfClass:[NSButton class]]) {
-			[(NSControl *)control setIntValue:(hackValues >> ([control tag] - 1)) & 1];
-		}
+	for (NSCell *control in [hacksMatrix cells]) {
+			[control setIntValue:(hackValues >> ([control tag] - 1)) & 1];
 	}
 	
 	[self hackToggle:hackEnable];
 	[self toggleShader:shaders];
 }
 
-- (void)awakeFromNib
-{
-	//I don't know why we need to do this...
-	hacksView = [[hacksView subviews] objectAtIndex:0];
-	shadersView = [[shadersView subviews] objectAtIndex:0];
-}
-
 #if !__has_feature(objc_arc)
 - (void)dealloc
 {
diff --git a/macosx/plugins/DFXVideo/macsrc/SGPUPreferences.h b/macosx/plugins/DFXVideo/macsrc/SGPUPreferences.h
index 27449a69..f66f5f8a 100755
--- a/macosx/plugins/DFXVideo/macsrc/SGPUPreferences.h
+++ b/macosx/plugins/DFXVideo/macsrc/SGPUPreferences.h
@@ -6,14 +6,9 @@
 //
 //
 
-#ifndef PeopsSoftGPU_SGPUPreferences_h
-#define PeopsSoftGPU_SGPUPreferences_h
-
 #import <Cocoa/Cocoa.h>
 
 BOOL isShaderEnabled();
 NSURL *PSXFragmentShader();
 NSURL *PSXVertexShader();
 float PSXShaderQuality();
-
-#endif