diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index 424a7475f..d97de1e71 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -36,120 +36,150 @@ EXTRA_DIST = \
 	Resources/ar.lproj/locversion.plist \
 	Resources/ar.lproj/main.nib/designable.nib \
 	Resources/ar.lproj/main.nib/keyedobjects.nib \
+	Resources/ar.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/ca.lproj/Localizable.strings \
 	Resources/ca.lproj/locversion.plist \
 	Resources/ca.lproj/main.nib/designable.nib \
 	Resources/ca.lproj/main.nib/keyedobjects.nib \
+	Resources/ca.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/cs.lproj/Localizable.strings \
 	Resources/cs.lproj/locversion.plist \
 	Resources/cs.lproj/main.nib/designable.nib \
 	Resources/cs.lproj/main.nib/keyedobjects.nib \
+	Resources/cs.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/da.lproj/Localizable.strings \
 	Resources/da.lproj/locversion.plist \
 	Resources/da.lproj/main.nib/designable.nib \
 	Resources/da.lproj/main.nib/keyedobjects.nib \
+	Resources/da.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/Dutch.lproj/Localizable.strings \
 	Resources/Dutch.lproj/locversion.plist \
 	Resources/Dutch.lproj/main.nib/designable.nib \
 	Resources/Dutch.lproj/main.nib/keyedobjects.nib \
+	Resources/Dutch.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/el.lproj/Localizable.strings \
 	Resources/el.lproj/locversion.plist \
 	Resources/el.lproj/main.nib/designable.nib \
 	Resources/el.lproj/main.nib/keyedobjects.nib \
+	Resources/el.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/English.lproj/Localizable.strings \
 	Resources/English.lproj/locversion.plist \
 	Resources/English.lproj/main.nib/designable.nib \
 	Resources/English.lproj/main.nib/keyedobjects.nib \
+	Resources/English.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/fi.lproj/Localizable.strings \
 	Resources/fi.lproj/locversion.plist \
 	Resources/fi.lproj/main.nib/designable.nib \
 	Resources/fi.lproj/main.nib/keyedobjects.nib \
+	Resources/fi.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/French.lproj/Localizable.strings \
 	Resources/French.lproj/locversion.plist \
 	Resources/French.lproj/main.nib/designable.nib \
 	Resources/French.lproj/main.nib/keyedobjects.nib \
+	Resources/French.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/German.lproj/Localizable.strings \
 	Resources/German.lproj/locversion.plist \
 	Resources/German.lproj/main.nib/designable.nib \
 	Resources/German.lproj/main.nib/keyedobjects.nib \
+	Resources/German.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/he.lproj/Localizable.strings \
 	Resources/he.lproj/locversion.plist \
 	Resources/he.lproj/main.nib/designable.nib \
 	Resources/he.lproj/main.nib/keyedobjects.nib \
+	Resources/he.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/hr.lproj/Localizable.strings \
 	Resources/hr.lproj/locversion.plist \
 	Resources/hr.lproj/main.nib/designable.nib \
 	Resources/hr.lproj/main.nib/keyedobjects.nib \
+	Resources/hr.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/hu.lproj/Localizable.strings \
 	Resources/hu.lproj/locversion.plist \
 	Resources/hu.lproj/main.nib/designable.nib \
 	Resources/hu.lproj/main.nib/keyedobjects.nib \
+	Resources/hu.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/Italian.lproj/Localizable.strings \
 	Resources/Italian.lproj/locversion.plist \
 	Resources/Italian.lproj/main.nib/designable.nib \
 	Resources/Italian.lproj/main.nib/keyedobjects.nib \
+	Resources/Italian.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/Japanese.lproj/Localizable.strings \
 	Resources/Japanese.lproj/locversion.plist \
 	Resources/Japanese.lproj/main.nib/designable.nib \
 	Resources/Japanese.lproj/main.nib/keyedobjects.nib \
+	Resources/Japanese.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/ko.lproj/Localizable.strings \
 	Resources/ko.lproj/locversion.plist \
 	Resources/ko.lproj/main.nib/designable.nib \
 	Resources/ko.lproj/main.nib/keyedobjects.nib \
+	Resources/ko.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/no.lproj/Localizable.strings \
 	Resources/no.lproj/locversion.plist \
 	Resources/no.lproj/main.nib/designable.nib \
 	Resources/no.lproj/main.nib/keyedobjects.nib \
+	Resources/no.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/pl.lproj/Localizable.strings \
 	Resources/pl.lproj/locversion.plist \
 	Resources/pl.lproj/main.nib/designable.nib \
 	Resources/pl.lproj/main.nib/keyedobjects.nib \
+	Resources/pl.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/pt.lproj/Localizable.strings \
 	Resources/pt.lproj/locversion.plist \
 	Resources/pt.lproj/main.nib/designable.nib \
 	Resources/pt.lproj/main.nib/keyedobjects.nib \
+	Resources/pt.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/pt_PT.lproj/Localizable.strings \
 	Resources/pt_PT.lproj/locversion.plist \
 	Resources/pt_PT.lproj/main.nib/designable.nib \
 	Resources/pt_PT.lproj/main.nib/keyedobjects.nib \
+	Resources/pt_PT.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/ro.lproj/Localizable.strings \
 	Resources/ro.lproj/locversion.plist \
 	Resources/ro.lproj/main.nib/designable.nib \
 	Resources/ro.lproj/main.nib/keyedobjects.nib \
+	Resources/ro.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/ru.lproj/Localizable.strings \
 	Resources/ru.lproj/locversion.plist \
 	Resources/ru.lproj/main.nib/designable.nib \
 	Resources/ru.lproj/main.nib/keyedobjects.nib \
+	Resources/ru.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/sk.lproj/Localizable.strings \
 	Resources/sk.lproj/locversion.plist \
 	Resources/sk.lproj/main.nib/designable.nib \
 	Resources/sk.lproj/main.nib/keyedobjects.nib \
+	Resources/sk.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/Spanish.lproj/Localizable.strings \
 	Resources/Spanish.lproj/locversion.plist \
 	Resources/Spanish.lproj/main.nib/designable.nib \
 	Resources/Spanish.lproj/main.nib/keyedobjects.nib \
+	Resources/Spanish.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/sv.lproj/Localizable.strings \
 	Resources/sv.lproj/locversion.plist \
 	Resources/sv.lproj/main.nib/designable.nib \
 	Resources/sv.lproj/main.nib/keyedobjects.nib \
+	Resources/sv.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/th.lproj/Localizable.strings \
 	Resources/th.lproj/locversion.plist \
 	Resources/th.lproj/main.nib/designable.nib \
 	Resources/th.lproj/main.nib/keyedobjects.nib \
+	Resources/th.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/tr.lproj/Localizable.strings \
 	Resources/tr.lproj/locversion.plist \
 	Resources/tr.lproj/main.nib/designable.nib \
 	Resources/tr.lproj/main.nib/keyedobjects.nib \
+	Resources/tr.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/uk.lproj/Localizable.strings \
 	Resources/uk.lproj/locversion.plist \
 	Resources/uk.lproj/main.nib/designable.nib \
 	Resources/uk.lproj/main.nib/keyedobjects.nib \
+	Resources/uk.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/X11.icns \
 	Resources/zh_CN.lproj/Localizable.strings \
 	Resources/zh_CN.lproj/locversion.plist \
 	Resources/zh_CN.lproj/main.nib/designable.nib \
 	Resources/zh_CN.lproj/main.nib/keyedobjects.nib \
+	Resources/zh_CN.lproj/main.nib/keyedobjects-110000.nib \
 	Resources/zh_TW.lproj/Localizable.strings \
 	Resources/zh_TW.lproj/locversion.plist \
 	Resources/zh_TW.lproj/main.nib/designable.nib \
 	Resources/zh_TW.lproj/main.nib/keyedobjects.nib
+	Resources/zh_TW.lproj/main.nib/keyedobjects-110000.nib
diff --git a/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib
index e018bac11..fbd8bae45 100644
--- a/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -319,7 +319,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="Van beeldscherm" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="Van beeldscherm" state="on" tag="-1" id="384"/>
@@ -655,17 +655,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="tN6-fH-UdJ">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="118.73100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="109.23100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Naam">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -677,7 +677,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="96" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="86.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Commando">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -689,7 +689,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="68" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="58.5" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Toetsen">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -713,7 +713,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -731,6 +731,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Menu" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..87b027728
Binary files /dev/null and b/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib
index ba2586136..9dadb5681 100644
Binary files a/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib
index e42829abb..9938c0f43 100644
--- a/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -208,9 +208,9 @@
                             <tabViewItem label="Input" identifier="1" id="349">
                                 <view key="view" id="351">
                                     <rect key="frame" x="10" y="33" width="438" height="246"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <button imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="363">
+                                        <button fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="363">
                                             <rect key="frame" x="18" y="210" width="402" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <buttonCell key="cell" type="check" title="Emulate three button mouse" bezelStyle="regularSquare" imagePosition="leading" alignment="left" inset="2" id="100363">
@@ -221,7 +221,7 @@
                                                 <action selector="prefs_changed:" target="196" id="394"/>
                                             </connections>
                                         </button>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="381" translatesAutoresizingMaskIntoConstraints="NO" id="364">
+                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" preferredMaxLayoutWidth="381" translatesAutoresizingMaskIntoConstraints="NO" id="364">
                                             <rect key="frame" x="36" y="60" width="385" height="31"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="When enabled, menu bar key equivalents may interfere with X11 applications that use the Meta modifier." id="100364">
@@ -230,7 +230,7 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="381" translatesAutoresizingMaskIntoConstraints="NO" id="365">
+                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" preferredMaxLayoutWidth="381" translatesAutoresizingMaskIntoConstraints="NO" id="365">
                                             <rect key="frame" x="36" y="162" width="385" height="42"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" id="100365">
@@ -241,7 +241,7 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <button imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="368">
+                                        <button fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="368">
                                             <rect key="frame" x="18" y="97" width="402" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <buttonCell key="cell" type="check" title="Enable key equivalents under X11" bezelStyle="regularSquare" imagePosition="leading" alignment="left" inset="2" id="100368">
@@ -252,7 +252,7 @@
                                                 <action selector="prefs_changed:" target="196" id="396"/>
                                             </connections>
                                         </button>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="381" translatesAutoresizingMaskIntoConstraints="NO" id="369">
+                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" preferredMaxLayoutWidth="381" translatesAutoresizingMaskIntoConstraints="NO" id="369">
                                             <rect key="frame" x="36" y="126" width="385" height="14"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Allows input menu changes to overwrite the current X11 keymap." id="100369">
@@ -261,7 +261,7 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <button imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="370">
+                                        <button fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="370">
                                             <rect key="frame" x="18" y="146" width="402" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <buttonCell key="cell" type="check" title="Follow system keyboard layout" bezelStyle="regularSquare" imagePosition="leading" alignment="left" inset="2" id="100370">
@@ -272,7 +272,7 @@
                                                 <action selector="prefs_changed:" target="196" id="395"/>
                                             </connections>
                                         </button>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="381" translatesAutoresizingMaskIntoConstraints="NO" id="300476">
+                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" preferredMaxLayoutWidth="381" translatesAutoresizingMaskIntoConstraints="NO" id="300476">
                                             <rect key="frame" x="36" y="-1" width="385" height="31"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="When enabled, the option keys send Alt_L and Alt_R X11 key symbols instead of Mode_switch." id="300479">
@@ -281,7 +281,7 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <button imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="300477">
+                                        <button fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="300477">
                                             <rect key="frame" x="18" y="36" width="402" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <buttonCell key="cell" type="check" title="Option keys send Alt_L and Alt_R" bezelStyle="regularSquare" imagePosition="leading" alignment="left" inset="2" id="300478">
@@ -305,7 +305,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="From Display" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="From Display" state="on" tag="-1" id="384"/>
@@ -594,6 +594,7 @@
                     </tabView>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="369"/>
         </window>
         <window title="X11 Application Menu" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" deferred="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="x11_apps" animationBehavior="default" id="285" userLabel="EditPrograms" customClass="NSPanel">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" resizable="YES"/>
@@ -631,17 +632,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="pFz-p0-8Hk">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="118.73099999999999" minWidth="62.731000000000002" maxWidth="1000" id="298">
+                                        <tableColumn width="109.23099999999999" minWidth="62.731000000000002" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Name">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -653,7 +654,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="96" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="86.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Command">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -665,7 +666,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="68" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="58.5" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Shortcut">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -689,7 +690,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -707,6 +708,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="-523" y="351"/>
         </window>
         <menu title="Menu" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..2b14fc012
Binary files /dev/null and b/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib
index a1af76867..11e1d9ce8 100644
Binary files a/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib
index 1754ebe5e..00a4c2fd1 100644
--- a/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -319,7 +319,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="du moniteur" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="du moniteur" state="on" tag="-1" id="384"/>
@@ -655,17 +655,17 @@
                         <rect key="frame" x="20" y="20" width="350" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="dk6-mg-gE4">
-                            <rect key="frame" x="1" y="29" width="333" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="333" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="333" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="152" minWidth="62.730998992919922" maxWidth="1000" headerToolTip="" id="298">
+                                        <tableColumn width="142.5" minWidth="62.730998992919922" maxWidth="1000" headerToolTip="" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Nom">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -677,7 +677,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="97" minWidth="40" maxWidth="1000" headerToolTip="" id="297">
+                                        <tableColumn width="87.5" minWidth="40" maxWidth="1000" headerToolTip="" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Commande">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -689,7 +689,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="66" minWidth="10" maxWidth="1000" headerToolTip="" id="535">
+                                        <tableColumn width="56.5" minWidth="10" maxWidth="1000" headerToolTip="" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Raccourci">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -713,7 +713,7 @@
                             <rect key="frame" x="334" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="333" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -731,6 +731,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Menu" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..d81fadbe0
Binary files /dev/null and b/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib
index 5a864fdf3..ab5f199e9 100644
Binary files a/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib
index 02f8cf1dd..dc11b6423 100644
--- a/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -212,7 +212,7 @@
                                     <rect key="frame" x="10" y="33" width="504" height="279"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <button imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="363">
+                                        <button fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="363">
                                             <rect key="frame" x="18" y="243" width="402" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <buttonCell key="cell" type="check" title="Drei Maustasten nachbilden" bezelStyle="regularSquare" imagePosition="leading" alignment="left" inset="2" id="100363">
@@ -223,7 +223,7 @@
                                                 <action selector="prefs_changed:" target="196" id="394"/>
                                             </connections>
                                         </button>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="457" translatesAutoresizingMaskIntoConstraints="NO" id="364">
+                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" preferredMaxLayoutWidth="457" translatesAutoresizingMaskIntoConstraints="NO" id="364">
                                             <rect key="frame" x="36" y="93" width="461" height="28"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Bei Aktivierung können die Tastenentsprechungen für die Menüleiste die X11-Programme stören, die Meta-Sondertasten verwenden." placeholderString="" id="100364">
@@ -232,7 +232,7 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="457" translatesAutoresizingMaskIntoConstraints="NO" id="365">
+                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" preferredMaxLayoutWidth="457" translatesAutoresizingMaskIntoConstraints="NO" id="365">
                                             <rect key="frame" x="36" y="203" width="461" height="34"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" placeholderString="" id="100365">
@@ -243,7 +243,7 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <button imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="368">
+                                        <button fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="368">
                                             <rect key="frame" x="18" y="127" width="402" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <buttonCell key="cell" type="check" title="Tastenentsprechungen unter X11 aktivieren" bezelStyle="regularSquare" imagePosition="leading" alignment="left" inset="2" id="100368">
@@ -254,7 +254,7 @@
                                                 <action selector="prefs_changed:" target="196" id="396"/>
                                             </connections>
                                         </button>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="457" translatesAutoresizingMaskIntoConstraints="NO" id="369">
+                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" preferredMaxLayoutWidth="457" translatesAutoresizingMaskIntoConstraints="NO" id="369">
                                             <rect key="frame" x="36" y="151" width="461" height="28"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Bei Aktivierung kann Ihre aktuelle X11-Keymap durch Änderungen des Tastaturmenüs überschrieben werden." placeholderString="" id="100369">
@@ -263,7 +263,7 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <button imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="370">
+                                        <button fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="370">
                                             <rect key="frame" x="18" y="185" width="402" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <buttonCell key="cell" type="check" title="Tastaturbelegung des Systems verwenden" bezelStyle="regularSquare" imagePosition="leading" alignment="left" inset="2" id="100370">
@@ -274,7 +274,7 @@
                                                 <action selector="prefs_changed:" target="196" id="395"/>
                                             </connections>
                                         </button>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="457" translatesAutoresizingMaskIntoConstraints="NO" id="300476">
+                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" preferredMaxLayoutWidth="457" translatesAutoresizingMaskIntoConstraints="NO" id="300476">
                                             <rect key="frame" x="36" y="32" width="461" height="31"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Bei Aktivierung entsprechen die Wahltasten Alt_L und Alt_R X11-Tastensymbolen anstatt „Mode_switch“." id="300479">
@@ -283,7 +283,7 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <button imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="300477">
+                                        <button fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="300477">
                                             <rect key="frame" x="18" y="69" width="402" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <buttonCell key="cell" type="check" title="Wahltasten entsprechen Alt_L und Alt_R" bezelStyle="regularSquare" imagePosition="leading" alignment="left" inset="2" id="300478">
@@ -294,7 +294,7 @@
                                                 <action selector="prefs_changed:" target="196" id="300480"/>
                                             </connections>
                                         </button>
-                                        <button imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="300482">
+                                        <button fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="300482">
                                             <rect key="frame" x="18" y="8" width="418" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <buttonCell key="cell" type="check" title="Immer in Bewegungsrichtung der Finger scrollen" bezelStyle="regularSquare" imagePosition="leading" alignment="left" inset="2" id="300483">
@@ -318,7 +318,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="Vom Monitor" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="Vom Monitor" state="on" tag="-1" id="384"/>
@@ -655,17 +655,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="4dU-0f-sWe">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="119.73100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="110.23100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Name">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -677,7 +677,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="97" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="87.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Befehl">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -689,7 +689,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="66" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="56.5" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Kurzbefehl">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -713,7 +713,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -731,6 +731,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Menü" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..e959734f0
Binary files /dev/null and b/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib
index 82abbcfed..c7bbe16df 100644
Binary files a/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib
index 6e6e37f56..22ccc95d1 100644
--- a/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -319,7 +319,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="Dal monitor" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="Dal monitor" state="on" tag="-1" id="384"/>
@@ -655,17 +655,17 @@
                         <rect key="frame" x="20" y="20" width="350" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="rJ5-Gk-hyL">
-                            <rect key="frame" x="1" y="29" width="333" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="333" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="333" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="129.73100280761719" minWidth="62.730998992919922" maxWidth="1000" headerToolTip="" id="298">
+                                        <tableColumn width="120.23100280761719" minWidth="62.730998992919922" maxWidth="1000" headerToolTip="" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Nome">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -677,7 +677,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="107" minWidth="40" maxWidth="1000" headerToolTip="" id="297">
+                                        <tableColumn width="97.5" minWidth="40" maxWidth="1000" headerToolTip="" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Comando">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -689,7 +689,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="78" minWidth="10" maxWidth="1000" headerToolTip="" id="535">
+                                        <tableColumn width="68.5" minWidth="10" maxWidth="1000" headerToolTip="" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Abbreviazione">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -713,7 +713,7 @@
                             <rect key="frame" x="334" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="333" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -731,6 +731,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Menu" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..961fb08b4
Binary files /dev/null and b/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib
index 264f7639b..a0ecb7c20 100644
Binary files a/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib
index 33bfb5b0a..72cbd4840 100644
--- a/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -318,7 +318,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="ディスプレイから" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="ディスプレイから" state="on" tag="-1" id="384"/>
@@ -649,17 +649,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="ShE-Qz-STZ">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="100" minWidth="43" maxWidth="1000" headerToolTip="" id="298">
+                                        <tableColumn width="90.5" minWidth="43" maxWidth="1000" headerToolTip="" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="名前">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -671,7 +671,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="97" minWidth="40" maxWidth="1000" headerToolTip="" id="297">
+                                        <tableColumn width="87.5" minWidth="40" maxWidth="1000" headerToolTip="" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="コマンド">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -683,7 +683,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="86" minWidth="30" maxWidth="1000" headerToolTip="" id="535">
+                                        <tableColumn width="76.5" minWidth="30" maxWidth="1000" headerToolTip="" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="ショートカット">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -707,7 +707,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -725,6 +725,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="メニュー" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..6db6eac51
Binary files /dev/null and b/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib
index a1e8649cd..e0b6c160d 100644
Binary files a/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib
index 936ab2bf2..0758d9432 100644
--- a/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -319,7 +319,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="De la pantalla" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="De la pantalla" state="on" tag="-1" id="384"/>
@@ -655,17 +655,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="cE2-mw-UoO">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="102" minWidth="62.730998992919922" maxWidth="1000" headerToolTip="" id="298">
+                                        <tableColumn width="92.5" minWidth="62.730998992919922" maxWidth="1000" headerToolTip="" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Nombre">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -677,7 +677,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="85" minWidth="40" maxWidth="1000" headerToolTip="" id="297">
+                                        <tableColumn width="75.5" minWidth="40" maxWidth="1000" headerToolTip="" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Comando">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -689,7 +689,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="96" minWidth="10" maxWidth="1000" headerToolTip="" id="535">
+                                        <tableColumn width="86.5" minWidth="10" maxWidth="1000" headerToolTip="" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Función rápida">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -713,7 +713,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -731,6 +731,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Menú" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..ef45ac3b1
Binary files /dev/null and b/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib
index 546a23d59..8b9993cc5 100644
Binary files a/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib
index 20dfc0964..85fa95292 100644
--- a/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -209,10 +209,10 @@
                         <tabViewItems>
                             <tabViewItem label="الأمان" identifier="" id="353">
                                 <view key="view" id="354" colorLabel="IBBuiltInLabel-Red">
-                                    <rect key="frame" x="10" y="33" width="438" height="279"/>
+                                    <rect key="frame" x="10" y="33" width="438" height="280"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <button imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="374" colorLabel="IBBuiltInLabel-Red">
+                                        <button fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="374" colorLabel="IBBuiltInLabel-Red">
                                             <rect key="frame" x="18" y="243" width="402" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <buttonCell key="cell" type="check" title="مصادقة الاتصالات" bezelStyle="regularSquare" imagePosition="leading" alignment="right" userInterfaceLayoutDirection="rightToLeft" inset="2" id="100374">
@@ -223,7 +223,7 @@
                                                 <action selector="prefs_changed:" target="196" id="399"/>
                                             </connections>
                                         </button>
-                                        <button imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="375" colorLabel="IBBuiltInLabel-Red">
+                                        <button fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="375" colorLabel="IBBuiltInLabel-Red">
                                             <rect key="frame" x="18" y="166" width="402" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <buttonCell key="cell" type="check" title="السماح بالاتصالات من عملاء الشبكة" bezelStyle="regularSquare" imagePosition="leading" alignment="right" userInterfaceLayoutDirection="rightToLeft" inset="2" id="100375">
@@ -234,7 +234,7 @@
                                                 <action selector="prefs_changed:" target="196" id="401"/>
                                             </connections>
                                         </button>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="381" translatesAutoresizingMaskIntoConstraints="NO" id="376" colorLabel="IBBuiltInLabel-Red">
+                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" preferredMaxLayoutWidth="381" translatesAutoresizingMaskIntoConstraints="NO" id="376" colorLabel="IBBuiltInLabel-Red">
                                             <rect key="frame" x="17" y="195" width="385" height="42"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" userInterfaceLayoutDirection="rightToLeft" alignment="right" id="100376">
@@ -244,7 +244,7 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="381" translatesAutoresizingMaskIntoConstraints="NO" id="377" colorLabel="IBBuiltInLabel-Red">
+                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" preferredMaxLayoutWidth="381" translatesAutoresizingMaskIntoConstraints="NO" id="377" colorLabel="IBBuiltInLabel-Red">
                                             <rect key="frame" x="17" y="118" width="385" height="42"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" userInterfaceLayoutDirection="rightToLeft" alignment="right" id="100377">
@@ -254,7 +254,7 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="379" colorLabel="IBBuiltInLabel-Red">
+                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="379" colorLabel="IBBuiltInLabel-Red">
                                             <rect key="frame" x="17" y="17" width="404" height="14"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" userInterfaceLayoutDirection="rightToLeft" alignment="right" title="يتم تنفيذ هذه الخيارات في المرة التالية لبدء تشغيل X11." id="100379">
@@ -434,7 +434,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="من شاشة العرض" bezelStyle="rounded" imagePosition="leading" alignment="right" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" userInterfaceLayoutDirection="rightToLeft" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="من شاشة العرض" state="on" tag="-1" id="384"/>
@@ -651,17 +651,17 @@
                         <rect key="frame" x="116" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="rsv-U4-lOf">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="118.73100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="109.23100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="right" title="الاسم">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -673,7 +673,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="96" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="86.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="right" title="الأوامر">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -685,7 +685,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="68.5" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="59" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="right" title="مفتاح اختصار">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -709,7 +709,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -727,6 +727,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="قائمة" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..b23a9017b
Binary files /dev/null and b/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib
index 511b84671..4748dbfa6 100644
Binary files a/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/ca.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/ca.lproj/main.nib/designable.nib
index 22803e18d..d5e23a513 100644
--- a/hw/xquartz/bundle/Resources/ca.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/ca.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -319,7 +319,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="De la pantalla" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="De la pantalla" state="on" tag="-1" id="384"/>
@@ -659,17 +659,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="xcY-jr-X2U">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="72.770065307617188" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="63.270065307617188" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Nom">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -681,7 +681,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="110.703125" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="101.203125" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Ordre">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -693,7 +693,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="98.96484375" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="89.46484375" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Drecera de teclat">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -717,7 +717,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -735,6 +735,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="-343" y="-107"/>
         </window>
         <menu title="Menú" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/ca.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/ca.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..4b3838bf9
Binary files /dev/null and b/hw/xquartz/bundle/Resources/ca.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/ca.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/ca.lproj/main.nib/keyedobjects.nib
index f4e822b2f..425307b38 100644
Binary files a/hw/xquartz/bundle/Resources/ca.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/ca.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/cs.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/cs.lproj/main.nib/designable.nib
index 090ed1cb8..61511e9ad 100644
--- a/hw/xquartz/bundle/Resources/cs.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/cs.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -319,7 +319,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="Z monitoru" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="Z monitoru" state="on" tag="-1" id="384"/>
@@ -657,17 +657,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="UBz-nG-IZo">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="118.73100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="109.23100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Název">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -679,7 +679,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="96" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="86.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Příkaz">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -691,7 +691,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="68" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="58.5" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Zkratka">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -715,7 +715,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -733,6 +733,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Nabídka" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/cs.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/cs.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..360b1c832
Binary files /dev/null and b/hw/xquartz/bundle/Resources/cs.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/cs.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/cs.lproj/main.nib/keyedobjects.nib
index a652caa42..dab78899c 100644
Binary files a/hw/xquartz/bundle/Resources/cs.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/cs.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib
index 6d2fceaa1..2c0de373a 100644
--- a/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -318,7 +318,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="Fra skærm" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="Fra skærm" state="on" tag="-1" id="384"/>
@@ -655,17 +655,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="hwJ-WN-dW0">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="119.73100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="110.23100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Navn">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -677,7 +677,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="97" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="87.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Kommando">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -689,7 +689,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="66.5" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="57" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Genvej">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -713,7 +713,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -731,6 +731,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Menu" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..6cb5b698b
Binary files /dev/null and b/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib
index c1372a3bf..5fb42914b 100644
Binary files a/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/el.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/el.lproj/main.nib/designable.nib
index 3a9f67e62..252f5b8a1 100644
--- a/hw/xquartz/bundle/Resources/el.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/el.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -319,7 +319,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="Από την προβολή" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="Από την προβολή" state="on" tag="-1" id="384"/>
@@ -657,17 +657,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="ihL-9t-ghm">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="118.73100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="109.23100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Όνομα">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -679,7 +679,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="96" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="86.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Command">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -691,7 +691,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="68" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="58.5" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Συντόμευση">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -715,7 +715,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -733,6 +733,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Μενού" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/el.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/el.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..24fb37cf0
Binary files /dev/null and b/hw/xquartz/bundle/Resources/el.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/el.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/el.lproj/main.nib/keyedobjects.nib
index ba272731b..ac3194c7a 100644
Binary files a/hw/xquartz/bundle/Resources/el.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/el.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib
index 4b8bfb1ab..e3edf097e 100644
--- a/hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -318,7 +318,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="Näytöltä" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="Näytöltä" state="on" tag="-1" id="384"/>
@@ -652,17 +652,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="4jH-kB-dUy">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="118.73100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="109.23100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Nimi">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -674,7 +674,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="96" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="86.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Komento">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -686,7 +686,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="68" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="58.5" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Oikotie">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -710,7 +710,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -728,6 +728,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Valikko" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..3591949b7
Binary files /dev/null and b/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib
index 805e59e36..89f5b0d6d 100644
Binary files a/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/he.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/he.lproj/main.nib/designable.nib
index 2a897ddfe..e56c1adbc 100644
--- a/hw/xquartz/bundle/Resources/he.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/he.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -209,10 +209,10 @@
                         <tabViewItems>
                             <tabViewItem label="אבטחה" identifier="" id="353">
                                 <view key="view" id="354" colorLabel="IBBuiltInLabel-Red">
-                                    <rect key="frame" x="10" y="33" width="438" height="279"/>
+                                    <rect key="frame" x="10" y="33" width="438" height="280"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <button imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="374" colorLabel="IBBuiltInLabel-Red">
+                                        <button fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="374" colorLabel="IBBuiltInLabel-Red">
                                             <rect key="frame" x="18" y="243" width="402" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <buttonCell key="cell" type="check" title="אמת חיבורים" bezelStyle="regularSquare" imagePosition="leading" alignment="right" userInterfaceLayoutDirection="rightToLeft" inset="2" id="100374">
@@ -223,7 +223,7 @@
                                                 <action selector="prefs_changed:" target="196" id="399"/>
                                             </connections>
                                         </button>
-                                        <button imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="375" colorLabel="IBBuiltInLabel-Red">
+                                        <button fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="375" colorLabel="IBBuiltInLabel-Red">
                                             <rect key="frame" x="18" y="166" width="402" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <buttonCell key="cell" type="check" title="אפשר חיבורים מלקוחות הרשת" bezelStyle="regularSquare" imagePosition="leading" alignment="right" userInterfaceLayoutDirection="rightToLeft" inset="2" id="100375">
@@ -234,7 +234,7 @@
                                                 <action selector="prefs_changed:" target="196" id="401"/>
                                             </connections>
                                         </button>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="381" translatesAutoresizingMaskIntoConstraints="NO" id="376" colorLabel="IBBuiltInLabel-Red">
+                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" preferredMaxLayoutWidth="381" translatesAutoresizingMaskIntoConstraints="NO" id="376" colorLabel="IBBuiltInLabel-Red">
                                             <rect key="frame" x="17" y="195" width="385" height="42"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" userInterfaceLayoutDirection="rightToLeft" alignment="right" id="100376">
@@ -244,7 +244,7 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="381" translatesAutoresizingMaskIntoConstraints="NO" id="377" colorLabel="IBBuiltInLabel-Red">
+                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" preferredMaxLayoutWidth="381" translatesAutoresizingMaskIntoConstraints="NO" id="377" colorLabel="IBBuiltInLabel-Red">
                                             <rect key="frame" x="17" y="118" width="385" height="42"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" userInterfaceLayoutDirection="rightToLeft" alignment="right" id="100377">
@@ -254,7 +254,7 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="379" colorLabel="IBBuiltInLabel-Red">
+                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="379" colorLabel="IBBuiltInLabel-Red">
                                             <rect key="frame" x="11" y="17" width="404" height="14"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" userInterfaceLayoutDirection="rightToLeft" alignment="right" title="אפשרויות אלו נכנסות לתוקפן בהפעלה הבאה של X11." id="100379">
@@ -434,7 +434,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="מהצג" bezelStyle="rounded" imagePosition="leading" alignment="right" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" userInterfaceLayoutDirection="rightToLeft" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="מהצג" state="on" tag="-1" id="384"/>
@@ -651,17 +651,17 @@
                         <rect key="frame" x="116" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="uVc-7D-Q8P">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="68" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="58.5" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="right" title="קיצור ">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -673,7 +673,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="96" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="86.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="right" title="‏Command">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -685,7 +685,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="118.73100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="109.23100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="right" title="‏שם">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -709,7 +709,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -727,6 +727,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="‏תפריט" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/he.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/he.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..3cc693794
Binary files /dev/null and b/hw/xquartz/bundle/Resources/he.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/he.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/he.lproj/main.nib/keyedobjects.nib
index 92469877b..797901ca2 100644
Binary files a/hw/xquartz/bundle/Resources/he.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/he.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/hr.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/hr.lproj/main.nib/designable.nib
index 3a29523f6..ad65bfd70 100644
--- a/hw/xquartz/bundle/Resources/hr.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/hr.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -318,7 +318,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="Od zaslona" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="Od zaslona" state="on" tag="-1" id="384"/>
@@ -655,17 +655,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="bRu-TK-TiZ">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="118.73100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="109.23100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Ime">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -677,7 +677,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="96" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="86.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Naredba">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -689,7 +689,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="68.5" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="59" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Prečac">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -713,7 +713,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -731,6 +731,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Izbornik" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/hr.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/hr.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..135e47552
Binary files /dev/null and b/hw/xquartz/bundle/Resources/hr.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/hr.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/hr.lproj/main.nib/keyedobjects.nib
index 01f4e5e9c..141a29dc7 100644
Binary files a/hw/xquartz/bundle/Resources/hr.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/hr.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/hu.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/hu.lproj/main.nib/designable.nib
index 4198c1597..fd75ba8bb 100644
--- a/hw/xquartz/bundle/Resources/hu.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/hu.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -318,7 +318,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="A kijelzőről" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="A kijelzőről" state="on" tag="-1" id="384"/>
@@ -656,17 +656,17 @@ az illesztőlap módosulásakor</string>
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="1Rb-LT-MwQ">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="118.73100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="109.23100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Név">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -678,7 +678,7 @@ az illesztőlap módosulásakor</string>
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="76" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="66.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Parancs">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -690,7 +690,7 @@ az illesztőlap módosulásakor</string>
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="88" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="78.5" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Billentyűparancs">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -714,7 +714,7 @@ az illesztőlap módosulásakor</string>
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -732,6 +732,7 @@ az illesztőlap módosulásakor</string>
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Menü" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/hu.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/hu.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..7faea00f6
Binary files /dev/null and b/hw/xquartz/bundle/Resources/hu.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/hu.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/hu.lproj/main.nib/keyedobjects.nib
index 2203febc2..0b497a7d7 100644
Binary files a/hw/xquartz/bundle/Resources/hu.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/hu.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib
index cde09b5a8..2b8e368b0 100644
--- a/hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -318,7 +318,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="모니터에서" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="모니터에서" state="on" tag="-1" id="384"/>
@@ -649,17 +649,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="vq9-6J-aRN">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="118.73100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="109.23100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="이름">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -671,7 +671,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="96" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="86.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="명령">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -683,7 +683,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="68" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="58.5" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="단축키">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -707,7 +707,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -725,6 +725,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="메뉴" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..65043025b
Binary files /dev/null and b/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib
index d5740a1f2..041240a6b 100644
Binary files a/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib
index f037e51dc..077f5cf54 100644
--- a/hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -318,7 +318,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="Fra skjerm" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="Fra skjerm" state="on" tag="-1" id="384"/>
@@ -653,17 +653,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="S0C-zB-eXO">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="118.73100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="109.23100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Navn">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -675,7 +675,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="96" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="86.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Kommando">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -687,7 +687,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="68" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="58.5" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Snarvei">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -711,7 +711,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -729,6 +729,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Meny" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..4a7ff917f
Binary files /dev/null and b/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib
index d510efba3..c4c6915e0 100644
Binary files a/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib
index 3e0b02aca..c95374fbf 100644
--- a/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -318,7 +318,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="Z monitora" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="Z monitora" state="on" tag="-1" id="384"/>
@@ -651,17 +651,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="6jz-is-B1k">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="119.73100280761719" minWidth="62.730998992919922" maxWidth="1000" headerToolTip="" id="298">
+                                        <tableColumn width="110.23100280761719" minWidth="62.730998992919922" maxWidth="1000" headerToolTip="" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Nazwa">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -673,7 +673,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="97" minWidth="40" maxWidth="1000" headerToolTip="" id="297">
+                                        <tableColumn width="87.5" minWidth="40" maxWidth="1000" headerToolTip="" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Polecenie">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -685,7 +685,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="66.5" minWidth="10" maxWidth="1000" headerToolTip="" id="535">
+                                        <tableColumn width="57" minWidth="10" maxWidth="1000" headerToolTip="" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Skrót">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -709,7 +709,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -727,6 +727,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Menu" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..42d406209
Binary files /dev/null and b/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib
index 1a31b1a87..1de9a1f36 100644
Binary files a/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib
index 397c53ba4..3952fc1ce 100644
--- a/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -318,7 +318,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="Da Tela" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="Da Tela" state="on" tag="-1" id="384"/>
@@ -654,17 +654,17 @@
                         <rect key="frame" x="20" y="20" width="350" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="DZ0-6j-S0n">
-                            <rect key="frame" x="1" y="29" width="333" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="333" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="333" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="129.73100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="120.23100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Nome">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -676,7 +676,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="107" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="97.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Comando">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -688,7 +688,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="78" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="68.5" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Atalho">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -712,7 +712,7 @@
                             <rect key="frame" x="334" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="333" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -730,6 +730,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Menu" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..455342a63
Binary files /dev/null and b/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib
index a8af7c4c9..eb6133012 100644
Binary files a/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib
index 796956300..e7b50c1b4 100644
--- a/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -319,7 +319,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="Do monitor" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="Do monitor" state="on" tag="-1" id="384"/>
@@ -654,17 +654,17 @@
                         <rect key="frame" x="20" y="20" width="296" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="HBh-qP-4bU">
-                            <rect key="frame" x="1" y="29" width="279" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="279" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="279" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="96.731002807617188" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="87.231002807617188" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Nome">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -676,7 +676,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="98" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="88.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Comando">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -688,7 +688,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="66" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="56.5" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Atalho">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -712,7 +712,7 @@
                             <rect key="frame" x="280" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="279" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -730,6 +730,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Menu" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..80631f1fb
Binary files /dev/null and b/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib
index e993d1bda..92950c47b 100644
Binary files a/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/ro.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/ro.lproj/main.nib/designable.nib
index 6b74029d6..7ec5325ac 100644
--- a/hw/xquartz/bundle/Resources/ro.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/ro.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -319,7 +319,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="De la afișaj" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="De la afișaj" state="on" tag="-1" id="384"/>
@@ -656,17 +656,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="tb7-sa-VdD">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="113.73100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="104.23100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Nume">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -678,7 +678,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="97" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="87.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Comandă">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -690,7 +690,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="72.5" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="63" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Scurtătură">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -714,7 +714,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -732,6 +732,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Meniu" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/ro.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/ro.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..3e2bdb9e0
Binary files /dev/null and b/hw/xquartz/bundle/Resources/ro.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/ro.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/ro.lproj/main.nib/keyedobjects.nib
index 12572fd7f..012033e29 100644
Binary files a/hw/xquartz/bundle/Resources/ro.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/ro.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/ru.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/ru.lproj/main.nib/designable.nib
index 76c1f2c0b..bdf93df28 100644
--- a/hw/xquartz/bundle/Resources/ru.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/ru.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -212,7 +212,7 @@
                                     <rect key="frame" x="10" y="33" width="554" height="279"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <button imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="363" colorLabel="IBBuiltInLabel-Red">
+                                        <button fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="363" colorLabel="IBBuiltInLabel-Red">
                                             <rect key="frame" x="15" y="243" width="402" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <buttonCell key="cell" type="check" title="Эмулировать трехкнопочную мышь" bezelStyle="regularSquare" imagePosition="leading" alignment="left" inset="2" id="100363">
@@ -223,7 +223,7 @@
                                                 <action selector="prefs_changed:" target="196" id="394"/>
                                             </connections>
                                         </button>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="500" translatesAutoresizingMaskIntoConstraints="NO" id="364" colorLabel="IBBuiltInLabel-Red">
+                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" preferredMaxLayoutWidth="500" translatesAutoresizingMaskIntoConstraints="NO" id="364" colorLabel="IBBuiltInLabel-Red">
                                             <rect key="frame" x="33" y="105" width="504" height="28"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" placeholderString="" id="100364">
@@ -233,7 +233,7 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="491" translatesAutoresizingMaskIntoConstraints="NO" id="365" colorLabel="IBBuiltInLabel-Red">
+                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" preferredMaxLayoutWidth="491" translatesAutoresizingMaskIntoConstraints="NO" id="365" colorLabel="IBBuiltInLabel-Red">
                                             <rect key="frame" x="33" y="200" width="495" height="42"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" placeholderString="" id="100365">
@@ -244,7 +244,7 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <button imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="368" colorLabel="IBBuiltInLabel-Red">
+                                        <button fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="368" colorLabel="IBBuiltInLabel-Red">
                                             <rect key="frame" x="15" y="137" width="402" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <buttonCell key="cell" type="check" title="Включить эквиваленты клавиш в X11" bezelStyle="regularSquare" imagePosition="leading" alignment="left" inset="2" id="100368">
@@ -255,7 +255,7 @@
                                                 <action selector="prefs_changed:" target="196" id="396"/>
                                             </connections>
                                         </button>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="500" translatesAutoresizingMaskIntoConstraints="NO" id="369" colorLabel="IBBuiltInLabel-Red">
+                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" preferredMaxLayoutWidth="500" translatesAutoresizingMaskIntoConstraints="NO" id="369" colorLabel="IBBuiltInLabel-Red">
                                             <rect key="frame" x="33" y="166" width="504" height="14"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Разрешать изменения меню ввода для перезаписи текущей X11-карты ключей." placeholderString="" id="100369">
@@ -264,7 +264,7 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <button imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="370" colorLabel="IBBuiltInLabel-Red">
+                                        <button fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="370" colorLabel="IBBuiltInLabel-Red">
                                             <rect key="frame" x="15" y="184" width="402" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <buttonCell key="cell" type="check" title="Следовать системной раскладке клавиатуры" bezelStyle="regularSquare" imagePosition="leading" alignment="left" inset="2" id="100370">
@@ -275,7 +275,7 @@
                                                 <action selector="prefs_changed:" target="196" id="395"/>
                                             </connections>
                                         </button>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="500" translatesAutoresizingMaskIntoConstraints="NO" id="300476" colorLabel="IBBuiltInLabel-Red">
+                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" preferredMaxLayoutWidth="500" translatesAutoresizingMaskIntoConstraints="NO" id="300476" colorLabel="IBBuiltInLabel-Red">
                                             <rect key="frame" x="33" y="41" width="504" height="31"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Если включено, клавиши Option отправляют символы X11 клавиш Alt_L и Alt_R X11, вместо Mode_switch." id="300479">
@@ -284,7 +284,7 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <button imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="300477" colorLabel="IBBuiltInLabel-Red">
+                                        <button fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="300477" colorLabel="IBBuiltInLabel-Red">
                                             <rect key="frame" x="15" y="76" width="402" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <buttonCell key="cell" type="check" title="Клавиши Option отправляют Alt_L и Alt_R" bezelStyle="regularSquare" imagePosition="leading" alignment="left" inset="2" id="300478">
@@ -295,7 +295,7 @@
                                                 <action selector="prefs_changed:" target="196" id="300480"/>
                                             </connections>
                                         </button>
-                                        <button imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="300482" colorLabel="IBBuiltInLabel-Red">
+                                        <button fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="300482" colorLabel="IBBuiltInLabel-Red">
                                             <rect key="frame" x="15" y="12" width="418" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <buttonCell key="cell" type="check" title="Всегда прокручивать в сторону движения пальца" bezelStyle="regularSquare" imagePosition="leading" alignment="left" inset="2" id="300483" colorLabel="IBBuiltInLabel-Red">
@@ -319,7 +319,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="С экрана" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="С экрана" state="on" tag="-1" id="384"/>
@@ -655,17 +655,17 @@
                         <rect key="frame" x="10" y="20" width="368" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="a1E-8Q-hEU">
-                            <rect key="frame" x="1" y="29" width="351" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="351" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="351" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="135.73101806640625" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="126.23101806640625" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Имя">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -677,7 +677,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="113" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="103.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Команда">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -689,7 +689,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="83.999969482421875" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="74.499969482421875" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Соч. кл.">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -713,7 +713,7 @@
                             <rect key="frame" x="352" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="351" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -731,6 +731,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Меню" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..bbed97423
Binary files /dev/null and b/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib
index f68413d14..0b96e100f 100644
Binary files a/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/sk.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/sk.lproj/main.nib/designable.nib
index aab0448ea..5fd0f98cf 100644
--- a/hw/xquartz/bundle/Resources/sk.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/sk.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -318,7 +318,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="Z displeja" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="Z displeja" state="on" tag="-1" id="384"/>
@@ -652,17 +652,17 @@
                         <rect key="frame" x="20" y="20" width="302" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="0sL-pl-jco">
-                            <rect key="frame" x="1" y="29" width="285" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="285" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="285" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="89.715377807617188" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="80.215377807617188" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Meno">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -674,7 +674,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="76.984375" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="67.484375" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Command">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -686,7 +686,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="100" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="90.5" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Klávesová skratka">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -710,7 +710,7 @@
                             <rect key="frame" x="286" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="285" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -728,6 +728,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Menu" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/sk.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/sk.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..42df30d2b
Binary files /dev/null and b/hw/xquartz/bundle/Resources/sk.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/sk.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/sk.lproj/main.nib/keyedobjects.nib
index 7eea90779..9ebde46e9 100644
Binary files a/hw/xquartz/bundle/Resources/sk.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/sk.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib
index a511d2898..4f1602a58 100644
--- a/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -318,7 +318,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="Från bildskärm" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="Från bildskärm" state="on" tag="-1" id="384"/>
@@ -653,17 +653,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="OyO-6e-tB2">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="119.73100280761719" minWidth="62.730998992919922" maxWidth="1000" headerToolTip="" id="298">
+                                        <tableColumn width="110.23100280761719" minWidth="62.730998992919922" maxWidth="1000" headerToolTip="" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Namn">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -675,7 +675,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="97" minWidth="40" maxWidth="1000" headerToolTip="" id="297">
+                                        <tableColumn width="87.5" minWidth="40" maxWidth="1000" headerToolTip="" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Kommando">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -687,7 +687,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="66" minWidth="10" maxWidth="1000" headerToolTip="" id="535">
+                                        <tableColumn width="56.5" minWidth="10" maxWidth="1000" headerToolTip="" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Kortkom.">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -711,7 +711,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -729,6 +729,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Meny" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..9b134773a
Binary files /dev/null and b/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib
index c5d9dc1ef..9bc54d9ab 100644
Binary files a/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/th.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/th.lproj/main.nib/designable.nib
index 8fc3cf30a..b7b763eaa 100644
--- a/hw/xquartz/bundle/Resources/th.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/th.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="เมนูหลัก" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -318,7 +318,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="จากจอแสดงผล" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="มุมมองอื่นๆ" id="380">
                                                     <items>
                                                         <menuItem title="จากจอแสดงผล" state="on" tag="-1" id="384"/>
@@ -652,17 +652,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="e6h-Bv-3J8">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="118.73099999999999" minWidth="62.731000000000002" maxWidth="1000" id="298">
+                                        <tableColumn width="109.23099999999999" minWidth="62.731000000000002" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="ชื่อ">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -674,7 +674,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="96" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="86.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="คำสั่ง">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -686,7 +686,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="68" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="58.5" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="ทางลัด">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -710,7 +710,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -728,6 +728,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="เมนู" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/th.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/th.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..34e5f7e77
Binary files /dev/null and b/hw/xquartz/bundle/Resources/th.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/th.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/th.lproj/main.nib/keyedobjects.nib
index 296e41959..0a5a3b367 100644
Binary files a/hw/xquartz/bundle/Resources/th.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/th.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/tr.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/tr.lproj/main.nib/designable.nib
index 2c8d54558..c9d38d487 100644
--- a/hw/xquartz/bundle/Resources/tr.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/tr.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -318,7 +318,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="Ekrandan" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="Ekrandan" state="on" tag="-1" id="384"/>
@@ -654,17 +654,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="QW2-zh-wIQ">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="118.73100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="109.23100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Ad">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -676,7 +676,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="96" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="86.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Komut">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -688,7 +688,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="68.5" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="59" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Kestirme">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -712,7 +712,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -730,6 +730,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Menü" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/tr.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/tr.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..b9ed81680
Binary files /dev/null and b/hw/xquartz/bundle/Resources/tr.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/tr.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/tr.lproj/main.nib/keyedobjects.nib
index c737b701b..f5663e05d 100644
Binary files a/hw/xquartz/bundle/Resources/tr.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/tr.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/uk.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/uk.lproj/main.nib/designable.nib
index 02dc3fe8d..1a87cf2b9 100644
--- a/hw/xquartz/bundle/Resources/uk.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/uk.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -319,7 +319,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="як у дисплея" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="як у дисплея" state="on" tag="-1" id="384"/>
@@ -656,17 +656,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="RnE-Zc-swV">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="111.73100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="102.23100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Назва">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -678,7 +678,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="98" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="88.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Команда">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -690,7 +690,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="73.5" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="64" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Скорочення">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -714,7 +714,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -732,6 +732,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="Меню" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/uk.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/uk.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..9297696fc
Binary files /dev/null and b/hw/xquartz/bundle/Resources/uk.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/uk.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/uk.lproj/main.nib/keyedobjects.nib
index 84f1acf94..d12239f61 100644
Binary files a/hw/xquartz/bundle/Resources/uk.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/uk.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib
index 21d20c6e9..68fd5923a 100644
--- a/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -318,7 +318,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="来自显示器" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="来自显示器" state="on" tag="-1" id="384"/>
@@ -649,17 +649,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="9m2-b1-H1b">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="118.73100280761719" minWidth="62.730998992919922" maxWidth="1000" headerToolTip="" id="298">
+                                        <tableColumn width="109.23100280761719" minWidth="62.730998992919922" maxWidth="1000" headerToolTip="" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="名称">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -671,7 +671,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="96" minWidth="40" maxWidth="1000" headerToolTip="" id="297">
+                                        <tableColumn width="86.5" minWidth="40" maxWidth="1000" headerToolTip="" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="命令">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -683,7 +683,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="68" minWidth="10" maxWidth="1000" headerToolTip="" id="535">
+                                        <tableColumn width="58.5" minWidth="10" maxWidth="1000" headerToolTip="" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="快捷">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -707,7 +707,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -725,6 +725,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="菜单" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..e21de5b2c
Binary files /dev/null and b/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib
index b72925e48..bb8fa7e45 100644
Binary files a/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib
index dbee34b93..d72ee6014 100644
--- a/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib
@@ -14,7 +14,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="X11" id="56">
@@ -318,7 +318,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="來自螢幕" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="384" id="100382">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="menu"/>
                                                 <menu key="menu" title="OtherViews" id="380">
                                                     <items>
                                                         <menuItem title="來自螢幕" state="on" tag="-1" id="384"/>
@@ -649,17 +649,17 @@
                         <rect key="frame" x="20" y="20" width="318" height="231"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="z7M-aF-B2W">
-                            <rect key="frame" x="1" y="29" width="301" height="186"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <rect key="frame" x="1" y="1" width="301" height="214"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="300295" id="296">
                                     <rect key="frame" x="0.0" y="0.0" width="301" height="186"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="119.73100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
+                                        <tableColumn width="110.23100280761719" minWidth="62.730998992919922" maxWidth="1000" id="298">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="名稱">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -671,7 +671,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="97" minWidth="40" maxWidth="1000" id="297">
+                                        <tableColumn width="87.5" minWidth="40" maxWidth="1000" id="297">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="指令">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -683,7 +683,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn width="66" minWidth="10" maxWidth="1000" id="535">
+                                        <tableColumn width="56.5" minWidth="10" maxWidth="1000" id="535">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="快速鍵">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -707,7 +707,7 @@
                             <rect key="frame" x="302" y="29" width="15" height="186"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <tableHeaderView key="headerView" id="300295">
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="300295">
                             <rect key="frame" x="0.0" y="0.0" width="301" height="28"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
@@ -725,6 +725,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="27" y="351"/>
         </window>
         <menu title="選單" id="423" userLabel="DockMenu">
             <items>
diff --git a/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects-110000.nib b/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects-110000.nib
new file mode 100644
index 000000000..cfc33e07f
Binary files /dev/null and b/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects-110000.nib differ
diff --git a/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib
index 32d7735d6..cbb1dc64d 100644
Binary files a/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib and b/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib differ
diff --git a/hw/xquartz/bundle/mk_bundke.sh b/hw/xquartz/bundle/mk_bundke.sh
index 632e5f76b..971d7b6ce 100755
--- a/hw/xquartz/bundle/mk_bundke.sh
+++ b/hw/xquartz/bundle/mk_bundke.sh
@@ -12,7 +12,7 @@ for lang in ${localities} ; do
     mkdir -p ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib
     [ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib ] || exit 1
 
-    for f in Localizable.strings main.nib/keyedobjects.nib ; do
+    for f in Localizable.strings main.nib/keyedobjects.nib main.nib/keyedobjects-110000.nib ; do
         install -m 644 ${SRCDIR}/Resources/${lang}.lproj/$f ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/${f}
     done
 done