From 2a5ad68cabf6e1412f1e86f733cec14ef9ea5969 Mon Sep 17 00:00:00 2001
From: 1024jp <1024jp@wolfrosch.com>
Date: Sun, 20 Aug 2023 09:57:02 +0900
Subject: [PATCH] Make setting window wider

---
 CHANGELOG.md                                  |   2 +-
 .../Base.lproj/AppearancePane.storyboard      |  44 +++----
 CotEditor/Base.lproj/EditPane.storyboard      |  50 +++-----
 CotEditor/Base.lproj/FormatPane.storyboard    |  46 +++----
 CotEditor/Base.lproj/GeneralPane.storyboard   |  34 ++---
 .../Base.lproj/KeyBindingsPane.storyboard     |  32 ++---
 CotEditor/Base.lproj/PrintPane.storyboard     |  24 ++--
 CotEditor/Base.lproj/SnippetsPane.storyboard  | 120 +++++++++---------
 CotEditor/Base.lproj/WindowPane.storyboard    | 111 ++++++++--------
 .../en.lproj/pgs/settings_window.html         |   2 +-
 .../ja.lproj/pgs/settings_window.html         |   2 +-
 CotEditor/de.lproj/EditPane.strings           |  10 +-
 CotEditor/de.lproj/WindowPane.strings         |  10 +-
 CotEditor/en-GB.lproj/EditPane.strings        |  10 +-
 CotEditor/en-GB.lproj/WindowPane.strings      |  10 +-
 CotEditor/es.lproj/EditPane.strings           |  10 +-
 CotEditor/es.lproj/WindowPane.strings         |  13 +-
 CotEditor/fr.lproj/EditPane.strings           |   8 +-
 CotEditor/fr.lproj/WindowPane.strings         |  10 +-
 CotEditor/it.lproj/EditPane.strings           |  10 +-
 CotEditor/it.lproj/WindowPane.strings         |  10 +-
 CotEditor/ja.lproj/EditPane.strings           |  10 +-
 CotEditor/ja.lproj/WindowPane.strings         |  10 +-
 CotEditor/pt.lproj/EditPane.strings           |  10 +-
 CotEditor/pt.lproj/WindowPane.strings         |  10 +-
 CotEditor/tr.lproj/EditPane.strings           |  10 +-
 CotEditor/tr.lproj/WindowPane.strings         |  14 +-
 CotEditor/zh-Hans.lproj/EditPane.strings      |  10 +-
 CotEditor/zh-Hans.lproj/WindowPane.strings    |  14 +-
 CotEditor/zh-Hant.lproj/EditPane.strings      |  10 +-
 CotEditor/zh-Hant.lproj/WindowPane.strings    |  12 +-
 31 files changed, 340 insertions(+), 338 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4746831a5f..43cec635cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,7 +32,7 @@ Change Log
 - [trivial] Change the behavior of the duplication command for syntax definitions to just create a duplicated syntax instead of opening the syntax editor dialog.
 - [trivial] Improve the behavior when selecting a row in the find result table in the Find window.
 - [trivial] Rename “syntax style” with just “syntax.”
-- [trivial] Rearrange the layout of the encoding list.
+- [trivial] Adjust the layout of the Settings window.
 
 
 ### Fixes
diff --git a/CotEditor/Base.lproj/AppearancePane.storyboard b/CotEditor/Base.lproj/AppearancePane.storyboard
index bb71b04534..697db34f55 100644
--- a/CotEditor/Base.lproj/AppearancePane.storyboard
+++ b/CotEditor/Base.lproj/AppearancePane.storyboard
@@ -11,10 +11,10 @@
             <objects>
                 <viewController id="WBM-EY-ENr" customClass="AppearancePaneController" customModule="CotEditor" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" horizontalHuggingPriority="750" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="LgU-un-VaX">
-                        <rect key="frame" x="0.0" y="0.0" width="570" height="656"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="656"/>
                         <subviews>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="ADB-Wp-iDy">
-                                <rect key="frame" x="29" y="342" width="512" height="314"/>
+                                <rect key="frame" x="44" y="342" width="512" height="314"/>
                                 <subviews>
                                     <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="icl-ar-8yG">
                                         <rect key="frame" x="18" y="278" width="114" height="16"/>
@@ -222,7 +222,7 @@
                                         </connections>
                                     </button>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="I05-Ks-5uR">
-                                        <rect key="frame" x="302" y="59" width="175" height="18"/>
+                                        <rect key="frame" x="302" y="59" width="190" height="18"/>
                                         <buttonCell key="cell" type="check" title="Other control characters" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="sxg-F3-ely">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -386,7 +386,7 @@
                                     <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="nqX-jr-n2L" secondAttribute="trailing" constant="20" symbolic="YES" id="DHf-3L-DRb"/>
                                     <constraint firstItem="sbW-46-DFB" firstAttribute="leading" secondItem="2y3-Ti-pue" secondAttribute="trailing" constant="8" symbolic="YES" id="DKp-dB-fTm"/>
                                     <constraint firstItem="x9R-2Y-F6b" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ADB-Wp-iDy" secondAttribute="leading" constant="20" symbolic="YES" id="EwF-3b-hzG"/>
-                                    <constraint firstAttribute="trailing" secondItem="uMj-Iu-oCy" secondAttribute="trailing" priority="750" constant="20" symbolic="YES" id="Ft4-Ab-tZV"/>
+                                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="uMj-Iu-oCy" secondAttribute="trailing" priority="750" constant="20" symbolic="YES" id="Ft4-Ab-tZV"/>
                                     <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Y0v-jK-SaN" secondAttribute="trailing" constant="20" symbolic="YES" id="Fxo-Dh-ntY"/>
                                     <constraint firstItem="x9R-2Y-F6b" firstAttribute="baseline" secondItem="xAb-JZ-6Pr" secondAttribute="baseline" id="GdT-01-AXJ"/>
                                     <constraint firstItem="Fcc-rL-m1T" firstAttribute="leading" secondItem="ZHd-UF-pkx" secondAttribute="trailing" constant="8" symbolic="YES" id="Gkf-Hl-M3h"/>
@@ -401,7 +401,7 @@
                                     <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Cfh-8I-pCg" secondAttribute="trailing" constant="20" symbolic="YES" id="P98-Fy-JKM"/>
                                     <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="6lq-jQ-EgE" secondAttribute="trailing" constant="20" symbolic="YES" id="PO6-5z-jqA"/>
                                     <constraint firstItem="icl-ar-8yG" firstAttribute="top" secondItem="ADB-Wp-iDy" secondAttribute="top" constant="20" symbolic="YES" id="PVD-oM-Cge"/>
-                                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="I05-Ks-5uR" secondAttribute="trailing" constant="20" symbolic="YES" id="Q4q-kp-wWO"/>
+                                    <constraint firstAttribute="trailing" secondItem="I05-Ks-5uR" secondAttribute="trailing" priority="750" constant="20" symbolic="YES" id="Q4q-kp-wWO"/>
                                     <constraint firstItem="Fcc-rL-m1T" firstAttribute="centerY" secondItem="ZHd-UF-pkx" secondAttribute="centerY" id="RCo-rU-m4T"/>
                                     <constraint firstItem="uyp-Xk-mRF" firstAttribute="top" secondItem="Y0v-jK-SaN" secondAttribute="bottom" constant="6" symbolic="YES" id="S91-HD-2Hg"/>
                                     <constraint firstItem="5XW-Ju-Ix5" firstAttribute="top" secondItem="LCf-XZ-KEp" secondAttribute="bottom" constant="8" symbolic="YES" id="SVZ-oV-anh"/>
@@ -456,25 +456,25 @@
                                 </constraints>
                             </customView>
                             <box horizontalHuggingPriority="750" horizontalCompressionResistancePriority="250" boxType="custom" borderType="line" title="Theme" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="B3l-Yn-4KT">
-                                <rect key="frame" x="20" y="52" width="171" height="280"/>
+                                <rect key="frame" x="20" y="52" width="181" height="280"/>
                                 <view key="contentView" id="Btf-Bu-KOk">
-                                    <rect key="frame" x="1" y="1" width="169" height="278"/>
+                                    <rect key="frame" x="1" y="1" width="179" height="278"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <scrollView verticalCompressionResistancePriority="250" borderType="none" autohidesScrollers="YES" horizontalLineScroll="20" horizontalPageScroll="10" verticalLineScroll="20" verticalPageScroll="10" translatesAutoresizingMaskIntoConstraints="NO" id="QiH-I6-BXd">
-                                            <rect key="frame" x="0.0" y="25" width="169" height="254"/>
+                                            <rect key="frame" x="0.0" y="25" width="179" height="254"/>
                                             <clipView key="contentView" drawsBackground="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lhq-HG-y2I">
-                                                <rect key="frame" x="0.0" y="0.0" width="169" height="254"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="179" height="254"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="fullWidth" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="16" rowSizeStyle="automatic" headerView="3yq-Qd-FKt" viewBased="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8ed-Dt-hO9">
-                                                        <rect key="frame" x="0.0" y="0.0" width="169" height="226"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="179" height="226"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <size key="intercellSpacing" width="3" height="4"/>
                                                         <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                                         <tableColumns>
-                                                            <tableColumn identifier="themeName" width="157" minWidth="40" maxWidth="1000" id="Avf-y8-wXG">
+                                                            <tableColumn identifier="themeName" width="167" minWidth="40" maxWidth="1000" id="Avf-y8-wXG">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Theme">
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                                     <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -487,11 +487,11 @@
                                                                 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                                 <prototypeCellViews>
                                                                     <tableCellView id="IKs-Gh-g0j">
-                                                                        <rect key="frame" x="1" y="2" width="166" height="16"/>
+                                                                        <rect key="frame" x="1" y="2" width="176" height="16"/>
                                                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                         <subviews>
                                                                             <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="jVT-ne-6NT">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="166" height="16"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="176" height="16"/>
                                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="Dendrobates" id="sRo-2c-Ydn">
                                                                                     <font key="font" metaFont="system"/>
@@ -525,19 +525,19 @@
                                                 <nil key="backgroundColor"/>
                                             </clipView>
                                             <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="FrY-ys-Wya">
-                                                <rect key="frame" x="0.0" y="238" width="169" height="16"/>
+                                                <rect key="frame" x="0.0" y="238" width="179" height="16"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                             </scroller>
                                             <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="Czd-4t-kEc">
                                                 <autoresizingMask key="autoresizingMask"/>
                                             </scroller>
                                             <tableHeaderView key="headerView" wantsLayer="YES" id="3yq-Qd-FKt">
-                                                <rect key="frame" x="0.0" y="0.0" width="169" height="28"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="179" height="28"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                             </tableHeaderView>
                                         </scrollView>
                                         <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="dse-xO-np5">
-                                            <rect key="frame" x="4" y="22" width="161" height="5"/>
+                                            <rect key="frame" x="4" y="22" width="171" height="5"/>
                                         </box>
                                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ka6-Bf-yVl">
                                             <rect key="frame" x="2" y="-0.5" width="24.5" height="27"/>
@@ -569,7 +569,7 @@
                                             </connections>
                                         </button>
                                         <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="IcH-In-axb">
-                                            <rect key="frame" x="126" y="1" width="41" height="23"/>
+                                            <rect key="frame" x="136" y="1" width="41" height="23"/>
                                             <popUpButtonCell key="cell" type="smallSquare" title="Theme Action" bezelStyle="smallSquare" imagePosition="only" alignment="center" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="LkE-Zl-odd">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="menu"/>
@@ -653,23 +653,21 @@
                                 </constraints>
                                 <color key="borderColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                 <color key="fillColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                <font key="titleFont" metaFont="smallSystem"/>
                             </box>
                             <box autoresizesSubviews="NO" boxType="custom" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="nMR-L3-OOw">
-                                <rect key="frame" x="190" y="52" width="360" height="280"/>
+                                <rect key="frame" x="200" y="52" width="380" height="280"/>
                                 <view key="contentView" id="XwV-Se-xeY">
-                                    <rect key="frame" x="1" y="1" width="358" height="278"/>
+                                    <rect key="frame" x="1" y="1" width="378" height="278"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 </view>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="360" id="iLy-T8-AkH"/>
+                                    <constraint firstAttribute="width" constant="380" id="iLy-T8-AkH"/>
                                 </constraints>
                                 <color key="borderColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                 <color key="fillColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                <font key="titleFont" metaFont="smallSystem"/>
                             </box>
                             <button identifier="settings_appearance" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="19L-5s-cbB">
-                                <rect key="frame" x="527" y="16" width="25" height="25"/>
+                                <rect key="frame" x="557" y="16" width="25" height="25"/>
                                 <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="sFb-B9-3cy">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
diff --git a/CotEditor/Base.lproj/EditPane.storyboard b/CotEditor/Base.lproj/EditPane.storyboard
index 6a0b67d4ae..51f284d822 100644
--- a/CotEditor/Base.lproj/EditPane.storyboard
+++ b/CotEditor/Base.lproj/EditPane.storyboard
@@ -12,22 +12,14 @@
             <objects>
                 <viewController id="6FT-QA-TTg" customClass="EditPaneController" customModule="CotEditor" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" horizontalHuggingPriority="750" verticalCompressionResistancePriority="250" id="4sX-tH-txQ">
-                        <rect key="frame" x="0.0" y="0.0" width="570" height="544"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="542"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="3oL-k6-e6i">
-                                <rect key="frame" x="58" y="0.0" width="455" height="544"/>
+                                <rect key="frame" x="73" y="0.0" width="455" height="542"/>
                                 <subviews>
-                                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="e7o-7Q-Iec">
-                                        <rect key="frame" x="30" y="508" width="81" height="16"/>
-                                        <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Substitution:" usesSingleLineMode="YES" id="SqI-BC-ar9">
-                                            <font key="font" metaFont="system"/>
-                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nqq-MP-8Cp">
-                                        <rect key="frame" x="115" y="507" width="132" height="18"/>
+                                        <rect key="frame" x="115" y="505" width="132" height="18"/>
                                         <buttonCell key="cell" type="check" title="Smart copy/paste" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3302">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -37,7 +29,7 @@
                                         </connections>
                                     </button>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6Dj-HL-UJe">
-                                        <rect key="frame" x="115" y="485" width="320" height="18"/>
+                                        <rect key="frame" x="115" y="483" width="320" height="18"/>
                                         <buttonCell key="cell" type="check" title="Automatically insert closing brackets and quotes" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="GRh-V2-hmW">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -47,7 +39,7 @@
                                         </connections>
                                     </button>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="D3Q-hS-szA">
-                                        <rect key="frame" x="115" y="463" width="158" height="18"/>
+                                        <rect key="frame" x="115" y="461" width="158" height="18"/>
                                         <buttonCell key="cell" type="check" title="Swap “¥” and “\” keys" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3303">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -56,17 +48,9 @@
                                             <binding destination="TDG-Hm-YNe" name="value" keyPath="values.swapYenAndBackSlashKey" id="m8U-xi-vnK"/>
                                         </connections>
                                     </button>
-                                    <textField focusRingType="none" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Vs4-ce-gbZ">
-                                        <rect key="frame" x="115" y="440" width="41" height="16"/>
-                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Smart" id="6I3-dM-2QV">
-                                            <font key="font" metaFont="system"/>
-                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="a9Q-Qg-ppv">
-                                        <rect key="frame" x="160" y="439" width="70" height="18"/>
-                                        <buttonCell key="cell" type="check" title="Quotes" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Abx-fM-gyc">
+                                        <rect key="frame" x="115" y="439" width="108" height="18"/>
+                                        <buttonCell key="cell" type="check" title="Smart quotes" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Abx-fM-gyc">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
@@ -75,8 +59,8 @@
                                         </connections>
                                     </button>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="N1n-gE-ApS">
-                                        <rect key="frame" x="236" y="439" width="71" height="18"/>
-                                        <buttonCell key="cell" type="check" title="Dashes" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="nr1-0X-aBY">
+                                        <rect key="frame" x="229" y="439" width="110" height="18"/>
+                                        <buttonCell key="cell" type="check" title="Smart dashes" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="nr1-0X-aBY">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
@@ -380,6 +364,14 @@
                                             <binding destination="6FT-QA-TTg" name="hidden" keyPath="isValidCompletion" id="w9H-xT-opt"/>
                                         </connections>
                                     </imageView>
+                                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="e7o-7Q-Iec">
+                                        <rect key="frame" x="30" y="506" width="81" height="16"/>
+                                        <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Substitution:" usesSingleLineMode="YES" id="SqI-BC-ar9">
+                                            <font key="font" metaFont="system"/>
+                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
                                 </subviews>
                                 <constraints>
                                     <constraint firstItem="t2q-cV-mtM" firstAttribute="leading" secondItem="EiF-pk-Dua" secondAttribute="trailing" constant="8" symbolic="YES" id="04l-Ip-qeQ"/>
@@ -409,6 +401,7 @@
                                     <constraint firstItem="6Dj-HL-UJe" firstAttribute="leading" secondItem="e7o-7Q-Iec" secondAttribute="trailing" constant="8" symbolic="YES" id="F3f-hf-7xA"/>
                                     <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="LUh-bR-BEp" secondAttribute="trailing" constant="20" symbolic="YES" id="FkI-Pt-Khc"/>
                                     <constraint firstItem="6o6-2H-ikQ" firstAttribute="leading" secondItem="PCw-Sh-dDO" secondAttribute="trailing" constant="8" symbolic="YES" id="Foh-0F-8Em"/>
+                                    <constraint firstItem="a9Q-Qg-ppv" firstAttribute="leading" secondItem="e7o-7Q-Iec" secondAttribute="trailing" constant="8" symbolic="YES" id="GMg-jE-BqN"/>
                                     <constraint firstItem="DcM-VC-C52" firstAttribute="leading" secondItem="8WW-uf-bLm" secondAttribute="trailing" constant="8" symbolic="YES" id="Gfx-VH-cwl"/>
                                     <constraint firstItem="nqq-MP-8Cp" firstAttribute="leading" secondItem="e7o-7Q-Iec" secondAttribute="trailing" constant="8" symbolic="YES" id="KNG-aH-ydW"/>
                                     <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Eul-Sk-7ow" secondAttribute="trailing" constant="20" symbolic="YES" id="KXg-u7-QgS"/>
@@ -418,7 +411,6 @@
                                     <constraint firstItem="EiF-pk-Dua" firstAttribute="trailing" secondItem="e7o-7Q-Iec" secondAttribute="trailing" id="LDp-QW-RGG"/>
                                     <constraint firstItem="55Y-oF-UTC" firstAttribute="leading" secondItem="gY2-yd-rUU" secondAttribute="leading" id="Lcb-gl-rfl"/>
                                     <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="N1n-gE-ApS" secondAttribute="trailing" constant="20" symbolic="YES" id="NHW-Ng-xxf"/>
-                                    <constraint firstItem="Vs4-ce-gbZ" firstAttribute="leading" secondItem="e7o-7Q-Iec" secondAttribute="trailing" constant="8" symbolic="YES" id="NMR-9t-Agl"/>
                                     <constraint firstItem="XNI-eS-U8G" firstAttribute="top" secondItem="DcM-VC-C52" secondAttribute="bottom" constant="16" id="OFb-iu-FwQ"/>
                                     <constraint firstItem="DcX-sg-7bi" firstAttribute="firstBaseline" secondItem="VFE-8n-7LR" secondAttribute="firstBaseline" id="OR9-dy-qSc"/>
                                     <constraint firstItem="XNI-eS-U8G" firstAttribute="leading" secondItem="8I5-Lh-Ofn" secondAttribute="trailing" constant="8" symbolic="YES" id="R0H-Ge-4Nv"/>
@@ -430,7 +422,6 @@
                                     <constraint firstItem="Eul-Sk-7ow" firstAttribute="top" secondItem="a9Q-Qg-ppv" secondAttribute="bottom" constant="6" symbolic="YES" id="SyE-lx-ScU"/>
                                     <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="XNI-eS-U8G" secondAttribute="trailing" constant="20" symbolic="YES" id="TcT-bX-yuA"/>
                                     <constraint firstItem="EiF-pk-Dua" firstAttribute="baseline" secondItem="d0U-hp-rcZ" secondAttribute="baseline" id="UzN-Wv-zg0"/>
-                                    <constraint firstItem="Vs4-ce-gbZ" firstAttribute="top" secondItem="D3Q-hS-szA" secondAttribute="bottom" constant="8" symbolic="YES" id="VPh-Zf-O80"/>
                                     <constraint firstItem="Jwj-BA-jAE" firstAttribute="top" secondItem="Xio-Kn-lnJ" secondAttribute="bottom" constant="16" id="X0V-RY-Vnt"/>
                                     <constraint firstItem="J5U-m9-FvG" firstAttribute="leading" secondItem="6o6-2H-ikQ" secondAttribute="trailing" constant="8" symbolic="YES" id="XGA-ab-wP3"/>
                                     <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="LOl-E4-tE2" secondAttribute="trailing" constant="20" symbolic="YES" id="XRH-eB-m49"/>
@@ -454,13 +445,13 @@
                                     <constraint firstItem="X2i-kL-uLT" firstAttribute="leading" secondItem="8WW-uf-bLm" secondAttribute="trailing" constant="8" symbolic="YES" id="gTD-U8-dse"/>
                                     <constraint firstItem="t2q-cV-mtM" firstAttribute="baseline" secondItem="I2h-Jb-whg" secondAttribute="baseline" id="ghF-iR-xdc"/>
                                     <constraint firstItem="N1n-gE-ApS" firstAttribute="leading" secondItem="a9Q-Qg-ppv" secondAttribute="trailing" constant="8" symbolic="YES" id="giZ-W2-K6d"/>
-                                    <constraint firstItem="a9Q-Qg-ppv" firstAttribute="baseline" secondItem="Vs4-ce-gbZ" secondAttribute="baseline" id="grr-aB-gr1"/>
                                     <constraint firstItem="t2q-cV-mtM" firstAttribute="baseline" secondItem="LOl-E4-tE2" secondAttribute="baseline" id="hAL-cw-gYm"/>
                                     <constraint firstItem="55Y-oF-UTC" firstAttribute="leading" secondItem="WL7-y8-umX" secondAttribute="leading" id="hym-mT-vSY"/>
                                     <constraint firstItem="6o6-2H-ikQ" firstAttribute="top" secondItem="BfR-6w-bx7" secondAttribute="bottom" constant="8" symbolic="YES" id="j4u-7t-1GT"/>
                                     <constraint firstItem="BfR-6w-bx7" firstAttribute="leading" secondItem="PCw-Sh-dDO" secondAttribute="trailing" constant="8" symbolic="YES" id="jW7-Om-cWO"/>
                                     <constraint firstItem="8I5-Lh-Ofn" firstAttribute="baseline" secondItem="XNI-eS-U8G" secondAttribute="baseline" id="lAn-dw-oZx"/>
                                     <constraint firstItem="8I5-Lh-Ofn" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="3oL-k6-e6i" secondAttribute="leading" constant="20" symbolic="YES" id="mJk-W9-B6M"/>
+                                    <constraint firstItem="a9Q-Qg-ppv" firstAttribute="top" secondItem="D3Q-hS-szA" secondAttribute="bottom" constant="6" symbolic="YES" id="mLL-2X-s0x"/>
                                     <constraint firstItem="gY2-yd-rUU" firstAttribute="top" secondItem="55Y-oF-UTC" secondAttribute="bottom" constant="6" symbolic="YES" id="mZe-vW-vrS"/>
                                     <constraint firstItem="EiF-pk-Dua" firstAttribute="leading" secondItem="3oL-k6-e6i" secondAttribute="leading" priority="750" constant="20" symbolic="YES" id="mZv-Sn-JNr"/>
                                     <constraint firstItem="e7o-7Q-Iec" firstAttribute="baseline" secondItem="nqq-MP-8Cp" secondAttribute="baseline" id="nt4-ss-o68"/>
@@ -470,7 +461,6 @@
                                     <constraint firstItem="LUh-bR-BEp" firstAttribute="top" secondItem="6o6-2H-ikQ" secondAttribute="bottom" constant="8" symbolic="YES" id="s5J-5j-YeL"/>
                                     <constraint firstItem="X2i-kL-uLT" firstAttribute="top" secondItem="t2q-cV-mtM" secondAttribute="bottom" constant="16" id="txH-oN-MWl"/>
                                     <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="DhT-LT-Lve" secondAttribute="trailing" constant="20" symbolic="YES" id="uwM-RZ-gkp"/>
-                                    <constraint firstItem="a9Q-Qg-ppv" firstAttribute="leading" secondItem="Vs4-ce-gbZ" secondAttribute="trailing" constant="8" symbolic="YES" id="vPF-iv-opv"/>
                                     <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="DcM-VC-C52" secondAttribute="trailing" constant="20" symbolic="YES" id="vgo-RV-kVt"/>
                                     <constraint firstItem="I2h-Jb-whg" firstAttribute="centerY" secondItem="PeI-EQ-t3D" secondAttribute="centerY" id="vtL-KC-RNE"/>
                                     <constraint firstItem="VFE-8n-7LR" firstAttribute="leading" secondItem="XNI-eS-U8G" secondAttribute="leading" id="wqq-0L-1nx"/>
@@ -481,7 +471,7 @@
                                 </constraints>
                             </customView>
                             <button identifier="settings_edit" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ks6-yt-k9q">
-                                <rect key="frame" x="527" y="16" width="25" height="25"/>
+                                <rect key="frame" x="557" y="16" width="25" height="25"/>
                                 <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="2Rz-Ie-QiJ">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
diff --git a/CotEditor/Base.lproj/FormatPane.storyboard b/CotEditor/Base.lproj/FormatPane.storyboard
index a5553f6c03..1acfce0cf2 100644
--- a/CotEditor/Base.lproj/FormatPane.storyboard
+++ b/CotEditor/Base.lproj/FormatPane.storyboard
@@ -11,11 +11,11 @@
             <objects>
                 <viewController id="Lgm-sL-YIF" customClass="FormatPaneController" customModule="CotEditor" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" horizontalHuggingPriority="750" verticalCompressionResistancePriority="250" id="8Od-1h-2eW">
-                        <rect key="frame" x="0.0" y="0.0" width="570" height="356"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="356"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="1uW-kK-NRh">
-                                <rect key="frame" x="53" y="0.0" width="464" height="356"/>
+                                <rect key="frame" x="68" y="0.0" width="464" height="356"/>
                                 <subviews>
                                     <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ofS-Q1-0g8">
                                         <rect key="frame" x="28" y="320" width="128" height="16"/>
@@ -52,14 +52,14 @@
                                         </textFieldCell>
                                     </textField>
                                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Lt0-OL-jLy">
-                                        <rect key="frame" x="159" y="263" width="287" height="25"/>
+                                        <rect key="frame" x="159" y="263" width="267" height="25"/>
                                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="pzk-U3-eHv">
                                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="menu"/>
                                             <menu key="menu" id="bX9-TD-b7t"/>
                                         </popUpButtonCell>
                                         <constraints>
-                                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="280" id="Iyz-Mm-eTf"/>
+                                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="260" id="Iyz-Mm-eTf"/>
                                         </constraints>
                                         <connections>
                                             <accessibilityConnection property="title" destination="cPL-gk-JM6" id="ya6-xb-Ll0"/>
@@ -98,7 +98,7 @@
                                         </connections>
                                     </textField>
                                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1qJ-mx-epO">
-                                        <rect key="frame" x="159" y="161" width="289" height="25"/>
+                                        <rect key="frame" x="159" y="161" width="267" height="25"/>
                                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="smt-3X-ADr">
                                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="menu"/>
@@ -122,25 +122,25 @@
                                         </textFieldCell>
                                     </textField>
                                     <box boxType="custom" borderType="line" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="FjK-rw-YKz">
-                                        <rect key="frame" x="162" y="20" width="282" height="137"/>
+                                        <rect key="frame" x="162" y="20" width="260" height="137"/>
                                         <view key="contentView" id="Vqp-DU-cnj">
-                                            <rect key="frame" x="1" y="1" width="280" height="135"/>
+                                            <rect key="frame" x="1" y="1" width="258" height="135"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="18" horizontalPageScroll="10" verticalLineScroll="18" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="F7X-aX-act">
-                                                    <rect key="frame" x="0.0" y="25" width="280" height="110"/>
+                                                    <rect key="frame" x="0.0" y="25" width="258" height="110"/>
                                                     <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="Ci2-bX-cSr">
-                                                        <rect key="frame" x="0.0" y="0.0" width="280" height="110"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="258" height="110"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
                                                             <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" tableStyle="fullWidth" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="16" rowSizeStyle="automatic" usesAutomaticRowHeights="YES" viewBased="YES" id="UvE-MV-Lh2">
-                                                                <rect key="frame" x="0.0" y="0.0" width="280" height="108"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="258" height="108"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                 <size key="intercellSpacing" width="3" height="2"/>
                                                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                                                 <tableColumns>
-                                                                    <tableColumn editable="NO" width="268" minWidth="40" maxWidth="1000" id="Tsu-pA-ACl">
+                                                                    <tableColumn editable="NO" width="246" minWidth="40" maxWidth="1000" id="Tsu-pA-ACl">
                                                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Syntax Name">
                                                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                                             <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -153,7 +153,7 @@
                                                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                                         <prototypeCellViews>
                                                                             <tableCellView id="9MN-yG-hHM">
-                                                                                <rect key="frame" x="1" y="1" width="277" height="16"/>
+                                                                                <rect key="frame" x="1" y="1" width="255" height="16"/>
                                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                                 <subviews>
                                                                                     <customView toolTip="This syntax is customized." translatesAutoresizingMaskIntoConstraints="NO" id="cbJ-XK-bnG" customClass="DotView" customModule="CotEditor" customModuleProvider="target">
@@ -178,7 +178,7 @@
                                                                                         </connections>
                                                                                     </customView>
                                                                                     <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="B3Y-Nj-FSx">
-                                                                                        <rect key="frame" x="14" y="0.0" width="263" height="16"/>
+                                                                                        <rect key="frame" x="14" y="0.0" width="241" height="16"/>
                                                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="7hV-jt-xSx">
                                                                                             <font key="font" metaFont="system"/>
                                                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -216,12 +216,11 @@
                                                         <nil key="backgroundColor"/>
                                                     </clipView>
                                                     <constraints>
-                                                        <constraint firstAttribute="width" constant="280" id="eXu-Ig-lJe"/>
                                                         <constraint firstAttribute="height" constant="110" id="fza-Nj-PzF"/>
                                                     </constraints>
                                                     <edgeInsets key="contentInsets" left="0.0" right="0.0" top="2" bottom="0.0"/>
                                                     <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" controlSize="small" horizontal="YES" id="Q5h-Zp-r9T">
-                                                        <rect key="frame" x="0.0" y="96" width="280" height="14"/>
+                                                        <rect key="frame" x="0.0" y="96" width="258" height="14"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                     <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" controlSize="small" horizontal="NO" id="m5L-fg-Q19">
@@ -230,7 +229,7 @@
                                                     </scroller>
                                                 </scrollView>
                                                 <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="9qi-gC-zFz">
-                                                    <rect key="frame" x="4" y="22" width="272" height="5"/>
+                                                    <rect key="frame" x="4" y="22" width="250" height="5"/>
                                                 </box>
                                                 <button toolTip="Add empty syntax" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Hma-8v-2gu">
                                                     <rect key="frame" x="2" y="-1.5" width="24.5" height="27"/>
@@ -273,7 +272,7 @@
                                                     </connections>
                                                 </button>
                                                 <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="gNn-jg-1Xr">
-                                                    <rect key="frame" x="238" y="0.0" width="40" height="24"/>
+                                                    <rect key="frame" x="216" y="0.0" width="40" height="24"/>
                                                     <popUpButtonCell key="cell" type="smallSquare" title="Syntax Action" bezelStyle="smallSquare" imagePosition="only" alignment="center" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="yBI-dh-jpV">
                                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                         <font key="font" metaFont="menu"/>
@@ -344,7 +343,6 @@
                                                 <constraint firstItem="dI1-Dk-Mce" firstAttribute="leading" secondItem="Hma-8v-2gu" secondAttribute="trailing" constant="-1" id="bKC-4v-NVw"/>
                                                 <constraint firstItem="dI1-Dk-Mce" firstAttribute="height" secondItem="Hma-8v-2gu" secondAttribute="height" id="brh-qC-UOX"/>
                                                 <constraint firstItem="dI1-Dk-Mce" firstAttribute="width" secondItem="Hma-8v-2gu" secondAttribute="width" id="dIJ-X0-upE"/>
-                                                <constraint firstItem="gNn-jg-1Xr" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Q0c-oI-um3" secondAttribute="trailing" constant="8" symbolic="YES" id="elk-Vj-nRB"/>
                                                 <constraint firstItem="Q0c-oI-um3" firstAttribute="height" secondItem="Hma-8v-2gu" secondAttribute="height" id="euv-s6-Hws"/>
                                                 <constraint firstAttribute="trailing" secondItem="9qi-gC-zFz" secondAttribute="trailing" constant="4" id="gJN-jj-Xvf"/>
                                                 <constraint firstItem="F7X-aX-act" firstAttribute="leading" secondItem="Vqp-DU-cnj" secondAttribute="leading" id="ghI-Ew-ukJ"/>
@@ -354,8 +352,12 @@
                                                 <constraint firstItem="gNn-jg-1Xr" firstAttribute="top" secondItem="9qi-gC-zFz" secondAttribute="bottom" id="rxP-VE-uUW"/>
                                                 <constraint firstAttribute="bottom" secondItem="Hma-8v-2gu" secondAttribute="bottom" id="s8e-N4-Ery"/>
                                                 <constraint firstItem="Hma-8v-2gu" firstAttribute="leading" secondItem="Vqp-DU-cnj" secondAttribute="leading" constant="2" id="sKd-vh-piT"/>
+                                                <constraint firstItem="gNn-jg-1Xr" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Q0c-oI-um3" secondAttribute="trailing" constant="8" symbolic="YES" id="zu2-VQ-wtr"/>
                                             </constraints>
                                         </view>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="260" id="ghN-Vn-p7A"/>
+                                        </constraints>
                                         <color key="borderColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                         <color key="fillColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </box>
@@ -410,22 +412,22 @@
                                     <constraint firstItem="ofS-Q1-0g8" firstAttribute="top" secondItem="1uW-kK-NRh" secondAttribute="top" constant="20" symbolic="YES" id="rNu-1S-89j"/>
                                     <constraint firstItem="Lt0-OL-jLy" firstAttribute="top" secondItem="hJ2-kD-hQi" secondAttribute="bottom" constant="14" id="rSk-Fu-gYy"/>
                                     <constraint firstItem="FjK-rw-YKz" firstAttribute="leading" secondItem="uJi-Od-G4t" secondAttribute="trailing" constant="8" symbolic="YES" id="skq-5b-Tg3"/>
-                                    <constraint firstAttribute="trailing" secondItem="FjK-rw-YKz" secondAttribute="trailing" priority="750" constant="20" symbolic="YES" id="tC1-2M-K9G"/>
                                     <constraint firstItem="LQO-NI-fGx" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="1uW-kK-NRh" secondAttribute="leading" constant="20" symbolic="YES" id="tL7-7g-PrF"/>
                                     <constraint firstItem="1qJ-mx-epO" firstAttribute="top" secondItem="zq7-jF-Cc9" secondAttribute="bottom" constant="14" id="vEY-pw-n3q"/>
+                                    <constraint firstAttribute="trailing" secondItem="FjK-rw-YKz" secondAttribute="trailing" priority="500" constant="20" symbolic="YES" id="vUR-ny-ijE"/>
                                     <constraint firstItem="bJE-E6-Cbo" firstAttribute="leading" secondItem="ofS-Q1-0g8" secondAttribute="trailing" constant="8" symbolic="YES" id="wtp-Ws-CaM"/>
                                     <constraint firstItem="zq7-jF-Cc9" firstAttribute="top" secondItem="Jhi-LF-z0j" secondAttribute="bottom" constant="16" id="x31-Ke-FZK"/>
                                     <constraint firstItem="MwE-73-7AJ" firstAttribute="top" secondItem="Lt0-OL-jLy" secondAttribute="bottom" constant="8" id="zMg-A9-a1W"/>
                                 </constraints>
                             </customView>
                             <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="N1E-uH-II1">
-                                <rect key="frame" x="20" y="299" width="530" height="5"/>
+                                <rect key="frame" x="20" y="299" width="560" height="5"/>
                             </box>
                             <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="QgD-bI-CJS">
-                                <rect key="frame" x="20" y="197" width="530" height="5"/>
+                                <rect key="frame" x="20" y="197" width="560" height="5"/>
                             </box>
                             <button identifier="settings_format" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Qm2-4V-mYI">
-                                <rect key="frame" x="527" y="16" width="25" height="25"/>
+                                <rect key="frame" x="557" y="16" width="25" height="25"/>
                                 <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="qkT-9V-g1o">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
diff --git a/CotEditor/Base.lproj/GeneralPane.storyboard b/CotEditor/Base.lproj/GeneralPane.storyboard
index 54bb3c1f8a..91069fe440 100644
--- a/CotEditor/Base.lproj/GeneralPane.storyboard
+++ b/CotEditor/Base.lproj/GeneralPane.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22146" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="JG1-NR-KT5">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22152" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="JG1-NR-KT5">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22146"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22152"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -10,12 +10,12 @@
         <scene sceneID="eDf-Cn-NDW">
             <objects>
                 <viewController id="JG1-NR-KT5" customClass="GeneralPaneController" customModule="CotEditor" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" horizontalHuggingPriority="750" verticalCompressionResistancePriority="250" id="T5J-Ml-0Oc">
-                        <rect key="frame" x="0.0" y="0.0" width="570" height="530"/>
+                    <view key="view" horizontalHuggingPriority="750" verticalCompressionResistancePriority="250" misplaced="YES" id="T5J-Ml-0Oc">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="516"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oN2-0G-iXz">
-                                <rect key="frame" x="146" y="409" width="216" height="18"/>
+                                <rect key="frame" x="146" y="395" width="216" height="18"/>
                                 <buttonCell key="cell" type="check" title="Enable Auto Save with Versions" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="SGo-FL-Pax">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -26,7 +26,7 @@
                                 </connections>
                             </button>
                             <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="goq-md-y5e">
-                                <rect key="frame" x="40" y="410" width="102" height="16"/>
+                                <rect key="frame" x="40" y="396" width="102" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Document save:" usesSingleLineMode="YES" id="Ki4-3Y-AZL">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -73,7 +73,7 @@
                                 </textFieldCell>
                             </textField>
                             <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="XmK-Ev-21D">
-                                <rect key="frame" x="166" y="364" width="386" height="42"/>
+                                <rect key="frame" x="166" y="364" width="416" height="28"/>
                                 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" id="sOa-Ea-zt9">
                                     <font key="font" metaFont="smallSystem"/>
                                     <string key="title">A system feature that automatically overwrites your files while editing. Even if it turned off, CotEditor creates backup covertly for unexpected quit.</string>
@@ -122,7 +122,7 @@
                                 </connections>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jK0-pT-HTR">
-                                <rect key="frame" x="146" y="493" width="235" height="18"/>
+                                <rect key="frame" x="146" y="479" width="235" height="18"/>
                                 <buttonCell key="cell" type="check" title="Reopen windows from last session" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="QX9-BI-SIL">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -134,7 +134,7 @@
                                 </connections>
                             </button>
                             <button identifier="settings_general" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Dby-UY-iuz">
-                                <rect key="frame" x="527" y="16" width="25" height="25"/>
+                                <rect key="frame" x="557" y="16" width="25" height="25"/>
                                 <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="rEM-8b-6Ms">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -144,7 +144,7 @@
                                 </connections>
                             </button>
                             <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NjY-HB-hDH">
-                                <rect key="frame" x="146" y="470" width="168" height="16"/>
+                                <rect key="frame" x="146" y="456" width="168" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="When nothing else is open:" id="wmw-xg-bSt">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -152,7 +152,7 @@
                                 </textFieldCell>
                             </textField>
                             <textField focusRingType="none" horizontalHuggingPriority="751" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ihY-NN-wRt">
-                                <rect key="frame" x="69" y="494" width="73" height="16"/>
+                                <rect key="frame" x="69" y="480" width="73" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="On startup:" usesSingleLineMode="YES" id="zDW-aW-9G8">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -168,7 +168,7 @@
                                 </textFieldCell>
                             </textField>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sMb-to-ljF">
-                                <rect key="frame" x="165" y="438" width="176" height="25"/>
+                                <rect key="frame" x="165" y="424" width="176" height="25"/>
                                 <popUpButtonCell key="cell" type="push" title="Create New Document" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" imageScaling="proportionallyDown" inset="2" selectedItem="i4c-DG-ADS" id="F8J-5l-ztJ">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="menu"/>
@@ -257,7 +257,7 @@
                                 </connections>
                             </button>
                             <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="oIq-wQ-hMA">
-                                <rect key="frame" x="146" y="52" width="406" height="28"/>
+                                <rect key="frame" x="146" y="52" width="436" height="28"/>
                                 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="With the 'cot' command-line tool, you can launch CotEditor and let it open files from the command line." id="c48-xK-Ag1">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -285,7 +285,7 @@
                                 </textFieldCell>
                             </textField>
                             <containerView translatesAutoresizingMaskIntoConstraints="NO" id="l3Q-r7-hXn">
-                                <rect key="frame" x="0.0" y="44" width="570" height="2"/>
+                                <rect key="frame" x="0.0" y="44" width="600" height="2"/>
                                 <constraints>
                                     <constraint firstAttribute="height" priority="750" constant="2" id="ZcE-nb-0Pl"/>
                                 </constraints>
@@ -395,7 +395,7 @@
             <objects>
                 <viewController id="q0M-8Q-aM1" customClass="UpdatesViewController" customModule="CotEditor" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" translatesAutoresizingMaskIntoConstraints="NO" id="LLa-wu-mor">
-                        <rect key="frame" x="0.0" y="0.0" width="570" height="103"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="103"/>
                         <subviews>
                             <button tag="-1" verticalHuggingPriority="750" verticalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="eh0-fN-8C5">
                                 <rect key="frame" x="130" y="61" width="222" height="18"/>
@@ -426,7 +426,7 @@
                                 </connections>
                             </button>
                             <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="751" tag="-2" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dyM-Pb-Ay4">
-                                <rect key="frame" x="150" y="8" width="402" height="28"/>
+                                <rect key="frame" x="150" y="8" width="432" height="28"/>
                                 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="Regardless of this setting, new pre-releases are always included while using a pre-release." id="chR-VY-cuI">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -434,7 +434,7 @@
                                 </textFieldCell>
                             </textField>
                             <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="9j3-BL-0Mu">
-                                <rect key="frame" x="20" y="90" width="530" height="5"/>
+                                <rect key="frame" x="20" y="90" width="560" height="5"/>
                             </box>
                         </subviews>
                         <constraints>
diff --git a/CotEditor/Base.lproj/KeyBindingsPane.storyboard b/CotEditor/Base.lproj/KeyBindingsPane.storyboard
index 8c3b48c1ea..c0482135e1 100644
--- a/CotEditor/Base.lproj/KeyBindingsPane.storyboard
+++ b/CotEditor/Base.lproj/KeyBindingsPane.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22146" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="sBQ-LT-Rwm">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22152" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="sBQ-LT-Rwm">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22146"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22152"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -11,11 +11,11 @@
             <objects>
                 <viewController id="sBQ-LT-Rwm" customClass="KeyBindingsPaneController" customModule="CotEditor" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" id="DCK-MH-F2c">
-                        <rect key="frame" x="0.0" y="0.0" width="570" height="360"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="360"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0ib-kt-Wxu">
-                                <rect key="frame" x="18" y="324" width="534" height="16"/>
+                                <rect key="frame" x="18" y="324" width="564" height="16"/>
                                 <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="To change a shortcut, click the key column, and then type the new keys." id="Hue-bU-8wr">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -95,19 +95,19 @@
                                 </tableHeaderView>
                             </scrollView>
                             <scrollView autohidesScrollers="YES" horizontalLineScroll="21" horizontalPageScroll="10" verticalLineScroll="21" verticalPageScroll="10" translatesAutoresizingMaskIntoConstraints="NO" id="m1z-qp-Bip">
-                                <rect key="frame" x="139" y="76" width="411" height="240"/>
+                                <rect key="frame" x="139" y="76" width="441" height="240"/>
                                 <clipView key="contentView" id="B7v-2R-SOJ">
-                                    <rect key="frame" x="1" y="1" width="409" height="238"/>
+                                    <rect key="frame" x="1" y="1" width="439" height="238"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="21" rowSizeStyle="automatic" headerView="UTT-Uw-P7a" viewBased="YES" indentationPerLevel="16" autosaveExpandedItems="YES" outlineTableColumn="jNh-nd-VRd" id="5rg-Un-32O">
-                                            <rect key="frame" x="0.0" y="0.0" width="409" height="215"/>
+                                        <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="21" rowSizeStyle="automatic" headerView="UTT-Uw-P7a" viewBased="YES" indentationPerLevel="16" autosaveExpandedItems="YES" outlineTableColumn="jNh-nd-VRd" id="5rg-Un-32O">
+                                            <rect key="frame" x="0.0" y="0.0" width="439" height="215"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <size key="intercellSpacing" width="8" height="0.0"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                             <tableColumns>
-                                                <tableColumn identifier="command" editable="NO" width="294" minWidth="16" maxWidth="1000" id="jNh-nd-VRd">
+                                                <tableColumn identifier="command" editable="NO" width="347" minWidth="16" maxWidth="1000" id="jNh-nd-VRd">
                                                     <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"/>
@@ -120,11 +120,11 @@
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
                                                     <prototypeCellViews>
                                                         <tableCellView id="rYO-UK-6m9">
-                                                            <rect key="frame" x="4" y="0.0" width="296" height="21"/>
+                                                            <rect key="frame" x="4" y="0.0" width="349" height="21"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
                                                                 <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JLp-JH-Jok">
-                                                                    <rect key="frame" x="0.0" y="3" width="296" height="16"/>
+                                                                    <rect key="frame" x="0.0" y="3" width="349" height="16"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Action Name" id="0Uo-2F-m2T">
                                                                         <font key="font" metaFont="system"/>
@@ -154,7 +154,7 @@
                                                     </textFieldCell>
                                                     <prototypeCellViews>
                                                         <tableCellView id="bQJ-P8-Oc8">
-                                                            <rect key="frame" x="308" y="0.0" width="74" height="21"/>
+                                                            <rect key="frame" x="361" y="0.0" width="74" height="21"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
                                                                 <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TE0-Ap-drx" customClass="ShortcutField" customModule="CotEditor" customModuleProvider="target">
@@ -190,7 +190,7 @@
                                     </subviews>
                                 </clipView>
                                 <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="ahF-Xv-8VN">
-                                    <rect key="frame" x="1" y="223" width="409" height="16"/>
+                                    <rect key="frame" x="1" y="223" width="439" height="16"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                                 <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="3LO-8b-vqL">
@@ -198,12 +198,12 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                                 <tableHeaderView key="headerView" wantsLayer="YES" id="UTT-Uw-P7a">
-                                    <rect key="frame" x="0.0" y="0.0" width="409" height="23"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="439" height="23"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </tableHeaderView>
                             </scrollView>
                             <textField focusRingType="none" horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="W7F-7i-PcV">
-                                <rect key="frame" x="439" y="50" width="113" height="14"/>
+                                <rect key="frame" x="469" y="50" width="113" height="14"/>
                                 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="WARNING MESSAGE" id="PAH-9l-L5p">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
@@ -228,7 +228,7 @@
                                 </connections>
                             </button>
                             <button identifier="settings_keybindings" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Nn9-0l-91J">
-                                <rect key="frame" x="527" y="16" width="25" height="25"/>
+                                <rect key="frame" x="557" y="16" width="25" height="25"/>
                                 <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ObZ-Ly-HzS">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
diff --git a/CotEditor/Base.lproj/PrintPane.storyboard b/CotEditor/Base.lproj/PrintPane.storyboard
index 9ec769c467..1f924bf58b 100644
--- a/CotEditor/Base.lproj/PrintPane.storyboard
+++ b/CotEditor/Base.lproj/PrintPane.storyboard
@@ -11,45 +11,47 @@
             <objects>
                 <viewController showSeguePresentationStyle="single" id="4if-cg-44c" customClass="PrintPaneController" customModule="CotEditor" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" horizontalHuggingPriority="750" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="KkP-8S-iZE">
-                        <rect key="frame" x="0.0" y="0.0" width="570" height="370"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="370"/>
                         <subviews>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="wGW-VF-jXB">
-                                <rect key="frame" x="115" y="20" width="341" height="350"/>
+                                <rect key="frame" x="130" y="20" width="341" height="350"/>
                                 <subviews>
                                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jB6-pW-rzu">
                                         <rect key="frame" x="111" y="189" width="214" height="25"/>
-                                        <popUpButtonCell key="cell" type="push" title="Same as Document’s Setting" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="953" id="R0d-ln-RzZ">
+                                        <popUpButtonCell key="cell" type="push" title="Same as Document’s Setting" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="953" id="R0d-ln-RzZ">
                                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="menu"/>
                                             <menu key="menu" id="szT-0b-MOf">
                                                 <items>
+                                                    <menuItem title="Same as Document’s Setting" state="on" tag="1" id="953"/>
+                                                    <menuItem isSeparatorItem="YES" id="W39-uV-7Iq"/>
                                                     <menuItem title="Don’t Print" id="952"/>
-                                                    <menuItem title="Same as Document’s Setting" state="on" id="953"/>
-                                                    <menuItem title="Print" id="954"/>
+                                                    <menuItem title="Print" tag="2" id="954"/>
                                                 </items>
                                             </menu>
                                         </popUpButtonCell>
                                         <connections>
                                             <accessibilityConnection property="title" destination="Hng-Zz-bj4" id="SYV-Ru-EXF"/>
-                                            <binding destination="qsh-ze-KuJ" name="selectedIndex" keyPath="values.printInvisibleCharIndex" id="f8S-hy-Fai"/>
+                                            <binding destination="qsh-ze-KuJ" name="selectedTag" keyPath="values.printInvisibleCharIndex" id="eU9-sY-xB5"/>
                                         </connections>
                                     </popUpButton>
                                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YjD-Jc-NEF">
                                         <rect key="frame" x="111" y="219" width="214" height="25"/>
-                                        <popUpButtonCell key="cell" type="push" title="Same as Document’s Setting" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="947" id="guD-S3-rc0">
+                                        <popUpButtonCell key="cell" type="push" title="Same as Document’s Setting" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="947" id="guD-S3-rc0">
                                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="menu"/>
                                             <menu key="menu" id="QXA-FM-XhB">
                                                 <items>
+                                                    <menuItem title="Same as Document’s Setting" state="on" tag="1" id="947"/>
+                                                    <menuItem isSeparatorItem="YES" id="LdL-xp-s2k"/>
                                                     <menuItem title="Don’t Print" id="946"/>
-                                                    <menuItem title="Same as Document’s Setting" state="on" id="947"/>
-                                                    <menuItem title="Print" id="948"/>
+                                                    <menuItem title="Print" tag="2" id="948"/>
                                                 </items>
                                             </menu>
                                         </popUpButtonCell>
                                         <connections>
                                             <accessibilityConnection property="title" destination="eCM-3I-GbW" id="s9z-Ub-Ckb"/>
-                                            <binding destination="qsh-ze-KuJ" name="selectedIndex" keyPath="values.printLineNumIndex" id="ytS-yE-cCc"/>
+                                            <binding destination="qsh-ze-KuJ" name="selectedTag" keyPath="values.printLineNumIndex" id="3sM-gu-gPv"/>
                                         </connections>
                                     </popUpButton>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MOp-QG-730">
@@ -397,7 +399,7 @@
                                 </constraints>
                             </customView>
                             <button identifier="settings_print" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vgh-ld-DGW">
-                                <rect key="frame" x="527" y="16" width="25" height="25"/>
+                                <rect key="frame" x="557" y="16" width="25" height="25"/>
                                 <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="vLp-x1-my1">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
diff --git a/CotEditor/Base.lproj/SnippetsPane.storyboard b/CotEditor/Base.lproj/SnippetsPane.storyboard
index 9e15e45b99..bfc44ee124 100644
--- a/CotEditor/Base.lproj/SnippetsPane.storyboard
+++ b/CotEditor/Base.lproj/SnippetsPane.storyboard
@@ -11,11 +11,11 @@
             <objects>
                 <viewController id="8L1-iP-mOW" sceneMemberID="viewController">
                     <view key="view" id="5bv-m9-nez">
-                        <rect key="frame" x="0.0" y="0.0" width="570" height="440"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="440"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <button identifier="settings_snippets" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kV3-Ig-n3x">
-                                <rect key="frame" x="527" y="16" width="25" height="25"/>
+                                <rect key="frame" x="557" y="16" width="25" height="25"/>
                                 <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="gOO-ru-gDn">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -25,7 +25,7 @@
                                 </connections>
                             </button>
                             <containerView translatesAutoresizingMaskIntoConstraints="NO" id="S7M-ag-ikd">
-                                <rect key="frame" x="20" y="52" width="530" height="378"/>
+                                <rect key="frame" x="20" y="52" width="560" height="378"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="378" id="Q3e-Zm-PmG"/>
                                 </constraints>
@@ -58,7 +58,7 @@
                         <tabViewItem id="SXo-Mh-X1Z"/>
                     </tabViewItems>
                     <tabView key="tabView" misplaced="YES" id="OvP-Cg-Kd2">
-                        <rect key="frame" x="0.0" y="0.0" width="530" height="378"/>
+                        <rect key="frame" x="0.0" y="0.0" width="560" height="378"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <font key="font" metaFont="message"/>
                         <connections>
@@ -80,23 +80,23 @@
             <objects>
                 <viewController title="Command" id="Jku-3h-OhR" customClass="SnippetsViewController" customModule="CotEditor" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" id="cRl-JP-UAb">
-                        <rect key="frame" x="0.0" y="0.0" width="524" height="330"/>
+                        <rect key="frame" x="0.0" y="0.0" width="554" height="330"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <scrollView autohidesScrollers="YES" horizontalLineScroll="21" horizontalPageScroll="10" verticalLineScroll="21" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7ds-uj-8Oj">
-                                <rect key="frame" x="10" y="176" width="504" height="126"/>
+                                <rect key="frame" x="10" y="176" width="534" height="126"/>
                                 <clipView key="contentView" id="57f-vc-YkM">
-                                    <rect key="frame" x="1" y="1" width="502" height="124"/>
+                                    <rect key="frame" x="1" y="1" width="532" height="124"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" columnReordering="NO" columnResizing="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="21" rowSizeStyle="automatic" headerView="974-uz-WFB" viewBased="YES" id="dsG-7b-UG0">
-                                            <rect key="frame" x="0.0" y="0.0" width="502" height="96"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="532" height="96"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <size key="intercellSpacing" width="8" height="0.0"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                             <tableColumns>
-                                                <tableColumn identifier="scope" width="94" minWidth="40" maxWidth="1000" headerToolTip="" id="pbJ-4Q-CE2">
+                                                <tableColumn identifier="scope" width="104" minWidth="40" maxWidth="1000" headerToolTip="" id="pbJ-4Q-CE2">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Syntax">
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -109,11 +109,11 @@
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                     <prototypeCellViews>
                                                         <tableCellView id="SdO-OQ-HSL">
-                                                            <rect key="frame" x="4" y="0.0" width="96" height="21"/>
+                                                            <rect key="frame" x="4" y="0.0" width="106" height="21"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
                                                                 <popUpButton id="68U-sn-0cP">
-                                                                    <rect key="frame" x="-3" y="1" width="97" height="20"/>
+                                                                    <rect key="frame" x="-3" y="1" width="107" height="20"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <popUpButtonCell key="cell" type="bevel" title="All" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" selectedItem="vXM-oG-cI7" id="N04-oz-sU5">
                                                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -144,7 +144,7 @@
                                                         </tableCellView>
                                                     </prototypeCellViews>
                                                 </tableColumn>
-                                                <tableColumn identifier="name" editable="NO" width="277" minWidth="16" maxWidth="1000" id="cMF-G3-bl6">
+                                                <tableColumn identifier="name" editable="NO" width="304" minWidth="16" maxWidth="1000" id="cMF-G3-bl6">
                                                     <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"/>
@@ -157,11 +157,11 @@
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
                                                     <prototypeCellViews>
                                                         <tableCellView id="WTC-7C-m9U">
-                                                            <rect key="frame" x="108" y="0.0" width="277" height="21"/>
+                                                            <rect key="frame" x="118" y="0.0" width="304" height="21"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zxQ-hR-j2t">
-                                                                    <rect key="frame" x="0.0" y="3" width="277" height="16"/>
+                                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zxQ-hR-j2t">
+                                                                    <rect key="frame" x="0.0" y="3" width="304" height="16"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="Insert Text 0" id="4d2-ZY-6Rc">
                                                                         <font key="font" metaFont="system"/>
@@ -180,7 +180,7 @@
                                                         </tableCellView>
                                                     </prototypeCellViews>
                                                 </tableColumn>
-                                                <tableColumn identifier="key" editable="NO" width="64" minWidth="64" maxWidth="64" id="wer-OB-X46">
+                                                <tableColumn identifier="key" editable="NO" width="72" minWidth="72" maxWidth="72" id="wer-OB-X46">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Key">
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -192,11 +192,11 @@
                                                     </textFieldCell>
                                                     <prototypeCellViews>
                                                         <tableCellView id="YN5-88-L3R">
-                                                            <rect key="frame" x="393" y="0.0" width="66" height="21"/>
+                                                            <rect key="frame" x="430" y="0.0" width="74" height="21"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" textCompletion="NO" id="7e5-Al-qqJ" customClass="ShortcutField" customModule="CotEditor" customModuleProvider="target">
-                                                                    <rect key="frame" x="0.0" y="3" width="56" height="16"/>
+                                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" textCompletion="NO" id="7e5-Al-qqJ" customClass="ShortcutField" customModule="CotEditor" customModuleProvider="target">
+                                                                    <rect key="frame" x="0.0" y="3" width="64" height="16"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="right" id="gro-YE-m3e">
                                                                         <customFormatter key="formatter" id="6BR-Gb-CrL" customClass="ShortcutFormatter" customModule="CotEditor" customModuleProvider="target"/>
@@ -228,7 +228,7 @@
                                     </subviews>
                                 </clipView>
                                 <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="09H-dK-VID">
-                                    <rect key="frame" x="1" y="109" width="502" height="16"/>
+                                    <rect key="frame" x="1" y="109" width="532" height="16"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                                 <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="dcy-AX-VPZ">
@@ -236,7 +236,7 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                                 <tableHeaderView key="headerView" wantsLayer="YES" id="974-uz-WFB">
-                                    <rect key="frame" x="0.0" y="0.0" width="502" height="28"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="532" height="28"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </tableHeaderView>
                             </scrollView>
@@ -253,8 +253,8 @@
                                     <action selector="addRemove:" target="Jku-3h-OhR" id="3Wy-4X-3Bg"/>
                                 </connections>
                             </segmentedControl>
-                            <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="K7g-Vp-Prr">
-                                <rect key="frame" x="339" y="154" width="177" height="14"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="K7g-Vp-Prr">
+                                <rect key="frame" x="369" y="154" width="177" height="14"/>
                                 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="SHORTCUT WARNING MESSAGE" id="rUw-Mw-hR2">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
@@ -264,7 +264,7 @@
                                     <binding destination="Jku-3h-OhR" name="value" keyPath="warningMessage" id="icx-80-xfY"/>
                                 </connections>
                             </textField>
-                            <textField horizontalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6IG-gg-VIP">
+                            <textField focusRingType="none" horizontalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6IG-gg-VIP">
                                 <rect key="frame" x="8" y="118" width="108" height="16"/>
                                 <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Insertion Format:" usesSingleLineMode="YES" id="PaR-eN-FFs">
                                     <font key="font" metaFont="system"/>
@@ -273,7 +273,7 @@
                                 </textFieldCell>
                             </textField>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MiJ-hw-gnc">
-                                <rect key="frame" x="350" y="114" width="168" height="22"/>
+                                <rect key="frame" x="380" y="114" width="168" height="22"/>
                                 <popUpButtonCell key="cell" type="push" title="Insert Variable" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" pullsDown="YES" preferredEdge="maxY" selectedItem="vOg-Tt-3ZZ" id="vaY-AY-tye">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="smallSystem"/>
@@ -288,18 +288,18 @@
                                 </constraints>
                             </popUpButton>
                             <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uil-3J-Loj">
-                                <rect key="frame" x="10" y="10" width="504" height="100"/>
+                                <rect key="frame" x="10" y="10" width="534" height="100"/>
                                 <clipView key="contentView" id="Aal-ZX-ppq">
-                                    <rect key="frame" x="1" y="1" width="502" height="98"/>
+                                    <rect key="frame" x="1" y="1" width="532" height="98"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <textView importsGraphics="NO" richText="NO" verticallyResizable="YES" allowsUndo="YES" smartInsertDelete="YES" layoutManager="textKit1" id="Fbn-Oh-pop" customClass="TokenTextView" customModule="CotEditor" customModuleProvider="target">
-                                            <rect key="frame" x="0.0" y="0.0" width="502" height="86"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="532" height="86"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                            <size key="minSize" width="502" height="86"/>
-                                            <size key="maxSize" width="528" height="10000000"/>
+                                            <size key="minSize" width="532" height="86"/>
+                                            <size key="maxSize" width="534" height="10000000"/>
                                             <color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                             <allowedInputSourceLocales>
                                                 <string>eu</string>
@@ -1012,8 +1012,8 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                             </scrollView>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="DUN-ho-Mkq">
-                                <rect key="frame" x="8" y="310" width="508" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="DUN-ho-Mkq">
+                                <rect key="frame" x="8" y="310" width="538" height="16"/>
                                 <textFieldCell key="cell" title="Text to be inserted by a command in the menu or by keyboard shortcut:" id="o3A-71-iGh">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1053,30 +1053,30 @@
                 </viewController>
                 <customObject id="3nJ-L4-Stp" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="220" y="523"/>
+            <point key="canvasLocation" x="251" y="527"/>
         </scene>
         <!--File Drop-->
         <scene sceneID="HD1-eZ-pHa">
             <objects>
                 <viewController title="File Drop" showSeguePresentationStyle="single" id="UtY-fi-jOg" customClass="FileDropViewController" customModule="CotEditor" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" horizontalHuggingPriority="750" verticalCompressionResistancePriority="250" id="Gi6-Rx-eMY">
-                        <rect key="frame" x="0.0" y="0.0" width="524" height="330"/>
+                        <rect key="frame" x="0.0" y="0.0" width="554" height="330"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <scrollView autohidesScrollers="YES" horizontalLineScroll="21" horizontalPageScroll="10" verticalLineScroll="21" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="prG-8I-L0n">
-                                <rect key="frame" x="10" y="176" width="504" height="126"/>
+                                <rect key="frame" x="10" y="176" width="534" height="126"/>
                                 <clipView key="contentView" id="Etr-Iq-249">
-                                    <rect key="frame" x="1" y="1" width="502" height="124"/>
+                                    <rect key="frame" x="1" y="1" width="532" height="124"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="21" rowSizeStyle="automatic" headerView="c3e-u6-nJD" viewBased="YES" id="eYE-eu-OMg">
-                                            <rect key="frame" x="0.0" y="0.0" width="502" height="101"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="532" height="101"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <size key="intercellSpacing" width="8" height="0.0"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                             <tableColumns>
-                                                <tableColumn width="138" minWidth="40" maxWidth="1000" headerToolTip="Syntax in which this file drop setting is used." id="RqT-x4-YbN">
+                                                <tableColumn width="128" minWidth="40" maxWidth="1000" headerToolTip="Syntax in which this file drop setting is used." id="RqT-x4-YbN">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Syntax">
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -1089,11 +1089,11 @@
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                     <prototypeCellViews>
                                                         <tableCellView id="Nke-jc-fMr">
-                                                            <rect key="frame" x="4" y="0.0" width="140" height="21"/>
+                                                            <rect key="frame" x="4" y="0.0" width="130" height="21"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
                                                                 <popUpButton id="IBU-1D-WII">
-                                                                    <rect key="frame" x="-3" y="1" width="141" height="20"/>
+                                                                    <rect key="frame" x="-3" y="1" width="131" height="20"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <popUpButtonCell key="cell" type="bevel" title="All" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" selectedItem="W3Z-PB-IUJ" id="eh9-Os-Ang">
                                                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -1123,7 +1123,7 @@
                                                         </tableCellView>
                                                     </prototypeCellViews>
                                                 </tableColumn>
-                                                <tableColumn identifier="extensions" width="159" minWidth="40" maxWidth="1000" headerToolTip="Filename extensions of dropped file (comma separated)." id="FAF-cL-AAk">
+                                                <tableColumn identifier="extensions" width="180" minWidth="40" maxWidth="1000" headerToolTip="Filename extensions of dropped file (comma separated)." id="FAF-cL-AAk">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Extensions">
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -1136,11 +1136,11 @@
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                     <prototypeCellViews>
                                                         <tableCellView id="dXX-uc-NQC">
-                                                            <rect key="frame" x="152" y="0.0" width="159" height="21"/>
+                                                            <rect key="frame" x="142" y="0.0" width="180" height="21"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField identifier="extensions" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="jIX-u0-ddX">
-                                                                    <rect key="frame" x="0.0" y="3" width="159" height="16"/>
+                                                                <textField identifier="extensions" focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="jIX-u0-ddX">
+                                                                    <rect key="frame" x="0.0" y="3" width="180" height="16"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="png, jpg, gif" usesSingleLineMode="YES" id="caT-Gh-1x2">
                                                                         <font key="font" metaFont="system"/>
@@ -1163,7 +1163,7 @@
                                                         </tableCellView>
                                                     </prototypeCellViews>
                                                 </tableColumn>
-                                                <tableColumn width="176.5" minWidth="10" maxWidth="1000" headerToolTip="" id="p2m-Qi-6k3">
+                                                <tableColumn width="195.5" minWidth="10" maxWidth="1000" headerToolTip="" id="p2m-Qi-6k3">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Description">
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -1176,11 +1176,11 @@
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                     <prototypeCellViews>
                                                         <tableCellView id="bjH-aA-F7G">
-                                                            <rect key="frame" x="319" y="0.0" width="178" height="21"/>
+                                                            <rect key="frame" x="330" y="0.0" width="197" height="21"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField identifier="description" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="RRF-15-RQ7">
-                                                                    <rect key="frame" x="0.0" y="3" width="178" height="16"/>
+                                                                <textField identifier="description" focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="RRF-15-RQ7">
+                                                                    <rect key="frame" x="0.0" y="3" width="197" height="16"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" usesSingleLineMode="YES" id="25Y-1h-PMq">
                                                                         <font key="font" metaFont="system"/>
@@ -1210,7 +1210,7 @@
                                     </subviews>
                                 </clipView>
                                 <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="ebT-4a-UjZ">
-                                    <rect key="frame" x="1" y="109" width="502" height="16"/>
+                                    <rect key="frame" x="1" y="109" width="532" height="16"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                                 <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="NiP-Ns-ZTe">
@@ -1218,7 +1218,7 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                                 <tableHeaderView key="headerView" wantsLayer="YES" id="c3e-u6-nJD">
-                                    <rect key="frame" x="0.0" y="0.0" width="502" height="23"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="532" height="23"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </tableHeaderView>
                             </scrollView>
@@ -1235,7 +1235,7 @@
                                     <action selector="addRemove:" target="UtY-fi-jOg" id="EM2-wI-Ym8"/>
                                 </connections>
                             </segmentedControl>
-                            <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JWP-To-iJP">
+                            <textField focusRingType="none" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JWP-To-iJP">
                                 <rect key="frame" x="8" y="118" width="108" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="Insertion Format:" usesSingleLineMode="YES" id="3332">
                                     <font key="font" metaFont="system"/>
@@ -1244,7 +1244,7 @@
                                 </textFieldCell>
                             </textField>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OK0-xb-bxI">
-                                <rect key="frame" x="350" y="114" width="168" height="22"/>
+                                <rect key="frame" x="380" y="114" width="168" height="22"/>
                                 <popUpButtonCell key="cell" type="push" title="Insert Variable" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" borderStyle="border" inset="2" pullsDown="YES" preferredEdge="maxY" selectedItem="541" id="Akg-Ri-30c">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="smallSystem"/>
@@ -1259,17 +1259,17 @@
                                 </constraints>
                             </popUpButton>
                             <scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pqq-0d-en4">
-                                <rect key="frame" x="10" y="10" width="504" height="100"/>
+                                <rect key="frame" x="10" y="10" width="534" height="100"/>
                                 <clipView key="contentView" id="W5x-PA-UNW">
-                                    <rect key="frame" x="1" y="1" width="502" height="98"/>
+                                    <rect key="frame" x="1" y="1" width="532" height="98"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <textView importsGraphics="NO" richText="NO" horizontallyResizable="YES" verticallyResizable="YES" allowsUndo="YES" smartInsertDelete="YES" layoutManager="textKit1" id="Rdu-bG-bow" customClass="TokenTextView" customModule="CotEditor" customModuleProvider="target">
-                                            <rect key="frame" x="0.0" y="0.0" width="502" height="86"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="532" height="86"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                            <size key="minSize" width="502" height="86"/>
+                                            <size key="minSize" width="532" height="86"/>
                                             <size key="maxSize" width="600" height="10000000"/>
                                             <color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                             <connections>
@@ -1293,12 +1293,12 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                                 <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="7DS-EA-ldr">
-                                    <rect key="frame" x="487" y="1" width="16" height="98"/>
+                                    <rect key="frame" x="517" y="1" width="16" height="98"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                             </scrollView>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="YcM-e0-LrE">
-                                <rect key="frame" x="8" y="310" width="508" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="YcM-e0-LrE">
+                                <rect key="frame" x="8" y="310" width="538" height="16"/>
                                 <textFieldCell key="cell" title="Text to be inserted by dropping files to the editor:" id="JRQ-2g-t49">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1345,7 +1345,7 @@
                     </declaredKeys>
                 </arrayController>
             </objects>
-            <point key="canvasLocation" x="220" y="964"/>
+            <point key="canvasLocation" x="251" y="963"/>
         </scene>
     </scenes>
     <resources>
diff --git a/CotEditor/Base.lproj/WindowPane.storyboard b/CotEditor/Base.lproj/WindowPane.storyboard
index d0cca6af4d..410a95255d 100644
--- a/CotEditor/Base.lproj/WindowPane.storyboard
+++ b/CotEditor/Base.lproj/WindowPane.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22146" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="Qki-Cn-AgK">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22152" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="Qki-Cn-AgK">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22146"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22152"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -11,13 +11,13 @@
             <objects>
                 <viewController id="Qki-Cn-AgK" customClass="WindowPaneController" customModule="CotEditor" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" horizontalHuggingPriority="750" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="uRF-iT-6pD">
-                        <rect key="frame" x="0.0" y="0.0" width="570" height="443"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="457"/>
                         <subviews>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="2rQ-L0-bX4">
-                                <rect key="frame" x="70" y="20" width="431" height="423"/>
+                                <rect key="frame" x="84" y="20" width="432" height="437"/>
                                 <subviews>
                                     <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="w4k-Qb-kRF">
-                                        <rect key="frame" x="55" y="387" width="75" height="16"/>
+                                        <rect key="frame" x="55" y="401" width="75" height="16"/>
                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Prefer tabs:" id="8zu-3V-Obg">
                                             <font key="font" metaFont="system"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -25,7 +25,7 @@
                                         </textFieldCell>
                                     </textField>
                                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KWJ-gB-0KX">
-                                        <rect key="frame" x="133" y="380" width="184" height="25"/>
+                                        <rect key="frame" x="133" y="394" width="184" height="25"/>
                                         <popUpButtonCell key="cell" type="push" title="Respect System Setting" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="-1" imageScaling="proportionallyDown" inset="2" selectedItem="Guj-Kc-zf2" id="6Y8-Pe-yLo">
                                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="menu"/>
@@ -47,7 +47,7 @@
                                         </connections>
                                     </popUpButton>
                                     <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1hW-gQ-vjs">
-                                        <rect key="frame" x="89" y="337" width="41" height="16"/>
+                                        <rect key="frame" x="89" y="351" width="41" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Show:" usesSingleLineMode="YES" id="iw9-Ba-eD2">
                                             <font key="font" metaFont="system"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -55,7 +55,7 @@
                                         </textFieldCell>
                                     </textField>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dN2-g1-1rQ">
-                                        <rect key="frame" x="134" y="336" width="277" height="18"/>
+                                        <rect key="frame" x="134" y="350" width="278" height="18"/>
                                         <buttonCell key="cell" type="check" title="Line numbers" bezelStyle="regularSquare" imagePosition="left" inset="2" id="A9U-Sx-or3">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -65,7 +65,7 @@
                                         </connections>
                                     </button>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WD1-55-LD1">
-                                        <rect key="frame" x="134" y="292" width="161" height="18"/>
+                                        <rect key="frame" x="134" y="306" width="161" height="18"/>
                                         <buttonCell key="cell" type="check" title="Page guide at column:" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3352">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -75,7 +75,7 @@
                                         </connections>
                                     </button>
                                     <textField focusRingType="none" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WVD-kf-A2E" customClass="NumberTextField" customModule="CotEditor" customModuleProvider="target">
-                                        <rect key="frame" x="303" y="290" width="36" height="21"/>
+                                        <rect key="frame" x="303" y="304" width="36" height="21"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="36" id="lNd-bS-xpa"/>
                                         </constraints>
@@ -98,7 +98,7 @@
                                         </connections>
                                     </textField>
                                     <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Euq-1v-RyO" customClass="AccessibleStepper" customModule="CotEditor" customModuleProvider="target">
-                                        <rect key="frame" x="340" y="287" width="19" height="28"/>
+                                        <rect key="frame" x="340" y="301" width="19" height="28"/>
                                         <stepperCell key="cell" continuous="YES" alignment="left" minValue="1" maxValue="1000" doubleValue="1" id="jBa-nO-Be8"/>
                                         <connections>
                                             <accessibilityConnection property="title" destination="WD1-55-LD1" id="sfY-2T-R0q"/>
@@ -107,7 +107,7 @@
                                         </connections>
                                     </stepper>
                                     <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="elp-ym-ri6">
-                                        <rect key="frame" x="22" y="265" width="108" height="16"/>
+                                        <rect key="frame" x="22" y="279" width="108" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Writing direction:" id="RwN-73-I8c">
                                             <font key="font" usesAppearanceFont="YES"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -115,7 +115,7 @@
                                         </textFieldCell>
                                     </textField>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jq0-Ac-Br7">
-                                        <rect key="frame" x="132" y="264" width="98" height="18"/>
+                                        <rect key="frame" x="132" y="278" width="98" height="18"/>
                                         <buttonCell key="cell" type="radio" title="Left to right" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="3Kb-bF-CW0">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -125,7 +125,7 @@
                                         </connections>
                                     </button>
                                     <button tag="1" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dbp-Ze-2O4">
-                                        <rect key="frame" x="236" y="264" width="97" height="18"/>
+                                        <rect key="frame" x="236" y="278" width="97" height="18"/>
                                         <buttonCell key="cell" type="radio" title="Right to left" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="USo-8p-Edc">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -135,7 +135,7 @@
                                         </connections>
                                     </button>
                                     <button tag="2" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wjb-yR-EWC">
-                                        <rect key="frame" x="339" y="264" width="72" height="18"/>
+                                        <rect key="frame" x="339" y="278" width="72" height="18"/>
                                         <buttonCell key="cell" type="radio" title="Vertical" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="Ge8-vU-lyg">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -145,7 +145,7 @@
                                         </connections>
                                     </button>
                                     <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="wv9-cn-NXQ">
-                                        <rect key="frame" x="60" y="237" width="70" height="16"/>
+                                        <rect key="frame" x="60" y="251" width="70" height="16"/>
                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Overscroll:" id="7Nz-lv-JZb">
                                             <font key="font" metaFont="system"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -153,7 +153,7 @@
                                         </textFieldCell>
                                     </textField>
                                     <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="C9r-v1-hrx" customClass="NumberTextField" customModule="CotEditor" customModuleProvider="target">
-                                        <rect key="frame" x="136" y="234" width="48" height="21"/>
+                                        <rect key="frame" x="136" y="248" width="48" height="21"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="48" id="NEd-ig-lO2"/>
                                         </constraints>
@@ -173,7 +173,7 @@
                                         </connections>
                                     </textField>
                                     <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SQY-QF-RyC">
-                                        <rect key="frame" x="185" y="231" width="19" height="28"/>
+                                        <rect key="frame" x="185" y="245" width="19" height="28"/>
                                         <stepperCell key="cell" continuous="YES" alignment="left" increment="0.10000000000000001" maxValue="1" id="YHE-bc-7kQ"/>
                                         <connections>
                                             <accessibilityConnection property="title" destination="wv9-cn-NXQ" id="uYs-Yo-oFw"/>
@@ -181,7 +181,7 @@
                                         </connections>
                                     </stepper>
                                     <textField focusRingType="none" horizontalHuggingPriority="751" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Obi-8V-K8Q">
-                                        <rect key="frame" x="18" y="190" width="112" height="16"/>
+                                        <rect key="frame" x="18" y="204" width="112" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Status bar shows:" usesSingleLineMode="YES" id="kjP-FS-fyd">
                                             <font key="font" metaFont="system"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -189,7 +189,7 @@
                                         </textFieldCell>
                                     </textField>
                                     <gridView verticalHuggingPriority="750" xPlacement="leading" yPlacement="top" rowAlignment="firstBaseline" columnSpacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="DnL-UN-PAA">
-                                        <rect key="frame" x="136" y="146" width="230" height="60"/>
+                                        <rect key="frame" x="136" y="160" width="230" height="60"/>
                                         <rows>
                                             <gridRow id="A5a-1R-KNS"/>
                                             <gridRow id="f5f-3D-cza"/>
@@ -278,15 +278,15 @@
                                         </gridCells>
                                     </gridView>
                                     <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="KaN-9u-fz0">
-                                        <rect key="frame" x="36" y="99" width="94" height="16"/>
-                                        <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Window width:" id="JZ8-uq-7Kg">
+                                        <rect key="frame" x="46" y="113" width="84" height="16"/>
+                                        <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Window size:" id="JZ8-uq-7Kg">
                                             <font key="font" usesAppearanceFont="YES"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
                                     <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hfv-mJ-E2k" customClass="NumberTextField" customModule="CotEditor" customModuleProvider="target">
-                                        <rect key="frame" x="136" y="96" width="64" height="21"/>
+                                        <rect key="frame" x="136" y="110" width="64" height="21"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="64" id="Kua-Lj-geS"/>
                                         </constraints>
@@ -310,7 +310,7 @@
                                         </connections>
                                     </textField>
                                     <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9xw-el-9xy">
-                                        <rect key="frame" x="202" y="99" width="19" height="16"/>
+                                        <rect key="frame" x="202" y="113" width="19" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="px" id="VCx-PO-Fnr">
                                             <font key="font" usesAppearanceFont="YES"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -318,15 +318,15 @@
                                         </textFieldCell>
                                     </textField>
                                     <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dlN-sO-hCs">
-                                        <rect key="frame" x="233" y="99" width="46" height="16"/>
-                                        <textFieldCell key="cell" lineBreakMode="clipping" title="height:" id="Zhk-Nt-kiD">
-                                            <font key="font" usesAppearanceFont="YES"/>
+                                        <rect key="frame" x="244" y="95" width="38" height="14"/>
+                                        <textFieldCell key="cell" controlSize="small" lineBreakMode="clipping" title="height" id="Zhk-Nt-kiD">
+                                            <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
                                     <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XGK-jf-PNq" customClass="NumberTextField" customModule="CotEditor" customModuleProvider="target">
-                                        <rect key="frame" x="285" y="96" width="64" height="21"/>
+                                        <rect key="frame" x="231" y="110" width="64" height="21"/>
                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" placeholderString="Auto" drawsBackground="YES" id="7iv-Gh-RFp">
                                             <numberFormatter key="formatter" formatterBehavior="custom10_4" allowsFloats="NO" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="sUS-DS-EEI">
                                                 <real key="minimum" value="100"/>
@@ -347,7 +347,7 @@
                                         </connections>
                                     </textField>
                                     <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kQy-qH-I9N">
-                                        <rect key="frame" x="351" y="99" width="19" height="16"/>
+                                        <rect key="frame" x="297" y="113" width="19" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="px" id="u8r-OW-Z1O">
                                             <font key="font" usesAppearanceFont="YES"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -395,9 +395,9 @@
                                         </textFieldCell>
                                     </textField>
                                     <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="klg-3N-8x9">
-                                        <rect key="frame" x="134" y="34" width="204" height="28"/>
+                                        <rect key="frame" x="134" y="34" width="224" height="28"/>
                                         <constraints>
-                                            <constraint firstAttribute="width" constant="200" id="jww-tZ-Fas"/>
+                                            <constraint firstAttribute="width" constant="220" id="jww-tZ-Fas"/>
                                         </constraints>
                                         <sliderCell key="cell" continuous="YES" alignment="left" minValue="0.20000000000000001" maxValue="1" doubleValue="0.29521857923497269" tickMarkPosition="below" numberOfTickMarks="9" sliderType="linear" id="wGe-ff-Cuy">
                                             <font key="font" usesAppearanceFont="YES"/>
@@ -408,7 +408,7 @@
                                         </connections>
                                     </slider>
                                     <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hqW-e1-Q8a" customClass="NumberTextField" customModule="CotEditor" customModuleProvider="target">
-                                        <rect key="frame" x="344" y="40" width="48" height="21"/>
+                                        <rect key="frame" x="364" y="40" width="48" height="21"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="48" id="kWm-Nn-j3V"/>
                                         </constraints>
@@ -428,7 +428,7 @@
                                         </connections>
                                     </textField>
                                     <stackView distribution="equalSpacing" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" horizontalCompressionResistancePriority="250" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dhU-V2-fZC">
-                                        <rect key="frame" x="132" y="20" width="208" height="16"/>
+                                        <rect key="frame" x="132" y="20" width="228" height="16"/>
                                         <subviews>
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="QR3-LX-w9s" customClass="OpacitySampleView" customModule="CotEditor" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="16" height="16"/>
@@ -442,7 +442,7 @@
                                                 </userDefinedRuntimeAttributes>
                                             </customView>
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="8L5-VE-MNm" customClass="OpacitySampleView" customModule="CotEditor" customModuleProvider="target">
-                                                <rect key="frame" x="48" y="0.0" width="16" height="16"/>
+                                                <rect key="frame" x="53" y="0.0" width="16" height="16"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" secondItem="8L5-VE-MNm" secondAttribute="height" multiplier="1:1" id="azY-tN-19G"/>
                                                 </constraints>
@@ -453,7 +453,7 @@
                                                 </userDefinedRuntimeAttributes>
                                             </customView>
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="mLK-dq-Qhn" customClass="OpacitySampleView" customModule="CotEditor" customModuleProvider="target">
-                                                <rect key="frame" x="96" y="0.0" width="16" height="16"/>
+                                                <rect key="frame" x="106" y="0.0" width="16" height="16"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" secondItem="mLK-dq-Qhn" secondAttribute="height" multiplier="1:1" id="9BS-lQ-TIS"/>
                                                 </constraints>
@@ -464,7 +464,7 @@
                                                 </userDefinedRuntimeAttributes>
                                             </customView>
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="lQK-Zu-MnD" customClass="OpacitySampleView" customModule="CotEditor" customModuleProvider="target">
-                                                <rect key="frame" x="144" y="0.0" width="16" height="16"/>
+                                                <rect key="frame" x="159" y="0.0" width="16" height="16"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" secondItem="lQK-Zu-MnD" secondAttribute="height" multiplier="1:1" id="OxC-wm-fqj"/>
                                                 </constraints>
@@ -475,7 +475,7 @@
                                                 </userDefinedRuntimeAttributes>
                                             </customView>
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="NTf-Ei-t1t" customClass="OpacitySampleView" customModule="CotEditor" customModuleProvider="target">
-                                                <rect key="frame" x="192" y="0.0" width="16" height="16"/>
+                                                <rect key="frame" x="212" y="0.0" width="16" height="16"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" secondItem="NTf-Ei-t1t" secondAttribute="height" multiplier="1:1" id="ncV-US-ELV"/>
                                                 </constraints>
@@ -505,16 +505,16 @@
                                         </customSpacing>
                                     </stackView>
                                     <customView verticalHuggingPriority="750" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="heB-2f-hH0" customClass="SeparatorGuideView" customModule="CotEditor" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="367" width="431" height="1"/>
+                                        <rect key="frame" x="0.0" y="381" width="432" height="1"/>
                                     </customView>
                                     <customView verticalHuggingPriority="750" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="hZu-SP-zrK" customClass="SeparatorGuideView" customModule="CotEditor" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="220" width="431" height="1"/>
+                                        <rect key="frame" x="0.0" y="234" width="432" height="1"/>
                                     </customView>
                                     <customView verticalHuggingPriority="750" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="7BU-ks-EwZ" customClass="SeparatorGuideView" customModule="CotEditor" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="129" width="431" height="1"/>
+                                        <rect key="frame" x="0.0" y="143" width="432" height="1"/>
                                     </customView>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WYL-DQ-n5Y">
-                                        <rect key="frame" x="154" y="314" width="119" height="18"/>
+                                        <rect key="frame" x="154" y="328" width="119" height="18"/>
                                         <buttonCell key="cell" type="check" title="Draw separator" bezelStyle="regularSquare" imagePosition="left" inset="2" id="zgz-Vf-91b">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -524,12 +524,21 @@
                                             <binding destination="NU0-2h-SUe" name="enabled" keyPath="values.showLineNumbers" id="ixu-Ti-hCz"/>
                                         </connections>
                                     </button>
+                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ykE-9e-9Uz">
+                                        <rect key="frame" x="152" y="95" width="33" height="14"/>
+                                        <textFieldCell key="cell" controlSize="small" lineBreakMode="clipping" title="width" id="IGc-EL-MXO">
+                                            <font key="font" metaFont="smallSystem"/>
+                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
                                 </subviews>
                                 <constraints>
                                     <constraint firstItem="WVD-kf-A2E" firstAttribute="baseline" secondItem="WD1-55-LD1" secondAttribute="baseline" id="0Ct-dD-NNZ"/>
                                     <constraint firstItem="7BU-ks-EwZ" firstAttribute="top" secondItem="DnL-UN-PAA" secondAttribute="bottom" constant="16" id="0Ka-Ty-ZWn"/>
                                     <constraint firstItem="ExR-YZ-RPy" firstAttribute="leading" secondItem="KI8-gR-WjS" secondAttribute="trailing" constant="8" symbolic="YES" id="0bf-6W-XQi"/>
                                     <constraint firstItem="C9r-v1-hrx" firstAttribute="leading" secondItem="wv9-cn-NXQ" secondAttribute="trailing" constant="8" symbolic="YES" id="0j9-Ju-NHS"/>
+                                    <constraint firstItem="dlN-sO-hCs" firstAttribute="firstBaseline" secondItem="ykE-9e-9Uz" secondAttribute="firstBaseline" id="0rX-Gf-T7C"/>
                                     <constraint firstItem="1hW-gQ-vjs" firstAttribute="trailing" secondItem="w4k-Qb-kRF" secondAttribute="trailing" id="11F-dj-pgx"/>
                                     <constraint firstItem="klg-3N-8x9" firstAttribute="leading" secondItem="Gi0-Gf-dth" secondAttribute="trailing" constant="8" symbolic="YES" id="14Z-T0-YTx"/>
                                     <constraint firstItem="WVD-kf-A2E" firstAttribute="centerY" secondItem="Euq-1v-RyO" secondAttribute="centerY" id="3RM-YM-6Ob"/>
@@ -546,12 +555,12 @@
                                     <constraint firstItem="elp-ym-ri6" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="2rQ-L0-bX4" secondAttribute="leading" constant="20" symbolic="YES" id="90n-CN-L7h"/>
                                     <constraint firstItem="SQY-QF-RyC" firstAttribute="leading" secondItem="C9r-v1-hrx" secondAttribute="trailing" constant="4" id="Ap6-2P-omb"/>
                                     <constraint firstItem="KI8-gR-WjS" firstAttribute="leading" secondItem="dgR-do-Wa7" secondAttribute="trailing" constant="6" symbolic="YES" id="AtN-Vu-CCM"/>
+                                    <constraint firstItem="ykE-9e-9Uz" firstAttribute="top" secondItem="hfv-mJ-E2k" secondAttribute="bottom" constant="1" id="B1n-P3-6Th"/>
                                     <constraint firstItem="7BU-ks-EwZ" firstAttribute="leading" secondItem="2rQ-L0-bX4" secondAttribute="leading" id="B4W-hU-zgH"/>
                                     <constraint firstItem="KaN-9u-fz0" firstAttribute="top" secondItem="7BU-ks-EwZ" secondAttribute="bottom" constant="14" id="CVI-bA-jpq"/>
                                     <constraint firstItem="WYL-DQ-n5Y" firstAttribute="leading" secondItem="dN2-g1-1rQ" secondAttribute="leading" constant="20" id="DvI-uj-y2H"/>
                                     <constraint firstItem="dgR-do-Wa7" firstAttribute="trailing" secondItem="1hW-gQ-vjs" secondAttribute="trailing" id="Ekg-Qe-IvC"/>
                                     <constraint firstItem="hqW-e1-Q8a" firstAttribute="leading" secondItem="klg-3N-8x9" secondAttribute="trailing" constant="8" symbolic="YES" id="Eq0-NE-6cD"/>
-                                    <constraint firstItem="dgR-do-Wa7" firstAttribute="top" secondItem="KaN-9u-fz0" secondAttribute="bottom" constant="12" id="HXO-dw-JZz"/>
                                     <constraint firstItem="dbp-Ze-2O4" firstAttribute="firstBaseline" secondItem="elp-ym-ri6" secondAttribute="firstBaseline" id="IR1-Lk-Qjq"/>
                                     <constraint firstItem="WD1-55-LD1" firstAttribute="top" secondItem="WYL-DQ-n5Y" secondAttribute="bottom" constant="6" symbolic="YES" id="IuB-Zd-oht"/>
                                     <constraint firstItem="KaN-9u-fz0" firstAttribute="trailing" secondItem="w4k-Qb-kRF" secondAttribute="trailing" id="Iyn-bu-9dl"/>
@@ -562,28 +571,30 @@
                                     <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="ExR-YZ-RPy" secondAttribute="trailing" constant="20" symbolic="YES" id="LAf-AJ-Uyn"/>
                                     <constraint firstAttribute="trailing" secondItem="dN2-g1-1rQ" secondAttribute="trailing" priority="750" constant="20" symbolic="YES" id="MGK-SO-UJa"/>
                                     <constraint firstItem="wv9-cn-NXQ" firstAttribute="trailing" secondItem="dgR-do-Wa7" secondAttribute="trailing" id="MOT-AW-sv0"/>
-                                    <constraint firstItem="XGK-jf-PNq" firstAttribute="leading" secondItem="dlN-sO-hCs" secondAttribute="trailing" constant="8" symbolic="YES" id="NgF-fn-XNb"/>
                                     <constraint firstItem="Gi0-Gf-dth" firstAttribute="top" secondItem="dgR-do-Wa7" secondAttribute="bottom" constant="12" id="PJf-J9-N5Y"/>
                                     <constraint firstItem="1hW-gQ-vjs" firstAttribute="trailing" secondItem="Obi-8V-K8Q" secondAttribute="trailing" id="PoO-9p-hV6"/>
                                     <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="KWJ-gB-0KX" secondAttribute="trailing" constant="20" symbolic="YES" id="PoY-T2-BvL"/>
                                     <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="DnL-UN-PAA" secondAttribute="trailing" constant="20" symbolic="YES" id="QW5-JF-lee"/>
+                                    <constraint firstItem="ykE-9e-9Uz" firstAttribute="centerX" secondItem="hfv-mJ-E2k" secondAttribute="centerX" id="R1P-Vl-iVF"/>
                                     <constraint firstItem="SQY-QF-RyC" firstAttribute="centerY" secondItem="C9r-v1-hrx" secondAttribute="centerY" id="SAE-UF-IIl"/>
-                                    <constraint firstItem="dlN-sO-hCs" firstAttribute="leading" secondItem="9xw-el-9xy" secondAttribute="trailing" constant="16" id="SDG-wL-GDn"/>
                                     <constraint firstItem="KWJ-gB-0KX" firstAttribute="baseline" secondItem="w4k-Qb-kRF" secondAttribute="baseline" id="TAb-vY-lbq"/>
                                     <constraint firstItem="jq0-Ac-Br7" firstAttribute="leading" secondItem="elp-ym-ri6" secondAttribute="trailing" constant="6" symbolic="YES" id="UKW-uc-WQ4"/>
                                     <constraint firstItem="heB-2f-hH0" firstAttribute="top" secondItem="KWJ-gB-0KX" secondAttribute="bottom" constant="16" id="VY0-bg-Z68"/>
+                                    <constraint firstItem="dlN-sO-hCs" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ykE-9e-9Uz" secondAttribute="trailing" constant="8" symbolic="YES" id="W3o-l6-sHb"/>
                                     <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="hqW-e1-Q8a" secondAttribute="trailing" constant="20" symbolic="YES" id="YPw-sG-xtQ"/>
                                     <constraint firstItem="jq0-Ac-Br7" firstAttribute="top" secondItem="WD1-55-LD1" secondAttribute="bottom" constant="12" id="YgY-tC-K1L"/>
                                     <constraint firstItem="hfv-mJ-E2k" firstAttribute="firstBaseline" secondItem="KaN-9u-fz0" secondAttribute="firstBaseline" id="ZNg-Lt-aal"/>
                                     <constraint firstItem="hqW-e1-Q8a" firstAttribute="baseline" secondItem="Gi0-Gf-dth" secondAttribute="baseline" id="a4L-dN-Qor"/>
                                     <constraint firstItem="dhU-V2-fZC" firstAttribute="top" secondItem="klg-3N-8x9" secondAttribute="bottom" constant="4" id="bOh-hO-FcE"/>
                                     <constraint firstItem="9xw-el-9xy" firstAttribute="leading" secondItem="hfv-mJ-E2k" secondAttribute="trailing" constant="4" id="c75-pF-BeJ"/>
+                                    <constraint firstItem="KI8-gR-WjS" firstAttribute="top" secondItem="ykE-9e-9Uz" secondAttribute="bottom" constant="8" symbolic="YES" id="c9P-d6-Hri"/>
                                     <constraint firstItem="XGK-jf-PNq" firstAttribute="firstBaseline" secondItem="KaN-9u-fz0" secondAttribute="firstBaseline" id="dn5-tO-a6D"/>
                                     <constraint firstItem="Gi0-Gf-dth" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="2rQ-L0-bX4" secondAttribute="leading" constant="20" symbolic="YES" id="dqe-ES-65n"/>
                                     <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="SQY-QF-RyC" secondAttribute="trailing" constant="20" symbolic="YES" id="eOq-sN-FWF"/>
                                     <constraint firstItem="dgR-do-Wa7" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="2rQ-L0-bX4" secondAttribute="leading" constant="20" symbolic="YES" id="gKC-uj-a77"/>
                                     <constraint firstItem="dbp-Ze-2O4" firstAttribute="leading" secondItem="jq0-Ac-Br7" secondAttribute="trailing" constant="8" symbolic="YES" id="gZe-zy-ty0"/>
                                     <constraint firstItem="wjb-yR-EWC" firstAttribute="leading" secondItem="dbp-Ze-2O4" secondAttribute="trailing" constant="8" symbolic="YES" id="gl2-uy-YUn"/>
+                                    <constraint firstItem="XGK-jf-PNq" firstAttribute="leading" secondItem="9xw-el-9xy" secondAttribute="trailing" priority="750" constant="12" id="hVh-Z0-cmR"/>
                                     <constraint firstItem="Obi-8V-K8Q" firstAttribute="leading" secondItem="2rQ-L0-bX4" secondAttribute="leading" priority="750" constant="20" symbolic="YES" id="jBW-fE-hhJ"/>
                                     <constraint firstItem="XGK-jf-PNq" firstAttribute="width" secondItem="hfv-mJ-E2k" secondAttribute="width" id="jir-RK-GVp"/>
                                     <constraint firstItem="WVD-kf-A2E" firstAttribute="leading" secondItem="WD1-55-LD1" secondAttribute="trailing" constant="8" symbolic="YES" id="kaP-FU-p01"/>
@@ -599,11 +610,11 @@
                                     <constraint firstItem="w4k-Qb-kRF" firstAttribute="top" secondItem="2rQ-L0-bX4" secondAttribute="top" constant="20" symbolic="YES" id="rz5-Vy-hFU"/>
                                     <constraint firstItem="KI8-gR-WjS" firstAttribute="baseline" secondItem="dgR-do-Wa7" secondAttribute="baseline" id="sRQ-cb-trO"/>
                                     <constraint firstItem="9xw-el-9xy" firstAttribute="firstBaseline" secondItem="KaN-9u-fz0" secondAttribute="firstBaseline" id="sX6-14-LiR"/>
-                                    <constraint firstItem="dlN-sO-hCs" firstAttribute="firstBaseline" secondItem="KaN-9u-fz0" secondAttribute="firstBaseline" id="tcr-AS-e5n"/>
                                     <constraint firstItem="kQy-qH-I9N" firstAttribute="leading" secondItem="XGK-jf-PNq" secondAttribute="trailing" constant="4" id="ttS-vn-QAZ"/>
                                     <constraint firstItem="Obi-8V-K8Q" firstAttribute="top" secondItem="hZu-SP-zrK" secondAttribute="bottom" constant="14" id="uXA-Mr-psh"/>
                                     <constraint firstAttribute="trailing" secondItem="heB-2f-hH0" secondAttribute="trailing" id="vAL-0O-z41"/>
                                     <constraint firstItem="jq0-Ac-Br7" firstAttribute="firstBaseline" secondItem="elp-ym-ri6" secondAttribute="firstBaseline" id="vHk-yO-PWq"/>
+                                    <constraint firstItem="dlN-sO-hCs" firstAttribute="centerX" secondItem="XGK-jf-PNq" secondAttribute="centerX" id="vZR-af-HPQ"/>
                                     <constraint firstItem="klg-3N-8x9" firstAttribute="firstBaseline" secondItem="Gi0-Gf-dth" secondAttribute="firstBaseline" id="wU9-u1-VuY"/>
                                     <constraint firstItem="C9r-v1-hrx" firstAttribute="baseline" secondItem="wv9-cn-NXQ" secondAttribute="baseline" id="wzH-lb-C8z"/>
                                     <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="WYL-DQ-n5Y" secondAttribute="trailing" constant="20" symbolic="YES" id="x3j-eO-Nhl"/>
@@ -618,16 +629,16 @@
                                 </constraints>
                             </customView>
                             <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="TQJ-IO-6BB">
-                                <rect key="frame" x="20" y="385" width="530" height="5"/>
+                                <rect key="frame" x="20" y="399" width="560" height="5"/>
                             </box>
                             <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="fDR-J7-rvC">
-                                <rect key="frame" x="20" y="238" width="530" height="5"/>
+                                <rect key="frame" x="20" y="252" width="560" height="5"/>
                             </box>
                             <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="HPd-WR-pN4">
-                                <rect key="frame" x="20" y="147" width="530" height="5"/>
+                                <rect key="frame" x="20" y="161" width="560" height="5"/>
                             </box>
                             <button identifier="settings_window" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6S6-gu-D2C">
-                                <rect key="frame" x="527" y="16" width="25" height="25"/>
+                                <rect key="frame" x="557" y="16" width="25" height="25"/>
                                 <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" state="on" borderStyle="border" inset="2" id="NSa-g8-oom">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -670,7 +681,7 @@
                 <customObject id="Vhg-R8-9Sf" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
                 <userDefaultsController representsSharedInstance="YES" id="NU0-2h-SUe" userLabel="Shared User Defaults Controller"/>
             </objects>
-            <point key="canvasLocation" x="0.0" y="0.0"/>
+            <point key="canvasLocation" x="0.0" y="39.5"/>
         </scene>
     </scenes>
 </document>
diff --git a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/settings_window.html b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/settings_window.html
index 27459ae2bd..6858a6a97a 100644
--- a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/settings_window.html
+++ b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/settings_window.html
@@ -62,7 +62,7 @@ <h1>Change Window settings in CotEditor</h1>
 	</tr>
 	
 	<tr>
-		<th>Window width/height</th>
+		<th>Window size</th>
 		<td>Set the default window size in pixel. If the fields are left blank, the size of the last window is adopted.</td>
 	</tr>
 	
diff --git a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/settings_window.html b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/settings_window.html
index eb2792c63e..c0c260f688 100644
--- a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/settings_window.html
+++ b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/settings_window.html
@@ -63,7 +63,7 @@ <h1>CotEditorで「ウインドウ」設定を変更する</h1>
 	</tr>
 	
 	<tr>
-		<th>ウインドウのサイズ</th>
+		<th>ウインドウサイズ</th>
 		<td>デフォルトのウインドウサイズをピクセルで設定します。設定値が空欄のときは最後のウインドウのサイズを継承します。</td>
 	</tr>
 	
diff --git a/CotEditor/de.lproj/EditPane.strings b/CotEditor/de.lproj/EditPane.strings
index bda3bff650..caa10e5684 100644
--- a/CotEditor/de.lproj/EditPane.strings
+++ b/CotEditor/de.lproj/EditPane.strings
@@ -32,12 +32,10 @@
 "GRh-V2-hmW.title" = "Klammern und Anführungszeichen automatisch schließen";  // Schließende Klammern und Anführungszeichen automatisch hinzufügen
 /* Class = "NSButtonCell"; title = "Swap “¥” and “\\” keys"; ObjectID = "3303"; */
 "3303.title" = "„¥“ und „\\“ Tasten tauschen";
-/* Class = "NSTextFieldCell"; title = "Smart"; ObjectID = "6I3-dM-2QV"; */
-"6I3-dM-2QV.title" = "Intelligente";
-/* Class = "NSButtonCell"; title = " Quotes"; ObjectID = "Abx-fM-gyc"; */
-"Abx-fM-gyc.title" = "Anführungszeichen";
-/* Class = "NSButtonCell"; title = "Dashes"; ObjectID = "nr1-0X-aBY"; */
-"nr1-0X-aBY.title" = "Bindestriche";
+/* Class = "NSButtonCell"; title = "Smart quotes"; ObjectID = "Abx-fM-gyc"; */
+"Abx-fM-gyc.title" = "Intelligente Anführungszeichen";
+/* Class = "NSButtonCell"; title = "Smart dashes"; ObjectID = "nr1-0X-aBY"; */
+"nr1-0X-aBY.title" = "Intelligente Bindestriche";
 /* Class = "NSButtonCell"; title = "Automatically trim trailing whitespace"; ObjectID = "noP-hx-YeQ"; */
 "noP-hx-YeQ.title" = "Leerzeichen am Zeilenende automatisch entfernen";
 /* Class = "NSButtonCell"; title = "Including whitespace-only lines"; ObjectID = "Tma-Oh-F7v"; */
diff --git a/CotEditor/de.lproj/WindowPane.strings b/CotEditor/de.lproj/WindowPane.strings
index f2a396eca7..b5d0d6da9a 100644
--- a/CotEditor/de.lproj/WindowPane.strings
+++ b/CotEditor/de.lproj/WindowPane.strings
@@ -75,12 +75,14 @@
 "SR0-Bx-Nh6.title" = "Aktuelle Spalte";
 
 
-/* Class = "NSTextFieldCell"; title = "Window width:"; ObjectID = "JZ8-uq-7Kg"; */
-"JZ8-uq-7Kg.title" = "Fensterbreite:";
+/* Class = "NSTextFieldCell"; title = "Window size:"; ObjectID = "JZ8-uq-7Kg"; */
+"JZ8-uq-7Kg.title" = "Fenstergröße:";
+/* Class = "NSTextFieldCell"; title = "width"; ObjectID = "IGc-EL-MXO"; */
+"IGc-EL-MXO.title" = "Breite";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "u8r-OW-Z1O"; */
 "u8r-OW-Z1O.title" = "px";
-/* Class = "NSTextFieldCell"; title = "height:"; ObjectID = "Zhk-Nt-kiD"; */
-"Zhk-Nt-kiD.title" = "-höhe:";
+/* Class = "NSTextFieldCell"; title = "height"; ObjectID = "Zhk-Nt-kiD"; */
+"Zhk-Nt-kiD.title" = "Höhe";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "VCx-PO-Fnr"; */
 "VCx-PO-Fnr.title" = "px";
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Auto"; ObjectID = "hye-gP-iep"; */
diff --git a/CotEditor/en-GB.lproj/EditPane.strings b/CotEditor/en-GB.lproj/EditPane.strings
index e6d3c9382a..3340d7c214 100644
--- a/CotEditor/en-GB.lproj/EditPane.strings
+++ b/CotEditor/en-GB.lproj/EditPane.strings
@@ -32,12 +32,10 @@
 "GRh-V2-hmW.title" = "Automatically insert closing brackets and quotes";
 /* Class = "NSButtonCell"; title = "Swap “¥” and “\\” keys"; ObjectID = "3303"; */
 "3303.title" = "Swap “¥” and “\\” keys";
-/* Class = "NSTextFieldCell"; title = "Smart"; ObjectID = "6I3-dM-2QV"; */
-"6I3-dM-2QV.title" = "Smart";
-/* Class = "NSButtonCell"; title = "Quotes"; ObjectID = "Abx-fM-gyc"; */
-"Abx-fM-gyc.title" = "Quotes";
-/* Class = "NSButtonCell"; title = "Dashes"; ObjectID = "nr1-0X-aBY"; */
-"nr1-0X-aBY.title" = "Dashes";
+/* Class = "NSButtonCell"; title = "Smart quotes"; ObjectID = "Abx-fM-gyc"; */
+"Abx-fM-gyc.title" = "Smart quotes";
+/* Class = "NSButtonCell"; title = "Smart dashes"; ObjectID = "nr1-0X-aBY"; */
+"nr1-0X-aBY.title" = "Smart dashes";
 /* Class = "NSButtonCell"; title = "Automatically trim trailing whitespace"; ObjectID = "noP-hx-YeQ"; */
 "noP-hx-YeQ.title" = "Automatically trim trailing whitespace";
 /* Class = "NSButtonCell"; title = "Including whitespace-only lines"; ObjectID = "Tma-Oh-F7v"; */
diff --git a/CotEditor/en-GB.lproj/WindowPane.strings b/CotEditor/en-GB.lproj/WindowPane.strings
index 5e7ad68b88..62060799e8 100644
--- a/CotEditor/en-GB.lproj/WindowPane.strings
+++ b/CotEditor/en-GB.lproj/WindowPane.strings
@@ -75,12 +75,14 @@
 "SR0-Bx-Nh6.title" = "Column";
 
 
-/* Class = "NSTextFieldCell"; title = "Window width:"; ObjectID = "JZ8-uq-7Kg"; */
-"JZ8-uq-7Kg.title" = "Window width:";
+/* Class = "NSTextFieldCell"; title = "Window size:"; ObjectID = "JZ8-uq-7Kg"; */
+"JZ8-uq-7Kg.title" = "Window size:";
+/* Class = "NSTextFieldCell"; title = "width"; ObjectID = "IGc-EL-MXO"; */
+"IGc-EL-MXO.title" = "width";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "u8r-OW-Z1O"; */
 "u8r-OW-Z1O.title" = "px";
-/* Class = "NSTextFieldCell"; title = "height:"; ObjectID = "Zhk-Nt-kiD"; */
-"Zhk-Nt-kiD.title" = "height:";
+/* Class = "NSTextFieldCell"; title = "height"; ObjectID = "Zhk-Nt-kiD"; */
+"Zhk-Nt-kiD.title" = "height";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "VCx-PO-Fnr"; */
 "VCx-PO-Fnr.title" = "px";
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Auto"; ObjectID = "hye-gP-iep"; */
diff --git a/CotEditor/es.lproj/EditPane.strings b/CotEditor/es.lproj/EditPane.strings
index 2f1394cc36..9d2d7c353f 100644
--- a/CotEditor/es.lproj/EditPane.strings
+++ b/CotEditor/es.lproj/EditPane.strings
@@ -32,12 +32,10 @@
 "GRh-V2-hmW.title" = "Inserte automáticamente los corchetes de cierre y las comillas";
 /* Class = "NSButtonCell"; title = "Swap “¥” and “\\” keys"; ObjectID = "3303"; */
 "3303.title" = "Intercambia las teclas “¥” y “\\”";
-/* Class = "NSTextFieldCell"; title = "Smart"; ObjectID = "6I3-dM-2QV"; */
-"6I3-dM-2QV.title" = "Inteligente:";
-/* Class = "NSButtonCell"; title = "Quotes"; ObjectID = "Abx-fM-gyc"; */
-"Abx-fM-gyc.title" = "Comillas";
-/* Class = "NSButtonCell"; title = "Dashes"; ObjectID = "nr1-0X-aBY"; */
-"nr1-0X-aBY.title" = "Guiones";
+/* Class = "NSButtonCell"; title = "Smart quotes"; ObjectID = "Abx-fM-gyc"; */
+"Abx-fM-gyc.title" = "Comillas tipográficas";
+/* Class = "NSButtonCell"; title = "Smart dashes"; ObjectID = "nr1-0X-aBY"; */
+"nr1-0X-aBY.title" = "Guiones inteligentes";
 /* Class = "NSButtonCell"; title = "Automatically trim trailing whitespace"; ObjectID = "noP-hx-YeQ"; */
 "noP-hx-YeQ.title" = "Recortar automáticamente los espacios en blanco finales";
 /* Class = "NSButtonCell"; title = "Including whitespace-only lines"; ObjectID = "Tma-Oh-F7v"; */
diff --git a/CotEditor/es.lproj/WindowPane.strings b/CotEditor/es.lproj/WindowPane.strings
index ab5e6a3d94..b1a84b104c 100644
--- a/CotEditor/es.lproj/WindowPane.strings
+++ b/CotEditor/es.lproj/WindowPane.strings
@@ -61,7 +61,7 @@
 
 
 /* Class = "NSTextFieldCell"; title = "Status bar shows:"; ObjectID = "kjP-FS-fyd"; */
-"kjP-FS-fyd.title" = "La barra de estado muestra:";
+"kjP-FS-fyd.title" = "Barra de estado:";  // omit "muestra" to avoid window resize
 /* Class = "NSButtonCell"; title = "Line count"; ObjectID = "6jK-xX-8AH"; */
 "6jK-xX-8AH.title" = "Recuento de líneas";
 
@@ -77,12 +77,14 @@
 "SR0-Bx-Nh6.title" = "Columna";
 
 
-/* Class = "NSTextFieldCell"; title = "Window width:"; ObjectID = "JZ8-uq-7Kg"; */
-"JZ8-uq-7Kg.title" = "Ancho de ventana:";
+/* Class = "NSTextFieldCell"; title = "Window size:"; ObjectID = "JZ8-uq-7Kg"; */
+"JZ8-uq-7Kg.title" = "Tamaño de la ventana:";
+/* Class = "NSTextFieldCell"; title = "width"; ObjectID = "IGc-EL-MXO"; */
+"IGc-EL-MXO.title" = "anchura";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "u8r-OW-Z1O"; */
 "u8r-OW-Z1O.title" = "px";
-/* Class = "NSTextFieldCell"; title = "height:"; ObjectID = "Zhk-Nt-kiD"; */
-"Zhk-Nt-kiD.title" = "Altura:";
+/* Class = "NSTextFieldCell"; title = "height"; ObjectID = "Zhk-Nt-kiD"; */
+"Zhk-Nt-kiD.title" = "altura";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "VCx-PO-Fnr"; */
 "VCx-PO-Fnr.title" = "px";
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Auto"; ObjectID = "hye-gP-iep"; */
@@ -99,4 +101,3 @@
 
 /* Class = "NSTextFieldCell"; title = "Editor opacity:"; ObjectID = "gSx-LA-TPc"; */
 "gSx-LA-TPc.title" = "Opacidad del editor:";
-   
\ No newline at end of file
diff --git a/CotEditor/fr.lproj/EditPane.strings b/CotEditor/fr.lproj/EditPane.strings
index a46848b729..390b5bb5db 100755
--- a/CotEditor/fr.lproj/EditPane.strings
+++ b/CotEditor/fr.lproj/EditPane.strings
@@ -32,11 +32,9 @@
 "GRh-V2-hmW.title" = "Insérer automatiquement les parenthèses et guillemets fermants";
 /* Class = "NSButtonCell"; title = "Swap “¥” and “\\” keys"; ObjectID = "3303"; */
 "3303.title" = "Inverser les touches “¥” et “\\”";
-/* Class = "NSTextFieldCell"; title = "Smart"; ObjectID = "6I3-dM-2QV"; */
-"6I3-dM-2QV.title" = "";
-/* Class = "NSButtonCell"; title = "Quotes"; ObjectID = "Abx-fM-gyc"; */
-"Abx-fM-gyc.title" = "Guillemets intelligents";
-/* Class = "NSButtonCell"; title = "Dashes"; ObjectID = "nr1-0X-aBY"; */
+/* Class = "NSButtonCell"; title = "Smart quotes"; ObjectID = "Abx-fM-gyc"; */
+"Abx-fM-gyc.title" = "Guillemets courbes";
+/* Class = "NSButtonCell"; title = "Smart dashes"; ObjectID = "nr1-0X-aBY"; */
 "nr1-0X-aBY.title" = "Tirets intelligents";
 /* Class = "NSButtonCell"; title = "Automatically trim trailing whitespace"; ObjectID = "noP-hx-YeQ"; */
 "noP-hx-YeQ.title" = "Retirer automatiquement les espaces en fin de ligne";
diff --git a/CotEditor/fr.lproj/WindowPane.strings b/CotEditor/fr.lproj/WindowPane.strings
index 566ef62938..888be8ab5d 100755
--- a/CotEditor/fr.lproj/WindowPane.strings
+++ b/CotEditor/fr.lproj/WindowPane.strings
@@ -75,12 +75,14 @@
 "SR0-Bx-Nh6.title" = "Colonne";
 
 
-/* Class = "NSTextFieldCell"; title = "Window width:"; ObjectID = "JZ8-uq-7Kg"; */
-"JZ8-uq-7Kg.title" = "Largeur de la fenêtre :";
+/* Class = "NSTextFieldCell"; title = "Window size:"; ObjectID = "JZ8-uq-7Kg"; */
+"JZ8-uq-7Kg.title" = "Taille de la fenêtre :";
+/* Class = "NSTextFieldCell"; title = "width"; ObjectID = "IGc-EL-MXO"; */
+"IGc-EL-MXO.title" = "largeur";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "u8r-OW-Z1O"; */
 "u8r-OW-Z1O.title" = "px";
-/* Class = "NSTextFieldCell"; title = "height:"; ObjectID = "Zhk-Nt-kiD"; */
-"Zhk-Nt-kiD.title" = "Hauteur :";
+/* Class = "NSTextFieldCell"; title = "height"; ObjectID = "Zhk-Nt-kiD"; */
+"Zhk-Nt-kiD.title" = "hauteur";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "VCx-PO-Fnr"; */
 "VCx-PO-Fnr.title" = "px";
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Auto"; ObjectID = "hye-gP-iep"; */
diff --git a/CotEditor/it.lproj/EditPane.strings b/CotEditor/it.lproj/EditPane.strings
index 22abf33093..158fe848cb 100644
--- a/CotEditor/it.lproj/EditPane.strings
+++ b/CotEditor/it.lproj/EditPane.strings
@@ -32,12 +32,10 @@
 "GRh-V2-hmW.title" = "Inserisci automaticamente parentesi e virgolette di chiusura";
 /* Class = "NSButtonCell"; title = "Swap “¥” and “\\” keys"; ObjectID = "3303"; */
 "3303.title" = "Inverti i tasti “¥” e “\\”";
-/* Class = "NSTextFieldCell"; title = "Smart"; ObjectID = "6I3-dM-2QV"; */
-"6I3-dM-2QV.title" = "Intelligente";
-/* Class = "NSButtonCell"; title = " Quotes"; ObjectID = "Abx-fM-gyc"; */
-"Abx-fM-gyc.title" = "Virgolette";
-/* Class = "NSButtonCell"; title = "Dashes"; ObjectID = "nr1-0X-aBY"; */
-"nr1-0X-aBY.title" = "Trattini";
+/* Class = "NSButtonCell"; title = "Smart quotes"; ObjectID = "Abx-fM-gyc"; */
+"Abx-fM-gyc.title" = "Virgolette smart";
+/* Class = "NSButtonCell"; title = "Smart dashes"; ObjectID = "nr1-0X-aBY"; */
+"nr1-0X-aBY.title" = "Trattini smart";
 /* Class = "NSButtonCell"; title = "Automatically trim trailing whitespace"; ObjectID = "noP-hx-YeQ"; */
 "noP-hx-YeQ.title" = "Rimuovi automaticamente spazi a fine riga";
 /* Class = "NSButtonCell"; title = "Including whitespace-only lines"; ObjectID = "Tma-Oh-F7v"; */
diff --git a/CotEditor/it.lproj/WindowPane.strings b/CotEditor/it.lproj/WindowPane.strings
index 70adb77511..8040af28c4 100644
--- a/CotEditor/it.lproj/WindowPane.strings
+++ b/CotEditor/it.lproj/WindowPane.strings
@@ -75,12 +75,14 @@
 "SR0-Bx-Nh6.title" = "Colonna";
 
 
-/* Class = "NSTextFieldCell"; title = "Window width:"; ObjectID = "JZ8-uq-7Kg"; */
-"JZ8-uq-7Kg.title" = "Larghezza finestra:";
+/* Class = "NSTextFieldCell"; title = "Window size:"; ObjectID = "JZ8-uq-7Kg"; */
+"JZ8-uq-7Kg.title" = "Dimensione finestra:";
+/* Class = "NSTextFieldCell"; title = "width"; ObjectID = "IGc-EL-MXO"; */
+"IGc-EL-MXO.title" = "larghezza";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "u8r-OW-Z1O"; */
 "u8r-OW-Z1O.title" = "px";
-/* Class = "NSTextFieldCell"; title = "height:"; ObjectID = "Zhk-Nt-kiD"; */
-"Zhk-Nt-kiD.title" = "altezza:";
+/* Class = "NSTextFieldCell"; title = "height"; ObjectID = "Zhk-Nt-kiD"; */
+"Zhk-Nt-kiD.title" = "altezza";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "VCx-PO-Fnr"; */
 "VCx-PO-Fnr.title" = "px";
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Auto"; ObjectID = "hye-gP-iep"; */
diff --git a/CotEditor/ja.lproj/EditPane.strings b/CotEditor/ja.lproj/EditPane.strings
index e9929cf725..ad0910ccbf 100644
--- a/CotEditor/ja.lproj/EditPane.strings
+++ b/CotEditor/ja.lproj/EditPane.strings
@@ -32,12 +32,10 @@
 "GRh-V2-hmW.title" = "括弧と引用符を自動的に閉じる";
 /* Class = "NSButtonCell"; title = "Swap “¥” and “\\” keys"; ObjectID = "3303"; */
 "3303.title" = "“¥”と“\\”のキーを入れ替える";
-/* Class = "NSTextFieldCell"; title = "Smart"; ObjectID = "6I3-dM-2QV"; */
-"6I3-dM-2QV.title" = "スマート";
-/* Class = "NSButtonCell"; title = "Quotes"; ObjectID = "Abx-fM-gyc"; */
-"Abx-fM-gyc.title" = "引用符";
-/* Class = "NSButtonCell"; title = "Dashes"; ObjectID = "nr1-0X-aBY"; */
-"nr1-0X-aBY.title" = "ダッシュ";
+/* Class = "NSButtonCell"; title = "Smart quotes"; ObjectID = "Abx-fM-gyc"; */
+"Abx-fM-gyc.title" = "スマート引用符";
+/* Class = "NSButtonCell"; title = "Smart dashes"; ObjectID = "nr1-0X-aBY"; */
+"nr1-0X-aBY.title" = "スマートダッシュ記号";
 /* Class = "NSButtonCell"; title = "Automatically trim trailing whitespace"; ObjectID = "noP-hx-YeQ"; */
 "noP-hx-YeQ.title" = "行末の空白を自動的に削除";
 /* Class = "NSButtonCell"; title = "Including whitespace-only lines"; ObjectID = "Tma-Oh-F7v"; */
diff --git a/CotEditor/ja.lproj/WindowPane.strings b/CotEditor/ja.lproj/WindowPane.strings
index 952de8c0cd..e4a769b8b6 100644
--- a/CotEditor/ja.lproj/WindowPane.strings
+++ b/CotEditor/ja.lproj/WindowPane.strings
@@ -75,12 +75,14 @@
 "SR0-Bx-Nh6.title" = "現在の列";
 
 
-/* Class = "NSTextFieldCell"; title = "Window width:"; ObjectID = "JZ8-uq-7Kg"; */
-"JZ8-uq-7Kg.title" = "ウインドウ幅:";
+/* Class = "NSTextFieldCell"; title = "Window size:"; ObjectID = "JZ8-uq-7Kg"; */
+"JZ8-uq-7Kg.title" = "ウインドウサイズ:";
+/* Class = "NSTextFieldCell"; title = "width"; ObjectID = "IGc-EL-MXO"; */
+"IGc-EL-MXO.title" = "幅";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "u8r-OW-Z1O"; */
 "u8r-OW-Z1O.title" = "px";
-/* Class = "NSTextFieldCell"; title = "height:"; ObjectID = "Zhk-Nt-kiD"; */
-"Zhk-Nt-kiD.title" = "高さ:";
+/* Class = "NSTextFieldCell"; title = "height"; ObjectID = "Zhk-Nt-kiD"; */
+"Zhk-Nt-kiD.title" = "高さ";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "VCx-PO-Fnr"; */
 "VCx-PO-Fnr.title" = "px";
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Auto"; ObjectID = "hye-gP-iep"; */
diff --git a/CotEditor/pt.lproj/EditPane.strings b/CotEditor/pt.lproj/EditPane.strings
index e6b9efcff6..924ae553c8 100644
--- a/CotEditor/pt.lproj/EditPane.strings
+++ b/CotEditor/pt.lproj/EditPane.strings
@@ -32,12 +32,10 @@
 "GRh-V2-hmW.title" = "Inserir chaves e aspas finais automaticamente";
 /* Class = "NSButtonCell"; title = "Swap “¥” and “\\” keys"; ObjectID = "3303"; */
 "3303.title" = "Trocar teclas “¥” e “\\”";
-/* Class = "NSTextFieldCell"; title = "Smart"; ObjectID = "6I3-dM-2QV"; */
-"6I3-dM-2QV.title" = "Inteligentes";
-/* Class = "NSButtonCell"; title = "Quotes"; ObjectID = "Abx-fM-gyc"; */
-"Abx-fM-gyc.title" = "Aspas";
-/* Class = "NSButtonCell"; title = "Dashes"; ObjectID = "nr1-0X-aBY"; */
-"nr1-0X-aBY.title" = "Hifens";
+/* Class = "NSButtonCell"; title = "Smart quotes"; ObjectID = "Abx-fM-gyc"; */
+"Abx-fM-gyc.title" = "Aspas Inteligentes";
+/* Class = "NSButtonCell"; title = "Smart dashes"; ObjectID = "nr1-0X-aBY"; */
+"nr1-0X-aBY.title" = "Hifens Inteligentes";
 /* Class = "NSButtonCell"; title = "Automatically trim trailing whitespace"; ObjectID = "noP-hx-YeQ"; */
 "noP-hx-YeQ.title" = "Apagar espaço em branco à direita automaticamente";
 /* Class = "NSButtonCell"; title = "Including whitespace-only lines"; ObjectID = "Tma-Oh-F7v"; */
diff --git a/CotEditor/pt.lproj/WindowPane.strings b/CotEditor/pt.lproj/WindowPane.strings
index bcee640632..bedcf97205 100644
--- a/CotEditor/pt.lproj/WindowPane.strings
+++ b/CotEditor/pt.lproj/WindowPane.strings
@@ -75,12 +75,14 @@
 "SR0-Bx-Nh6.title" = "Coluna";
 
 
-/* Class = "NSTextFieldCell"; title = "Window width:"; ObjectID = "JZ8-uq-7Kg"; */
-"JZ8-uq-7Kg.title" = "Largura da janela:";
+/* Class = "NSTextFieldCell"; title = "Window size:"; ObjectID = "JZ8-uq-7Kg"; */
+"JZ8-uq-7Kg.title" = "Tamanho da Janela:";
+/* Class = "NSTextFieldCell"; title = "width"; ObjectID = "IGc-EL-MXO"; */
+"IGc-EL-MXO.title" = "largura";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "u8r-OW-Z1O"; */
 "u8r-OW-Z1O.title" = "px";
-/* Class = "NSTextFieldCell"; title = "height:"; ObjectID = "Zhk-Nt-kiD"; */
-"Zhk-Nt-kiD.title" = "altura:";
+/* Class = "NSTextFieldCell"; title = "height"; ObjectID = "Zhk-Nt-kiD"; */
+"Zhk-Nt-kiD.title" = "altura";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "VCx-PO-Fnr"; */
 "VCx-PO-Fnr.title" = "px";
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Auto"; ObjectID = "hye-gP-iep"; */
diff --git a/CotEditor/tr.lproj/EditPane.strings b/CotEditor/tr.lproj/EditPane.strings
index c1b3e8f420..bc6a0cab66 100644
--- a/CotEditor/tr.lproj/EditPane.strings
+++ b/CotEditor/tr.lproj/EditPane.strings
@@ -32,12 +32,10 @@
 "GRh-V2-hmW.title" = "Kapatma ayraçlarını ve tırnaklarını kendiliğinden ekle";
 /* Class = "NSButtonCell"; title = "Swap “¥” and “\\” keys"; ObjectID = "3303"; */
 "3303.title" = "“¥” ve “\\” düğmelerini birbirleriyle değiştir";
-/* Class = "NSTextFieldCell"; title = "Smart"; ObjectID = "6I3-dM-2QV"; */
-"6I3-dM-2QV.title" = "Akıllı";
-/* Class = "NSButtonCell"; title = "Quotes"; ObjectID = "Abx-fM-gyc"; */
-"Abx-fM-gyc.title" = "Tırnaklar";
-/* Class = "NSButtonCell"; title = "Dashes"; ObjectID = "nr1-0X-aBY"; */
-"nr1-0X-aBY.title" = "Tireler";
+/* Class = "NSButtonCell"; title = "Smart quotes"; ObjectID = "Abx-fM-gyc"; */
+"Abx-fM-gyc.title" = "Akıllı Tırnaklar";
+/* Class = "NSButtonCell"; title = "Smart dashes"; ObjectID = "nr1-0X-aBY"; */
+"nr1-0X-aBY.title" = "Akıllı Tireler";
 /* Class = "NSButtonCell"; title = "Automatically trim trailing whitespace"; ObjectID = "noP-hx-YeQ"; */
 "noP-hx-YeQ.title" = "Sondaki boşlukları kendiliğinden kırp";
 /* Class = "NSButtonCell"; title = "Including whitespace-only lines"; ObjectID = "Tma-Oh-F7v"; */
diff --git a/CotEditor/tr.lproj/WindowPane.strings b/CotEditor/tr.lproj/WindowPane.strings
index 2768e50935..1d98b31b39 100644
--- a/CotEditor/tr.lproj/WindowPane.strings
+++ b/CotEditor/tr.lproj/WindowPane.strings
@@ -75,14 +75,16 @@
 "SR0-Bx-Nh6.title" = "Sütun";
 
 
-/* Class = "NSTextFieldCell"; title = "Window width:"; ObjectID = "JZ8-uq-7Kg"; */
-"JZ8-uq-7Kg.title" = "Pencere genişliği:";
+/* Class = "NSTextFieldCell"; title = "Window size:"; ObjectID = "JZ8-uq-7Kg"; */
+"JZ8-uq-7Kg.title" = "Pencere Büyüklüğü:";
+/* Class = "NSTextFieldCell"; title = "width"; ObjectID = "IGc-EL-MXO"; */
+"IGc-EL-MXO.title" = "genişlik";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "u8r-OW-Z1O"; */
-"u8r-OW-Z1O.title" = "pks";
-/* Class = "NSTextFieldCell"; title = "height:"; ObjectID = "Zhk-Nt-kiD"; */
-"Zhk-Nt-kiD.title" = "Yükseklik:";
+"u8r-OW-Z1O.title" = "piks.";
+/* Class = "NSTextFieldCell"; title = "height"; ObjectID = "Zhk-Nt-kiD"; */
+"Zhk-Nt-kiD.title" = "yükseklik";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "VCx-PO-Fnr"; */
-"VCx-PO-Fnr.title" = "pks";
+"VCx-PO-Fnr.title" = "piks.";
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Auto"; ObjectID = "hye-gP-iep"; */
 "hye-gP-iep.ibShadowedIsNilPlaceholder" = "Otom.";
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Auto"; ObjectID = "UXj-fO-Vee"; */
diff --git a/CotEditor/zh-Hans.lproj/EditPane.strings b/CotEditor/zh-Hans.lproj/EditPane.strings
index f541f99be4..828320e29e 100644
--- a/CotEditor/zh-Hans.lproj/EditPane.strings
+++ b/CotEditor/zh-Hans.lproj/EditPane.strings
@@ -32,12 +32,10 @@
 "GRh-V2-hmW.title" = "自动补全括号和引号";
 /* Class = "NSButtonCell"; title = "Swap “¥” and “\\” keys"; ObjectID = "3303"; */
 "3303.title" = "转换“¥”和“\\”按键";
-/* Class = "NSTextFieldCell"; title = "Smart"; ObjectID = "6I3-dM-2QV"; */
-"6I3-dM-2QV.title" = "智能";
-/* Class = "NSButtonCell"; title = "Quotes"; ObjectID = "Abx-fM-gyc"; */
-"Abx-fM-gyc.title" = "引号";
-/* Class = "NSButtonCell"; title = "Dashes"; ObjectID = "nr1-0X-aBY"; */
-"nr1-0X-aBY.title" = "破折号";
+/* Class = "NSButtonCell"; title = "Smart quotes"; ObjectID = "Abx-fM-gyc"; */
+"Abx-fM-gyc.title" = "智能引号";
+/* Class = "NSButtonCell"; title = "Smart dashes"; ObjectID = "nr1-0X-aBY"; */
+"nr1-0X-aBY.title" = "智能破折号";
 /* Class = "NSButtonCell"; title = "Automatically trim trailing whitespace"; ObjectID = "noP-hx-YeQ"; */
 "noP-hx-YeQ.title" = "自动去除末尾空格";
 /* Class = "NSButtonCell"; title = "Including whitespace-only lines"; ObjectID = "Tma-Oh-F7v"; */
diff --git a/CotEditor/zh-Hans.lproj/WindowPane.strings b/CotEditor/zh-Hans.lproj/WindowPane.strings
index e01c186d8e..2786c26684 100644
--- a/CotEditor/zh-Hans.lproj/WindowPane.strings
+++ b/CotEditor/zh-Hans.lproj/WindowPane.strings
@@ -75,14 +75,16 @@
 "SR0-Bx-Nh6.title" = "当前列";
 
 
-/* Class = "NSTextFieldCell"; title = "Window width:"; ObjectID = "JZ8-uq-7Kg"; */
-"JZ8-uq-7Kg.title" = "窗口宽度：";
+/* Class = "NSTextFieldCell"; title = "Window size:"; ObjectID = "JZ8-uq-7Kg"; */
+"JZ8-uq-7Kg.title" = "窗口大小：";
+/* Class = "NSTextFieldCell"; title = "width"; ObjectID = "IGc-EL-MXO"; */
+"IGc-EL-MXO.title" = "宽度";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "u8r-OW-Z1O"; */
-"u8r-OW-Z1O.title" = "px";
-/* Class = "NSTextFieldCell"; title = "height:"; ObjectID = "Zhk-Nt-kiD"; */
-"Zhk-Nt-kiD.title" = "高度：";
+"u8r-OW-Z1O.title" = "像素";
+/* Class = "NSTextFieldCell"; title = "height"; ObjectID = "Zhk-Nt-kiD"; */
+"Zhk-Nt-kiD.title" = "高度";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "VCx-PO-Fnr"; */
-"VCx-PO-Fnr.title" = "px";
+"VCx-PO-Fnr.title" = "像素";
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Auto"; ObjectID = "hye-gP-iep"; */
 "hye-gP-iep.ibShadowedIsNilPlaceholder" = "自动";
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Auto"; ObjectID = "UXj-fO-Vee"; */
diff --git a/CotEditor/zh-Hant.lproj/EditPane.strings b/CotEditor/zh-Hant.lproj/EditPane.strings
index ae0c0754c0..480d04a299 100644
--- a/CotEditor/zh-Hant.lproj/EditPane.strings
+++ b/CotEditor/zh-Hant.lproj/EditPane.strings
@@ -32,12 +32,10 @@
 "GRh-V2-hmW.title" = "自動補全括弧和引號";
 /* Class = "NSButtonCell"; title = "Swap “¥” and “\\” keys"; ObjectID = "3303"; */
 "3303.title" = "轉換「¥」和「\\」按鍵";
-/* Class = "NSTextFieldCell"; title = "Smart"; ObjectID = "6I3-dM-2QV"; */
-"6I3-dM-2QV.title" = "智慧";
-/* Class = "NSButtonCell"; title = "Quotes"; ObjectID = "Abx-fM-gyc"; */
-"Abx-fM-gyc.title" = "引號";
-/* Class = "NSButtonCell"; title = "Dashes"; ObjectID = "nr1-0X-aBY"; */
-"nr1-0X-aBY.title" = "破折號";
+/* Class = "NSButtonCell"; title = "Smart quotes"; ObjectID = "Abx-fM-gyc"; */
+"Abx-fM-gyc.title" = "智慧型引號";
+/* Class = "NSButtonCell"; title = "Smart dashes"; ObjectID = "nr1-0X-aBY"; */
+"nr1-0X-aBY.title" = "智慧型破折號";
 /* Class = "NSButtonCell"; title = "Automatically trim trailing whitespace"; ObjectID = "noP-hx-YeQ"; */
 "noP-hx-YeQ.title" = "自動去除末尾空格";
 /* Class = "NSButtonCell"; title = "Including whitespace-only lines"; ObjectID = "Tma-Oh-F7v"; */
diff --git a/CotEditor/zh-Hant.lproj/WindowPane.strings b/CotEditor/zh-Hant.lproj/WindowPane.strings
index 0251251e94..d08c2fe564 100644
--- a/CotEditor/zh-Hant.lproj/WindowPane.strings
+++ b/CotEditor/zh-Hant.lproj/WindowPane.strings
@@ -75,14 +75,16 @@
 "SR0-Bx-Nh6.title" = "當前列";
 
 
-/* Class = "NSTextFieldCell"; title = "Window width:"; ObjectID = "JZ8-uq-7Kg"; */
-"JZ8-uq-7Kg.title" = "視窗寬度：";
+/* Class = "NSTextFieldCell"; title = "Window size:"; ObjectID = "JZ8-uq-7Kg"; */
+"JZ8-uq-7Kg.title" = "視窗大小：";
+/* Class = "NSTextFieldCell"; title = "width"; ObjectID = "IGc-EL-MXO"; */
+"IGc-EL-MXO.title" = "寬度";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "u8r-OW-Z1O"; */
-"u8r-OW-Z1O.title" = "px";
-/* Class = "NSTextFieldCell"; title = "height:"; ObjectID = "Zhk-Nt-kiD"; */
+"u8r-OW-Z1O.title" = "像素";
+/* Class = "NSTextFieldCell"; title = "height"; ObjectID = "Zhk-Nt-kiD"; */
 "Zhk-Nt-kiD.title" = "高度：";
 /* Class = "NSTextFieldCell"; title = "px"; ObjectID = "VCx-PO-Fnr"; */
-"VCx-PO-Fnr.title" = "px";
+"VCx-PO-Fnr.title" = "像素";
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Auto"; ObjectID = "hye-gP-iep"; */
 "hye-gP-iep.ibShadowedIsNilPlaceholder" = "自動";
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Auto"; ObjectID = "UXj-fO-Vee"; */