diff --git a/Source/Base.lproj/preferences.xib b/Source/Base.lproj/preferences.xib
index f189ef01..c82b4cbf 100644
--- a/Source/Base.lproj/preferences.xib
+++ b/Source/Base.lproj/preferences.xib
@@ -121,7 +121,7 @@
                             <font key="font" metaFont="system"/>
                         </buttonCell>
                         <connections>
-                            <binding destination="32" name="value" keyPath="values.EscToCleanInputBufferKey" id="atP-oI-qLL"/>
+                            <binding destination="32" name="value" keyPath="values.EscToCleanInputBuffer" id="tD5-7J-qTF"/>
                         </connections>
                     </button>
                     <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="13">
diff --git a/Source/Preferences.swift b/Source/Preferences.swift
index 14afc3c0..c8b29bb5 100644
--- a/Source/Preferences.swift
+++ b/Source/Preferences.swift
@@ -204,11 +204,11 @@ struct ComposingKeys {
 // MARK: -
 
 class Preferences: NSObject {
-    @UserDefault(key: kKeyboardLayoutPreferenceKey, defaultValue: KeyboardLayout.standard)
-    @objc static var keyboardLayout: KeyboardLayout
+    @UserDefault(key: kKeyboardLayoutPreferenceKey, defaultValue: 0)
+    @objc static var keyboardLayout: Int
 
     @objc static var keyboardLayoutName: String {
-        self.keyboardLayout.name
+        (KeyboardLayout(rawValue: self.keyboardLayout) ?? KeyboardLayout.standard).name
     }
 
     @UserDefault(key: kBasisKeyboardLayoutPreferenceKey, defaultValue: "com.apple.keylayout.US")
@@ -235,7 +235,7 @@ class Preferences: NSObject {
     @UserDefault(key: kChooseCandidateUsingSpaceKey, defaultValue: true)
     @objc static var chooseCandidateUsingSpace: Bool
 
-    @UserDefault(key: kChineseConversionEnabledKey, defaultValue: true)
+    @UserDefault(key: kChineseConversionEnabledKey, defaultValue: false)
     @objc static var chineseConversionEnabled: Bool
 
     @objc static func toggleChineseConversionEnabled() -> Bool {
@@ -243,7 +243,7 @@ class Preferences: NSObject {
         return chineseConversionEnabled
     }
 
-    @UserDefault(key: kHalfWidthPunctuationEnabledKey, defaultValue: true)
+    @UserDefault(key: kHalfWidthPunctuationEnabledKey, defaultValue: false)
     @objc static var halfWidthPunctuationEnabled: Bool
 
     @objc static func toogleHalfWidthPunctuationEnabled() -> Bool {
@@ -251,7 +251,7 @@ class Preferences: NSObject {
         return halfWidthPunctuationEnabled;
     }
 
-    @UserDefault(key: kEscToCleanInputBufferKey, defaultValue: true)
+    @UserDefault(key: kEscToCleanInputBufferKey, defaultValue: false)
     @objc static var escToCleanInputBuffer: Bool
 
     // MARK: Optional settings
diff --git a/Source/PreferencesWindowController.swift b/Source/PreferencesWindowController.swift
index 604950e0..c3c83252 100644
--- a/Source/PreferencesWindowController.swift
+++ b/Source/PreferencesWindowController.swift
@@ -125,6 +125,7 @@ import Carbon
 
         basisKeyboardLayoutButton.select(chosenItem ?? usKeyboardLayoutItem)
         selectionKeyComboBox.usesDataSource = false
+        selectionKeyComboBox.removeAllItems()
         selectionKeyComboBox.addItems(withObjectValues: [Preferences.defaultKeys, "asdfghjkl", "asdfzxcvb"])
 
         var candidateSelectionKeys = Preferences.candidateKeys ?? Preferences.defaultKeys
diff --git a/Source/zh-Hant.lproj/preferences.xib b/Source/zh-Hant.lproj/preferences.xib
index 0ea703cc..5374cd6c 100644
--- a/Source/zh-Hant.lproj/preferences.xib
+++ b/Source/zh-Hant.lproj/preferences.xib
@@ -227,7 +227,7 @@
                             <font key="font" metaFont="system"/>
                         </buttonCell>
                         <connections>
-                            <binding destination="32" name="value" keyPath="values.EscToCleanInputBufferKey" id="DyT-0S-5XE"/>
+                            <binding destination="32" name="value" keyPath="values.EscToCleanInputBuffer" id="Van-yb-Rvz"/>
                         </connections>
                     </button>
                     <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="113">