MacGui: convert more xibs to Auto Layout.

6 files changed, 517 insertions, 306 deletions

diff --git a/macosx/English.lproj/AddPreset.xib b/macosx/English.lproj/AddPreset.xib
index 1a710baa8..8e1922470 100644
--- a/macosx/English.lproj/AddPreset.xib
+++ b/macosx/English.lproj/AddPreset.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11173.2" systemVersion="16A238m" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" generatesPrototypingConstraints="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="16A238m" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
         <development version="7000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11173.2"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
         <capability name="box content view" minToolsVersion="7.0"/>
     </dependencies>
     <objects>
@@ -69,7 +69,7 @@
                         </textFieldCell>
                     </textField>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fLU-xs-0du">
-                        <rect key="frame" x="418" y="14" width="47" height="28"/>
+                        <rect key="frame" x="403" y="14" width="62" height="28"/>
                         <buttonCell key="cell" type="push" title="Add" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="Deg-rS-mRc">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="smallSystem"/>
@@ -82,7 +82,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Y03-Ts-ZA4">
-                        <rect key="frame" x="358" y="14" width="62" height="28"/>
+                        <rect key="frame" x="343" y="14" width="62" height="28"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="5Xb-gz-QEa">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="smallSystem"/>
@@ -130,14 +130,14 @@ Gw
                             <accessibilityConnection property="title" destination="Wy7-cF-tGv" id="qbt-Xs-S0o"/>
                         </connections>
                     </textField>
-                    <box autoresizesSubviews="NO" borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="H9n-64-GXz">
-                        <rect key="frame" x="125" y="98" width="306" height="25"/>
+                    <box autoresizesSubviews="NO" transparent="YES" borderWidth="0.0" title="Box" boxType="custom" borderType="none" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="H9n-64-GXz">
+                        <rect key="frame" x="128" y="96" width="300" height="24"/>
                         <view key="contentView" id="YlE-Da-0Vn">
-                            <rect key="frame" x="0.0" y="0.0" width="306" height="25"/>
+                            <rect key="frame" x="0.0" y="0.0" width="300" height="24"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gOg-oO-8ar">
-                                    <rect key="frame" x="8" y="2" width="52" height="19"/>
+                                    <rect key="frame" x="5" y="4" width="52" height="19"/>
                                     <string key="toolTip">Select the maximum width allowed by the preset (has no effect if the preset specifies Strict anamorphic). 0 means no limit is placed on the width.</string>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="52" id="T8n-Ik-Oc2"/>
@@ -151,7 +151,7 @@ Gw
                                     <accessibility description="Picture Width"/>
                                 </textField>
                                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="25" translatesAutoresizingMaskIntoConstraints="NO" id="mQk-Ua-wzc">
-                                    <rect key="frame" x="60" y="5" width="29" height="14"/>
+                                    <rect key="frame" x="57" y="7" width="29" height="14"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="25" id="Zwp-Kv-7lL"/>
                                     </constraints>
@@ -162,7 +162,7 @@ Gw
                                     </textFieldCell>
                                 </textField>
                                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mga-dS-8BF">
-                                    <rect key="frame" x="89" y="2" width="52" height="19"/>
+                                    <rect key="frame" x="86" y="4" width="52" height="19"/>
                                     <string key="toolTip">Select the maximum height allowed by the preset (has no effect if the preset specifies Strict anamorphic).  0 means no limit is placed on the height.</string>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="52" id="4os-w4-V7L"/>
@@ -225,7 +225,7 @@ Gw
                     <constraint firstItem="ubZ-rD-tIS" firstAttribute="leading" secondItem="Wy7-cF-tGv" secondAttribute="leading" id="0wx-gx-gb8"/>
                     <constraint firstItem="aez-2b-JXx" firstAttribute="baseline" secondItem="YVc-5E-NjK" secondAttribute="baseline" id="4Q5-W8-cDd"/>
                     <constraint firstItem="aez-2b-JXx" firstAttribute="top" secondItem="z6B-ig-ouq" secondAttribute="bottom" constant="10" id="4Z4-Zb-Xaa"/>
-                    <constraint firstItem="H9n-64-GXz" firstAttribute="centerY" secondItem="z6B-ig-ouq" secondAttribute="centerY" id="5tq-QZ-6b1"/>
+                    <constraint firstItem="H9n-64-GXz" firstAttribute="centerY" secondItem="z6B-ig-ouq" secondAttribute="centerY" constant="3" id="5tq-QZ-6b1"/>
                     <constraint firstItem="H9n-64-GXz" firstAttribute="leading" secondItem="z6B-ig-ouq" secondAttribute="trailing" constant="1" id="7Vw-nX-giB"/>
                     <constraint firstItem="Y03-Ts-ZA4" firstAttribute="top" secondItem="nWJ-0b-fUA" secondAttribute="bottom" constant="8" id="8xO-Rb-whc"/>
                     <constraint firstItem="z6B-ig-ouq" firstAttribute="top" secondItem="8kl-Sh-Gh7" secondAttribute="bottom" constant="24" id="Ctr-hQ-r5q"/>
@@ -245,10 +245,11 @@ Gw
                     <constraint firstItem="Wpk-WC-aVk" firstAttribute="leading" secondItem="Wy7-cF-tGv" secondAttribute="leading" id="UMW-Tx-m1x"/>
                     <constraint firstItem="fLU-xs-0du" firstAttribute="leading" secondItem="Y03-Ts-ZA4" secondAttribute="trailing" constant="8" id="VOp-hp-vTJ"/>
                     <constraint firstItem="z6B-ig-ouq" firstAttribute="baseline" secondItem="gOg-oO-8ar" secondAttribute="baseline" id="X7w-dY-03H"/>
+                    <constraint firstItem="Y03-Ts-ZA4" firstAttribute="width" secondItem="fLU-xs-0du" secondAttribute="width" id="YYV-wg-58h"/>
                     <constraint firstItem="aKg-n4-OUS" firstAttribute="top" secondItem="AcO-9f-fnb" secondAttribute="top" constant="20" id="ZfQ-ns-Acz"/>
                     <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Mga-dS-8BF" secondAttribute="trailing" constant="90" id="d33-fp-0W7"/>
                     <constraint firstItem="8kl-Sh-Gh7" firstAttribute="leading" secondItem="zDq-QP-LAu" secondAttribute="trailing" constant="8" id="d4Q-TW-lX1"/>
-                    <constraint firstItem="H9n-64-GXz" firstAttribute="bottom" secondItem="z6B-ig-ouq" secondAttribute="bottom" id="eKn-iL-cTq"/>
+                    <constraint firstItem="H9n-64-GXz" firstAttribute="bottom" secondItem="z6B-ig-ouq" secondAttribute="bottom" constant="6" id="eKn-iL-cTq"/>
                     <constraint firstItem="nWJ-0b-fUA" firstAttribute="leading" secondItem="ubZ-rD-tIS" secondAttribute="trailing" constant="8" id="frd-Bx-84r"/>
                     <constraint firstItem="AWD-QF-ZQB" firstAttribute="leading" secondItem="AcO-9f-fnb" secondAttribute="leading" constant="20" id="fxg-rD-EDL"/>
                     <constraint firstAttribute="trailing" secondItem="fLU-xs-0du" secondAttribute="trailing" constant="20" id="heQ-wd-hk8"/>
@@ -266,7 +267,7 @@ Gw
             <connections>
                 <outlet property="delegate" destination="-2" id="YgD-Uk-vtp"/>
             </connections>
-            <point key="canvasLocation" x="407" y="256"/>
+            <point key="canvasLocation" x="407" y="255.5"/>
         </window>
     </objects>
 </document>
diff --git a/macosx/English.lproj/Audio.xib b/macosx/English.lproj/Audio.xib
index d25e87930..ff7a77e8e 100644
--- a/macosx/English.lproj/Audio.xib
+++ b/macosx/English.lproj/Audio.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11173.2" systemVersion="16A238m" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="16A238m" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
         <development version="7000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11173.2"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="HBAudioController">
@@ -47,9 +47,8 @@
             <rect key="frame" x="0.0" y="0.0" width="926" height="322"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <button identifier="Codec" verticalHuggingPriority="750" id="vFP-nq-IQg">
-                    <rect key="frame" x="110" y="288" width="140" height="28"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                <button identifier="Codec" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vFP-nq-IQg">
+                    <rect key="frame" x="110" y="288" width="134" height="28"/>
                     <buttonCell key="cell" type="push" title="Configure Defaults…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="aYF-d5-Ya6">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="smallSystem"/>
@@ -63,9 +62,8 @@
                         </binding>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" id="wcL-rL-aYS">
-                    <rect key="frame" x="248" y="288" width="116" height="28"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wcL-rL-aYS">
+                    <rect key="frame" x="242" y="288" width="109" height="28"/>
                     <buttonCell key="cell" type="push" title="Reload Defaults" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="q2P-Tg-cBJ">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="smallSystem"/>
@@ -79,9 +77,11 @@
                         </binding>
                     </connections>
                 </button>
-                <popUpButton verticalHuggingPriority="750" id="jrP-M5-2Rq">
+                <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jrP-M5-2Rq">
                     <rect key="frame" x="17" y="291" width="88" height="22"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <constraints>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="82" id="VHA-F2-mvU"/>
+                    </constraints>
                     <popUpButtonCell key="cell" type="push" title="Track" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="AoT-G9-aA4">
                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="smallSystem"/>
@@ -110,15 +110,14 @@
                         </binding>
                     </connections>
                 </popUpButton>
-                <scrollView autohidesScrollers="YES" horizontalLineScroll="27" horizontalPageScroll="10" verticalLineScroll="27" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="Yzu-Rk-hTv">
+                <scrollView autohidesScrollers="YES" horizontalLineScroll="27" horizontalPageScroll="10" verticalLineScroll="27" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yzu-Rk-hTv">
                     <rect key="frame" x="20" y="20" width="886" height="264"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <clipView key="contentView" id="2VK-QX-oZ0">
                         <rect key="frame" x="1" y="0.0" width="884" height="263"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="25" rowSizeStyle="automatic" headerView="jdT-w6-s4n" viewBased="YES" id="yix-PF-sqH">
-                                <rect key="frame" x="0.0" y="0.0" width="884" height="246"/>
+                                <rect key="frame" x="0.0" y="0.0" width="884" height="240"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <size key="intercellSpacing" width="3" height="2"/>
                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -141,9 +140,8 @@
                                                 <rect key="frame" x="1" y="1" width="322" height="25"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <popUpButton verticalHuggingPriority="750" id="6iN-2G-JDF">
+                                                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6iN-2G-JDF">
                                                         <rect key="frame" x="0.0" y="1" width="322" height="22"/>
-                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="ExA-Sd-3dO">
                                                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                             <font key="font" metaFont="smallSystem"/>
@@ -156,6 +154,11 @@
                                                         </connections>
                                                     </popUpButton>
                                                 </subviews>
+                                                <constraints>
+                                                    <constraint firstAttribute="trailing" secondItem="6iN-2G-JDF" secondAttribute="trailing" constant="3" id="5te-yc-q0S"/>
+                                                    <constraint firstItem="6iN-2G-JDF" firstAttribute="top" secondItem="wJH-tU-zL6" secondAttribute="top" constant="3" id="WkD-VZ-ui5"/>
+                                                    <constraint firstItem="6iN-2G-JDF" firstAttribute="leading" secondItem="wJH-tU-zL6" secondAttribute="leading" constant="3" id="fmf-0N-RWE"/>
+                                                </constraints>
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
@@ -176,9 +179,8 @@
                                                 <rect key="frame" x="326" y="1" width="143" height="25"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <popUpButton verticalHuggingPriority="750" id="tYY-w7-ZIq">
+                                                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tYY-w7-ZIq">
                                                         <rect key="frame" x="0.0" y="1" width="143" height="22"/>
-                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="eIX-Zp-DHh">
                                                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                             <font key="font" metaFont="smallSystem"/>
@@ -195,6 +197,11 @@
                                                         </connections>
                                                     </popUpButton>
                                                 </subviews>
+                                                <constraints>
+                                                    <constraint firstAttribute="trailing" secondItem="tYY-w7-ZIq" secondAttribute="trailing" constant="3" id="8et-C2-Mkm"/>
+                                                    <constraint firstItem="tYY-w7-ZIq" firstAttribute="leading" secondItem="8ed-5g-y6e" secondAttribute="leading" constant="3" id="g29-Ym-Y7V"/>
+                                                    <constraint firstItem="tYY-w7-ZIq" firstAttribute="top" secondItem="8ed-5g-y6e" secondAttribute="top" constant="3" id="rlT-3F-1BJ"/>
+                                                </constraints>
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
@@ -215,9 +222,8 @@
                                                 <rect key="frame" x="472" y="1" width="128" height="25"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <popUpButton verticalHuggingPriority="750" id="LLW-KN-65P">
+                                                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LLW-KN-65P">
                                                         <rect key="frame" x="0.0" y="1" width="128" height="22"/>
-                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="CAe-A2-A0F">
                                                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                             <font key="font" metaFont="smallSystem"/>
@@ -231,6 +237,11 @@
                                                         </connections>
                                                     </popUpButton>
                                                 </subviews>
+                                                <constraints>
+                                                    <constraint firstItem="LLW-KN-65P" firstAttribute="leading" secondItem="JWs-Gl-4kd" secondAttribute="leading" constant="3" id="70M-44-T1f"/>
+                                                    <constraint firstItem="LLW-KN-65P" firstAttribute="top" secondItem="JWs-Gl-4kd" secondAttribute="top" constant="3" id="SZw-G0-gDR"/>
+                                                    <constraint firstAttribute="trailing" secondItem="LLW-KN-65P" secondAttribute="trailing" constant="3" id="UgM-NH-jNp"/>
+                                                </constraints>
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
@@ -251,9 +262,8 @@
                                                 <rect key="frame" x="603" y="1" width="74" height="25"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <popUpButton verticalHuggingPriority="750" id="QA9-1y-Pyj">
+                                                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QA9-1y-Pyj">
                                                         <rect key="frame" x="0.0" y="1" width="74" height="22"/>
-                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="ewo-F6-Dcj">
                                                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                             <font key="font" metaFont="smallSystem"/>
@@ -267,6 +277,11 @@
                                                         </connections>
                                                     </popUpButton>
                                                 </subviews>
+                                                <constraints>
+                                                    <constraint firstItem="QA9-1y-Pyj" firstAttribute="top" secondItem="iQl-Lr-pqe" secondAttribute="top" constant="3" id="OCI-qu-zuA"/>
+                                                    <constraint firstItem="QA9-1y-Pyj" firstAttribute="leading" secondItem="iQl-Lr-pqe" secondAttribute="leading" constant="3" id="V4d-Tf-drr"/>
+                                                    <constraint firstAttribute="trailing" secondItem="QA9-1y-Pyj" secondAttribute="trailing" constant="3" id="qk1-Zn-1SE"/>
+                                                </constraints>
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
@@ -287,9 +302,8 @@
                                                 <rect key="frame" x="680" y="1" width="74" height="25"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <popUpButton verticalHuggingPriority="750" id="Qg1-iw-07b">
+                                                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Qg1-iw-07b">
                                                         <rect key="frame" x="0.0" y="1" width="74" height="22"/>
-                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="HcR-KC-NJF">
                                                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                             <font key="font" metaFont="smallSystem"/>
@@ -303,6 +317,11 @@
                                                         </connections>
                                                     </popUpButton>
                                                 </subviews>
+                                                <constraints>
+                                                    <constraint firstItem="Qg1-iw-07b" firstAttribute="top" secondItem="Acc-Cw-PLD" secondAttribute="top" constant="3" id="KMN-A8-iff"/>
+                                                    <constraint firstItem="Qg1-iw-07b" firstAttribute="leading" secondItem="Acc-Cw-PLD" secondAttribute="leading" constant="3" id="btr-Z1-Bnr"/>
+                                                    <constraint firstAttribute="trailing" secondItem="Qg1-iw-07b" secondAttribute="trailing" constant="3" id="mHq-TV-BtU"/>
+                                                </constraints>
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
@@ -323,9 +342,8 @@
                                                 <rect key="frame" x="757" y="1" width="61" height="25"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="2c7-G5-4KL">
+                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="2c7-G5-4KL">
                                                         <rect key="frame" x="31" y="5" width="29" height="14"/>
-                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="center" title="0" id="Q4T-80-wxf">
                                                             <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="uNn-5A-2RM"/>
                                                             <font key="font" metaFont="smallSystem"/>
@@ -341,9 +359,8 @@
                                                             </binding>
                                                         </connections>
                                                     </textField>
-                                                    <slider horizontalHuggingPriority="750" verticalHuggingPriority="750" id="gtC-MM-esd">
-                                                        <rect key="frame" x="3" y="0.0" width="22" height="22"/>
-                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                    <slider horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gtC-MM-esd">
+                                                        <rect key="frame" x="3" y="2" width="22" height="22"/>
                                                         <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="-5" maxValue="16" doubleValue="0.25" numberOfTickMarks="21" allowsTickMarkValuesOnly="YES" sliderType="circular" id="BBQ-FP-aQN"/>
                                                         <connections>
                                                             <binding destination="wfV-Pi-jHd" name="enabled" keyPath="objectValue.PassThruDisabled" id="Wz3-ZW-SLi"/>
@@ -355,6 +372,13 @@
                                                         </connections>
                                                     </slider>
                                                 </subviews>
+                                                <constraints>
+                                                    <constraint firstItem="2c7-G5-4KL" firstAttribute="centerY" secondItem="wfV-Pi-jHd" secondAttribute="centerY" id="Aqi-sv-l0Q"/>
+                                                    <constraint firstItem="gtC-MM-esd" firstAttribute="centerY" secondItem="wfV-Pi-jHd" secondAttribute="centerY" id="I15-9m-efr"/>
+                                                    <constraint firstItem="2c7-G5-4KL" firstAttribute="leading" secondItem="gtC-MM-esd" secondAttribute="trailing" constant="8" symbolic="YES" id="Rh0-KC-4Ux"/>
+                                                    <constraint firstAttribute="trailing" secondItem="2c7-G5-4KL" secondAttribute="trailing" constant="3" id="do4-Vx-vJo"/>
+                                                    <constraint firstItem="gtC-MM-esd" firstAttribute="leading" secondItem="wfV-Pi-jHd" secondAttribute="leading" constant="3" id="e1v-e7-nRQ"/>
+                                                </constraints>
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
@@ -375,9 +399,8 @@
                                                 <rect key="frame" x="821" y="1" width="61" height="25"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <slider horizontalHuggingPriority="750" verticalHuggingPriority="750" id="o3M-fP-6Ps">
+                                                    <slider horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="o3M-fP-6Ps">
                                                         <rect key="frame" x="3" y="1" width="22" height="22"/>
-                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" maxValue="4" numberOfTickMarks="16" allowsTickMarkValuesOnly="YES" sliderType="circular" id="nII-CW-aWc"/>
                                                         <connections>
                                                             <binding destination="RMf-U7-5Td" name="enabled" keyPath="objectValue.DRCEnabled" id="tzk-tB-jEf"/>
@@ -388,9 +411,8 @@
                                                             </binding>
                                                         </connections>
                                                     </slider>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="yPh-4R-HRQ">
+                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="yPh-4R-HRQ">
                                                         <rect key="frame" x="31" y="5" width="29" height="14"/>
-                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="center" title="0" id="Ifq-hI-oCs">
                                                             <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="Tnc-So-JNG"/>
                                                             <font key="font" metaFont="smallSystem"/>
@@ -407,6 +429,13 @@
                                                         </connections>
                                                     </textField>
                                                 </subviews>
+                                                <constraints>
+                                                    <constraint firstItem="o3M-fP-6Ps" firstAttribute="centerY" secondItem="RMf-U7-5Td" secondAttribute="centerY" id="38b-az-JSU"/>
+                                                    <constraint firstItem="yPh-4R-HRQ" firstAttribute="leading" secondItem="o3M-fP-6Ps" secondAttribute="trailing" constant="8" symbolic="YES" id="HkV-NP-0CH"/>
+                                                    <constraint firstItem="o3M-fP-6Ps" firstAttribute="leading" secondItem="RMf-U7-5Td" secondAttribute="leading" constant="3" id="O6V-mr-bd0"/>
+                                                    <constraint firstAttribute="trailing" secondItem="yPh-4R-HRQ" secondAttribute="trailing" constant="3" id="Oeg-aX-OK9"/>
+                                                    <constraint firstItem="yPh-4R-HRQ" firstAttribute="centerY" secondItem="RMf-U7-5Td" secondAttribute="centerY" id="b3F-n0-RkN"/>
+                                                </constraints>
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
@@ -432,12 +461,24 @@
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                     <tableHeaderView key="headerView" id="jdT-w6-s4n">
-                        <rect key="frame" x="0.0" y="0.0" width="884" height="17"/>
+                        <rect key="frame" x="0.0" y="0.0" width="884" height="23"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </tableHeaderView>
                 </scrollView>
             </subviews>
-            <point key="canvasLocation" x="628" y="206"/>
+            <constraints>
+                <constraint firstItem="vFP-nq-IQg" firstAttribute="baseline" secondItem="wcL-rL-aYS" secondAttribute="baseline" id="Jpv-h8-eIt"/>
+                <constraint firstItem="jrP-M5-2Rq" firstAttribute="top" secondItem="LOv-5G-86T" secondAttribute="top" constant="10" id="YZQ-Cd-9PQ"/>
+                <constraint firstItem="jrP-M5-2Rq" firstAttribute="leading" secondItem="Yzu-Rk-hTv" secondAttribute="leading" id="ZQu-ST-8WI"/>
+                <constraint firstItem="wcL-rL-aYS" firstAttribute="leading" secondItem="vFP-nq-IQg" secondAttribute="trailing" constant="8" symbolic="YES" id="ZhK-HQ-HjO"/>
+                <constraint firstItem="vFP-nq-IQg" firstAttribute="leading" secondItem="jrP-M5-2Rq" secondAttribute="trailing" constant="13" id="cmo-hl-1EF"/>
+                <constraint firstItem="Yzu-Rk-hTv" firstAttribute="top" secondItem="jrP-M5-2Rq" secondAttribute="bottom" constant="10" id="hHE-jV-Tld"/>
+                <constraint firstAttribute="trailing" secondItem="Yzu-Rk-hTv" secondAttribute="trailing" constant="20" symbolic="YES" id="hv4-if-HKZ"/>
+                <constraint firstItem="jrP-M5-2Rq" firstAttribute="leading" secondItem="LOv-5G-86T" secondAttribute="leading" constant="20" symbolic="YES" id="rg8-FI-cSd"/>
+                <constraint firstAttribute="bottom" secondItem="Yzu-Rk-hTv" secondAttribute="bottom" constant="20" symbolic="YES" id="uil-Nm-DIV"/>
+                <constraint firstItem="jrP-M5-2Rq" firstAttribute="baseline" secondItem="vFP-nq-IQg" secondAttribute="baseline" id="y3i-kl-lge"/>
+            </constraints>
+            <point key="canvasLocation" x="730" y="-14"/>
         </view>
         <menu id="hyy-qd-qpe">
             <items>
diff --git a/macosx/English.lproj/AudioDefaults.xib b/macosx/English.lproj/AudioDefaults.xib
index 9adf8167b..535351e96 100644
--- a/macosx/English.lproj/AudioDefaults.xib
+++ b/macosx/English.lproj/AudioDefaults.xib
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11129.15" systemVersion="15G26a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11173.2" systemVersion="16A238m" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11129.15"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11173.2"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="HBAudioDefaultsController">
@@ -18,35 +18,33 @@
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="kwM-lz-5lG">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="175" y="825" width="813" height="473"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
-            <value key="minSize" type="size" width="813" height="397"/>
-            <value key="maxSize" type="size" width="813" height="600"/>
+            <rect key="contentRect" x="175" y="825" width="794" height="474"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" id="ZP2-Cp-K5w">
-                <rect key="frame" x="0.0" y="0.0" width="813" height="473"/>
+                <rect key="frame" x="0.0" y="0.0" width="794" height="474"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="fPg-3n-1TN">
-                        <rect key="frame" x="10" y="437" width="145" height="14"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="fPg-3n-1TN">
+                        <rect key="frame" x="10" y="438" width="138" height="14"/>
                         <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Track Selection Behavior:" id="GbM-vm-RC2">
                             <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 horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Jsz-Er-bsF">
-                        <rect key="frame" x="10" y="413" width="145" height="14"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Languages:" id="mAT-Jp-SG1">
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="Jsz-Er-bsF">
+                        <rect key="frame" x="10" y="414" width="138" height="14"/>
+                        <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Languages:" id="mAT-Jp-SG1">
                             <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" id="oiD-QI-wly">
-                        <rect key="frame" x="158" y="432" width="252" height="22"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oiD-QI-wly">
+                        <rect key="frame" x="151" y="433" width="256" height="22"/>
+                        <constraints>
+                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="250" id="cNR-3T-9di"/>
+                        </constraints>
                         <popUpButtonCell key="cell" type="push" title="None" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="mvw-Hg-JFM" id="21e-KY-8TR">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="smallSystem"/>
@@ -64,9 +62,12 @@
                             <outlet property="nextKeyView" destination="Of7-71-Ci6" id="jgQ-nK-YLu"/>
                         </connections>
                     </popUpButton>
-                    <button verticalHuggingPriority="750" id="QAt-5X-NBT">
-                        <rect key="frame" x="161" y="262" width="71" height="23"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QAt-5X-NBT">
+                        <rect key="frame" x="154" y="263" width="71" height="23"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="71" id="Oxw-OO-Jaq"/>
+                            <constraint firstAttribute="height" constant="21" id="WOD-xe-KmQ"/>
+                        </constraints>
                         <buttonCell key="cell" type="smallSquare" title="Show All" bezelStyle="smallSquare" imagePosition="overlaps" alignment="center" controlSize="small" borderStyle="border" inset="3" id="PiQ-bA-7P1">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
                             <font key="font" metaFont="smallSystem"/>
@@ -77,9 +78,8 @@
                             <outlet property="nextKeyView" destination="vUx-OV-W5T" id="fma-A5-pRA"/>
                         </connections>
                     </button>
-                    <button verticalHuggingPriority="750" id="sC2-52-liU">
-                        <rect key="frame" x="718" y="14" width="80" height="28"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sC2-52-liU">
+                        <rect key="frame" x="717" y="14" width="62" height="28"/>
                         <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="kDe-1L-VkD">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="smallSystem"/>
@@ -92,9 +92,8 @@ DQ
                             <outlet property="nextKeyView" destination="oiD-QI-wly" id="1gO-sY-HNE"/>
                         </connections>
                     </button>
-                    <button id="vUx-OV-W5T">
-                        <rect key="frame" x="548" y="411" width="77" height="18"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <button translatesAutoresizingMaskIntoConstraints="NO" id="vUx-OV-W5T">
+                        <rect key="frame" x="575" y="412" width="46" height="18"/>
                         <string key="toolTip">Enable this if your playback device supports MP3. This permits MP3 passthru to be selected when automatic passthru selecion is enabled.</string>
                         <buttonCell key="cell" type="check" title="MP3" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="sdZ-Rx-JoG">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -106,9 +105,8 @@ DQ
                             <outlet property="nextKeyView" destination="fzd-MO-xaB" id="1fb-a1-B25"/>
                         </connections>
                     </button>
-                    <button id="fzd-MO-xaB">
-                        <rect key="frame" x="548" y="393" width="77" height="18"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <button translatesAutoresizingMaskIntoConstraints="NO" id="fzd-MO-xaB">
+                        <rect key="frame" x="575" y="394" width="45" height="18"/>
                         <string key="toolTip">Enable this if your playback device supports AAC. This permits AAC passthru to be selected when automatic passthru selecion is enabled.</string>
                         <buttonCell key="cell" type="check" title="AAC" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="cUX-iP-UAs">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -120,9 +118,8 @@ DQ
                             <outlet property="nextKeyView" destination="fgl-Ev-ELt" id="Exn-Wt-M4D"/>
                         </connections>
                     </button>
-                    <button id="fgl-Ev-ELt">
-                        <rect key="frame" x="548" y="375" width="77" height="18"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <button translatesAutoresizingMaskIntoConstraints="NO" id="fgl-Ev-ELt">
+                        <rect key="frame" x="575" y="376" width="44" height="18"/>
                         <string key="toolTip">Enable this if your playback device supports AC3. This permits AC3 passthru to be selected when automatic passthru selecion is enabled.</string>
                         <buttonCell key="cell" type="check" title="AC3" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="VnE-3R-bUf">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -134,9 +131,8 @@ DQ
                             <outlet property="nextKeyView" destination="E93-Md-aWa" id="Yv5-Xs-mbs"/>
                         </connections>
                     </button>
-                    <button id="E93-Md-aWa">
-                        <rect key="frame" x="548" y="357" width="77" height="18"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <button translatesAutoresizingMaskIntoConstraints="NO" id="E93-Md-aWa">
+                        <rect key="frame" x="575" y="358" width="44" height="18"/>
                         <string key="toolTip">Enable this if your playback device supports DTS. This permits DTS passthru to be selected when automatic passthru selecion is enabled.</string>
                         <buttonCell key="cell" type="check" title="DTS" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="8mC-Wx-myL">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -148,9 +144,8 @@ DQ
                             <outlet property="nextKeyView" destination="IxI-o9-jMs" id="sBB-lF-vtE"/>
                         </connections>
                     </button>
-                    <button id="IxI-o9-jMs">
-                        <rect key="frame" x="548" y="339" width="77" height="18"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <button translatesAutoresizingMaskIntoConstraints="NO" id="IxI-o9-jMs">
+                        <rect key="frame" x="575" y="340" width="66" height="18"/>
                         <string key="toolTip">Enable this if your playback device supports DTS-HD. This permits DTS-HD passthru to be selected when automatic passthru selecion is enabled.</string>
                         <buttonCell key="cell" type="check" title="DTS-HD" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="LX6-kc-5vq">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -162,18 +157,19 @@ DQ
                             <outlet property="nextKeyView" destination="LdN-Cx-ZJY" id="rAA-cB-Ma5"/>
                         </connections>
                     </button>
-                    <textField verticalHuggingPriority="750" id="l4i-pd-Cbk">
-                        <rect key="frame" x="430" y="413" width="115" height="14"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="l4i-pd-Cbk">
+                        <rect key="frame" x="472" y="414" width="100" height="14"/>
                         <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Auto Passthru:" id="s6s-EH-5CB">
                             <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 toolTip="Set the audio codec to encode with when a suitable track can not be found for audio passthru." verticalHuggingPriority="750" id="LdN-Cx-ZJY">
-                        <rect key="frame" x="548" y="292" width="152" height="22"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <popUpButton toolTip="Set the audio codec to encode with when a suitable track can not be found for audio passthru." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LdN-Cx-ZJY">
+                        <rect key="frame" x="575" y="293" width="66" height="22"/>
+                        <constraints>
+                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="60" id="Ka4-YN-iLe"/>
+                        </constraints>
                         <popUpButtonCell key="cell" type="push" title="Item" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="UJy-A2-Bb1" id="OqD-Tf-29c">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="smallSystem"/>
@@ -194,27 +190,24 @@ DQ
                             <outlet property="nextKeyView" destination="uF5-6E-EIe" id="gaK-Cr-XA9"/>
                         </connections>
                     </popUpButton>
-                    <textField verticalHuggingPriority="750" id="Tth-IR-7cU">
-                        <rect key="frame" x="430" y="297" width="115" height="14"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <textField horizontalHuggingPriority="248" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="Tth-IR-7cU">
+                        <rect key="frame" x="472" y="298" width="100" height="14"/>
                         <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Passthru Fallback:" id="AQe-Sg-Qgh">
                             <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 horizontalHuggingPriority="251" verticalHuggingPriority="750" id="RtZ-Cz-5mG">
-                        <rect key="frame" x="18" y="229" width="253" height="14"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="600" translatesAutoresizingMaskIntoConstraints="NO" id="RtZ-Cz-5mG">
+                        <rect key="frame" x="18" y="230" width="253" height="14"/>
                         <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Audio encoder settings for each selected track:" id="007-WM-RmC">
                             <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>
-                    <segmentedControl verticalHuggingPriority="750" id="N4q-sT-WgW">
-                        <rect key="frame" x="18" y="53" width="54" height="20"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="N4q-sT-WgW">
+                        <rect key="frame" x="18" y="51" width="54" height="20"/>
                         <segmentedCell key="cell" controlSize="small" borderStyle="border" alignment="left" style="rounded" trackingMode="momentary" id="otA-K4-TxM">
                             <font key="font" metaFont="smallSystem"/>
                             <segments>
@@ -231,9 +224,8 @@ DQ
                             <outlet property="nextKeyView" destination="sC2-52-liU" id="mmR-bd-cFG"/>
                         </connections>
                     </segmentedControl>
-                    <button id="os0-Jl-OXF">
-                        <rect key="frame" x="650" y="411" width="77" height="18"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <button translatesAutoresizingMaskIntoConstraints="NO" id="os0-Jl-OXF">
+                        <rect key="frame" x="646" y="412" width="62" height="18"/>
                         <string key="toolTip">Enable this if your playback device supports TrueHD. This permits TrueHD passthru to be selected when automatic passthru selecion is enabled.</string>
                         <buttonCell key="cell" type="check" title="TrueHD" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="z9d-P3-6UP">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -245,9 +237,8 @@ DQ
                             <outlet property="nextKeyView" destination="0HY-xB-cvO" id="TYi-8L-gT4"/>
                         </connections>
                     </button>
-                    <button id="0HY-xB-cvO">
-                        <rect key="frame" x="650" y="393" width="77" height="18"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <button translatesAutoresizingMaskIntoConstraints="NO" id="0HY-xB-cvO">
+                        <rect key="frame" x="646" y="394" width="50" height="18"/>
                         <string key="toolTip">Enable this if your playback device supports FLAC. This permits FLAC passthru to be selected when automatic passthru selecion is enabled.</string>
                         <buttonCell key="cell" type="check" title="FLAC" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="naS-No-CdV">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -259,9 +250,8 @@ DQ
                             <outlet property="nextKeyView" destination="BK7-c4-kkk" id="Pt4-9c-oQl"/>
                         </connections>
                     </button>
-                    <button id="BK7-c4-kkk">
-                        <rect key="frame" x="650" y="375" width="77" height="18"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <button translatesAutoresizingMaskIntoConstraints="NO" id="BK7-c4-kkk">
+                        <rect key="frame" x="646" y="376" width="51" height="18"/>
                         <string key="toolTip">Enable this if your playback device supports EAC3. This permits EAC3 passthru to be selected when automatic passthru selecion is enabled.</string>
                         <buttonCell key="cell" type="check" title="EAC3" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="u9h-dn-wcK">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -273,21 +263,20 @@ DQ
                             <outlet property="nextKeyView" destination="LdN-Cx-ZJY" id="scB-D1-Zvp"/>
                         </connections>
                     </button>
-                    <scrollView autohidesScrollers="YES" horizontalLineScroll="26" horizontalPageScroll="10" verticalLineScroll="26" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="hGL-Ew-UVJ">
-                        <rect key="frame" x="20" y="81" width="773" height="140"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                    <scrollView autohidesScrollers="YES" horizontalLineScroll="26" horizontalPageScroll="10" verticalLineScroll="26" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hGL-Ew-UVJ">
+                        <rect key="frame" x="20" y="79" width="754" height="143"/>
                         <clipView key="contentView" id="jkU-Fi-GCv">
-                            <rect key="frame" x="1" y="0.0" width="771" height="139"/>
+                            <rect key="frame" x="1" y="0.0" width="752" height="142"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="24" rowSizeStyle="automatic" headerView="IbE-bD-EWJ" viewBased="YES" id="ZsG-T1-vGv">
-                                    <rect key="frame" x="0.0" y="0.0" width="771" height="122"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="752" height="119"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="273" minWidth="143" maxWidth="1000" id="pR9-d4-SNf">
+                                        <tableColumn width="254" minWidth="143" maxWidth="1000" id="pR9-d4-SNf">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Codec">
                                                 <font key="font" metaFont="smallSystem"/>
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -301,12 +290,11 @@ DQ
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <prototypeCellViews>
                                                 <tableCellView id="UBy-AR-7XQ">
-                                                    <rect key="frame" x="1" y="1" width="273" height="24"/>
+                                                    <rect key="frame" x="1" y="1" width="254" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <popUpButton verticalHuggingPriority="750" id="6lx-af-rBL">
-                                                            <rect key="frame" x="0.0" y="0.0" width="273" height="22"/>
-                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                        <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6lx-af-rBL">
+                                                            <rect key="frame" x="0.0" y="0.0" width="254" height="22"/>
                                                             <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="t8s-X1-tQV">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="smallSystem"/>
@@ -322,6 +310,11 @@ DQ
                                                             </connections>
                                                         </popUpButton>
                                                     </subviews>
+                                                    <constraints>
+                                                        <constraint firstItem="6lx-af-rBL" firstAttribute="top" secondItem="UBy-AR-7XQ" secondAttribute="top" constant="3" id="1Kh-Id-340"/>
+                                                        <constraint firstAttribute="trailing" secondItem="6lx-af-rBL" secondAttribute="trailing" constant="3" id="b0g-QN-mE5"/>
+                                                        <constraint firstItem="6lx-af-rBL" firstAttribute="leading" secondItem="UBy-AR-7XQ" secondAttribute="leading" constant="3" id="gEB-tA-iF8"/>
+                                                    </constraints>
                                                 </tableCellView>
                                             </prototypeCellViews>
                                         </tableColumn>
@@ -339,12 +332,11 @@ DQ
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <prototypeCellViews>
                                                 <tableCellView id="uS1-Fd-V9I">
-                                                    <rect key="frame" x="277" y="1" width="151" height="24"/>
+                                                    <rect key="frame" x="258" y="1" width="151" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <popUpButton verticalHuggingPriority="750" id="igm-hS-rrD">
+                                                        <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="igm-hS-rrD">
                                                             <rect key="frame" x="0.0" y="0.0" width="151" height="22"/>
-                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                             <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="2JY-Ie-KSg">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="smallSystem"/>
@@ -361,6 +353,11 @@ DQ
                                                             </connections>
                                                         </popUpButton>
                                                     </subviews>
+                                                    <constraints>
+                                                        <constraint firstItem="igm-hS-rrD" firstAttribute="top" secondItem="uS1-Fd-V9I" secondAttribute="top" constant="3" id="ceS-pW-5IW"/>
+                                                        <constraint firstAttribute="trailing" secondItem="igm-hS-rrD" secondAttribute="trailing" constant="3" id="rE2-yu-vnE"/>
+                                                        <constraint firstItem="igm-hS-rrD" firstAttribute="leading" secondItem="uS1-Fd-V9I" secondAttribute="leading" constant="3" id="scd-Mn-gB5"/>
+                                                    </constraints>
                                                 </tableCellView>
                                             </prototypeCellViews>
                                         </tableColumn>
@@ -378,12 +375,11 @@ DQ
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <prototypeCellViews>
                                                 <tableCellView id="5No-Mm-bpD">
-                                                    <rect key="frame" x="431" y="1" width="111" height="24"/>
+                                                    <rect key="frame" x="412" y="1" width="111" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <popUpButton verticalHuggingPriority="750" id="r80-yv-59n">
+                                                        <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="r80-yv-59n">
                                                             <rect key="frame" x="0.0" y="0.0" width="111" height="22"/>
-                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                             <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="pdm-QA-coL">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="smallSystem"/>
@@ -401,6 +397,11 @@ DQ
                                                             </connections>
                                                         </popUpButton>
                                                     </subviews>
+                                                    <constraints>
+                                                        <constraint firstAttribute="trailing" secondItem="r80-yv-59n" secondAttribute="trailing" constant="3" id="2HE-NI-bX5"/>
+                                                        <constraint firstItem="r80-yv-59n" firstAttribute="leading" secondItem="5No-Mm-bpD" secondAttribute="leading" constant="3" id="Nuj-Xz-LVY"/>
+                                                        <constraint firstItem="r80-yv-59n" firstAttribute="top" secondItem="5No-Mm-bpD" secondAttribute="top" constant="3" id="kod-5T-YF3"/>
+                                                    </constraints>
                                                 </tableCellView>
                                             </prototypeCellViews>
                                         </tableColumn>
@@ -418,12 +419,11 @@ DQ
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <prototypeCellViews>
                                                 <tableCellView id="Bxd-gI-dFS">
-                                                    <rect key="frame" x="545" y="1" width="96" height="24"/>
+                                                    <rect key="frame" x="526" y="1" width="96" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <popUpButton verticalHuggingPriority="750" id="hHP-dw-nba">
+                                                        <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hHP-dw-nba">
                                                             <rect key="frame" x="0.0" y="0.0" width="96" height="22"/>
-                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                             <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="U8n-oy-hkv">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="smallSystem"/>
@@ -440,6 +440,11 @@ DQ
                                                             </connections>
                                                         </popUpButton>
                                                     </subviews>
+                                                    <constraints>
+                                                        <constraint firstItem="hHP-dw-nba" firstAttribute="leading" secondItem="Bxd-gI-dFS" secondAttribute="leading" constant="3" id="BBz-1c-LaX"/>
+                                                        <constraint firstAttribute="trailing" secondItem="hHP-dw-nba" secondAttribute="trailing" constant="3" id="Sqg-TH-Ay6"/>
+                                                        <constraint firstItem="hHP-dw-nba" firstAttribute="top" secondItem="Bxd-gI-dFS" secondAttribute="top" constant="3" id="yiV-MA-VQG"/>
+                                                    </constraints>
                                                 </tableCellView>
                                             </prototypeCellViews>
                                         </tableColumn>
@@ -457,12 +462,11 @@ DQ
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <prototypeCellViews>
                                                 <tableCellView id="fhc-Nv-0Oh">
-                                                    <rect key="frame" x="644" y="1" width="61" height="28"/>
+                                                    <rect key="frame" x="625" y="1" width="61" height="28"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="xnA-03-Bul">
-                                                            <rect key="frame" x="31" y="8" width="29" height="14"/>
-                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="xnA-03-Bul">
+                                                            <rect key="frame" x="31" y="7" width="29" height="14"/>
                                                             <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="center" title="0" id="OVr-Jm-VrK">
                                                                 <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="xHc-m4-rcn"/>
                                                                 <font key="font" metaFont="smallSystem"/>
@@ -474,16 +478,22 @@ DQ
                                                                 <binding destination="fhc-Nv-0Oh" name="enabled" keyPath="objectValue.passThruDisabled" id="NpX-pb-t52"/>
                                                             </connections>
                                                         </textField>
-                                                        <slider horizontalHuggingPriority="750" verticalHuggingPriority="750" id="DbI-6O-BzA">
-                                                            <rect key="frame" x="3" y="4" width="22" height="22"/>
-                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                                            <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="-5" maxValue="16" doubleValue="0.25" numberOfTickMarks="21" allowsTickMarkValuesOnly="YES" sliderType="circular" id="ea5-qc-etr"/>
+                                                        <slider horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DbI-6O-BzA">
+                                                            <rect key="frame" x="3" y="3" width="22" height="22"/>
+                                                            <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="-5" maxValue="16" doubleValue="-0.79999999999999982" numberOfTickMarks="21" allowsTickMarkValuesOnly="YES" sliderType="circular" id="ea5-qc-etr"/>
                                                             <connections>
                                                                 <binding destination="fhc-Nv-0Oh" name="value" keyPath="objectValue.gain" id="frc-hE-wEW"/>
                                                                 <binding destination="fhc-Nv-0Oh" name="enabled" keyPath="objectValue.passThruDisabled" id="uQZ-XI-fJG"/>
                                                             </connections>
                                                         </slider>
                                                     </subviews>
+                                                    <constraints>
+                                                        <constraint firstItem="xnA-03-Bul" firstAttribute="centerY" secondItem="fhc-Nv-0Oh" secondAttribute="centerY" id="1gM-jy-ydl"/>
+                                                        <constraint firstItem="DbI-6O-BzA" firstAttribute="centerY" secondItem="fhc-Nv-0Oh" secondAttribute="centerY" id="8HO-2a-0jg"/>
+                                                        <constraint firstItem="xnA-03-Bul" firstAttribute="leading" secondItem="DbI-6O-BzA" secondAttribute="trailing" constant="8" symbolic="YES" id="Cdu-ya-Xcp"/>
+                                                        <constraint firstAttribute="trailing" secondItem="xnA-03-Bul" secondAttribute="trailing" constant="3" id="ISR-6D-0LD"/>
+                                                        <constraint firstItem="DbI-6O-BzA" firstAttribute="leading" secondItem="fhc-Nv-0Oh" secondAttribute="leading" constant="3" id="UFq-Xa-DGq"/>
+                                                    </constraints>
                                                 </tableCellView>
                                             </prototypeCellViews>
                                         </tableColumn>
@@ -501,21 +511,19 @@ DQ
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <prototypeCellViews>
                                                 <tableCellView id="t2K-5D-xsX">
-                                                    <rect key="frame" x="708" y="1" width="61" height="27"/>
+                                                    <rect key="frame" x="689" y="1" width="61" height="27"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <slider horizontalHuggingPriority="750" verticalHuggingPriority="750" id="DGi-Dl-5nh">
+                                                        <slider horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DGi-Dl-5nh">
                                                             <rect key="frame" x="3" y="3" width="22" height="22"/>
-                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                             <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" maxValue="4" numberOfTickMarks="16" allowsTickMarkValuesOnly="YES" sliderType="circular" id="MFS-fh-Kd1"/>
                                                             <connections>
                                                                 <binding destination="t2K-5D-xsX" name="value" keyPath="objectValue.drc" id="SVc-TS-Jvf"/>
                                                                 <binding destination="t2K-5D-xsX" name="enabled" keyPath="objectValue.passThruDisabled" id="VZj-BF-MXl"/>
                                                             </connections>
                                                         </slider>
-                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="BaY-Lo-8xn">
+                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="BaY-Lo-8xn">
                                                             <rect key="frame" x="31" y="7" width="29" height="14"/>
-                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                             <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="center" title="0" id="MiI-OV-waZ">
                                                                 <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="FR6-Cx-d2s"/>
                                                                 <font key="font" metaFont="smallSystem"/>
@@ -528,6 +536,13 @@ DQ
                                                             </connections>
                                                         </textField>
                                                     </subviews>
+                                                    <constraints>
+                                                        <constraint firstItem="DGi-Dl-5nh" firstAttribute="leading" secondItem="t2K-5D-xsX" secondAttribute="leading" constant="3" id="0zB-Ob-EuK"/>
+                                                        <constraint firstItem="BaY-Lo-8xn" firstAttribute="leading" secondItem="DGi-Dl-5nh" secondAttribute="trailing" constant="8" symbolic="YES" id="UCb-jm-FVj"/>
+                                                        <constraint firstItem="DGi-Dl-5nh" firstAttribute="centerY" secondItem="t2K-5D-xsX" secondAttribute="centerY" id="XCA-82-B1e"/>
+                                                        <constraint firstItem="BaY-Lo-8xn" firstAttribute="centerY" secondItem="t2K-5D-xsX" secondAttribute="centerY" id="iTt-zz-dyS"/>
+                                                        <constraint firstAttribute="trailing" secondItem="BaY-Lo-8xn" secondAttribute="trailing" constant="3" id="qXd-Fq-bWj"/>
+                                                    </constraints>
                                                 </tableCellView>
                                             </prototypeCellViews>
                                         </tableColumn>
@@ -538,10 +553,12 @@ DQ
                                     </connections>
                                 </tableView>
                             </subviews>
-                            <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </clipView>
+                        <constraints>
+                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="140" id="4LW-Vv-px8"/>
+                        </constraints>
                         <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="ToF-HP-PBf">
-                            <rect key="frame" x="1" y="51" width="771" height="16"/>
+                            <rect key="frame" x="1" y="126" width="738" height="16"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="Dhw-4v-YLa">
@@ -549,13 +566,12 @@ DQ
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <tableHeaderView key="headerView" id="IbE-bD-EWJ">
-                            <rect key="frame" x="0.0" y="0.0" width="771" height="17"/>
+                            <rect key="frame" x="0.0" y="0.0" width="752" height="23"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
                     </scrollView>
-                    <button id="uF5-6E-EIe">
-                        <rect key="frame" x="80" y="54" width="281" height="18"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <button translatesAutoresizingMaskIntoConstraints="NO" id="uF5-6E-EIe">
+                        <rect key="frame" x="80" y="52" width="246" height="18"/>
                         <string key="toolTip">Only the primary audio track will be encoded with the full encoder list. All other secondary audio output tracks will be encoded with first encoder only.</string>
                         <buttonCell key="cell" type="check" title="Use only first encoder for secondary audio" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="66v-2g-DHn">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -565,9 +581,8 @@ DQ
                             <binding destination="-2" name="value" keyPath="self.settings.secondaryEncoderMode" id="Umc-CV-pJy"/>
                         </connections>
                     </button>
-                    <button verticalHuggingPriority="750" id="kJY-av-BYf">
-                        <rect key="frame" x="640" y="14" width="80" height="28"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kJY-av-BYf">
+                        <rect key="frame" x="657" y="14" width="62" height="28"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Jn4-1L-J1g">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="smallSystem"/>
@@ -579,15 +594,14 @@ Gw
                             <action selector="cancel:" target="-2" id="Vkr-zh-YAJ"/>
                         </connections>
                     </button>
-                    <scrollView autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="10" verticalLineScroll="16" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="aTC-39-h6S">
-                        <rect key="frame" x="161" y="292" width="246" height="135"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <scrollView autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="10" verticalLineScroll="16" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aTC-39-h6S">
+                        <rect key="frame" x="154" y="293" width="250" height="135"/>
                         <clipView key="contentView" id="TdE-Sh-NcS">
-                            <rect key="frame" x="1" y="1" width="244" height="133"/>
+                            <rect key="frame" x="1" y="1" width="248" height="133"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" autosaveColumns="NO" rowHeight="14" viewBased="YES" id="Of7-71-Ci6">
-                                    <rect key="frame" x="0.0" y="0.0" width="244" height="0.0"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="248" height="133"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -609,9 +623,8 @@ Gw
                                                     <rect key="frame" x="1" y="1" width="16" height="17"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <button id="F5N-kV-6cy">
+                                                        <button translatesAutoresizingMaskIntoConstraints="NO" id="F5N-kV-6cy">
                                                             <rect key="frame" x="0.0" y="0.0" width="23" height="20"/>
-                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                             <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="NOa-yY-z7A">
                                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                                 <font key="font" metaFont="smallSystem"/>
@@ -622,13 +635,19 @@ Gw
                                                             </connections>
                                                         </button>
                                                     </subviews>
+                                                    <constraints>
+                                                        <constraint firstItem="F5N-kV-6cy" firstAttribute="leading" secondItem="haT-6q-XQu" secondAttribute="leading" constant="3" id="IcV-Ph-vK6"/>
+                                                        <constraint firstAttribute="bottom" secondItem="F5N-kV-6cy" secondAttribute="bottom" constant="3" id="QL4-tT-aU6"/>
+                                                        <constraint firstItem="F5N-kV-6cy" firstAttribute="top" secondItem="haT-6q-XQu" secondAttribute="top" id="Uu2-Tz-ONd"/>
+                                                        <constraint firstAttribute="trailing" secondItem="F5N-kV-6cy" secondAttribute="trailing" constant="-5" id="awP-x4-2SN"/>
+                                                    </constraints>
                                                 </tableCellView>
                                             </prototypeCellViews>
                                             <connections>
                                                 <binding destination="ZBe-aP-wvq" name="value" keyPath="arrangedObjects.isSelected" id="fRp-oC-H6C"/>
                                             </connections>
                                         </tableColumn>
-                                        <tableColumn identifier="" width="222" minWidth="10" maxWidth="3.4028234663852886e+38" id="1jx-n6-maB">
+                                        <tableColumn identifier="" width="226" minWidth="10" maxWidth="3.4028234663852886e+38" id="1jx-n6-maB">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
                                                 <font key="font" metaFont="smallSystem"/>
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -642,12 +661,11 @@ Gw
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <prototypeCellViews>
                                                 <tableCellView id="viR-RI-qpg">
-                                                    <rect key="frame" x="20" y="1" width="224" height="17"/>
+                                                    <rect key="frame" x="20" y="1" width="226" height="17"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="dL0-3w-ALm">
-                                                            <rect key="frame" x="0.0" y="3" width="224" height="14"/>
-                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="dL0-3w-ALm">
+                                                            <rect key="frame" x="0.0" y="2" width="226" height="14"/>
                                                             <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="fSK-fP-YJj">
                                                                 <font key="font" metaFont="smallSystem"/>
                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -658,6 +676,11 @@ Gw
                                                             </connections>
                                                         </textField>
                                                     </subviews>
+                                                    <constraints>
+                                                        <constraint firstAttribute="trailing" secondItem="dL0-3w-ALm" secondAttribute="trailing" constant="2" id="kLM-an-5ue"/>
+                                                        <constraint firstItem="dL0-3w-ALm" firstAttribute="centerY" secondItem="viR-RI-qpg" secondAttribute="centerY" id="kzD-b7-S3v"/>
+                                                        <constraint firstItem="dL0-3w-ALm" firstAttribute="leading" secondItem="viR-RI-qpg" secondAttribute="leading" constant="2" id="nV9-Hj-M9z"/>
+                                                    </constraints>
                                                     <connections>
                                                         <outlet property="textField" destination="dL0-3w-ALm" id="Pj5-gu-2cY"/>
                                                     </connections>
@@ -672,10 +695,12 @@ Gw
                                     </connections>
                                 </tableView>
                             </subviews>
-                            <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </clipView>
-                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="bXf-U5-ogz">
-                            <rect key="frame" x="1" y="118" width="244" height="16"/>
+                        <constraints>
+                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="250" id="7Rp-Nn-e0h"/>
+                        </constraints>
+                        <scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="bXf-U5-ogz">
+                            <rect key="frame" x="1" y="118" width="248" height="16"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="BWM-rq-VTg">
@@ -686,9 +711,8 @@ Gw
                             <outlet property="nextKeyView" destination="QAt-5X-NBT" id="u00-fZ-W1s"/>
                         </connections>
                     </scrollView>
-                    <button horizontalHuggingPriority="750" verticalHuggingPriority="750" id="M11-Ls-RrL">
-                        <rect key="frame" x="18" y="16" width="25" height="25"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="M11-Ls-RrL">
+                        <rect key="frame" x="18" y="17" width="22" height="22"/>
                         <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="sOl-fj-Vc8">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="smallSystem"/>
@@ -698,11 +722,66 @@ Gw
                         </connections>
                     </button>
                 </subviews>
+                <constraints>
+                    <constraint firstItem="0HY-xB-cvO" firstAttribute="top" secondItem="os0-Jl-OXF" secondAttribute="bottom" constant="6" id="1Kg-ZM-dIQ"/>
+                    <constraint firstItem="fPg-3n-1TN" firstAttribute="top" secondItem="ZP2-Cp-K5w" secondAttribute="top" constant="22" id="1TC-iB-tBM"/>
+                    <constraint firstItem="kJY-av-BYf" firstAttribute="width" secondItem="sC2-52-liU" secondAttribute="width" id="3US-QJ-5QL"/>
+                    <constraint firstAttribute="trailing" secondItem="os0-Jl-OXF" secondAttribute="trailing" constant="88" id="4bS-Yo-TSN"/>
+                    <constraint firstItem="fgl-Ev-ELt" firstAttribute="top" secondItem="fzd-MO-xaB" secondAttribute="bottom" constant="6" id="66e-Qk-ajP"/>
+                    <constraint firstItem="os0-Jl-OXF" firstAttribute="baseline" secondItem="vUx-OV-W5T" secondAttribute="baseline" id="7N7-5F-zWF"/>
+                    <constraint firstItem="uF5-6E-EIe" firstAttribute="baseline" secondItem="N4q-sT-WgW" secondAttribute="baseline" id="8Xr-a4-1RY"/>
+                    <constraint firstItem="M11-Ls-RrL" firstAttribute="top" secondItem="N4q-sT-WgW" secondAttribute="bottom" constant="15" id="AOo-Sb-GZW"/>
+                    <constraint firstAttribute="trailing" secondItem="sC2-52-liU" secondAttribute="trailing" constant="20" id="B62-ty-pmI"/>
+                    <constraint firstItem="Jsz-Er-bsF" firstAttribute="width" secondItem="fPg-3n-1TN" secondAttribute="width" id="DTG-Dg-ju5"/>
+                    <constraint firstItem="os0-Jl-OXF" firstAttribute="leading" secondItem="vUx-OV-W5T" secondAttribute="trailing" constant="30" id="Fmc-Z0-yQZ"/>
+                    <constraint firstAttribute="bottom" secondItem="M11-Ls-RrL" secondAttribute="bottom" constant="20" id="G1B-eX-eqE"/>
+                    <constraint firstItem="QAt-5X-NBT" firstAttribute="top" secondItem="aTC-39-h6S" secondAttribute="bottom" constant="8" id="Gc4-RW-fsh"/>
+                    <constraint firstItem="IxI-o9-jMs" firstAttribute="leading" secondItem="E93-Md-aWa" secondAttribute="leading" id="HtK-To-0EQ"/>
+                    <constraint firstItem="fPg-3n-1TN" firstAttribute="baseline" secondItem="oiD-QI-wly" secondAttribute="baseline" id="Ixv-MD-yaN"/>
+                    <constraint firstItem="uF5-6E-EIe" firstAttribute="leading" secondItem="N4q-sT-WgW" secondAttribute="trailing" constant="13" id="J0L-CA-XLI"/>
+                    <constraint firstItem="LdN-Cx-ZJY" firstAttribute="leading" secondItem="Tth-IR-7cU" secondAttribute="trailing" constant="8" id="J5S-TP-Bn4"/>
+                    <constraint firstItem="aTC-39-h6S" firstAttribute="top" secondItem="Jsz-Er-bsF" secondAttribute="top" id="JGp-Ee-U2U"/>
+                    <constraint firstItem="l4i-pd-Cbk" firstAttribute="top" secondItem="aTC-39-h6S" secondAttribute="top" id="LEE-zN-6Nn"/>
+                    <constraint firstItem="kJY-av-BYf" firstAttribute="baseline" secondItem="sC2-52-liU" secondAttribute="baseline" id="LdH-5O-jKo"/>
+                    <constraint firstItem="LdN-Cx-ZJY" firstAttribute="baseline" secondItem="Tth-IR-7cU" secondAttribute="baseline" id="Lpv-O6-woq"/>
+                    <constraint firstItem="BK7-c4-kkk" firstAttribute="leading" secondItem="0HY-xB-cvO" secondAttribute="leading" id="N4x-g8-IIS"/>
+                    <constraint firstItem="RtZ-Cz-5mG" firstAttribute="leading" secondItem="ZP2-Cp-K5w" secondAttribute="leading" constant="20" id="R53-5h-0vJ"/>
+                    <constraint firstAttribute="bottom" secondItem="sC2-52-liU" secondAttribute="bottom" constant="20" id="RRW-Y5-912"/>
+                    <constraint firstItem="vUx-OV-W5T" firstAttribute="leading" secondItem="l4i-pd-Cbk" secondAttribute="trailing" constant="8" id="RmT-3c-K9e"/>
+                    <constraint firstItem="aTC-39-h6S" firstAttribute="top" secondItem="oiD-QI-wly" secondAttribute="bottom" constant="8" id="SNx-1k-9Uf"/>
+                    <constraint firstItem="BK7-c4-kkk" firstAttribute="top" secondItem="0HY-xB-cvO" secondAttribute="bottom" constant="6" id="VVW-dq-3ff"/>
+                    <constraint firstItem="fgl-Ev-ELt" firstAttribute="leading" secondItem="fzd-MO-xaB" secondAttribute="leading" id="WS0-eR-HKh"/>
+                    <constraint firstItem="fzd-MO-xaB" firstAttribute="leading" secondItem="vUx-OV-W5T" secondAttribute="leading" id="Xtx-ud-2Ie"/>
+                    <constraint firstItem="RtZ-Cz-5mG" firstAttribute="top" secondItem="QAt-5X-NBT" secondAttribute="bottom" constant="20" id="Xwx-lx-KHL"/>
+                    <constraint firstItem="E93-Md-aWa" firstAttribute="leading" secondItem="fgl-Ev-ELt" secondAttribute="leading" id="YeR-2U-oWh"/>
+                    <constraint firstItem="Tth-IR-7cU" firstAttribute="width" secondItem="l4i-pd-Cbk" secondAttribute="width" id="Z0M-ak-Mll"/>
+                    <constraint firstItem="aTC-39-h6S" firstAttribute="leading" secondItem="QAt-5X-NBT" secondAttribute="leading" id="aO7-nw-AjV"/>
+                    <constraint firstItem="Jsz-Er-bsF" firstAttribute="leading" secondItem="fPg-3n-1TN" secondAttribute="leading" id="bPd-p5-Z94"/>
+                    <constraint firstItem="LdN-Cx-ZJY" firstAttribute="top" secondItem="IxI-o9-jMs" secondAttribute="bottom" constant="29" id="cCv-9s-FHB"/>
+                    <constraint firstItem="0HY-xB-cvO" firstAttribute="leading" secondItem="os0-Jl-OXF" secondAttribute="leading" id="dtd-xw-QCP"/>
+                    <constraint firstItem="hGL-Ew-UVJ" firstAttribute="top" secondItem="LdN-Cx-ZJY" secondAttribute="bottom" constant="74" id="e7V-pM-tjy"/>
+                    <constraint firstItem="M11-Ls-RrL" firstAttribute="leading" secondItem="N4q-sT-WgW" secondAttribute="leading" id="fBT-WX-Q5Z"/>
+                    <constraint firstAttribute="trailing" secondItem="hGL-Ew-UVJ" secondAttribute="trailing" constant="20" id="glz-Tw-AyY"/>
+                    <constraint firstItem="vUx-OV-W5T" firstAttribute="baseline" secondItem="l4i-pd-Cbk" secondAttribute="baseline" id="j0t-pv-Wfy"/>
+                    <constraint firstItem="E93-Md-aWa" firstAttribute="top" secondItem="fgl-Ev-ELt" secondAttribute="bottom" constant="6" id="jeE-jg-jxu"/>
+                    <constraint firstItem="hGL-Ew-UVJ" firstAttribute="top" secondItem="RtZ-Cz-5mG" secondAttribute="bottom" constant="8" id="jhe-0p-LYz"/>
+                    <constraint firstItem="Tth-IR-7cU" firstAttribute="leading" secondItem="l4i-pd-Cbk" secondAttribute="leading" id="mrj-X0-EFm"/>
+                    <constraint firstItem="IxI-o9-jMs" firstAttribute="top" secondItem="E93-Md-aWa" secondAttribute="bottom" constant="6" id="pR6-Bh-P94"/>
+                    <constraint firstItem="aTC-39-h6S" firstAttribute="leading" secondItem="Jsz-Er-bsF" secondAttribute="trailing" constant="8" id="pV4-BK-VLF"/>
+                    <constraint firstItem="fzd-MO-xaB" firstAttribute="top" secondItem="vUx-OV-W5T" secondAttribute="bottom" constant="6" id="rMw-EM-QAG"/>
+                    <constraint firstItem="oiD-QI-wly" firstAttribute="leading" secondItem="fPg-3n-1TN" secondAttribute="trailing" constant="8" id="t8C-sb-QkU"/>
+                    <constraint firstItem="sC2-52-liU" firstAttribute="leading" secondItem="kJY-av-BYf" secondAttribute="trailing" constant="8" id="vZI-9R-5tO"/>
+                    <constraint firstItem="fPg-3n-1TN" firstAttribute="leading" secondItem="ZP2-Cp-K5w" secondAttribute="leading" constant="12" id="vb4-Zo-R8r"/>
+                    <constraint firstItem="N4q-sT-WgW" firstAttribute="top" secondItem="hGL-Ew-UVJ" secondAttribute="bottom" constant="8" id="w2O-Xt-Vdr"/>
+                    <constraint firstItem="l4i-pd-Cbk" firstAttribute="leading" secondItem="aTC-39-h6S" secondAttribute="trailing" constant="70" id="wiP-c8-LfG"/>
+                    <constraint firstItem="hGL-Ew-UVJ" firstAttribute="leading" secondItem="ZP2-Cp-K5w" secondAttribute="leading" constant="20" id="yag-PB-aqP"/>
+                    <constraint firstItem="hGL-Ew-UVJ" firstAttribute="leading" secondItem="N4q-sT-WgW" secondAttribute="leading" id="zUn-OY-n5b"/>
+                </constraints>
             </view>
             <connections>
                 <outlet property="initialFirstResponder" destination="oiD-QI-wly" id="Vxi-xi-P0d"/>
             </connections>
-            <point key="canvasLocation" x="558.5" y="284.5"/>
+            <point key="canvasLocation" x="558" y="96"/>
         </window>
         <arrayController objectClassName="HBLang" id="ZBe-aP-wvq" userLabel="Languages Table Controller" customClass="HBLanguageArrayController">
             <declaredKeys>
diff --git a/macosx/English.lproj/ChaptersTitles.xib b/macosx/English.lproj/ChaptersTitles.xib
index 74dd2df01..8200f6d64 100644
--- a/macosx/English.lproj/ChaptersTitles.xib
+++ b/macosx/English.lproj/ChaptersTitles.xib
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9060" systemVersion="15C48a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="16A238m" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <development version="6300" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9060"/>
+        <development version="7000" identifier="xcode"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="HBChapterTitlesController">
@@ -18,10 +18,8 @@
             <rect key="frame" x="0.0" y="0.0" width="926" height="322"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <button toolTip="Add chapter markers to output file." id="7Xf-c0-jsr">
-                    <rect key="frame" x="17" y="294" width="165" height="18"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <animations/>
+                <button toolTip="Add chapter markers to output file." translatesAutoresizingMaskIntoConstraints="NO" id="7Xf-c0-jsr">
+                    <rect key="frame" x="17" y="294" width="146" height="18"/>
                     <buttonCell key="cell" type="check" title="Create chapter markers" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="lJL-wX-DVP">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="smallSystem"/>
@@ -35,10 +33,8 @@
                         <binding destination="-2" name="value" keyPath="self.job.chaptersEnabled" id="7wG-le-s1k"/>
                     </connections>
                 </button>
-                <button toolTip="Import a list of chapter names from a file." verticalHuggingPriority="750" id="Ron-3B-rYg">
-                    <rect key="frame" x="656" y="288" width="129" height="28"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
-                    <animations/>
+                <button toolTip="Import a list of chapter names from a file." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ron-3B-rYg">
+                    <rect key="frame" x="671" y="288" width="121" height="28"/>
                     <buttonCell key="cell" type="push" title="Import Chapters…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="PM3-Ue-0kW">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="smallSystem"/>
@@ -52,10 +48,8 @@
                         </binding>
                     </connections>
                 </button>
-                <button toolTip="Export the list of chapter names to a file." verticalHuggingPriority="750" id="3SP-6e-RPS">
-                    <rect key="frame" x="783" y="288" width="128" height="28"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
-                    <animations/>
+                <button toolTip="Export the list of chapter names to a file." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3SP-6e-RPS">
+                    <rect key="frame" x="790" y="288" width="121" height="28"/>
                     <buttonCell key="cell" type="push" title="Export Chapters…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="h0O-zg-OF9">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="smallSystem"/>
@@ -69,17 +63,15 @@
                         </binding>
                     </connections>
                 </button>
-                <scrollView autohidesScrollers="YES" horizontalLineScroll="18" horizontalPageScroll="0.0" verticalLineScroll="18" verticalPageScroll="0.0" usesPredominantAxisScrolling="NO" id="lqY-aE-MZi">
+                <scrollView autohidesScrollers="YES" horizontalLineScroll="18" horizontalPageScroll="0.0" verticalLineScroll="18" verticalPageScroll="0.0" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lqY-aE-MZi">
                     <rect key="frame" x="20" y="20" width="886" height="264"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <clipView key="contentView" id="3Pi-zz-fFg">
                         <rect key="frame" x="1" y="0.0" width="884" height="263"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="16" headerView="0rK-Rs-NTb" viewBased="YES" id="InF-gR-Lia">
-                                <rect key="frame" x="0.0" y="0.0" width="884" height="246"/>
+                                <rect key="frame" x="0.0" y="0.0" width="884" height="240"/>
                                 <autoresizingMask key="autoresizingMask"/>
-                                <animations/>
                                 <size key="intercellSpacing" width="3" height="2"/>
                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
@@ -101,10 +93,8 @@
                                                 <rect key="frame" x="1" y="1" width="76" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="9mL-8S-7Nl">
+                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="9mL-8S-7Nl">
                                                         <rect key="frame" x="0.0" y="3" width="84" height="14"/>
-                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                        <animations/>
                                                         <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="G9p-Cg-wyC">
                                                             <font key="font" metaFont="smallSystem"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -115,7 +105,10 @@
                                                         </connections>
                                                     </textField>
                                                 </subviews>
-                                                <animations/>
+                                                <constraints>
+                                                    <constraint firstAttribute="bottom" secondItem="9mL-8S-7Nl" secondAttribute="bottom" constant="3" id="Vjh-cp-7Jd"/>
+                                                    <constraint firstItem="9mL-8S-7Nl" firstAttribute="leading" secondItem="xTN-ym-UFK" secondAttribute="leading" constant="2" id="pSw-cC-cvN"/>
+                                                </constraints>
                                                 <connections>
                                                     <outlet property="textField" destination="9mL-8S-7Nl" id="eLt-na-ejF"/>
                                                 </connections>
@@ -146,10 +139,8 @@
                                                 <rect key="frame" x="80" y="1" width="84" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="4HO-kO-Qtr">
+                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="4HO-kO-Qtr">
                                                         <rect key="frame" x="0.0" y="3" width="84" height="14"/>
-                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                        <animations/>
                                                         <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="Vmq-zJ-NEA">
                                                             <font key="font" metaFont="smallSystem"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -160,7 +151,10 @@
                                                         </connections>
                                                     </textField>
                                                 </subviews>
-                                                <animations/>
+                                                <constraints>
+                                                    <constraint firstItem="4HO-kO-Qtr" firstAttribute="centerX" secondItem="AVw-G2-Zyi" secondAttribute="centerX" id="XEw-X9-ZcZ"/>
+                                                    <constraint firstAttribute="bottom" secondItem="4HO-kO-Qtr" secondAttribute="bottom" constant="3" id="jD8-P2-VDl"/>
+                                                </constraints>
                                                 <connections>
                                                     <outlet property="textField" destination="4HO-kO-Qtr" id="iex-iJ-sA2"/>
                                                 </connections>
@@ -191,10 +185,11 @@
                                                 <rect key="frame" x="167" y="1" width="715" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="rpj-MP-nnZ">
+                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="rpj-MP-nnZ">
                                                         <rect key="frame" x="0.0" y="0.0" width="715" height="17"/>
-                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                        <animations/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="17" id="o2t-lQ-cWD"/>
+                                                        </constraints>
                                                         <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="Table View Cell" id="UjY-nz-uSt">
                                                             <font key="font" metaFont="smallSystem"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -206,7 +201,11 @@
                                                         </connections>
                                                     </textField>
                                                 </subviews>
-                                                <animations/>
+                                                <constraints>
+                                                    <constraint firstItem="rpj-MP-nnZ" firstAttribute="centerX" secondItem="yZu-QP-dyq" secondAttribute="centerX" id="Dx4-rQ-TQm"/>
+                                                    <constraint firstItem="rpj-MP-nnZ" firstAttribute="leading" secondItem="yZu-QP-dyq" secondAttribute="leading" constant="2" id="SLO-o4-IZz"/>
+                                                    <constraint firstItem="rpj-MP-nnZ" firstAttribute="centerY" secondItem="yZu-QP-dyq" secondAttribute="centerY" id="eQZ-La-EGl"/>
+                                                </constraints>
                                                 <connections>
                                                     <outlet property="textField" destination="rpj-MP-nnZ" id="fwU-RB-S1Z"/>
                                                 </connections>
@@ -225,28 +224,34 @@
                                 </connections>
                             </tableView>
                         </subviews>
-                        <animations/>
                         <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </clipView>
-                    <animations/>
                     <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="O2b-uL-5ea">
                         <rect key="frame" x="-100" y="-100" width="488" height="15"/>
                         <autoresizingMask key="autoresizingMask"/>
-                        <animations/>
                     </scroller>
                     <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="yp0-pp-Yw7">
                         <rect key="frame" x="869" y="17" width="16" height="246"/>
                         <autoresizingMask key="autoresizingMask"/>
-                        <animations/>
                     </scroller>
                     <tableHeaderView key="headerView" id="0rK-Rs-NTb">
-                        <rect key="frame" x="0.0" y="0.0" width="884" height="17"/>
+                        <rect key="frame" x="0.0" y="0.0" width="884" height="23"/>
                         <autoresizingMask key="autoresizingMask"/>
-                        <animations/>
                     </tableHeaderView>
                 </scrollView>
             </subviews>
-            <animations/>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="3SP-6e-RPS" secondAttribute="trailing" constant="20" symbolic="YES" id="9xx-GM-LnW"/>
+                <constraint firstItem="3SP-6e-RPS" firstAttribute="trailing" secondItem="lqY-aE-MZi" secondAttribute="trailing" id="A7s-6B-V8k"/>
+                <constraint firstItem="Ron-3B-rYg" firstAttribute="baseline" secondItem="3SP-6e-RPS" secondAttribute="baseline" id="DcN-Zr-Ck1"/>
+                <constraint firstItem="lqY-aE-MZi" firstAttribute="top" secondItem="Ron-3B-rYg" secondAttribute="bottom" constant="10" id="Dki-q6-mVP"/>
+                <constraint firstItem="3SP-6e-RPS" firstAttribute="leading" secondItem="Ron-3B-rYg" secondAttribute="trailing" constant="8" symbolic="YES" id="Eq4-Bh-pEN"/>
+                <constraint firstItem="7Xf-c0-jsr" firstAttribute="baseline" secondItem="Ron-3B-rYg" secondAttribute="baseline" id="Pv3-Vo-6c3"/>
+                <constraint firstAttribute="bottom" secondItem="lqY-aE-MZi" secondAttribute="bottom" constant="20" symbolic="YES" id="epW-QY-9Za"/>
+                <constraint firstItem="Ron-3B-rYg" firstAttribute="top" secondItem="qs9-Xl-pXA" secondAttribute="top" constant="10" id="got-Hc-hGi"/>
+                <constraint firstItem="7Xf-c0-jsr" firstAttribute="leading" secondItem="lqY-aE-MZi" secondAttribute="leading" id="xvS-rd-BVF"/>
+                <constraint firstItem="7Xf-c0-jsr" firstAttribute="leading" secondItem="qs9-Xl-pXA" secondAttribute="leading" constant="20" symbolic="YES" id="zIR-UV-LXe"/>
+            </constraints>
             <point key="canvasLocation" x="268" y="396"/>
         </view>
         <userDefaultsController representsSharedInstance="YES" id="coy-s6-QLx"/>
diff --git a/macosx/English.lproj/Subtitles.xib b/macosx/English.lproj/Subtitles.xib
index 971b12558..6e5e877ff 100644
--- a/macosx/English.lproj/Subtitles.xib
+++ b/macosx/English.lproj/Subtitles.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11173.2" systemVersion="16A238m" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="16A238m" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
         <development version="7000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11173.2"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="HBSubtitlesController">
@@ -17,9 +17,11 @@
             <rect key="frame" x="0.0" y="0.0" width="926" height="322"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <popUpButton verticalHuggingPriority="750" id="2Tb-KC-Ugi">
+                <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2Tb-KC-Ugi">
                     <rect key="frame" x="17" y="291" width="88" height="22"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <constraints>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="82" id="LnC-EY-WyR"/>
+                    </constraints>
                     <popUpButtonCell key="cell" type="push" title="Track" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="8ZD-D6-TLA">
                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="smallSystem"/>
@@ -53,9 +55,8 @@
                         </binding>
                     </connections>
                 </popUpButton>
-                <button verticalHuggingPriority="750" id="QsM-28-Pya">
-                    <rect key="frame" x="110" y="288" width="140" height="28"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QsM-28-Pya">
+                    <rect key="frame" x="110" y="288" width="134" height="28"/>
                     <buttonCell key="cell" type="push" title="Configure Defaults…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="oxg-bs-1si">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="smallSystem"/>
@@ -69,9 +70,8 @@
                         </binding>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" id="Vxx-gk-9kY">
-                    <rect key="frame" x="248" y="288" width="116" height="28"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Vxx-gk-9kY">
+                    <rect key="frame" x="242" y="288" width="109" height="28"/>
                     <buttonCell key="cell" type="push" title="Reload Defaults" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="jG8-uo-1tv">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="smallSystem"/>
@@ -85,15 +85,14 @@
                         </binding>
                     </connections>
                 </button>
-                <scrollView autohidesScrollers="YES" horizontalLineScroll="27" horizontalPageScroll="10" verticalLineScroll="27" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="Syo-rH-vof">
+                <scrollView autohidesScrollers="YES" horizontalLineScroll="27" horizontalPageScroll="10" verticalLineScroll="27" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Syo-rH-vof">
                     <rect key="frame" x="20" y="20" width="886" height="264"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <clipView key="contentView" id="ljc-nW-Cnc">
                         <rect key="frame" x="1" y="0.0" width="884" height="263"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="25" rowSizeStyle="automatic" headerView="IiW-3a-Drv" viewBased="YES" id="0yM-wE-D2x">
-                                <rect key="frame" x="0.0" y="0.0" width="884" height="246"/>
+                                <rect key="frame" x="0.0" y="0.0" width="884" height="240"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <size key="intercellSpacing" width="3" height="2"/>
                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -120,9 +119,8 @@
                                                 <rect key="frame" x="1" y="1" width="322" height="25"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <popUpButton verticalHuggingPriority="750" id="Tf3-cP-TGw">
+                                                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Tf3-cP-TGw">
                                                         <rect key="frame" x="0.0" y="1" width="322" height="22"/>
-                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="JWk-Ab-hdY">
                                                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                             <font key="font" metaFont="smallSystem"/>
@@ -140,6 +138,11 @@
                                                         </connections>
                                                     </popUpButton>
                                                 </subviews>
+                                                <constraints>
+                                                    <constraint firstItem="Tf3-cP-TGw" firstAttribute="leading" secondItem="EZp-rc-7mo" secondAttribute="leading" constant="3" id="SjK-h4-jBa"/>
+                                                    <constraint firstAttribute="trailing" secondItem="Tf3-cP-TGw" secondAttribute="trailing" constant="3" id="Z2W-qa-AON"/>
+                                                    <constraint firstItem="Tf3-cP-TGw" firstAttribute="top" secondItem="EZp-rc-7mo" secondAttribute="top" constant="3" id="nLT-E9-asy"/>
+                                                </constraints>
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
@@ -158,9 +161,8 @@
                                                 <rect key="frame" x="326" y="1" width="76" height="25"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <button id="HC5-ql-Vcr">
+                                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="HC5-ql-Vcr">
                                                         <rect key="frame" x="26" y="3" width="23" height="20"/>
-                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="SPR-9q-XBK">
                                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                             <font key="font" metaFont="smallSystem"/>
@@ -171,6 +173,12 @@
                                                         </connections>
                                                     </button>
                                                 </subviews>
+                                                <constraints>
+                                                    <constraint firstItem="HC5-ql-Vcr" firstAttribute="centerY" secondItem="zKg-by-KFV" secondAttribute="centerY" id="Bnl-uV-Fds"/>
+                                                    <constraint firstItem="HC5-ql-Vcr" firstAttribute="top" secondItem="zKg-by-KFV" secondAttribute="top" constant="5" id="LGF-pz-TTr"/>
+                                                    <constraint firstItem="HC5-ql-Vcr" firstAttribute="leading" secondItem="zKg-by-KFV" secondAttribute="leading" constant="29" id="OGP-N0-fSq"/>
+                                                    <constraint firstItem="HC5-ql-Vcr" firstAttribute="centerX" secondItem="zKg-by-KFV" secondAttribute="centerX" id="mvF-fX-bf0"/>
+                                                </constraints>
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
@@ -189,9 +197,8 @@
                                                 <rect key="frame" x="405" y="1" width="64" height="25"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <button id="zpm-9Z-Hsq">
+                                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="zpm-9Z-Hsq">
                                                         <rect key="frame" x="20" y="3" width="23" height="20"/>
-                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="s2E-1o-mGs">
                                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                             <font key="font" metaFont="smallSystem"/>
@@ -206,6 +213,12 @@
                                                         </connections>
                                                     </button>
                                                 </subviews>
+                                                <constraints>
+                                                    <constraint firstItem="zpm-9Z-Hsq" firstAttribute="centerX" secondItem="gxH-yz-YRK" secondAttribute="centerX" id="Xbu-8p-kJ7"/>
+                                                    <constraint firstItem="zpm-9Z-Hsq" firstAttribute="centerY" secondItem="gxH-yz-YRK" secondAttribute="centerY" id="nLs-iU-WUw"/>
+                                                    <constraint firstItem="zpm-9Z-Hsq" firstAttribute="leading" secondItem="gxH-yz-YRK" secondAttribute="leading" constant="23" id="php-Zc-NnF"/>
+                                                    <constraint firstItem="zpm-9Z-Hsq" firstAttribute="top" secondItem="gxH-yz-YRK" secondAttribute="top" constant="5" id="ylD-H0-wie"/>
+                                                </constraints>
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
@@ -224,9 +237,8 @@
                                                 <rect key="frame" x="472" y="1" width="51" height="25"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <button id="mdO-Qu-3Pb">
+                                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="mdO-Qu-3Pb">
                                                         <rect key="frame" x="14" y="4" width="22" height="18"/>
-                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="kwl-qH-Dgo">
                                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                             <font key="font" metaFont="smallSystem"/>
@@ -237,6 +249,10 @@
                                                         </connections>
                                                     </button>
                                                 </subviews>
+                                                <constraints>
+                                                    <constraint firstItem="mdO-Qu-3Pb" firstAttribute="centerX" secondItem="mQ6-s6-Zm2" secondAttribute="centerX" id="hk9-EN-HLO"/>
+                                                    <constraint firstItem="mdO-Qu-3Pb" firstAttribute="centerY" secondItem="mQ6-s6-Zm2" secondAttribute="centerY" id="t3m-Ce-JH7"/>
+                                                </constraints>
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
@@ -261,9 +277,8 @@
                                                 <rect key="frame" x="526" y="1" width="173" height="25"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <popUpButton verticalHuggingPriority="750" id="Inz-O5-B8g">
+                                                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Inz-O5-B8g">
                                                         <rect key="frame" x="0.0" y="0.0" width="173" height="22"/>
-                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="zIn-sc-xak">
                                                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                             <font key="font" metaFont="smallSystem"/>
@@ -286,6 +301,11 @@
                                                         </connections>
                                                     </popUpButton>
                                                 </subviews>
+                                                <constraints>
+                                                    <constraint firstAttribute="bottom" secondItem="Inz-O5-B8g" secondAttribute="bottom" constant="3" id="CII-4f-7Y0"/>
+                                                    <constraint firstItem="Inz-O5-B8g" firstAttribute="leading" secondItem="4bh-my-GeM" secondAttribute="leading" constant="3" id="CnV-f5-Gtx"/>
+                                                    <constraint firstAttribute="trailing" secondItem="Inz-O5-B8g" secondAttribute="trailing" constant="3" id="NhM-0h-zLT"/>
+                                                </constraints>
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
@@ -306,9 +326,8 @@
                                                 <rect key="frame" x="702" y="1" width="113" height="25"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <popUpButton verticalHuggingPriority="750" id="QV0-kE-4yR">
+                                                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QV0-kE-4yR">
                                                         <rect key="frame" x="0.0" y="0.0" width="113" height="22"/>
-                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="jFr-2c-3Vv">
                                                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                             <font key="font" metaFont="smallSystem"/>
@@ -327,6 +346,11 @@
                                                         </connections>
                                                     </popUpButton>
                                                 </subviews>
+                                                <constraints>
+                                                    <constraint firstAttribute="bottom" secondItem="QV0-kE-4yR" secondAttribute="bottom" constant="3" id="3cY-6P-m7C"/>
+                                                    <constraint firstAttribute="trailing" secondItem="QV0-kE-4yR" secondAttribute="trailing" constant="3" id="56f-EX-8Xt"/>
+                                                    <constraint firstItem="QV0-kE-4yR" firstAttribute="leading" secondItem="ZBK-cc-m0z" secondAttribute="leading" constant="3" id="W3d-o2-suN"/>
+                                                </constraints>
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
@@ -347,9 +371,8 @@
                                                 <rect key="frame" x="818" y="1" width="64" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="aJi-zQ-0cg">
+                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="aJi-zQ-0cg">
                                                         <rect key="frame" x="0.0" y="-3" width="64" height="14"/>
-                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="center" title="0" id="hhH-c3-gD0">
                                                             <numberFormatter key="formatter" formatterBehavior="default10_4" numberStyle="decimal" minimumIntegerDigits="1" maximumIntegerDigits="2000000000" maximumFractionDigits="3" id="Jui-oB-oVO"/>
                                                             <font key="font" metaFont="smallSystem"/>
@@ -366,6 +389,11 @@
                                                         </connections>
                                                     </textField>
                                                 </subviews>
+                                                <constraints>
+                                                    <constraint firstItem="aJi-zQ-0cg" firstAttribute="top" secondItem="9tV-iL-oaF" secondAttribute="top" constant="6" id="AHN-d6-URf"/>
+                                                    <constraint firstItem="aJi-zQ-0cg" firstAttribute="centerX" secondItem="9tV-iL-oaF" secondAttribute="centerX" id="Dqo-dR-xOW"/>
+                                                    <constraint firstItem="aJi-zQ-0cg" firstAttribute="leading" secondItem="9tV-iL-oaF" secondAttribute="leading" constant="2" id="bUg-SG-Q9K"/>
+                                                </constraints>
                                                 <connections>
                                                     <outlet property="textField" destination="aJi-zQ-0cg" id="WSP-oS-jCs"/>
                                                 </connections>
@@ -393,11 +421,23 @@
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                     <tableHeaderView key="headerView" id="IiW-3a-Drv">
-                        <rect key="frame" x="0.0" y="0.0" width="884" height="17"/>
+                        <rect key="frame" x="0.0" y="0.0" width="884" height="23"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </tableHeaderView>
                 </scrollView>
             </subviews>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="Syo-rH-vof" secondAttribute="trailing" constant="20" symbolic="YES" id="5IB-ap-YgJ"/>
+                <constraint firstItem="2Tb-KC-Ugi" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" symbolic="YES" id="9Vp-q0-po2"/>
+                <constraint firstItem="2Tb-KC-Ugi" firstAttribute="leading" secondItem="Syo-rH-vof" secondAttribute="leading" id="Fni-x3-tM1"/>
+                <constraint firstItem="QsM-28-Pya" firstAttribute="baseline" secondItem="Vxx-gk-9kY" secondAttribute="baseline" id="JZu-dS-kIW"/>
+                <constraint firstItem="QsM-28-Pya" firstAttribute="leading" secondItem="2Tb-KC-Ugi" secondAttribute="trailing" constant="13" id="Txa-IP-VtQ"/>
+                <constraint firstItem="Vxx-gk-9kY" firstAttribute="leading" secondItem="QsM-28-Pya" secondAttribute="trailing" constant="8" symbolic="YES" id="aW7-PU-5SX"/>
+                <constraint firstItem="2Tb-KC-Ugi" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="10" id="bkf-sN-APi"/>
+                <constraint firstItem="Syo-rH-vof" firstAttribute="top" secondItem="2Tb-KC-Ugi" secondAttribute="bottom" constant="10" id="cGP-id-a2G"/>
+                <constraint firstItem="2Tb-KC-Ugi" firstAttribute="baseline" secondItem="QsM-28-Pya" secondAttribute="baseline" id="jnV-Dq-iyH"/>
+                <constraint firstAttribute="bottom" secondItem="Syo-rH-vof" secondAttribute="bottom" constant="20" symbolic="YES" id="mQT-2H-f1T"/>
+            </constraints>
             <point key="canvasLocation" x="521" y="-253"/>
         </customView>
         <arrayController objectClassName="HBSubtitlesTrack" id="ssY-jQ-Nev">
diff --git a/macosx/English.lproj/SubtitlesDefaults.xib b/macosx/English.lproj/SubtitlesDefaults.xib
index 866e23fa4..46ca66138 100644
--- a/macosx/English.lproj/SubtitlesDefaults.xib
+++ b/macosx/English.lproj/SubtitlesDefaults.xib
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G7a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="16A238m" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
         <development version="6300" identifier="xcode"/>
@@ -18,44 +18,38 @@
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="kwM-lz-5lG">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="283" y="305" width="427" height="421"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
-            <value key="minSize" type="size" width="427" height="304"/>
-            <value key="maxSize" type="size" width="427" height="1000"/>
+            <rect key="contentRect" x="283" y="305" width="427" height="422"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" id="ZP2-Cp-K5w">
-                <rect key="frame" x="0.0" y="0.0" width="427" height="421"/>
+                <rect key="frame" x="0.0" y="0.0" width="427" height="422"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="fPg-3n-1TN">
-                        <rect key="frame" x="-2" y="385" width="157" height="14"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="fPg-3n-1TN">
+                        <rect key="frame" x="18" y="386" width="138" height="14"/>
                         <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Track Selection Behavior:" id="GbM-vm-RC2">
                             <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 horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Jsz-Er-bsF">
-                        <rect key="frame" x="-2" y="361" width="157" height="14"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Languages:" id="mAT-Jp-SG1">
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="Jsz-Er-bsF">
+                        <rect key="frame" x="18" y="362" width="138" height="14"/>
+                        <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Languages:" id="mAT-Jp-SG1">
                             <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 horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Hqz-Lw-gAu">
-                        <rect key="frame" x="-2" y="183" width="157" height="14"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="Hqz-Lw-gAu">
+                        <rect key="frame" x="18" y="182" width="138" height="14"/>
                         <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Options:" id="NJl-q3-zXL">
                             <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" id="oiD-QI-wly">
-                        <rect key="frame" x="158" y="380" width="252" height="22"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oiD-QI-wly">
+                        <rect key="frame" x="159" y="381" width="251" height="22"/>
                         <popUpButtonCell key="cell" type="push" title="None" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="mvw-Hg-JFM" id="21e-KY-8TR">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="smallSystem"/>
@@ -72,9 +66,8 @@
                             <binding destination="-2" name="selectedIndex" keyPath="self.settings.trackSelectionBehavior" id="sKn-Mr-Hce"/>
                         </connections>
                     </popUpButton>
-                    <button toolTip="Closed captions are text subtitles that can be added to any container as a soft subtitle track (not burned)." id="uF5-6E-EIe">
-                        <rect key="frame" x="158" y="180" width="251" height="18"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <button toolTip="Closed captions are text subtitles that can be added to any container as a soft subtitle track (not burned)." translatesAutoresizingMaskIntoConstraints="NO" id="uF5-6E-EIe">
+                        <rect key="frame" x="159" y="180" width="250" height="18"/>
                         <buttonCell key="cell" type="check" title="Add Closed Captions when available" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="66v-2g-DHn">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                             <font key="font" metaFont="smallSystem"/>
@@ -83,9 +76,8 @@
                             <binding destination="-2" name="value" keyPath="self.settings.addCC" id="JNz-WE-LD3"/>
                         </connections>
                     </button>
-                    <button toolTip="This search pass finds short sequences of foreign audio and provides subtitles for them." id="OOC-GZ-OFA">
-                        <rect key="frame" x="158" y="162" width="251" height="18"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <button toolTip="This search pass finds short sequences of foreign audio and provides subtitles for them." translatesAutoresizingMaskIntoConstraints="NO" id="OOC-GZ-OFA">
+                        <rect key="frame" x="159" y="162" width="250" height="18"/>
                         <buttonCell key="cell" type="check" title="Add &quot;Foreign Audio Search&quot;" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="vNY-OC-hTJ">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                             <font key="font" metaFont="smallSystem"/>
@@ -94,15 +86,14 @@
                             <binding destination="-2" name="value" keyPath="self.settings.addForeignAudioSearch" id="UZC-m0-Mco"/>
                         </connections>
                     </button>
-                    <scrollView autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="10" verticalLineScroll="16" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="aTC-39-h6S">
-                        <rect key="frame" x="161" y="240" width="246" height="135"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                    <scrollView autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="10" verticalLineScroll="16" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aTC-39-h6S">
+                        <rect key="frame" x="162" y="240" width="245" height="136"/>
                         <clipView key="contentView" id="TdE-Sh-NcS">
-                            <rect key="frame" x="1" y="1" width="244" height="133"/>
+                            <rect key="frame" x="1" y="1" width="243" height="134"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" autosaveColumns="NO" rowHeight="14" viewBased="YES" id="Of7-71-Ci6">
-                                    <rect key="frame" x="0.0" y="0.0" width="244" height="0.0"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="243" height="134"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -124,9 +115,8 @@
                                                     <rect key="frame" x="1" y="1" width="16" height="17"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <button id="8lG-Fl-ywI">
-                                                            <rect key="frame" x="0.0" y="0.0" width="22" height="20"/>
-                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                        <button translatesAutoresizingMaskIntoConstraints="NO" id="8lG-Fl-ywI">
+                                                            <rect key="frame" x="0.0" y="-3" width="22" height="23"/>
                                                             <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="w0a-by-kw7">
                                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                                 <font key="font" metaFont="smallSystem"/>
@@ -137,13 +127,18 @@
                                                             </connections>
                                                         </button>
                                                     </subviews>
+                                                    <constraints>
+                                                        <constraint firstItem="8lG-Fl-ywI" firstAttribute="leading" secondItem="HzO-IC-pgS" secondAttribute="leading" constant="3" id="ADO-pf-rmU"/>
+                                                        <constraint firstItem="8lG-Fl-ywI" firstAttribute="top" secondItem="HzO-IC-pgS" secondAttribute="top" id="DE6-jn-5Qb"/>
+                                                        <constraint firstItem="8lG-Fl-ywI" firstAttribute="centerY" secondItem="HzO-IC-pgS" secondAttribute="centerY" id="qzZ-Cr-YoA"/>
+                                                    </constraints>
                                                 </tableCellView>
                                             </prototypeCellViews>
                                             <connections>
                                                 <binding destination="ZBe-aP-wvq" name="value" keyPath="arrangedObjects.isSelected" id="fRp-oC-H6C"/>
                                             </connections>
                                         </tableColumn>
-                                        <tableColumn identifier="" width="222" minWidth="10" maxWidth="3.4028234663852886e+38" id="P9C-KV-mos">
+                                        <tableColumn identifier="" width="221" minWidth="10" maxWidth="3.4028234663852886e+38" id="P9C-KV-mos">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
                                                 <font key="font" metaFont="smallSystem"/>
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -157,12 +152,11 @@
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <prototypeCellViews>
                                                 <tableCellView id="kaV-mC-lYC">
-                                                    <rect key="frame" x="20" y="1" width="224" height="17"/>
+                                                    <rect key="frame" x="20" y="1" width="221" height="17"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="jv9-fP-XC4">
-                                                            <rect key="frame" x="0.0" y="3" width="224" height="14"/>
-                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="jv9-fP-XC4">
+                                                            <rect key="frame" x="0.0" y="2" width="222" height="14"/>
                                                             <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="Ze3-5Z-MaG">
                                                                 <font key="font" metaFont="smallSystem"/>
                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -173,6 +167,12 @@
                                                             </connections>
                                                         </textField>
                                                     </subviews>
+                                                    <constraints>
+                                                        <constraint firstItem="jv9-fP-XC4" firstAttribute="centerX" secondItem="kaV-mC-lYC" secondAttribute="centerX" id="HtD-2c-tfr"/>
+                                                        <constraint firstAttribute="trailing" secondItem="jv9-fP-XC4" secondAttribute="trailing" constant="1" id="NmL-l0-19h"/>
+                                                        <constraint firstItem="jv9-fP-XC4" firstAttribute="centerY" secondItem="kaV-mC-lYC" secondAttribute="centerY" id="eKv-ib-CLI"/>
+                                                        <constraint firstItem="jv9-fP-XC4" firstAttribute="leading" secondItem="kaV-mC-lYC" secondAttribute="leading" constant="2" id="ljd-Tb-JFO"/>
+                                                    </constraints>
                                                     <connections>
                                                         <outlet property="textField" destination="jv9-fP-XC4" id="601-tW-LGg"/>
                                                     </connections>
@@ -189,17 +189,23 @@
                             </subviews>
                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </clipView>
-                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="bXf-U5-ogz">
-                            <rect key="frame" x="1" y="118" width="244" height="16"/>
+                        <constraints>
+                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="136" id="ALe-lg-Sa2"/>
+                        </constraints>
+                        <scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="bXf-U5-ogz">
+                            <rect key="frame" x="1" y="119" width="243" height="16"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="BWM-rq-VTg">
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
-                    <button verticalHuggingPriority="750" id="QAt-5X-NBT">
-                        <rect key="frame" x="161" y="210" width="71" height="23"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QAt-5X-NBT">
+                        <rect key="frame" x="162" y="210" width="71" height="23"/>
+                        <constraints>
+                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="71" id="FFS-P3-FfD"/>
+                            <constraint firstAttribute="height" constant="21" id="ftj-Wf-PU1"/>
+                        </constraints>
                         <buttonCell key="cell" type="smallSquare" title="Show All" bezelStyle="smallSquare" imagePosition="overlaps" alignment="center" controlSize="small" borderStyle="border" inset="3" id="PiQ-bA-7P1">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
                             <font key="font" metaFont="smallSystem"/>
@@ -209,9 +215,8 @@
                             <action selector="edit:" target="-2" id="13y-nD-hEj"/>
                         </connections>
                     </button>
-                    <popUpButton verticalHuggingPriority="750" id="Lsa-kB-2BP">
-                        <rect key="frame" x="158" y="129" width="252" height="22"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Lsa-kB-2BP">
+                        <rect key="frame" x="159" y="129" width="251" height="22"/>
                         <string key="toolTip">Set the behavior of subtitle "Burn-in"
 
 Burned-In subtitles are part of the video and can not be disabled during playback.
@@ -233,18 +238,16 @@ Only one subtitle track can be burned. Since conflics can occur, the first chose
                             <binding destination="-2" name="selectedIndex" keyPath="self.settings.burnInBehavior" id="VvM-Ka-msm"/>
                         </connections>
                     </popUpButton>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="qAf-lQ-GN4">
-                        <rect key="frame" x="-2" y="134" width="157" height="14"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="qAf-lQ-GN4">
+                        <rect key="frame" x="18" y="134" width="138" height="14"/>
                         <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Burn-In Behavior:" id="640-NB-Uby">
                             <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>
-                    <button id="ceZ-On-t5S">
-                        <rect key="frame" x="158" y="109" width="96" height="18"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <button translatesAutoresizingMaskIntoConstraints="NO" id="ceZ-On-t5S">
+                        <rect key="frame" x="159" y="109" width="250" height="18"/>
                         <string key="toolTip">Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded. Use this option if your player software or device does not support DVD Subtitles.
 
 Only one subtitle track can be burned. Since conflics can occur, the first chosen wins.</string>
@@ -256,9 +259,8 @@ Only one subtitle track can be burned. Since conflics can occur, the first chose
                             <binding destination="-2" name="value" keyPath="self.settings.burnInDVDSubtitles" id="JoG-RB-CFT"/>
                         </connections>
                     </button>
-                    <button id="Px8-G6-NVX">
-                        <rect key="frame" x="158" y="91" width="110" height="18"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <button translatesAutoresizingMaskIntoConstraints="NO" id="Px8-G6-NVX">
+                        <rect key="frame" x="159" y="91" width="250" height="18"/>
                         <string key="toolTip">Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded. Use this option if your player software or device does not support Blu-ray Subtitles.
 
 Only one subtitle track can be burned. Since conflics can occur, the first chosen wins.</string>
@@ -270,18 +272,16 @@ Only one subtitle track can be burned. Since conflics can occur, the first chose
                             <binding destination="-2" name="value" keyPath="self.settings.burnInBluraySubtitles" id="bZK-Kf-z6W"/>
                         </connections>
                     </button>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="MlS-tB-pEv">
-                        <rect key="frame" x="159" y="58" width="250" height="28"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="MlS-tB-pEv">
+                        <rect key="frame" x="160" y="58" width="249" height="28"/>
                         <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="Only one of the above subtitle burn options will be applied, starting with the top." id="N4s-K9-RwM">
                             <font key="font" metaFont="smallSystem"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <button verticalHuggingPriority="750" id="QdJ-64-GgC">
-                        <rect key="frame" x="332" y="14" width="80" height="28"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QdJ-64-GgC">
+                        <rect key="frame" x="350" y="14" width="62" height="28"/>
                         <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="iLI-Nb-D7t">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="smallSystem"/>
@@ -293,9 +293,8 @@ DQ
                             <action selector="ok:" target="-2" id="MND-2r-dHh"/>
                         </connections>
                     </button>
-                    <button verticalHuggingPriority="750" id="AAX-DK-L3G">
-                        <rect key="frame" x="254" y="14" width="80" height="28"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AAX-DK-L3G">
+                        <rect key="frame" x="290" y="14" width="62" height="28"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ego-rt-a64">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="smallSystem"/>
@@ -307,9 +306,8 @@ Gw
                             <action selector="cancel:" target="-2" id="Ysh-pi-YX2"/>
                         </connections>
                     </button>
-                    <button horizontalHuggingPriority="750" verticalHuggingPriority="750" id="nfu-VW-cTe">
-                        <rect key="frame" x="18" y="15" width="25" height="25"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nfu-VW-cTe">
+                        <rect key="frame" x="18" y="15" width="22" height="22"/>
                         <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="X9Q-sR-XPa">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="smallSystem"/>
@@ -319,8 +317,55 @@ Gw
                         </connections>
                     </button>
                 </subviews>
+                <constraints>
+                    <constraint firstAttribute="trailing" secondItem="ceZ-On-t5S" secondAttribute="trailing" constant="20" id="1s9-9K-9py"/>
+                    <constraint firstItem="nfu-VW-cTe" firstAttribute="leading" secondItem="ZP2-Cp-K5w" secondAttribute="leading" constant="20" id="4u3-4b-4ps"/>
+                    <constraint firstAttribute="trailing" secondItem="Lsa-kB-2BP" secondAttribute="trailing" constant="20" id="7cO-6T-zv0"/>
+                    <constraint firstItem="Px8-G6-NVX" firstAttribute="leading" secondItem="Lsa-kB-2BP" secondAttribute="leading" id="8S5-Gb-lK8"/>
+                    <constraint firstItem="uF5-6E-EIe" firstAttribute="top" secondItem="QAt-5X-NBT" secondAttribute="bottom" constant="16" id="8we-VP-7wd"/>
+                    <constraint firstAttribute="bottom" secondItem="nfu-VW-cTe" secondAttribute="bottom" constant="18" id="D3B-WT-db0"/>
+                    <constraint firstAttribute="trailing" secondItem="oiD-QI-wly" secondAttribute="trailing" constant="20" id="DCH-xM-c7M"/>
+                    <constraint firstItem="MlS-tB-pEv" firstAttribute="top" secondItem="Px8-G6-NVX" secondAttribute="bottom" constant="8" id="DuC-dI-6lg"/>
+                    <constraint firstItem="Lsa-kB-2BP" firstAttribute="top" secondItem="OOC-GZ-OFA" secondAttribute="bottom" constant="15" id="Jom-Wb-udi"/>
+                    <constraint firstItem="qAf-lQ-GN4" firstAttribute="baseline" secondItem="Lsa-kB-2BP" secondAttribute="baseline" id="LsD-LD-mET"/>
+                    <constraint firstItem="OOC-GZ-OFA" firstAttribute="top" secondItem="uF5-6E-EIe" secondAttribute="bottom" constant="6" id="Niq-4w-rB0"/>
+                    <constraint firstItem="QdJ-64-GgC" firstAttribute="baseline" secondItem="AAX-DK-L3G" secondAttribute="baseline" id="OlE-Se-x5E"/>
+                    <constraint firstItem="Hqz-Lw-gAu" firstAttribute="width" secondItem="fPg-3n-1TN" secondAttribute="width" id="OlM-xu-XFb"/>
+                    <constraint firstAttribute="trailing" secondItem="MlS-tB-pEv" secondAttribute="trailing" constant="20" id="QKq-6a-ufU"/>
+                    <constraint firstAttribute="trailing" secondItem="Px8-G6-NVX" secondAttribute="trailing" constant="20" id="T4u-wo-tvG"/>
+                    <constraint firstItem="aTC-39-h6S" firstAttribute="top" secondItem="oiD-QI-wly" secondAttribute="bottom" constant="8" id="TFb-ud-8Gn"/>
+                    <constraint firstItem="uF5-6E-EIe" firstAttribute="leading" secondItem="Hqz-Lw-gAu" secondAttribute="trailing" constant="8" id="Tc8-wG-e4Q"/>
+                    <constraint firstItem="QdJ-64-GgC" firstAttribute="width" secondItem="AAX-DK-L3G" secondAttribute="width" id="V7Q-Z0-mdN"/>
+                    <constraint firstItem="Jsz-Er-bsF" firstAttribute="top" secondItem="aTC-39-h6S" secondAttribute="top" id="Vjm-7V-1cC"/>
+                    <constraint firstItem="OOC-GZ-OFA" firstAttribute="leading" secondItem="uF5-6E-EIe" secondAttribute="leading" id="WKZ-HH-AyA"/>
+                    <constraint firstItem="fPg-3n-1TN" firstAttribute="baseline" secondItem="oiD-QI-wly" secondAttribute="baseline" id="XJA-tm-IJd"/>
+                    <constraint firstAttribute="bottom" secondItem="QdJ-64-GgC" secondAttribute="bottom" constant="20" id="XzF-Bn-tMl"/>
+                    <constraint firstItem="Hqz-Lw-gAu" firstAttribute="baseline" secondItem="uF5-6E-EIe" secondAttribute="baseline" id="bmT-Td-cBg"/>
+                    <constraint firstItem="QAt-5X-NBT" firstAttribute="top" secondItem="aTC-39-h6S" secondAttribute="bottom" constant="8" id="cwx-ga-usN"/>
+                    <constraint firstItem="ceZ-On-t5S" firstAttribute="top" secondItem="Lsa-kB-2BP" secondAttribute="bottom" constant="8" id="fZD-U2-nWu"/>
+                    <constraint firstItem="Lsa-kB-2BP" firstAttribute="leading" secondItem="qAf-lQ-GN4" secondAttribute="trailing" constant="8" id="fl7-9l-tFW"/>
+                    <constraint firstItem="aTC-39-h6S" firstAttribute="trailing" secondItem="oiD-QI-wly" secondAttribute="trailing" id="hq2-2Y-G4l"/>
+                    <constraint firstAttribute="trailing" secondItem="OOC-GZ-OFA" secondAttribute="trailing" constant="20" id="htF-X4-lpu"/>
+                    <constraint firstItem="Px8-G6-NVX" firstAttribute="top" secondItem="ceZ-On-t5S" secondAttribute="bottom" constant="6" id="iWq-sE-ajq"/>
+                    <constraint firstItem="QdJ-64-GgC" firstAttribute="top" secondItem="MlS-tB-pEv" secondAttribute="bottom" constant="20" id="iyr-A8-UM6"/>
+                    <constraint firstItem="ceZ-On-t5S" firstAttribute="leading" secondItem="Lsa-kB-2BP" secondAttribute="leading" id="koA-TF-GxL"/>
+                    <constraint firstAttribute="trailing" secondItem="uF5-6E-EIe" secondAttribute="trailing" constant="20" id="l0V-di-L2v"/>
+                    <constraint firstItem="qAf-lQ-GN4" firstAttribute="leading" secondItem="fPg-3n-1TN" secondAttribute="leading" id="o90-wY-3FL"/>
+                    <constraint firstItem="Hqz-Lw-gAu" firstAttribute="leading" secondItem="fPg-3n-1TN" secondAttribute="leading" id="p6B-ac-s9o"/>
+                    <constraint firstItem="QAt-5X-NBT" firstAttribute="leading" secondItem="aTC-39-h6S" secondAttribute="leading" id="qCP-iV-r50"/>
+                    <constraint firstItem="aTC-39-h6S" firstAttribute="leading" secondItem="Jsz-Er-bsF" secondAttribute="trailing" constant="8" id="rLi-Pt-pSb"/>
+                    <constraint firstItem="fPg-3n-1TN" firstAttribute="leading" secondItem="ZP2-Cp-K5w" secondAttribute="leading" constant="20" id="rjw-eY-hZF"/>
+                    <constraint firstItem="MlS-tB-pEv" firstAttribute="leading" secondItem="Px8-G6-NVX" secondAttribute="leading" id="sKB-2V-Vpl"/>
+                    <constraint firstItem="fPg-3n-1TN" firstAttribute="width" secondItem="Jsz-Er-bsF" secondAttribute="width" id="sP1-AF-E06"/>
+                    <constraint firstItem="oiD-QI-wly" firstAttribute="leading" secondItem="fPg-3n-1TN" secondAttribute="trailing" constant="8" id="uju-2t-fvL"/>
+                    <constraint firstAttribute="trailing" secondItem="QdJ-64-GgC" secondAttribute="trailing" constant="20" id="vHr-4w-kqh"/>
+                    <constraint firstItem="QdJ-64-GgC" firstAttribute="leading" secondItem="AAX-DK-L3G" secondAttribute="trailing" constant="8" id="vSw-l6-Yrw"/>
+                    <constraint firstItem="Jsz-Er-bsF" firstAttribute="leading" secondItem="fPg-3n-1TN" secondAttribute="leading" id="zJW-NV-9EO"/>
+                    <constraint firstItem="fPg-3n-1TN" firstAttribute="top" secondItem="ZP2-Cp-K5w" secondAttribute="top" constant="22" id="zQ3-6j-SE5"/>
+                    <constraint firstItem="qAf-lQ-GN4" firstAttribute="width" secondItem="fPg-3n-1TN" secondAttribute="width" id="zyM-7a-twX"/>
+                </constraints>
             </view>
-            <point key="canvasLocation" x="638.5" y="166.5"/>
+            <point key="canvasLocation" x="602.5" y="52"/>
         </window>
         <arrayController objectClassName="HBLang" id="ZBe-aP-wvq" userLabel="Table Controller" customClass="HBLanguageArrayController">
             <declaredKeys>