From 009ae6bb1768bf267868a1686e4cd0f7fc97e1e2 Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Sun, 22 Sep 2013 07:00:42 +0000
Subject: Updating constraints on OS X XIBs.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87258 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 macosx/English.lproj/AddPluginSheet.xib            |  16 +--
 macosx/English.lproj/CheatWindow.xib               |  30 +++---
 macosx/English.lproj/PcsxrMemCardDocument.xib      |  37 +++----
 .../English.lproj/Bladesio1PluginConfig.xib        |  23 ++---
 .../DFCdrom/English.lproj/DFCdromPluginConfig.xib  |  56 +++++-----
 .../English.lproj/NetPcsxrHIDInputPluginMain.xib   |  92 +++++++++--------
 macosx/plugins/DFNet/English.lproj/DFNet.xib       |  24 ++---
 macosx/plugins/DFNet/English.lproj/SockDialog.xib  |  22 ++--
 .../English.lproj/NetSfPeopsSpuPluginMain.xib      |  52 +++++-----
 .../English.lproj/NetSfPeopsSoftGPUConfig.xib      | 108 +++++++++----------
 .../English.lproj/NetSfPeopsOpenGLConfig.xib       | 115 +++++++++++----------
 11 files changed, 285 insertions(+), 290 deletions(-)

diff --git a/macosx/English.lproj/AddPluginSheet.xib b/macosx/English.lproj/AddPluginSheet.xib
index e13b321e..b9045ffd 100644
--- a/macosx/English.lproj/AddPluginSheet.xib
+++ b/macosx/English.lproj/AddPluginSheet.xib
@@ -34,11 +34,8 @@
                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="psxplugin" id="57"/>
                     </imageView>
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="43">
-                        <rect key="frame" x="89" y="114" width="290" height="17"/>
+                        <rect key="frame" x="89" y="114" width="126" height="17"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="284" id="62"/>
-                        </constraints>
                         <textFieldCell key="cell" alignment="left" title="Plugin Installation" id="58">
                             <font key="font" metaFont="systemBold"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -46,11 +43,8 @@
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="44">
-                        <rect key="frame" x="89" y="88" width="290" height="18"/>
+                        <rect key="frame" x="89" y="92" width="248" height="14"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="18" id="79"/>
-                        </constraints>
                         <textFieldCell key="cell" selectable="YES" alignment="left" title="Do you want to install this plugin into PCSXR?" id="59">
                             <font key="font" metaFont="smallSystem"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -92,18 +86,18 @@ Gw
                 <constraints>
                     <constraint firstItem="29" firstAttribute="top" secondItem="7" secondAttribute="top" constant="20" symbolic="YES" id="88"/>
                     <constraint firstItem="43" firstAttribute="top" secondItem="7" secondAttribute="top" constant="16" id="94"/>
-                    <constraint firstItem="44" firstAttribute="top" secondItem="43" secondAttribute="bottom" constant="8" symbolic="YES" id="96"/>
                     <constraint firstItem="29" firstAttribute="leading" secondItem="7" secondAttribute="leading" constant="20" symbolic="YES" id="101"/>
                     <constraint firstItem="47" firstAttribute="leading" secondItem="29" secondAttribute="trailing" constant="8" symbolic="YES" id="103"/>
                     <constraint firstItem="44" firstAttribute="leading" secondItem="29" secondAttribute="trailing" constant="8" symbolic="YES" id="108"/>
-                    <constraint firstItem="43" firstAttribute="trailing" secondItem="44" secondAttribute="trailing" id="109"/>
                     <constraint firstItem="43" firstAttribute="leading" secondItem="29" secondAttribute="trailing" constant="8" symbolic="YES" id="110"/>
                     <constraint firstAttribute="bottom" secondItem="112" secondAttribute="bottom" constant="20" symbolic="YES" id="115"/>
-                    <constraint firstAttribute="bottom" secondItem="116" secondAttribute="bottom" constant="20" symbolic="YES" id="119"/>
                     <constraint firstAttribute="trailing" secondItem="47" secondAttribute="trailing" constant="20" symbolic="YES" id="121"/>
                     <constraint firstItem="47" firstAttribute="bottom" secondItem="29" secondAttribute="bottom" id="122"/>
                     <constraint firstAttribute="trailing" secondItem="112" secondAttribute="trailing" constant="20" symbolic="YES" id="125"/>
                     <constraint firstItem="112" firstAttribute="leading" secondItem="116" secondAttribute="trailing" constant="12" symbolic="YES" id="126"/>
+                    <constraint firstItem="47" firstAttribute="top" secondItem="44" secondAttribute="bottom" constant="7" id="nEW-ZE-1vH"/>
+                    <constraint firstItem="44" firstAttribute="top" secondItem="43" secondAttribute="bottom" constant="8" symbolic="YES" id="wXs-74-I05"/>
+                    <constraint firstItem="112" firstAttribute="baseline" secondItem="116" secondAttribute="baseline" id="wec-HN-wNe"/>
                 </constraints>
             </view>
             <connections>
diff --git a/macosx/English.lproj/CheatWindow.xib b/macosx/English.lproj/CheatWindow.xib
index 9019bd74..761d85c7 100644
--- a/macosx/English.lproj/CheatWindow.xib
+++ b/macosx/English.lproj/CheatWindow.xib
@@ -49,14 +49,14 @@
                         </connections>
                     </button>
                     <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="23">
-                        <rect key="frame" x="20" y="53" width="658" height="284"/>
+                        <rect key="frame" x="20" y="58" width="658" height="279"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <clipView key="contentView" id="6pF-og-es3">
-                            <rect key="frame" x="1" y="17" width="656" height="266"/>
+                            <rect key="frame" x="1" y="17" width="656" height="261"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" headerView="27" id="26">
-                                    <rect key="frame" x="0.0" y="0.0" width="656" height="266"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="656" height="261"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -187,7 +187,6 @@
                 <constraints>
                     <constraint firstItem="6" firstAttribute="baseline" secondItem="4" secondAttribute="baseline" id="115"/>
                     <constraint firstAttribute="trailing" secondItem="23" secondAttribute="trailing" constant="20" symbolic="YES" id="116"/>
-                    <constraint firstAttribute="bottom" secondItem="23" secondAttribute="bottom" constant="53" id="117"/>
                     <constraint firstItem="23" firstAttribute="top" secondItem="2" secondAttribute="top" constant="20" symbolic="YES" id="118"/>
                     <constraint firstItem="6" firstAttribute="leading" secondItem="2" secondAttribute="leading" constant="20" symbolic="YES" id="121"/>
                     <constraint firstAttribute="bottom" secondItem="6" secondAttribute="bottom" constant="17" id="122"/>
@@ -203,6 +202,7 @@
                     <constraint firstItem="78" firstAttribute="leading" secondItem="256" secondAttribute="trailing" constant="12" symbolic="YES" id="259"/>
                     <constraint firstItem="256" firstAttribute="baseline" secondItem="78" secondAttribute="baseline" id="260"/>
                     <constraint firstItem="256" firstAttribute="leading" secondItem="227" secondAttribute="trailing" constant="12" symbolic="YES" id="261"/>
+                    <constraint firstItem="256" firstAttribute="top" secondItem="23" secondAttribute="bottom" constant="20" symbolic="YES" id="I40-Zw-qK6"/>
                 </constraints>
             </view>
             <connections>
@@ -219,14 +219,14 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="136">
-                        <rect key="frame" x="20" y="56" width="302" height="189"/>
+                        <rect key="frame" x="20" y="53" width="302" height="192"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <clipView key="contentView" id="COc-Cf-C5K">
-                            <rect key="frame" x="1" y="17" width="300" height="171"/>
+                            <rect key="frame" x="1" y="17" width="300" height="174"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" headerView="139" id="137">
-                                    <rect key="frame" x="0.0" y="0.0" width="300" height="171"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="300" height="174"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -238,7 +238,7 @@
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
                                             </tableHeaderCell>
-                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="144">
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" id="144">
                                                 <customFormatter key="formatter" id="271" customClass="PcsxrHexadecimalFormatter"/>
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -255,7 +255,7 @@
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
                                             </tableHeaderCell>
-                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="143">
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" id="143">
                                                 <customFormatter key="formatter" id="272" customClass="PcsxrHexadecimalFormatter"/>
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -278,7 +278,7 @@
                             <rect key="frame" x="1" y="120" width="143" height="16"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="37" id="140">
+                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" id="140">
                             <rect key="frame" x="224" y="17" width="15" height="102"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
@@ -351,14 +351,16 @@ Gw
                     <constraint firstAttribute="trailing" secondItem="152" secondAttribute="trailing" constant="20" symbolic="YES" id="154"/>
                     <constraint firstAttribute="bottom" secondItem="152" secondAttribute="bottom" constant="20" symbolic="YES" id="155"/>
                     <constraint firstItem="152" firstAttribute="leading" secondItem="156" secondAttribute="trailing" constant="12" symbolic="YES" id="158"/>
-                    <constraint firstAttribute="bottom" secondItem="156" secondAttribute="bottom" constant="20" symbolic="YES" id="159"/>
-                    <constraint firstAttribute="bottom" secondItem="136" secondAttribute="bottom" constant="56" id="160"/>
                     <constraint firstAttribute="trailing" secondItem="136" secondAttribute="trailing" constant="20" symbolic="YES" id="161"/>
-                    <constraint firstAttribute="bottom" secondItem="179" secondAttribute="bottom" constant="20" symbolic="YES" id="182"/>
                     <constraint firstItem="175" firstAttribute="leading" secondItem="135" secondAttribute="leading" constant="20" symbolic="YES" id="193"/>
-                    <constraint firstAttribute="bottom" secondItem="175" secondAttribute="bottom" constant="20" symbolic="YES" id="198"/>
                     <constraint firstItem="175" firstAttribute="top" secondItem="179" secondAttribute="top" id="203"/>
                     <constraint firstItem="179" firstAttribute="leading" secondItem="175" secondAttribute="trailing" constant="-1" id="236"/>
+                    <constraint firstItem="175" firstAttribute="bottom" secondItem="156" secondAttribute="bottom" id="BiT-cB-72z"/>
+                    <constraint firstItem="179" firstAttribute="top" secondItem="136" secondAttribute="bottom" constant="8" symbolic="YES" id="Ehy-91-5kl"/>
+                    <constraint firstItem="152" firstAttribute="baseline" secondItem="156" secondAttribute="baseline" id="G4C-ss-lMH"/>
+                    <constraint firstItem="175" firstAttribute="height" secondItem="179" secondAttribute="height" id="cDU-nE-cHi"/>
+                    <constraint firstItem="175" firstAttribute="bottom" secondItem="179" secondAttribute="bottom" id="dA3-Bb-69x"/>
+                    <constraint firstItem="175" firstAttribute="width" secondItem="179" secondAttribute="width" id="krz-I3-Qzw"/>
                 </constraints>
             </view>
         </window>
diff --git a/macosx/English.lproj/PcsxrMemCardDocument.xib b/macosx/English.lproj/PcsxrMemCardDocument.xib
index abd34fe5..1abc5574 100644
--- a/macosx/English.lproj/PcsxrMemCardDocument.xib
+++ b/macosx/English.lproj/PcsxrMemCardDocument.xib
@@ -16,16 +16,16 @@
             <windowStyleMask key="styleMask" titled="YES"/>
             <windowCollectionBehavior key="collectionBehavior" moveToActiveSpace="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="133" y="235" width="416" height="148"/>
+            <rect key="contentRect" x="133" y="235" width="420" height="160"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
             <value key="minSize" type="size" width="416" height="86"/>
             <value key="maxSize" type="size" width="416" height="155"/>
             <view key="contentView" id="6">
-                <rect key="frame" x="0.0" y="0.0" width="416" height="148"/>
+                <rect key="frame" x="0.0" y="0.0" width="420" height="160"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <imageView translatesAutoresizingMaskIntoConstraints="NO" id="100023">
-                        <rect key="frame" x="20" y="63" width="64" height="64"/>
+                        <rect key="frame" x="20" y="75" width="64" height="64"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="64" id="100071"/>
@@ -34,7 +34,7 @@
                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="pcsxrmemcard" id="100030"/>
                     </imageView>
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="100024">
-                        <rect key="frame" x="89" y="111" width="310" height="17"/>
+                        <rect key="frame" x="89" y="122" width="158" height="17"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" alignment="left" title="Memory Card Selection" id="100029">
                             <font key="font" metaFont="systemBold"/>
@@ -43,28 +43,25 @@
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="100025">
-                        <rect key="frame" x="89" y="44" width="310" height="34"/>
+                        <rect key="frame" x="89" y="61" width="314" height="28"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="34" id="100072"/>
-                        </constraints>
-                        <textFieldCell key="cell" selectable="YES" alignment="left" title="Select which memory card slot you want to put this card in?" id="100028">
+                        <textFieldCell key="cell" controlSize="small" alignment="left" title="Select which memory card slot you want to put this card in." id="100028">
                             <font key="font" metaFont="smallSystem"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="100034">
-                        <rect key="frame" x="89" y="86" width="310" height="17"/>
+                        <rect key="frame" x="89" y="97" width="314" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="100035">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" title="Label" id="100035">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <button verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="100126">
-                        <rect key="frame" x="326" y="13" width="76" height="32"/>
+                        <rect key="frame" x="330" y="13" width="76" height="32"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="push" title="Slot 2" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="100127">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -72,7 +69,7 @@
                         </buttonCell>
                     </button>
                     <button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="100130">
-                        <rect key="frame" x="250" y="13" width="76" height="32"/>
+                        <rect key="frame" x="254" y="13" width="76" height="32"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="push" title="Slot 1" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="100131">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -97,21 +94,21 @@ Gw
                 <constraints>
                     <constraint firstItem="100023" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="20" symbolic="YES" id="100056"/>
                     <constraint firstItem="100034" firstAttribute="top" secondItem="100024" secondAttribute="bottom" constant="8" symbolic="YES" id="100061"/>
-                    <constraint firstItem="100024" firstAttribute="top" secondItem="6" secondAttribute="top" constant="20" symbolic="YES" id="100062"/>
                     <constraint firstItem="100024" firstAttribute="leading" secondItem="100023" secondAttribute="trailing" constant="8" symbolic="YES" id="100082"/>
-                    <constraint firstItem="100034" firstAttribute="leading" secondItem="100023" secondAttribute="trailing" constant="8" symbolic="YES" id="100086"/>
-                    <constraint firstItem="100025" firstAttribute="leading" secondItem="100023" secondAttribute="trailing" constant="8" symbolic="YES" id="100092"/>
                     <constraint firstAttribute="trailing" secondItem="100025" secondAttribute="trailing" constant="20" symbolic="YES" id="100094"/>
-                    <constraint firstAttribute="trailing" secondItem="100034" secondAttribute="trailing" constant="20" symbolic="YES" id="100096"/>
-                    <constraint firstAttribute="trailing" secondItem="100024" secondAttribute="trailing" constant="20" symbolic="YES" id="100097"/>
                     <constraint firstItem="100025" firstAttribute="top" secondItem="100034" secondAttribute="bottom" constant="8" symbolic="YES" id="100098"/>
                     <constraint firstItem="100023" firstAttribute="top" secondItem="6" secondAttribute="top" constant="21" id="100125"/>
                     <constraint firstAttribute="trailing" secondItem="100126" secondAttribute="trailing" constant="20" symbolic="YES" id="100128"/>
                     <constraint firstAttribute="bottom" secondItem="100126" secondAttribute="bottom" constant="20" symbolic="YES" id="100129"/>
-                    <constraint firstAttribute="bottom" secondItem="100130" secondAttribute="bottom" constant="20" symbolic="YES" id="100132"/>
                     <constraint firstItem="100126" firstAttribute="leading" secondItem="100130" secondAttribute="trailing" constant="12" symbolic="YES" id="100133"/>
-                    <constraint firstAttribute="bottom" secondItem="100134" secondAttribute="bottom" constant="20" symbolic="YES" id="100136"/>
                     <constraint firstItem="100134" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="20" symbolic="YES" id="100137"/>
+                    <constraint firstItem="100130" firstAttribute="baseline" secondItem="100134" secondAttribute="baseline" id="QnN-dy-ijO"/>
+                    <constraint firstItem="100034" firstAttribute="leading" secondItem="100024" secondAttribute="leading" id="cns-wR-hZz"/>
+                    <constraint firstAttribute="trailing" secondItem="100034" secondAttribute="trailing" constant="20" symbolic="YES" id="eWZ-wr-Bub"/>
+                    <constraint firstItem="100130" firstAttribute="baseline" secondItem="100126" secondAttribute="baseline" id="fiF-w1-dU1"/>
+                    <constraint firstItem="100034" firstAttribute="leading" secondItem="100025" secondAttribute="leading" id="qEH-aA-8nT"/>
+                    <constraint firstItem="100130" firstAttribute="top" secondItem="100025" secondAttribute="bottom" constant="8" symbolic="YES" id="qor-pU-drx"/>
+                    <constraint firstItem="100024" firstAttribute="top" secondItem="100023" secondAttribute="top" id="u6d-xx-QEZ"/>
                 </constraints>
             </view>
             <connections>
diff --git a/macosx/plugins/Bladesio1/English.lproj/Bladesio1PluginConfig.xib b/macosx/plugins/Bladesio1/English.lproj/Bladesio1PluginConfig.xib
index 550a0523..4dab32de 100644
--- a/macosx/plugins/Bladesio1/English.lproj/Bladesio1PluginConfig.xib
+++ b/macosx/plugins/Bladesio1/English.lproj/Bladesio1PluginConfig.xib
@@ -28,7 +28,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7">
-                        <rect key="frame" x="154" y="13" width="82" height="32"/>
+                        <rect key="frame" x="160" y="13" width="82" height="32"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="186">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -42,11 +42,8 @@ Gw
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8">
-                        <rect key="frame" x="236" y="13" width="65" height="32"/>
+                        <rect key="frame" x="242" y="13" width="59" height="32"/>
                         <autoresizingMask key="autoresizingMask"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="53" id="254"/>
-                        </constraints>
                         <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="187">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -72,16 +69,16 @@ DQ
                                     <constraints>
                                         <constraint firstAttribute="width" constant="79" id="255"/>
                                     </constraints>
-                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="IP Address:" id="199">
+                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="IP Address:" id="199">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
                                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="200">
-                                    <rect key="frame" x="15" y="48" width="85" height="17"/>
+                                    <rect key="frame" x="15" y="51" width="85" height="17"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Player:" id="201">
+                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Player:" id="201">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -90,7 +87,7 @@ DQ
                                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="202">
                                     <rect key="frame" x="15" y="20" width="85" height="17"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Port" id="203">
+                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Port:" id="203">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -127,7 +124,7 @@ DQ
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     <popUpButtonCell key="cell" type="push" title="Disabled" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="213" id="209">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                        <font key="font" metaFont="system"/>
+                                        <font key="font" metaFont="menu"/>
                                         <menu key="menu" title="OtherViews" id="210">
                                             <items>
                                                 <menuItem title="Disabled" state="on" id="213"/>
@@ -142,7 +139,6 @@ DQ
                         <constraints>
                             <constraint firstItem="198" firstAttribute="leading" secondItem="193" secondAttribute="leading" constant="16" id="225"/>
                             <constraint firstItem="200" firstAttribute="leading" secondItem="193" secondAttribute="leading" constant="16" id="226"/>
-                            <constraint firstItem="208" firstAttribute="bottom" secondItem="200" secondAttribute="bottom" id="227"/>
                             <constraint firstItem="208" firstAttribute="leading" secondItem="206" secondAttribute="leading" id="228"/>
                             <constraint firstItem="204" firstAttribute="top" secondItem="193" secondAttribute="top" constant="8" id="229"/>
                             <constraint firstItem="204" firstAttribute="leading" secondItem="198" secondAttribute="trailing" constant="8" symbolic="YES" id="230"/>
@@ -157,6 +153,7 @@ DQ
                             <constraint firstItem="208" firstAttribute="leading" secondItem="200" secondAttribute="trailing" constant="8" symbolic="YES" id="240"/>
                             <constraint firstItem="198" firstAttribute="baseline" secondItem="204" secondAttribute="baseline" id="241"/>
                             <constraint firstItem="206" firstAttribute="top" secondItem="193" secondAttribute="top" constant="67" id="256"/>
+                            <constraint firstItem="200" firstAttribute="baseline" secondItem="208" secondAttribute="baseline" id="fre-iJ-E54"/>
                         </constraints>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -190,16 +187,16 @@ DQ
                 <constraints>
                     <constraint firstItem="194" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="20" symbolic="YES" id="242"/>
                     <constraint firstItem="193" firstAttribute="top" secondItem="194" secondAttribute="bottom" constant="8" symbolic="YES" id="243"/>
-                    <constraint firstAttribute="bottom" secondItem="7" secondAttribute="bottom" constant="20" symbolic="YES" id="244"/>
                     <constraint firstItem="8" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="12" symbolic="YES" id="245"/>
                     <constraint firstAttribute="trailing" secondItem="8" secondAttribute="trailing" constant="20" symbolic="YES" id="246"/>
                     <constraint firstItem="221" firstAttribute="top" secondItem="193" secondAttribute="bottom" constant="20" symbolic="YES" id="247"/>
-                    <constraint firstAttribute="bottom" secondItem="221" secondAttribute="bottom" constant="20" symbolic="YES" id="248"/>
                     <constraint firstAttribute="trailing" secondItem="193" secondAttribute="trailing" constant="20" symbolic="YES" id="249"/>
                     <constraint firstItem="194" firstAttribute="top" secondItem="6" secondAttribute="top" constant="20" symbolic="YES" id="250"/>
                     <constraint firstItem="193" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="20" symbolic="YES" id="251"/>
                     <constraint firstItem="221" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="20" symbolic="YES" id="252"/>
                     <constraint firstAttribute="bottom" secondItem="8" secondAttribute="bottom" constant="20" symbolic="YES" id="253"/>
+                    <constraint firstItem="8" firstAttribute="baseline" secondItem="221" secondAttribute="baseline" id="iGD-Hx-cif"/>
+                    <constraint firstItem="8" firstAttribute="baseline" secondItem="7" secondAttribute="baseline" id="q6S-UG-37H"/>
                 </constraints>
             </view>
             <connections>
diff --git a/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.xib b/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.xib
index 1052bcb5..e14062be 100644
--- a/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.xib
+++ b/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.xib
@@ -33,7 +33,7 @@
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <button translatesAutoresizingMaskIntoConstraints="NO" id="169">
-                                    <rect key="frame" x="15" y="21" width="151" height="18"/>
+                                    <rect key="frame" x="15" y="19" width="151" height="18"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <buttonCell key="cell" type="check" title="Use Cached Reading" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="189">
                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -41,17 +41,17 @@
                                     </buttonCell>
                                 </button>
                                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="173">
-                                    <rect key="frame" x="128" y="40" width="197" height="26"/>
+                                    <rect key="frame" x="130" y="40" width="195" height="26"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <constraints>
-                                        <constraint firstAttribute="width" constant="192" id="271"/>
+                                        <constraint firstAttribute="width" constant="190" id="QnV-gO-Owq"/>
                                     </constraints>
-                                    <popUpButtonCell key="cell" type="push" title="Default" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="190">
+                                    <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="190">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                        <font key="font" metaFont="system"/>
+                                        <font key="font" metaFont="menu"/>
                                         <menu key="menu" title="OtherViews" id="174">
                                             <items>
-                                                <menuItem title="Default" state="on" id="176"/>
+                                                <menuItem title="Default" id="176"/>
                                                 <menuItem title="1 X" tag="1" id="177"/>
                                                 <menuItem title="2 X" tag="2" id="175"/>
                                                 <menuItem title="4 X" tag="4" id="179"/>
@@ -63,9 +63,9 @@
                                     </popUpButtonCell>
                                 </popUpButton>
                                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="266">
-                                    <rect key="frame" x="14" y="46" width="106" height="17"/>
+                                    <rect key="frame" x="14" y="46" width="113" height="17"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="CD-ROM Speed:" id="267">
+                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="CD-ROM Speed:" id="267">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -77,9 +77,10 @@
                             <constraint firstItem="173" firstAttribute="top" secondItem="162" secondAttribute="top" constant="24" id="232"/>
                             <constraint firstAttribute="trailing" secondItem="173" secondAttribute="trailing" constant="16" id="234"/>
                             <constraint firstItem="169" firstAttribute="leading" secondItem="162" secondAttribute="leading" constant="16" id="236"/>
-                            <constraint firstAttribute="bottom" secondItem="169" secondAttribute="bottom" constant="21" id="270"/>
                             <constraint firstItem="173" firstAttribute="baseline" secondItem="266" secondAttribute="baseline" id="272"/>
-                            <constraint firstItem="266" firstAttribute="leading" secondItem="162" secondAttribute="leading" constant="16" id="273"/>
+                            <constraint firstItem="173" firstAttribute="leading" secondItem="266" secondAttribute="trailing" constant="8" symbolic="YES" id="FPY-Qc-N1f"/>
+                            <constraint firstItem="266" firstAttribute="leading" secondItem="162" secondAttribute="leading" constant="16" id="XTz-Fk-3oB"/>
+                            <constraint firstItem="169" firstAttribute="top" secondItem="173" secondAttribute="bottom" constant="8" symbolic="YES" id="n6F-ne-iWN"/>
                         </constraints>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -91,21 +92,6 @@
                             <rect key="frame" x="2" y="2" width="339" height="51"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="171">
-                                    <rect key="frame" x="14" y="21" width="114" height="17"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="108" id="220"/>
-                                        <constraint firstAttribute="height" constant="17" id="221"/>
-                                    </constraints>
-                                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" id="191">
-                                        <font key="font" metaFont="system"/>
-                                        <string key="title">Cache Size:
-</string>
-                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                    </textFieldCell>
-                                </textField>
                                 <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="172">
                                     <rect key="frame" x="129" y="15" width="195" height="25"/>
                                     <autoresizingMask key="autoresizingMask"/>
@@ -116,13 +102,25 @@
                                         <font key="font" size="12" name="Helvetica"/>
                                     </sliderCell>
                                 </slider>
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Jzm-F5-M7J">
+                                    <rect key="frame" x="14" y="10" width="112" height="34"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" id="MSf-Ad-auA">
+                                        <font key="font" metaFont="system"/>
+                                        <string key="title">Cache Size:
+</string>
+                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
                             </subviews>
                         </view>
                         <constraints>
-                            <constraint firstItem="172" firstAttribute="top" secondItem="171" secondAttribute="top" id="238"/>
-                            <constraint firstItem="171" firstAttribute="leading" secondItem="164" secondAttribute="leading" constant="16" id="239"/>
-                            <constraint firstItem="171" firstAttribute="top" secondItem="164" secondAttribute="top" constant="28" id="240"/>
                             <constraint firstAttribute="trailing" secondItem="172" secondAttribute="trailing" constant="16" id="241"/>
+                            <constraint firstItem="172" firstAttribute="top" secondItem="164" secondAttribute="top" constant="28" id="1SZ-MD-TCY"/>
+                            <constraint firstItem="Jzm-F5-M7J" firstAttribute="baseline" secondItem="172" secondAttribute="baseline" id="M64-If-woz"/>
+                            <constraint firstItem="172" firstAttribute="leading" secondItem="Jzm-F5-M7J" secondAttribute="trailing" constant="8" symbolic="YES" id="NFN-dN-Z1o"/>
+                            <constraint firstItem="Jzm-F5-M7J" firstAttribute="leading" secondItem="164" secondAttribute="leading" constant="16" id="b9u-7l-0XP"/>
                         </constraints>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -168,7 +166,7 @@ Gw
                     <constraint firstAttribute="bottom" secondItem="164" secondAttribute="bottom" constant="60" id="247"/>
                     <constraint firstAttribute="trailing" secondItem="242" secondAttribute="trailing" constant="20" symbolic="YES" id="249"/>
                     <constraint firstItem="242" firstAttribute="leading" secondItem="250" secondAttribute="trailing" constant="12" symbolic="YES" id="252"/>
-                    <constraint firstAttribute="bottom" secondItem="250" secondAttribute="bottom" constant="20" symbolic="YES" id="253"/>
+                    <constraint firstItem="242" firstAttribute="baseline" secondItem="250" secondAttribute="baseline" id="sHP-yL-yOn"/>
                 </constraints>
             </view>
             <connections>
diff --git a/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.xib b/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.xib
index ecc42406..9cd07551 100644
--- a/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.xib
+++ b/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.xib
@@ -18,26 +18,30 @@
         <window title="Input Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" wantsToBeColor="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Configuration">
             <windowStyleMask key="styleMask" titled="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="87" y="281" width="463" height="424"/>
+            <rect key="contentRect" x="87" y="281" width="469" height="439"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
             <value key="minSize" type="size" width="310" height="160"/>
             <view key="contentView" id="6">
-                <rect key="frame" x="0.0" y="0.0" width="463" height="424"/>
+                <rect key="frame" x="0.0" y="0.0" width="469" height="439"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <tabView translatesAutoresizingMaskIntoConstraints="NO" id="11">
-                        <rect key="frame" x="13" y="40" width="437" height="378"/>
+                        <rect key="frame" x="13" y="51" width="443" height="382"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <font key="font" metaFont="system"/>
                         <tabViewItems>
                             <tabViewItem label="Controller 1" identifier="pad1" id="9">
                                 <view key="view" id="7">
-                                    <rect key="frame" x="10" y="33" width="417" height="332"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <rect key="frame" x="10" y="33" width="423" height="336"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="167">
-                                            <rect key="frame" x="0.0" y="0.0" width="417" height="332"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="423" height="336"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="336" id="MAN-ya-b9q"/>
+                                                <constraint firstAttribute="width" constant="423" id="bGa-w5-ZON"/>
+                                            </constraints>
                                         </customView>
                                     </subviews>
                                     <constraints>
@@ -45,24 +49,30 @@
                                         <constraint firstItem="167" firstAttribute="centerX" secondItem="7" secondAttribute="centerX" id="217"/>
                                         <constraint firstItem="167" firstAttribute="leading" secondItem="7" secondAttribute="leading" id="218"/>
                                         <constraint firstItem="167" firstAttribute="top" secondItem="7" secondAttribute="top" id="219"/>
+                                        <constraint firstAttribute="trailing" secondItem="167" secondAttribute="trailing" id="wJQ-EB-TUD"/>
                                     </constraints>
                                 </view>
                             </tabViewItem>
                             <tabViewItem label="Controller 2" identifier="pad2" id="8">
                                 <view key="view" id="10">
-                                    <rect key="frame" x="10" y="33" width="417" height="332"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <rect key="frame" x="10" y="33" width="423" height="336"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="153">
-                                            <rect key="frame" x="0.0" y="0.0" width="417" height="332"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="423" height="336"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="423" id="H35-Lr-OgY"/>
+                                                <constraint firstAttribute="height" constant="336" id="HBB-Jg-lOB"/>
+                                            </constraints>
                                         </customView>
                                     </subviews>
                                     <constraints>
                                         <constraint firstItem="153" firstAttribute="centerX" secondItem="10" secondAttribute="centerX" id="228"/>
-                                        <constraint firstItem="153" firstAttribute="top" secondItem="10" secondAttribute="top" id="229"/>
-                                        <constraint firstItem="153" firstAttribute="bottom" secondItem="10" secondAttribute="bottom" id="230"/>
-                                        <constraint firstItem="153" firstAttribute="leading" secondItem="10" secondAttribute="leading" id="231"/>
+                                        <constraint firstAttribute="trailing" secondItem="153" secondAttribute="trailing" id="H5E-3k-Mwf"/>
+                                        <constraint firstItem="153" firstAttribute="top" secondItem="10" secondAttribute="top" id="NXD-eg-6me"/>
+                                        <constraint firstItem="153" firstAttribute="leading" secondItem="10" secondAttribute="leading" id="QMU-g8-NKt"/>
+                                        <constraint firstAttribute="bottom" secondItem="153" secondAttribute="bottom" id="npc-la-Czu"/>
                                     </constraints>
                                 </view>
                             </tabViewItem>
@@ -72,7 +82,7 @@
                         </connections>
                     </tabView>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="256">
-                        <rect key="frame" x="390" y="13" width="59" height="32"/>
+                        <rect key="frame" x="396" y="13" width="59" height="32"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="257">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -86,7 +96,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="261">
-                        <rect key="frame" x="308" y="13" width="82" height="32"/>
+                        <rect key="frame" x="314" y="13" width="82" height="32"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="262">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -104,11 +114,11 @@ Gw
                     <constraint firstAttribute="trailing" secondItem="11" secondAttribute="trailing" constant="20" symbolic="YES" id="220"/>
                     <constraint firstItem="11" firstAttribute="top" secondItem="6" secondAttribute="top" constant="12" symbolic="YES" id="223"/>
                     <constraint firstItem="11" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="20" symbolic="YES" id="225"/>
-                    <constraint firstAttribute="bottom" secondItem="11" secondAttribute="bottom" constant="50" id="252"/>
                     <constraint firstAttribute="bottom" secondItem="256" secondAttribute="bottom" constant="20" symbolic="YES" id="259"/>
                     <constraint firstItem="256" firstAttribute="leading" secondItem="261" secondAttribute="trailing" constant="12" symbolic="YES" id="263"/>
-                    <constraint firstAttribute="bottom" secondItem="261" secondAttribute="bottom" constant="20" symbolic="YES" id="264"/>
                     <constraint firstAttribute="trailing" secondItem="256" secondAttribute="trailing" constant="20" symbolic="YES" id="267"/>
+                    <constraint firstItem="261" firstAttribute="baseline" secondItem="256" secondAttribute="baseline" id="C2F-N8-ou7"/>
+                    <constraint firstItem="261" firstAttribute="top" secondItem="11" secondAttribute="bottom" constant="20" symbolic="YES" id="Iaf-EF-wEU"/>
                 </constraints>
             </view>
         </window>
@@ -117,20 +127,20 @@ Gw
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="194">
-                    <rect key="frame" x="17" y="302" width="49" height="14"/>
+                    <rect key="frame" x="17" y="300" width="43" height="14"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="43" id="275"/>
-                    </constraints>
-                    <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="Device:" id="208">
+                    <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Device:" id="208">
                         <font key="font" metaFont="smallSystem"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <popUpButton verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="189">
-                    <rect key="frame" x="68" y="297" width="195" height="22"/>
+                    <rect key="frame" x="62" y="295" width="195" height="22"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="189" id="4yb-mx-WCf"/>
+                    </constraints>
                     <popUpButtonCell key="cell" type="push" title="(Keyboard only)" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="192" id="207">
                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="smallSystem"/>
@@ -145,31 +155,25 @@ Gw
                     </connections>
                 </popUpButton>
                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="185">
-                    <rect key="frame" x="59" y="8" width="304" height="14"/>
+                    <rect key="frame" x="60" y="8" width="302" height="14"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="298" id="282"/>
-                    </constraints>
-                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="To reset an entry: Select it and press the delete '←' key" id="206">
+                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="To reset an entry: Select it and press the delete '←' key" id="206">
                         <font key="font" metaFont="smallSystem"/>
                         <color key="textColor" white="0.25" alpha="1" colorSpace="calibratedWhite"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="132">
-                    <rect key="frame" x="265" y="302" width="34" height="14"/>
+                <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="132">
+                    <rect key="frame" x="259" y="300" width="40" height="14"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="28" id="276"/>
-                    </constraints>
-                    <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="Type:" id="205">
+                    <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Type:" id="205">
                         <font key="font" metaFont="smallSystem"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <popUpButton verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="126">
-                    <rect key="frame" x="301" y="297" width="105" height="22"/>
+                    <rect key="frame" x="301" y="295" width="105" height="22"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="99" id="236"/>
@@ -189,14 +193,14 @@ Gw
                     </connections>
                 </popUpButton>
                 <scrollView horizontalLineScroll="16" horizontalPageScroll="10" verticalLineScroll="16" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="121">
-                    <rect key="frame" x="20" y="30" width="383" height="262"/>
+                    <rect key="frame" x="20" y="30" width="383" height="260"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <clipView key="contentView" id="xit-lf-WfZ">
-                        <rect key="frame" x="1" y="17" width="381" height="244"/>
+                        <rect key="frame" x="1" y="17" width="381" height="242"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView verticalHuggingPriority="750" tag="1" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="14" headerView="212" id="123">
-                                <rect key="frame" x="0.0" y="0.0" width="381" height="244"/>
+                                <rect key="frame" x="0.0" y="0.0" width="381" height="242"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <size key="intercellSpacing" width="3" height="2"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -241,7 +245,7 @@ Gw
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                     <scroller key="verticalScroller" verticalHuggingPriority="750" id="210">
-                        <rect key="frame" x="366" y="17" width="16" height="244"/>
+                        <rect key="frame" x="366" y="17" width="16" height="242"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                     <tableHeaderView key="headerView" id="212">
@@ -253,19 +257,19 @@ Gw
             <constraints>
                 <constraint firstItem="126" firstAttribute="leading" secondItem="132" secondAttribute="trailing" constant="8" symbolic="YES" id="238"/>
                 <constraint firstAttribute="trailing" secondItem="121" secondAttribute="trailing" constant="20" symbolic="YES" id="240"/>
-                <constraint firstItem="189" firstAttribute="baseline" secondItem="132" secondAttribute="baseline" id="243"/>
-                <constraint firstItem="132" firstAttribute="baseline" secondItem="126" secondAttribute="baseline" id="244"/>
                 <constraint firstItem="121" firstAttribute="leading" secondItem="16" secondAttribute="leading" constant="20" symbolic="YES" id="246"/>
                 <constraint firstAttribute="trailing" secondItem="126" secondAttribute="trailing" constant="20" symbolic="YES" id="247"/>
                 <constraint firstItem="132" firstAttribute="leading" secondItem="189" secondAttribute="trailing" constant="8" symbolic="YES" id="248"/>
-                <constraint firstItem="132" firstAttribute="top" secondItem="16" secondAttribute="top" constant="20" symbolic="YES" id="250"/>
-                <constraint firstItem="194" firstAttribute="leading" secondItem="16" secondAttribute="leading" constant="20" symbolic="YES" id="273"/>
-                <constraint firstItem="194" firstAttribute="top" secondItem="16" secondAttribute="top" constant="20" symbolic="YES" id="274"/>
                 <constraint firstItem="189" firstAttribute="leading" secondItem="194" secondAttribute="trailing" constant="8" symbolic="YES" id="277"/>
-                <constraint firstItem="121" firstAttribute="top" secondItem="189" secondAttribute="bottom" constant="8" symbolic="YES" id="279"/>
                 <constraint firstItem="185" firstAttribute="centerX" secondItem="121" secondAttribute="centerX" id="284"/>
                 <constraint firstAttribute="bottom" secondItem="185" secondAttribute="bottom" constant="8" id="290"/>
                 <constraint firstItem="185" firstAttribute="top" secondItem="121" secondAttribute="bottom" constant="8" symbolic="YES" id="291"/>
+                <constraint firstItem="121" firstAttribute="top" secondItem="126" secondAttribute="bottom" constant="8" symbolic="YES" id="1x0-zI-e7A"/>
+                <constraint firstItem="132" firstAttribute="baseline" secondItem="194" secondAttribute="baseline" id="BCf-9Q-wD8"/>
+                <constraint firstItem="132" firstAttribute="baseline" secondItem="126" secondAttribute="baseline" id="Gpf-Vs-HAL"/>
+                <constraint firstItem="189" firstAttribute="top" secondItem="16" secondAttribute="top" constant="20" symbolic="YES" id="kWH-eJ-7CV"/>
+                <constraint firstItem="194" firstAttribute="leading" secondItem="16" secondAttribute="leading" constant="20" symbolic="YES" id="nGT-PI-3rO"/>
+                <constraint firstItem="132" firstAttribute="baseline" secondItem="189" secondAttribute="baseline" id="sA6-sv-wIf"/>
             </constraints>
             <connections>
                 <outlet property="deviceMenu" destination="189" id="200"/>
diff --git a/macosx/plugins/DFNet/English.lproj/DFNet.xib b/macosx/plugins/DFNet/English.lproj/DFNet.xib
index b90f5b13..d1113943 100644
--- a/macosx/plugins/DFNet/English.lproj/DFNet.xib
+++ b/macosx/plugins/DFNet/English.lproj/DFNet.xib
@@ -55,30 +55,27 @@
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="19">
-                        <rect key="frame" x="17" y="120" width="75" height="17"/>
+                        <rect key="frame" x="17" y="120" width="104" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="IP Address:" id="20">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="IP Address:" id="20">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="21">
-                        <rect key="frame" x="17" y="88" width="38" height="17"/>
+                        <rect key="frame" x="17" y="88" width="104" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="32" id="32"/>
-                        </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Port:" id="22">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Port:" id="22">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="24">
-                        <rect key="frame" x="17" y="56" width="101" height="17"/>
+                        <rect key="frame" x="17" y="56" width="104" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Player Number:" id="25">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Player Number:" id="25">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -130,11 +127,8 @@ Gw
                     <constraint firstItem="17" firstAttribute="leading" secondItem="9" secondAttribute="leading" id="46"/>
                     <constraint firstItem="21" firstAttribute="leading" secondItem="2" secondAttribute="leading" constant="20" symbolic="YES" id="47"/>
                     <constraint firstItem="19" firstAttribute="leading" secondItem="2" secondAttribute="leading" constant="20" symbolic="YES" id="48"/>
-                    <constraint firstAttribute="trailing" secondItem="17" secondAttribute="trailing" constant="20" symbolic="YES" id="49"/>
-                    <constraint firstAttribute="trailing" secondItem="26" secondAttribute="trailing" constant="20" symbolic="YES" id="52"/>
                     <constraint firstAttribute="bottom" secondItem="54" secondAttribute="bottom" constant="20" symbolic="YES" id="57"/>
                     <constraint firstAttribute="trailing" secondItem="54" secondAttribute="trailing" constant="20" symbolic="YES" id="58"/>
-                    <constraint firstAttribute="bottom" secondItem="59" secondAttribute="bottom" constant="20" symbolic="YES" id="61"/>
                     <constraint firstItem="54" firstAttribute="leading" secondItem="59" secondAttribute="trailing" constant="12" symbolic="YES" id="63"/>
                     <constraint firstItem="9" firstAttribute="top" secondItem="2" secondAttribute="top" constant="20" symbolic="YES" id="72"/>
                     <constraint firstItem="19" firstAttribute="baseline" secondItem="9" secondAttribute="baseline" id="74"/>
@@ -143,6 +137,12 @@ Gw
                     <constraint firstItem="26" firstAttribute="top" secondItem="17" secondAttribute="bottom" constant="10" symbolic="YES" id="82"/>
                     <constraint firstItem="24" firstAttribute="baseline" secondItem="26" secondAttribute="baseline" id="83"/>
                     <constraint firstItem="24" firstAttribute="leading" secondItem="2" secondAttribute="leading" constant="20" symbolic="YES" id="84"/>
+                    <constraint firstItem="54" firstAttribute="baseline" secondItem="59" secondAttribute="baseline" id="Hiw-cw-hgP"/>
+                    <constraint firstItem="26" firstAttribute="leading" secondItem="24" secondAttribute="trailing" constant="8" symbolic="YES" id="Z3c-SU-FF9"/>
+                    <constraint firstItem="9" firstAttribute="leading" secondItem="19" secondAttribute="trailing" constant="8" symbolic="YES" id="khN-2J-vyq"/>
+                    <constraint firstItem="17" firstAttribute="leading" secondItem="21" secondAttribute="trailing" constant="8" symbolic="YES" id="qkM-ee-2DJ"/>
+                    <constraint firstItem="9" firstAttribute="trailing" secondItem="26" secondAttribute="trailing" id="tih-ev-TML"/>
+                    <constraint firstItem="9" firstAttribute="trailing" secondItem="17" secondAttribute="trailing" id="yvV-4Z-Fpf"/>
                 </constraints>
             </view>
         </window>
diff --git a/macosx/plugins/DFNet/English.lproj/SockDialog.xib b/macosx/plugins/DFNet/English.lproj/SockDialog.xib
index 8b42bf95..0f9b82ba 100644
--- a/macosx/plugins/DFNet/English.lproj/SockDialog.xib
+++ b/macosx/plugins/DFNet/English.lproj/SockDialog.xib
@@ -13,19 +13,19 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" wantsToBeColor="NO" animationBehavior="default" id="1">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+        <window title="Connecting…" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" wantsToBeColor="NO" animationBehavior="default" id="1">
+            <windowStyleMask key="styleMask" titled="YES" texturedBackground="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="371" width="380" height="124"/>
+            <rect key="contentRect" x="196" y="371" width="259" height="124"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
             <value key="minSize" type="size" width="380" height="140"/>
             <value key="maxSize" type="size" width="380" height="140"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="380" height="124"/>
+                <rect key="frame" x="0.0" y="0.0" width="259" height="124"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3">
-                        <rect key="frame" x="78" y="87" width="225" height="17"/>
+                        <rect key="frame" x="17" y="87" width="225" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="219" id="11"/>
@@ -37,14 +37,14 @@
                         </textFieldCell>
                     </textField>
                     <progressIndicator verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="6">
-                        <rect key="frame" x="103" y="60" width="174" height="20"/>
+                        <rect key="frame" x="42" y="60" width="174" height="20"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="174" id="19"/>
                         </constraints>
                     </progressIndicator>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="26">
-                        <rect key="frame" x="149" y="13" width="82" height="32"/>
+                        <rect key="frame" x="88" y="13" width="82" height="32"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="27">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -60,11 +60,13 @@ Gw
                 </subviews>
                 <constraints>
                     <constraint firstItem="3" firstAttribute="top" secondItem="2" secondAttribute="top" constant="20" symbolic="YES" id="14"/>
-                    <constraint firstItem="3" firstAttribute="centerX" secondItem="6" secondAttribute="centerX" id="17"/>
                     <constraint firstItem="6" firstAttribute="top" secondItem="3" secondAttribute="bottom" constant="8" symbolic="YES" id="21"/>
-                    <constraint firstItem="26" firstAttribute="centerX" secondItem="2" secondAttribute="centerX" id="28"/>
                     <constraint firstAttribute="bottom" secondItem="26" secondAttribute="bottom" constant="20" symbolic="YES" id="29"/>
-                    <constraint firstItem="26" firstAttribute="centerX" secondItem="6" secondAttribute="centerX" id="30"/>
+                    <constraint firstItem="3" firstAttribute="leading" secondItem="2" secondAttribute="leading" constant="20" symbolic="YES" id="5Ll-g2-DWG"/>
+                    <constraint firstItem="26" firstAttribute="top" secondItem="6" secondAttribute="bottom" constant="20" symbolic="YES" id="EeQ-6H-ewJ"/>
+                    <constraint firstAttribute="trailing" secondItem="3" secondAttribute="trailing" constant="20" symbolic="YES" id="WGc-wJ-nm5"/>
+                    <constraint firstAttribute="centerX" secondItem="26" secondAttribute="centerX" id="aG8-6a-4Pp"/>
+                    <constraint firstAttribute="centerX" secondItem="6" secondAttribute="centerX" id="dae-LS-2An"/>
                 </constraints>
             </view>
         </window>
diff --git a/macosx/plugins/DFSound/Resorces/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib b/macosx/plugins/DFSound/Resorces/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib
index b7edfa6f..76f30af9 100644
--- a/macosx/plugins/DFSound/Resorces/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib
+++ b/macosx/plugins/DFSound/Resorces/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib
@@ -30,14 +30,14 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <box title="General Settings" translatesAutoresizingMaskIntoConstraints="NO" id="9">
-                        <rect key="frame" x="17" y="173" width="432" height="144"/>
+                        <rect key="frame" x="17" y="161" width="432" height="156"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <view key="contentView">
-                            <rect key="frame" x="2" y="2" width="428" height="127"/>
+                            <rect key="frame" x="2" y="2" width="428" height="139"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="11">
-                                    <rect key="frame" x="13" y="86" width="96" height="17"/>
+                                    <rect key="frame" x="13" y="98" width="96" height="17"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="90" id="157"/>
@@ -50,7 +50,7 @@
                                     </textFieldCell>
                                 </textField>
                                 <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="12" customClass="NamedSlider">
-                                    <rect key="frame" x="127" y="84" width="144" height="26"/>
+                                    <rect key="frame" x="127" y="96" width="144" height="26"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="140" id="122"/>
@@ -64,7 +64,7 @@
                                     </connections>
                                 </slider>
                                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="15">
-                                    <rect key="frame" x="13" y="54" width="96" height="17"/>
+                                    <rect key="frame" x="13" y="66" width="96" height="17"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="17" id="227"/>
@@ -76,7 +76,7 @@
                                     </textFieldCell>
                                 </textField>
                                 <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="16" customClass="NamedSlider">
-                                    <rect key="frame" x="127" y="52" width="144" height="26"/>
+                                    <rect key="frame" x="127" y="64" width="144" height="26"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <sliderCell key="cell" continuous="YES" alignment="left" maxValue="3" doubleValue="1" tickMarkPosition="above" numberOfTickMarks="4" allowsTickMarkValuesOnly="YES" sliderType="linear" id="83">
                                         <font key="font" size="12" name="Helvetica"/>
@@ -86,7 +86,7 @@
                                     </connections>
                                 </slider>
                                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="17">
-                                    <rect key="frame" x="274" y="86" width="133" height="17"/>
+                                    <rect key="frame" x="274" y="98" width="133" height="17"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="127" id="129"/>
@@ -98,7 +98,7 @@
                                     </textFieldCell>
                                 </textField>
                                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="18">
-                                    <rect key="frame" x="274" y="54" width="133" height="17"/>
+                                    <rect key="frame" x="274" y="66" width="133" height="17"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="(Simple Interpolation)" id="85">
                                         <font key="font" metaFont="smallSystem"/>
@@ -107,7 +107,7 @@
                                     </textFieldCell>
                                 </textField>
                                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="69">
-                                    <rect key="frame" x="14" y="26" width="96" height="17"/>
+                                    <rect key="frame" x="14" y="38" width="96" height="17"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="90" id="182"/>
@@ -119,7 +119,7 @@
                                     </textFieldCell>
                                 </textField>
                                 <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="70" customClass="NamedSlider">
-                                    <rect key="frame" x="127" y="20" width="144" height="26"/>
+                                    <rect key="frame" x="127" y="32" width="144" height="26"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <sliderCell key="cell" continuous="YES" alignment="left" maxValue="4" doubleValue="3" tickMarkPosition="above" numberOfTickMarks="5" allowsTickMarkValuesOnly="YES" sliderType="linear" id="87">
                                         <font key="font" size="12" name="Helvetica"/>
@@ -130,7 +130,7 @@
                                     </connections>
                                 </slider>
                                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="71">
-                                    <rect key="frame" x="274" y="26" width="133" height="17"/>
+                                    <rect key="frame" x="274" y="38" width="133" height="17"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="17" id="224"/>
@@ -151,7 +151,6 @@
                             <constraint firstItem="12" firstAttribute="baseline" secondItem="11" secondAttribute="baseline" id="137"/>
                             <constraint firstItem="16" firstAttribute="baseline" secondItem="15" secondAttribute="baseline" id="140"/>
                             <constraint firstItem="12" firstAttribute="leading" secondItem="9" secondAttribute="leading" constant="128" id="141"/>
-                            <constraint firstItem="12" firstAttribute="top" secondItem="9" secondAttribute="top" constant="32" id="145"/>
                             <constraint firstItem="71" firstAttribute="trailing" secondItem="18" secondAttribute="trailing" id="147"/>
                             <constraint firstItem="11" firstAttribute="leading" secondItem="15" secondAttribute="leading" id="148"/>
                             <constraint firstItem="11" firstAttribute="leading" secondItem="9" secondAttribute="leading" constant="15" id="149"/>
@@ -168,17 +167,17 @@
                             <constraint firstItem="18" firstAttribute="baseline" secondItem="16" secondAttribute="baseline" id="222"/>
                             <constraint firstItem="70" firstAttribute="centerY" secondItem="69" secondAttribute="centerY" id="225"/>
                             <constraint firstItem="15" firstAttribute="top" secondItem="18" secondAttribute="top" id="226"/>
-                            <constraint firstAttribute="bottom" secondItem="70" secondAttribute="bottom" constant="20" id="228"/>
                             <constraint firstItem="71" firstAttribute="baseline" secondItem="69" secondAttribute="baseline" id="229"/>
+                            <constraint firstItem="12" firstAttribute="top" secondItem="9" secondAttribute="top" constant="32" id="NZC-Zb-1uZ"/>
                         </constraints>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     </box>
                     <box title="XA Music" translatesAutoresizingMaskIntoConstraints="NO" id="19">
-                        <rect key="frame" x="246" y="69" width="203" height="100"/>
+                        <rect key="frame" x="258" y="57" width="191" height="100"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <view key="contentView">
-                            <rect key="frame" x="2" y="2" width="199" height="83"/>
+                            <rect key="frame" x="2" y="2" width="187" height="83"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <matrix verticalHuggingPriority="750" mode="highlight" allowsEmptySelection="NO" autosizesCells="NO" translatesAutoresizingMaskIntoConstraints="NO" id="233">
@@ -204,22 +203,24 @@
                         <constraints>
                             <constraint firstItem="233" firstAttribute="leading" secondItem="19" secondAttribute="leading" constant="16" id="240"/>
                             <constraint firstItem="233" firstAttribute="top" secondItem="19" secondAttribute="top" constant="25" id="247"/>
+                            <constraint firstAttribute="trailing" secondItem="233" secondAttribute="trailing" constant="16" id="685-id-VwW"/>
+                            <constraint firstAttribute="bottom" secondItem="233" secondAttribute="bottom" constant="53" id="s0x-In-827"/>
                         </constraints>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     </box>
                     <box title="Misc" translatesAutoresizingMaskIntoConstraints="NO" id="24">
-                        <rect key="frame" x="17" y="69" width="227" height="100"/>
+                        <rect key="frame" x="17" y="57" width="221" height="100"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <view key="contentView">
-                            <rect key="frame" x="2" y="2" width="223" height="83"/>
+                            <rect key="frame" x="2" y="2" width="217" height="83"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <matrix verticalHuggingPriority="750" mode="highlight" allowsEmptySelection="NO" autosizesCells="NO" translatesAutoresizingMaskIntoConstraints="NO" id="196">
-                                    <rect key="frame" x="17" y="13" width="199" height="60"/>
+                                    <rect key="frame" x="17" y="13" width="189" height="60"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                    <size key="cellSize" width="199" height="18"/>
+                                    <size key="cellSize" width="189" height="18"/>
                                     <size key="intercellSpacing" width="0.0" height="3"/>
                                     <buttonCell key="prototype" type="check" title="High Compatibility Mode" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="197">
                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -247,7 +248,8 @@
                         <constraints>
                             <constraint firstItem="196" firstAttribute="top" secondItem="24" secondAttribute="top" constant="25" id="206"/>
                             <constraint firstItem="196" firstAttribute="leading" secondItem="24" secondAttribute="leading" constant="16" id="207"/>
-                            <constraint firstAttribute="bottom" secondItem="196" secondAttribute="bottom" constant="11" id="209"/>
+                            <constraint firstAttribute="bottom" secondItem="196" secondAttribute="bottom" constant="11" id="PEg-kx-UCc"/>
+                            <constraint firstAttribute="trailing" secondItem="196" secondAttribute="trailing" constant="10" id="keZ-Mg-22z"/>
                         </constraints>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -301,14 +303,14 @@ Gw
                     <constraint firstAttribute="bottom" secondItem="162" secondAttribute="bottom" constant="20" symbolic="YES" id="164"/>
                     <constraint firstAttribute="trailing" secondItem="162" secondAttribute="trailing" constant="20" symbolic="YES" id="165"/>
                     <constraint firstItem="162" firstAttribute="leading" secondItem="166" secondAttribute="trailing" constant="12" symbolic="YES" id="169"/>
-                    <constraint firstAttribute="bottom" secondItem="166" secondAttribute="bottom" constant="20" symbolic="YES" id="170"/>
                     <constraint firstItem="171" firstAttribute="leading" secondItem="5" secondAttribute="leading" constant="20" symbolic="YES" id="173"/>
-                    <constraint firstAttribute="bottom" secondItem="171" secondAttribute="bottom" constant="20" symbolic="YES" id="174"/>
-                    <constraint firstItem="19" firstAttribute="top" secondItem="9" secondAttribute="bottom" constant="8" symbolic="YES" id="188"/>
                     <constraint firstItem="24" firstAttribute="top" secondItem="9" secondAttribute="bottom" constant="8" symbolic="YES" id="189"/>
                     <constraint firstItem="24" firstAttribute="baseline" secondItem="19" secondAttribute="baseline" id="210"/>
-                    <constraint firstItem="19" firstAttribute="leading" secondItem="24" secondAttribute="trailing" constant="8" symbolic="YES" id="213"/>
-                    <constraint firstItem="19" firstAttribute="leading" secondItem="5" secondAttribute="leading" constant="249" id="214"/>
+                    <constraint firstItem="19" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="24" secondAttribute="trailing" constant="8" symbolic="YES" id="213"/>
+                    <constraint firstItem="162" firstAttribute="baseline" secondItem="166" secondAttribute="baseline" id="2K2-D5-vWF"/>
+                    <constraint firstItem="24" firstAttribute="bottom" secondItem="19" secondAttribute="bottom" id="Piu-cZ-ar8"/>
+                    <constraint firstItem="171" firstAttribute="top" secondItem="24" secondAttribute="bottom" constant="20" symbolic="YES" id="ZcK-sY-WDH"/>
+                    <constraint firstItem="162" firstAttribute="baseline" secondItem="171" secondAttribute="baseline" id="qDt-F5-FPQ"/>
                 </constraints>
             </view>
             <connections>
diff --git a/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.xib b/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.xib
index 8a92f7e8..53f86024 100644
--- a/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.xib
+++ b/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.xib
@@ -38,19 +38,16 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <box title="Hacks" translatesAutoresizingMaskIntoConstraints="NO" id="76">
-                        <rect key="frame" x="17" y="213" width="432" height="192"/>
+                        <rect key="frame" x="17" y="190" width="432" height="217"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <view key="contentView">
-                            <rect key="frame" x="2" y="2" width="428" height="175"/>
+                            <rect key="frame" x="2" y="2" width="428" height="200"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="74">
-                                    <rect key="frame" x="33" y="137" width="362" height="28"/>
+                                    <rect key="frame" x="39" y="148" width="351" height="42"/>
                                     <autoresizingMask key="autoresizingMask"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="356" id="318"/>
-                                    </constraints>
-                                    <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" id="162">
+                                    <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="center" id="162">
                                         <font key="font" metaFont="smallSystem"/>
                                         <string key="title">Only enable a hack to fix a specific problem in a game.
 Hold the mouse over a checkbox to get more information about it.</string>
@@ -59,7 +56,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
                                     </textFieldCell>
                                 </textField>
                                 <matrix verticalHuggingPriority="750" mode="highlight" allowsEmptySelection="NO" autosizesCells="NO" translatesAutoresizingMaskIntoConstraints="NO" id="530">
-                                    <rect key="frame" x="20" y="31" width="388" height="98"/>
+                                    <rect key="frame" x="20" y="42" width="388" height="98"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     <size key="cellSize" width="192" height="18"/>
@@ -121,32 +118,29 @@ Hold the mouse over a checkbox to get more information about it.</string>
                             <constraint firstItem="74" firstAttribute="top" secondItem="76" secondAttribute="top" constant="25" id="396"/>
                             <constraint firstItem="530" firstAttribute="top" secondItem="74" secondAttribute="bottom" constant="8" symbolic="YES" id="545"/>
                             <constraint firstItem="530" firstAttribute="centerX" secondItem="76" secondAttribute="centerX" id="548"/>
-                            <constraint firstItem="530" firstAttribute="centerX" secondItem="74" secondAttribute="centerX" id="549"/>
+                            <constraint firstAttribute="centerX" secondItem="74" secondAttribute="centerX" id="FQU-NU-T1y"/>
                         </constraints>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     </box>
                     <box title="Display Settings" translatesAutoresizingMaskIntoConstraints="NO" id="89">
-                        <rect key="frame" x="17" y="409" width="220" height="135"/>
+                        <rect key="frame" x="17" y="411" width="220" height="133"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <view key="contentView">
-                            <rect key="frame" x="2" y="2" width="216" height="118"/>
+                            <rect key="frame" x="2" y="2" width="216" height="116"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <button hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="93">
-                                    <rect key="frame" x="18" y="32" width="189" height="18"/>
+                                    <rect key="frame" x="18" y="30" width="173" height="18"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <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>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="185" id="308"/>
-                                    </constraints>
                                     <buttonCell key="cell" type="check" title="Sync to Monitor Refresh" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="172">
                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                         <font key="font" metaFont="system"/>
                                     </buttonCell>
                                 </button>
                                 <button toolTip="Skip rendering frames to improve overall speed when needed. This setting might cause compatibility problems" translatesAutoresizingMaskIntoConstraints="NO" id="96">
-                                    <rect key="frame" x="18" y="72" width="147" height="18"/>
+                                    <rect key="frame" x="18" y="70" width="147" height="18"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <buttonCell key="cell" type="check" title="Use Frame Skipping" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="173">
                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -154,7 +148,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
                                     </buttonCell>
                                 </button>
                                 <button toolTip="When Enabled a small counter will show the current performance of the rendering measured in Frames Per Second (FPS)" translatesAutoresizingMaskIntoConstraints="NO" id="97">
-                                    <rect key="frame" x="18" y="92" width="148" height="18"/>
+                                    <rect key="frame" x="18" y="90" width="148" height="18"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <buttonCell key="cell" type="check" title="Display FPS Counter" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="174">
                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -162,7 +156,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
                                     </buttonCell>
                                 </button>
                                 <button hidden="YES" toolTip="Automatically enter full screen mode" translatesAutoresizingMaskIntoConstraints="NO" id="99">
-                                    <rect key="frame" x="18" y="52" width="125" height="18"/>
+                                    <rect key="frame" x="18" y="50" width="125" height="18"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <buttonCell key="cell" type="check" title="Auto Full Screen" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="175">
                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -185,18 +179,15 @@ Hold the mouse over a checkbox to get more information about it.</string>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     </box>
                     <box title="Rendering" translatesAutoresizingMaskIntoConstraints="NO" id="107">
-                        <rect key="frame" x="242" y="409" width="207" height="135"/>
+                        <rect key="frame" x="239" y="411" width="210" height="133"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <view key="contentView">
-                            <rect key="frame" x="2" y="2" width="203" height="118"/>
+                            <rect key="frame" x="2" y="2" width="206" height="116"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <textField toolTip="Specify when to use dithering to render colors" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="112">
-                                    <rect key="frame" x="14" y="95" width="144" height="17"/>
+                                    <rect key="frame" x="14" y="93" width="107" height="17"/>
                                     <autoresizingMask key="autoresizingMask"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="138" id="254"/>
-                                    </constraints>
                                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Dither Graphics:" id="176">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -204,14 +195,14 @@ Hold the mouse over a checkbox to get more information about it.</string>
                                     </textFieldCell>
                                 </textField>
                                 <popUpButton toolTip="Specify when to use dithering to render colors" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="116">
-                                    <rect key="frame" x="15" y="63" width="174" height="26"/>
+                                    <rect key="frame" x="15" y="61" width="177" height="26"/>
                                     <autoresizingMask key="autoresizingMask"/>
-                                    <popUpButtonCell key="cell" type="push" title="Never" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="177">
+                                    <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="177">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                        <font key="font" metaFont="system"/>
+                                        <font key="font" metaFont="menu"/>
                                         <menu key="menu" title="OtherViews" id="113">
                                             <items>
-                                                <menuItem title="Never" state="on" id="111"/>
+                                                <menuItem title="Never" id="111"/>
                                                 <menuItem title="When Hinted" id="115"/>
                                                 <menuItem title="Always" id="114"/>
                                             </items>
@@ -219,7 +210,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
                                     </popUpButtonCell>
                                 </popUpButton>
                                 <button toolTip="Enable use of the hacks specified below" translatesAutoresizingMaskIntoConstraints="NO" id="117">
-                                    <rect key="frame" x="15" y="44" width="118" height="18"/>
+                                    <rect key="frame" x="15" y="40" width="118" height="18"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <buttonCell key="cell" type="check" title="Enable Hacks" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="178">
                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -230,7 +221,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
                                     </connections>
                                 </button>
                                 <button translatesAutoresizingMaskIntoConstraints="NO" id="180">
-                                    <rect key="frame" x="15" y="24" width="118" height="18"/>
+                                    <rect key="frame" x="15" y="20" width="118" height="18"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     <buttonCell key="cell" type="check" title="Enable Shaders" bezelStyle="regularSquare" imagePosition="left" inset="2" id="181">
                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -245,27 +236,28 @@ Hold the mouse over a checkbox to get more information about it.</string>
                         <constraints>
                             <constraint firstItem="112" firstAttribute="top" secondItem="107" secondAttribute="top" constant="21" id="309"/>
                             <constraint firstItem="116" firstAttribute="top" secondItem="112" secondAttribute="bottom" constant="8" symbolic="YES" id="310"/>
-                            <constraint firstItem="116" firstAttribute="leading" secondItem="107" secondAttribute="leading" constant="16" id="311"/>
-                            <constraint firstItem="180" firstAttribute="leading" secondItem="107" secondAttribute="leading" constant="16" id="574"/>
-                            <constraint firstItem="117" firstAttribute="leading" secondItem="107" secondAttribute="leading" constant="16" id="582"/>
                             <constraint firstItem="112" firstAttribute="leading" secondItem="107" secondAttribute="leading" constant="16" id="583"/>
-                            <constraint firstItem="117" firstAttribute="top" secondItem="107" secondAttribute="top" constant="73" id="590"/>
                             <constraint firstItem="180" firstAttribute="top" secondItem="117" secondAttribute="bottom" constant="6" symbolic="YES" id="591"/>
                             <constraint firstAttribute="trailing" secondItem="116" secondAttribute="trailing" constant="16" id="592"/>
                             <constraint firstItem="180" firstAttribute="trailing" secondItem="117" secondAttribute="trailing" id="593"/>
+                            <constraint firstItem="117" firstAttribute="leading" secondItem="180" secondAttribute="leading" id="E8l-1O-t2W"/>
+                            <constraint firstItem="117" firstAttribute="top" secondItem="116" secondAttribute="bottom" constant="8" symbolic="YES" id="edX-A9-gv2"/>
+                            <constraint firstItem="117" firstAttribute="leading" secondItem="112" secondAttribute="leading" id="rCK-rd-Jyw"/>
+                            <constraint firstAttribute="bottom" secondItem="180" secondAttribute="bottom" constant="20" id="ttc-Yy-itN"/>
+                            <constraint firstItem="117" firstAttribute="leading" secondItem="116" secondAttribute="leading" id="wDx-5p-e55"/>
                         </constraints>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     </box>
                     <box autoresizesSubviews="NO" title="Shaders" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="179">
-                        <rect key="frame" x="17" y="67" width="432" height="142"/>
+                        <rect key="frame" x="17" y="57" width="432" height="129"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <view key="contentView">
-                            <rect key="frame" x="1" y="1" width="430" height="126"/>
+                            <rect key="frame" x="1" y="1" width="430" height="113"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="182">
-                                    <rect key="frame" x="333" y="88" width="89" height="32"/>
+                                    <rect key="frame" x="333" y="75" width="89" height="32"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     <buttonCell key="cell" type="push" title="Select..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="183">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -276,7 +268,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
                                     </connections>
                                 </button>
                                 <button verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="184">
-                                    <rect key="frame" x="333" y="55" width="89" height="32"/>
+                                    <rect key="frame" x="333" y="42" width="89" height="32"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     <buttonCell key="cell" type="push" title="Select..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="185">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -287,7 +279,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
                                     </connections>
                                 </button>
                                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="186">
-                                    <rect key="frame" x="85" y="98" width="249" height="17"/>
+                                    <rect key="frame" x="85" y="85" width="249" height="17"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="243" id="255"/>
@@ -299,7 +291,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
                                     </textFieldCell>
                                 </textField>
                                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="188">
-                                    <rect key="frame" x="85" y="65" width="249" height="17"/>
+                                    <rect key="frame" x="85" y="52" width="249" height="17"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="189">
                                         <font key="font" metaFont="system"/>
@@ -308,35 +300,35 @@ Hold the mouse over a checkbox to get more information about it.</string>
                                     </textFieldCell>
                                 </textField>
                                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="194">
-                                    <rect key="frame" x="15" y="98" width="50" height="17"/>
+                                    <rect key="frame" x="15" y="85" width="68" height="17"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Vertex:" id="195">
+                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Vertex:" id="195">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
                                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="196">
-                                    <rect key="frame" x="15" y="65" width="68" height="17"/>
+                                    <rect key="frame" x="15" y="52" width="68" height="17"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Fragment:" id="197">
+                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Fragment:" id="197">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
                                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="219">
-                                    <rect key="frame" x="86" y="26" width="100" height="26"/>
+                                    <rect key="frame" x="86" y="20" width="100" height="26"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="95" id="279"/>
                                     </constraints>
-                                    <popUpButtonCell key="cell" type="push" title="1.0" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" imageScaling="proportionallyDown" inset="2" id="220">
+                                    <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="220">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                        <font key="font" metaFont="system"/>
+                                        <font key="font" metaFont="menu"/>
                                         <menu key="menu" title="OtherViews" id="221">
                                             <items>
-                                                <menuItem title="1.0" state="on" tag="1" id="222">
+                                                <menuItem title="1.0" tag="1" id="222">
                                                     <modifierMask key="keyEquivalentModifierMask"/>
                                                 </menuItem>
                                                 <menuItem title="2.0" tag="2" id="223">
@@ -351,9 +343,9 @@ Hold the mouse over a checkbox to get more information about it.</string>
                                     </popUpButtonCell>
                                 </popUpButton>
                                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="225">
-                                    <rect key="frame" x="15" y="32" width="53" height="17"/>
+                                    <rect key="frame" x="15" y="26" width="68" height="17"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Quality:" id="226">
+                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Quality:" id="226">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -376,9 +368,13 @@ Hold the mouse over a checkbox to get more information about it.</string>
                             <constraint firstItem="188" firstAttribute="baseline" secondItem="184" secondAttribute="baseline" id="337"/>
                             <constraint firstItem="196" firstAttribute="baseline" secondItem="188" secondAttribute="baseline" id="339"/>
                             <constraint firstItem="182" firstAttribute="top" secondItem="179" secondAttribute="top" constant="25" id="347"/>
-                            <constraint firstItem="225" firstAttribute="top" secondItem="196" secondAttribute="bottom" constant="16" id="602"/>
                             <constraint firstItem="219" firstAttribute="baseline" secondItem="225" secondAttribute="baseline" id="604"/>
                             <constraint firstItem="219" firstAttribute="leading" secondItem="188" secondAttribute="leading" id="605"/>
+                            <constraint firstItem="219" firstAttribute="leading" secondItem="225" secondAttribute="trailing" constant="8" symbolic="YES" id="A6p-5D-bmZ"/>
+                            <constraint firstItem="219" firstAttribute="top" secondItem="188" secondAttribute="bottom" constant="8" symbolic="YES" id="KPq-V4-so9"/>
+                            <constraint firstAttribute="bottom" secondItem="219" secondAttribute="bottom" constant="20" id="PEh-P9-5MF"/>
+                            <constraint firstAttribute="trailing" secondItem="182" secondAttribute="trailing" constant="12" id="UCy-BE-x17"/>
+                            <constraint firstItem="186" firstAttribute="leading" secondItem="194" secondAttribute="trailing" constant="8" symbolic="YES" id="a1M-U6-Tbp"/>
                         </constraints>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -431,21 +427,19 @@ Gw
                     <constraint firstItem="381" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="20" symbolic="YES" id="383"/>
                     <constraint firstAttribute="trailing" secondItem="371" secondAttribute="trailing" constant="20" symbolic="YES" id="386"/>
                     <constraint firstAttribute="bottom" secondItem="371" secondAttribute="bottom" constant="20" symbolic="YES" id="387"/>
-                    <constraint firstAttribute="bottom" secondItem="375" secondAttribute="bottom" constant="20" symbolic="YES" id="388"/>
                     <constraint firstItem="371" firstAttribute="leading" secondItem="375" secondAttribute="trailing" constant="12" symbolic="YES" id="389"/>
-                    <constraint firstAttribute="bottom" secondItem="381" secondAttribute="bottom" constant="20" symbolic="YES" id="390"/>
-                    <constraint firstItem="179" firstAttribute="top" secondItem="6" secondAttribute="top" constant="355" id="517"/>
                     <constraint firstItem="107" firstAttribute="top" secondItem="6" secondAttribute="top" constant="20" symbolic="YES" id="560"/>
                     <constraint firstAttribute="trailing" secondItem="107" secondAttribute="trailing" constant="20" symbolic="YES" id="561"/>
                     <constraint firstItem="89" firstAttribute="baseline" secondItem="107" secondAttribute="baseline" id="563"/>
-                    <constraint firstItem="107" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="245" id="575"/>
                     <constraint firstAttribute="trailing" secondItem="89" secondAttribute="trailing" constant="232" id="576"/>
                     <constraint firstItem="76" firstAttribute="top" secondItem="89" secondAttribute="bottom" constant="8" symbolic="YES" id="577"/>
                     <constraint firstItem="76" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="20" symbolic="YES" id="578"/>
-                    <constraint firstItem="76" firstAttribute="top" secondItem="6" secondAttribute="top" constant="159" id="579"/>
                     <constraint firstAttribute="trailing" secondItem="76" secondAttribute="trailing" constant="20" symbolic="YES" id="580"/>
                     <constraint firstItem="179" firstAttribute="top" secondItem="76" secondAttribute="bottom" constant="8" symbolic="YES" id="581"/>
-                    <constraint firstAttribute="bottom" secondItem="179" secondAttribute="bottom" constant="71" id="600"/>
+                    <constraint firstItem="107" firstAttribute="leading" secondItem="89" secondAttribute="trailing" constant="8" symbolic="YES" id="0zX-Nj-tN8"/>
+                    <constraint firstItem="381" firstAttribute="top" secondItem="179" secondAttribute="bottom" constant="20" symbolic="YES" id="adH-hd-tGe"/>
+                    <constraint firstItem="375" firstAttribute="baseline" secondItem="371" secondAttribute="baseline" id="af1-DM-A7k"/>
+                    <constraint firstItem="375" firstAttribute="baseline" secondItem="381" secondAttribute="baseline" id="zZT-Ts-UqV"/>
                 </constraints>
             </view>
             <connections>
diff --git a/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.xib b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.xib
index f892cb16..2bd23f61 100644
--- a/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.xib
+++ b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.xib
@@ -42,15 +42,15 @@
         <window title="GPU Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" wantsToBeColor="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window">
             <windowStyleMask key="styleMask" titled="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="2" y="373" width="611" height="554"/>
+            <rect key="contentRect" x="2" y="373" width="611" height="509"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
             <value key="minSize" type="size" width="283.34100000000001" height="107"/>
             <view key="contentView" id="6">
-                <rect key="frame" x="0.0" y="0.0" width="611" height="554"/>
+                <rect key="frame" x="0.0" y="0.0" width="611" height="509"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <box title="Display Settings" translatesAutoresizingMaskIntoConstraints="NO" id="89">
-                        <rect key="frame" x="17" y="383" width="577" height="151"/>
+                        <rect key="frame" x="17" y="338" width="577" height="151"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <view key="contentView">
                             <rect key="frame" x="2" y="2" width="573" height="134"/>
@@ -114,7 +114,7 @@
                                     </constraints>
                                     <popUpButtonCell key="cell" type="push" title="Current" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="926" id="924">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                        <font key="font" metaFont="system"/>
+                                        <font key="font" metaFont="menu"/>
                                         <menu key="menu" title="OtherViews" id="925">
                                             <items>
                                                 <menuItem title="Current" state="on" id="926"/>
@@ -203,7 +203,6 @@
                             <constraint firstAttribute="trailing" secondItem="785" secondAttribute="trailing" constant="16" id="799"/>
                             <constraint firstItem="785" firstAttribute="top" secondItem="89" secondAttribute="top" constant="25" id="814"/>
                             <constraint firstItem="912" firstAttribute="top" secondItem="910" secondAttribute="bottom" constant="8" symbolic="YES" id="936"/>
-                            <constraint firstItem="908" firstAttribute="trailing" secondItem="911" secondAttribute="trailing" id="938"/>
                             <constraint firstItem="910" firstAttribute="top" secondItem="909" secondAttribute="bottom" constant="8" symbolic="YES" id="939"/>
                             <constraint firstItem="909" firstAttribute="baseline" secondItem="908" secondAttribute="baseline" id="940"/>
                             <constraint firstItem="912" firstAttribute="bottom" secondItem="911" secondAttribute="bottom" id="943"/>
@@ -212,23 +211,23 @@
                             <constraint firstItem="908" firstAttribute="top" secondItem="89" secondAttribute="top" constant="25" id="946"/>
                             <constraint firstItem="908" firstAttribute="leading" secondItem="89" secondAttribute="leading" constant="149" id="947"/>
                             <constraint firstItem="910" firstAttribute="leading" secondItem="89" secondAttribute="leading" constant="16" id="948"/>
+                            <constraint firstAttribute="bottom" secondItem="912" secondAttribute="bottom" constant="22" id="YZu-mL-ucP"/>
+                            <constraint firstAttribute="bottom" secondItem="785" secondAttribute="bottom" constant="24" id="slk-vo-UJi"/>
+                            <constraint firstItem="911" firstAttribute="leading" secondItem="912" secondAttribute="trailing" constant="58" id="zTj-FO-SBY"/>
                         </constraints>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     </box>
                     <box toolTip="If your card supports it, will mix textures more accurately" title="Rendering" translatesAutoresizingMaskIntoConstraints="NO" id="107">
-                        <rect key="frame" x="17" y="74" width="577" height="305"/>
+                        <rect key="frame" x="17" y="57" width="577" height="277"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <view key="contentView">
-                            <rect key="frame" x="2" y="2" width="573" height="288"/>
+                            <rect key="frame" x="2" y="2" width="573" height="260"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <textField toolTip="Specify when to use dithering to render colors" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="112">
-                                    <rect key="frame" x="14" y="260" width="121" height="17"/>
+                                <textField toolTip="Specify when to use dithering to render colors" verticalHuggingPriority="750" horizontalCompressionResistancePriority="671" translatesAutoresizingMaskIntoConstraints="NO" id="112">
+                                    <rect key="frame" x="14" y="232" width="107" height="17"/>
                                     <autoresizingMask key="autoresizingMask"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="115" id="981"/>
-                                    </constraints>
                                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Dither Graphics:" id="383">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -236,14 +235,14 @@
                                     </textFieldCell>
                                 </textField>
                                 <popUpButton toolTip="Specify when to use dithering to render colors" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="116">
-                                    <rect key="frame" x="138" y="254" width="174" height="26"/>
+                                    <rect key="frame" x="124" y="226" width="174" height="26"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="169" id="624"/>
                                     </constraints>
                                     <popUpButtonCell key="cell" type="push" title="When Hinted" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="115" id="384">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                        <font key="font" metaFont="system"/>
+                                        <font key="font" metaFont="menu"/>
                                         <menu key="menu" title="OtherViews" id="113">
                                             <items>
                                                 <menuItem title="Never" id="111"/>
@@ -254,14 +253,14 @@
                                     </popUpButtonCell>
                                 </popUpButton>
                                 <popUpButton toolTip="Use offscreen drawing to remove some graphics glitches" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="202">
-                                    <rect key="frame" x="138" y="227" width="174" height="22"/>
+                                    <rect key="frame" x="124" y="199" width="174" height="22"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="17" id="701"/>
                                     </constraints>
                                     <popUpButtonCell key="cell" type="push" title="Default" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="206" id="393">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                        <font key="font" metaFont="system"/>
+                                        <font key="font" metaFont="menu"/>
                                         <menu key="menu" title="OtherViews" id="203">
                                             <items>
                                                 <menuItem title="None" id="205"/>
@@ -274,33 +273,33 @@
                                     </popUpButtonCell>
                                 </popUpButton>
                                 <textField toolTip="Use offscreen drawing to remove some graphics glitches" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="207">
-                                    <rect key="frame" x="14" y="231" width="121" height="21"/>
+                                    <rect key="frame" x="14" y="203" width="107" height="21"/>
                                     <autoresizingMask key="autoresizingMask"/>
-                                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Offscreen Drawing" id="394">
+                                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Offscreen Drawing:" id="394">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
                                 <box title="Textures" translatesAutoresizingMaskIntoConstraints="NO" id="212">
-                                    <rect key="frame" x="14" y="95" width="351" height="128"/>
+                                    <rect key="frame" x="14" y="71" width="337" height="123"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <view key="contentView">
-                                        <rect key="frame" x="2" y="2" width="347" height="111"/>
+                                        <rect key="frame" x="2" y="2" width="333" height="106"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
                                             <popUpButton toolTip="The color depth of stored textures." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="169">
-                                                <rect key="frame" x="145" y="77" width="188" height="26"/>
+                                                <rect key="frame" x="131" y="72" width="188" height="26"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="183" id="1030"/>
                                                 </constraints>
-                                                <popUpButtonCell key="cell" type="push" title="default" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="395">
+                                                <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="395">
                                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                    <font key="font" metaFont="system"/>
+                                                    <font key="font" metaFont="menu"/>
                                                     <menu key="menu" title="OtherViews" id="170">
                                                         <items>
-                                                            <menuItem title="default" state="on" id="172"/>
+                                                            <menuItem title="default" id="172"/>
                                                             <menuItem title="RGBA 16" id="171"/>
                                                             <menuItem title="R5 G5 B5 A1" id="173"/>
                                                             <menuItem title="RGBA 32" id="250"/>
@@ -310,47 +309,44 @@
                                                 </popUpButtonCell>
                                             </popUpButton>
                                             <textField toolTip="Select a quality level of texture scaling" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="201">
-                                                <rect key="frame" x="13" y="51" width="114" height="17"/>
+                                                <rect key="frame" x="13" y="46" width="115" height="17"/>
                                                 <autoresizingMask key="autoresizingMask"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="width" constant="108" id="734"/>
-                                                </constraints>
-                                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Enhancement" id="398">
+                                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Enhancement:" id="398">
                                                     <font key="font" metaFont="system"/>
                                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
                                             <textField toolTip="Filter textures when scaled. Higher values filter more kinds of textures, i.e. sprites." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="193">
-                                                <rect key="frame" x="14" y="23" width="114" height="17"/>
+                                                <rect key="frame" x="14" y="18" width="114" height="17"/>
                                                 <autoresizingMask key="autoresizingMask"/>
-                                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Filtering" id="397">
+                                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Filtering:" id="397">
                                                     <font key="font" metaFont="system"/>
                                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
                                             <textField toolTip="The color depth of stored textures." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="174">
-                                                <rect key="frame" x="14" y="83" width="114" height="17"/>
+                                                <rect key="frame" x="14" y="78" width="114" height="17"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="108" id="758"/>
                                                 </constraints>
-                                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Color Depth" id="396">
+                                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Color Depth:" id="396">
                                                     <font key="font" metaFont="system"/>
                                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
                                             <slider toolTip="Filter textures when scaled. Higher values filter more kinds of textures, i.e. sprites." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="252">
-                                                <rect key="frame" x="145" y="17" width="187" height="26"/>
+                                                <rect key="frame" x="131" y="12" width="187" height="26"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <sliderCell key="cell" alignment="left" maxValue="6" tickMarkPosition="above" numberOfTickMarks="7" allowsTickMarkValuesOnly="YES" sliderType="linear" id="399">
                                                     <font key="font" size="12" name="Helvetica"/>
                                                 </sliderCell>
                                             </slider>
                                             <slider toolTip="Select a quality level of texture scaling" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="253">
-                                                <rect key="frame" x="145" y="49" width="187" height="26"/>
+                                                <rect key="frame" x="131" y="44" width="187" height="26"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <sliderCell key="cell" alignment="left" maxValue="2" tickMarkPosition="above" numberOfTickMarks="3" allowsTickMarkValuesOnly="YES" sliderType="linear" id="400">
                                                     <font key="font" size="12" name="Helvetica"/>
@@ -367,26 +363,33 @@
                                         <constraint firstAttribute="trailing" secondItem="253" secondAttribute="trailing" constant="16" id="748"/>
                                         <constraint firstItem="201" firstAttribute="baseline" secondItem="253" secondAttribute="baseline" id="749"/>
                                         <constraint firstItem="193" firstAttribute="leading" secondItem="212" secondAttribute="leading" constant="16" id="754"/>
-                                        <constraint firstItem="193" firstAttribute="trailing" secondItem="174" secondAttribute="trailing" id="755"/>
                                         <constraint firstItem="169" firstAttribute="top" secondItem="212" secondAttribute="top" constant="25" id="767"/>
                                         <constraint firstItem="252" firstAttribute="top" secondItem="253" secondAttribute="bottom" constant="8" symbolic="YES" id="1025"/>
                                         <constraint firstItem="193" firstAttribute="centerY" secondItem="252" secondAttribute="centerY" id="1028"/>
                                         <constraint firstAttribute="trailing" secondItem="252" secondAttribute="trailing" constant="16" id="1029"/>
                                         <constraint firstItem="169" firstAttribute="leading" secondItem="253" secondAttribute="leading" id="1031"/>
                                         <constraint firstItem="252" firstAttribute="leading" secondItem="253" secondAttribute="leading" id="1032"/>
+                                        <constraint firstItem="253" firstAttribute="leading" secondItem="169" secondAttribute="leading" id="8nJ-Q1-ZKd"/>
+                                        <constraint firstItem="169" firstAttribute="leading" secondItem="174" secondAttribute="trailing" constant="8" symbolic="YES" id="SbF-7f-Bnq"/>
+                                        <constraint firstItem="252" firstAttribute="leading" secondItem="193" secondAttribute="trailing" constant="8" symbolic="YES" id="Tqx-Cn-OVc"/>
+                                        <constraint firstItem="253" firstAttribute="trailing" secondItem="169" secondAttribute="trailing" id="eXl-E8-pL6"/>
+                                        <constraint firstItem="253" firstAttribute="trailing" secondItem="252" secondAttribute="trailing" id="skt-z8-TVZ"/>
+                                        <constraint firstItem="253" firstAttribute="leading" secondItem="252" secondAttribute="leading" id="u9D-yy-haW"/>
+                                        <constraint firstItem="253" firstAttribute="leading" secondItem="201" secondAttribute="trailing" constant="8" symbolic="YES" id="uGh-ua-ROW"/>
+                                        <constraint firstAttribute="bottom" secondItem="252" secondAttribute="bottom" constant="12" id="woL-if-MOn"/>
                                     </constraints>
                                     <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                                     <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 </box>
                                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="215">
-                                    <rect key="frame" x="414" y="225" width="130" height="26"/>
+                                    <rect key="frame" x="407" y="197" width="130" height="26"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="125" id="623"/>
                                     </constraints>
                                     <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="218" id="401">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                        <font key="font" metaFont="system"/>
+                                        <font key="font" metaFont="menu"/>
                                         <menu key="menu" title="OtherViews" id="216">
                                             <items>
                                                 <menuItem title="Item1" state="on" id="218"/>
@@ -397,7 +400,7 @@
                                     </popUpButtonCell>
                                 </popUpButton>
                                 <textField toolTip="Select the method the PSX uses to read the contents of the screen" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="220">
-                                    <rect key="frame" x="398" y="260" width="161" height="17"/>
+                                    <rect key="frame" x="384" y="232" width="175" height="17"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Frame Buffer Effects" id="402">
                                         <font key="font" metaFont="system"/>
@@ -406,7 +409,7 @@
                                     </textFieldCell>
                                 </textField>
                                 <colorWell toolTip="Select a color and transparency for the scanlines" translatesAutoresizingMaskIntoConstraints="NO" id="341">
-                                    <rect key="frame" x="370" y="186" width="23" height="22"/>
+                                    <rect key="frame" x="356" y="158" width="23" height="22"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="23" id="563"/>
@@ -415,7 +418,7 @@
                                     <color key="color" red="0.0" green="0.0" blue="0.0" alpha="0.23999999459999999" colorSpace="calibratedRGB"/>
                                 </colorWell>
                                 <matrix verticalHuggingPriority="750" mode="highlight" allowsEmptySelection="NO" autosizesCells="NO" translatesAutoresizingMaskIntoConstraints="NO" id="702">
-                                    <rect key="frame" x="401" y="58" width="155" height="150"/>
+                                    <rect key="frame" x="387" y="30" width="169" height="150"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     <size key="cellSize" width="155" height="14"/>
@@ -514,10 +517,13 @@
                             <constraint firstItem="215" firstAttribute="centerY" secondItem="202" secondAttribute="centerY" id="1001"/>
                             <constraint firstItem="702" firstAttribute="leading" secondItem="341" secondAttribute="trailing" constant="8" symbolic="YES" id="1006"/>
                             <constraint firstItem="341" firstAttribute="leading" secondItem="212" secondAttribute="trailing" constant="8" symbolic="YES" id="1009"/>
-                            <constraint firstItem="212" firstAttribute="top" secondItem="207" secondAttribute="bottom" constant="8" symbolic="YES" id="1013"/>
                             <constraint firstItem="702" firstAttribute="top" secondItem="215" secondAttribute="bottom" constant="20" id="1016"/>
                             <constraint firstItem="341" firstAttribute="top" secondItem="702" secondAttribute="top" id="1017"/>
-                            <constraint firstAttribute="bottom" secondItem="212" secondAttribute="bottom" constant="97" id="1033"/>
+                            <constraint firstAttribute="bottom" secondItem="702" secondAttribute="bottom" constant="28" id="3Ng-tn-NLl"/>
+                            <constraint firstItem="112" firstAttribute="leading" secondItem="207" secondAttribute="leading" id="7oK-ZZ-JYr"/>
+                            <constraint firstItem="112" firstAttribute="trailing" secondItem="207" secondAttribute="trailing" id="PhN-KE-FcQ"/>
+                            <constraint firstItem="212" firstAttribute="top" secondItem="202" secondAttribute="bottom" constant="8" symbolic="YES" id="RYi-RA-sus"/>
+                            <constraint firstItem="202" firstAttribute="leading" secondItem="207" secondAttribute="trailing" constant="8" symbolic="YES" id="naS-nh-gFe"/>
                         </constraints>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -566,17 +572,16 @@ Gw
                     <constraint firstAttribute="trailing" secondItem="107" secondAttribute="trailing" constant="20" symbolic="YES" id="566"/>
                     <constraint firstItem="107" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="20" symbolic="YES" id="567"/>
                     <constraint firstItem="665" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="20" symbolic="YES" id="667"/>
-                    <constraint firstAttribute="bottom" secondItem="665" secondAttribute="bottom" constant="20" symbolic="YES" id="668"/>
                     <constraint firstAttribute="bottom" secondItem="670" secondAttribute="bottom" constant="20" symbolic="YES" id="672"/>
                     <constraint firstAttribute="trailing" secondItem="670" secondAttribute="trailing" constant="20" symbolic="YES" id="673"/>
                     <constraint firstItem="670" firstAttribute="leading" secondItem="674" secondAttribute="trailing" constant="12" symbolic="YES" id="676"/>
-                    <constraint firstAttribute="bottom" secondItem="674" secondAttribute="bottom" constant="20" symbolic="YES" id="677"/>
                     <constraint firstItem="89" firstAttribute="top" secondItem="6" secondAttribute="top" constant="20" symbolic="YES" id="680"/>
                     <constraint firstAttribute="trailing" secondItem="89" secondAttribute="trailing" constant="20" symbolic="YES" id="682"/>
                     <constraint firstItem="89" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="20" symbolic="YES" id="907"/>
                     <constraint firstItem="107" firstAttribute="top" secondItem="89" secondAttribute="bottom" constant="8" symbolic="YES" id="985"/>
-                    <constraint firstItem="107" firstAttribute="top" secondItem="6" secondAttribute="top" constant="175" id="986"/>
-                    <constraint firstAttribute="bottom" secondItem="107" secondAttribute="bottom" constant="78" id="987"/>
+                    <constraint firstItem="674" firstAttribute="baseline" secondItem="670" secondAttribute="baseline" id="2YQ-xw-azh"/>
+                    <constraint firstItem="674" firstAttribute="top" secondItem="107" secondAttribute="bottom" constant="20" symbolic="YES" id="Iw3-oE-kXe"/>
+                    <constraint firstItem="674" firstAttribute="baseline" secondItem="665" secondAttribute="baseline" id="WHu-Oa-tPr"/>
                 </constraints>
             </view>
             <connections>
@@ -600,7 +605,7 @@ Gw
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <matrix verticalHuggingPriority="750" mode="highlight" allowsEmptySelection="NO" autosizesCells="NO" translatesAutoresizingMaskIntoConstraints="NO" id="479">
-                                    <rect key="frame" x="17" y="13" width="420" height="178"/>
+                                    <rect key="frame" x="17" y="13" width="425" height="178"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     <size key="cellSize" width="210" height="18"/>
@@ -694,16 +699,14 @@ Gw
                             <constraint firstItem="479" firstAttribute="top" secondItem="474" secondAttribute="top" constant="11" id="662"/>
                             <constraint firstItem="479" firstAttribute="leading" secondItem="474" secondAttribute="leading" constant="16" id="663"/>
                             <constraint firstAttribute="bottom" secondItem="479" secondAttribute="bottom" constant="11" id="664"/>
+                            <constraint firstAttribute="trailing" secondItem="479" secondAttribute="trailing" constant="16" id="Re3-Pu-Jgh"/>
                         </constraints>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     </box>
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="475">
-                        <rect key="frame" x="143" y="269" width="211" height="56"/>
+                        <rect key="frame" x="149" y="269" width="199" height="56"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="205" id="650"/>
-                        </constraints>
                         <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="center" id="478">
                             <font key="font" metaFont="smallSystem"/>
                             <string key="title">Only enable a hack to fix a specific problem in a game.
@@ -755,15 +758,17 @@ Gw
                 <constraints>
                     <constraint firstAttribute="bottom" secondItem="501" secondAttribute="bottom" constant="20" symbolic="YES" id="651"/>
                     <constraint firstItem="475" firstAttribute="top" secondItem="476" secondAttribute="bottom" constant="8" symbolic="YES" id="652"/>
-                    <constraint firstItem="474" firstAttribute="centerX" secondItem="475" secondAttribute="centerX" id="653"/>
                     <constraint firstItem="501" firstAttribute="leading" secondItem="503" secondAttribute="trailing" constant="12" symbolic="YES" id="654"/>
-                    <constraint firstAttribute="bottom" secondItem="503" secondAttribute="bottom" constant="20" symbolic="YES" id="655"/>
                     <constraint firstItem="474" firstAttribute="leading" secondItem="473" secondAttribute="leading" constant="20" symbolic="YES" id="656"/>
                     <constraint firstItem="474" firstAttribute="top" secondItem="475" secondAttribute="bottom" constant="8" symbolic="YES" id="657"/>
-                    <constraint firstItem="476" firstAttribute="centerX" secondItem="475" secondAttribute="centerX" id="658"/>
                     <constraint firstAttribute="trailing" secondItem="474" secondAttribute="trailing" constant="20" symbolic="YES" id="659"/>
                     <constraint firstItem="476" firstAttribute="top" secondItem="473" secondAttribute="top" constant="20" symbolic="YES" id="660"/>
                     <constraint firstAttribute="trailing" secondItem="501" secondAttribute="trailing" constant="20" symbolic="YES" id="661"/>
+                    <constraint firstItem="503" firstAttribute="baseline" secondItem="501" secondAttribute="baseline" id="QkN-xP-GgJ"/>
+                    <constraint firstAttribute="centerX" secondItem="475" secondAttribute="centerX" id="h7b-lg-buU"/>
+                    <constraint firstAttribute="centerX" secondItem="476" secondAttribute="centerX" id="lmY-oG-JbI"/>
+                    <constraint firstAttribute="centerX" secondItem="474" secondAttribute="centerX" id="mBv-KE-F3g"/>
+                    <constraint firstItem="503" firstAttribute="top" secondItem="474" secondAttribute="bottom" constant="20" symbolic="YES" id="pZ0-EO-AD7"/>
                 </constraints>
             </view>
         </window>
-- 
cgit v1.2.3