diff --git a/HeavenlyWind.Base/CollapsedIfNullExtension.cs b/HeavenlyWind.Base/CollapsedIfNullExtension.cs
index d06156a6..a60498fa 100644
--- a/HeavenlyWind.Base/CollapsedIfNullExtension.cs
+++ b/HeavenlyWind.Base/CollapsedIfNullExtension.cs
@@ -17,13 +17,13 @@ public CollapsedIfNullExtension(string rpPath)
         }
 
         public override object ProvideValue(IServiceProvider rpServiceProvider) =>
-            new Binding(r_Path) { Converter = NullToVisibilityConverter.Instance }.ProvideValue(rpServiceProvider);
+            new Binding(r_Path) { Converter = NullToVisibilityConverter.Instance, FallbackValue = EnumUtil.GetBoxed(Visibility.Collapsed) }.ProvideValue(rpServiceProvider);
 
         class NullToVisibilityConverter : IValueConverter
         {
             public static NullToVisibilityConverter Instance { get; } = new NullToVisibilityConverter();
 
-            public object Convert(object rpValue, Type rpTargetType, object rpParameter, CultureInfo rpCulture) => rpValue == null ? Visibility.Collapsed : Visibility.Visible;
+            public object Convert(object rpValue, Type rpTargetType, object rpParameter, CultureInfo rpCulture) => rpValue == null ? EnumUtil.GetBoxed(Visibility.Collapsed) : EnumUtil.GetBoxed(Visibility.Visible);
 
             public object ConvertBack(object rpValue, Type rpTargetType, object rpParameter, CultureInfo rpCulture)
             {
diff --git a/HeavenlyWind.Base/CollapsedIfZeroExtension.cs b/HeavenlyWind.Base/CollapsedIfZeroExtension.cs
index e42d3811..7c57532c 100644
--- a/HeavenlyWind.Base/CollapsedIfZeroExtension.cs
+++ b/HeavenlyWind.Base/CollapsedIfZeroExtension.cs
@@ -19,7 +19,7 @@ public CollapsedIfZeroExtension(string rpPath)
         }
 
         public override object ProvideValue(IServiceProvider rpServiceProvider) =>
-            new Binding(r_Path) { Converter = IsEqualToZeroToVisibilityConverter.Instance }.ProvideValue(rpServiceProvider);
+            new Binding(r_Path) { Converter = IsEqualToZeroToVisibilityConverter.Instance, FallbackValue = EnumUtil.GetBoxed(Visibility.Collapsed) }.ProvideValue(rpServiceProvider);
 
         class IsEqualToZeroToVisibilityConverter : IValueConverter
         {
@@ -28,9 +28,9 @@ class IsEqualToZeroToVisibilityConverter : IValueConverter
             public object Convert(object rpValue, Type rpTargetType, object rpParameter, CultureInfo rpCulture)
             {
                 if (rpValue is double)
-                    return (double)rpValue == .0 ? Visibility.Collapsed : Visibility.Visible;
+                    return (double)rpValue == .0 ? EnumUtil.GetBoxed(Visibility.Collapsed) : EnumUtil.GetBoxed(Visibility.Visible);
                 else
-                    return ConvertClass.ToInt32(rpValue) == 0 ? Visibility.Collapsed : Visibility.Visible;
+                    return ConvertClass.ToInt32(rpValue) == 0 ? EnumUtil.GetBoxed(Visibility.Collapsed) : EnumUtil.GetBoxed(Visibility.Visible);
             }
 
             public object ConvertBack(object rpValue, Type rpTargetType, object rpParameter, CultureInfo rpCulture)
diff --git a/HeavenlyWind.Base/CurrentDockExtension.cs b/HeavenlyWind.Base/CurrentDockExtension.cs
index 4f9a896c..7cca1264 100644
--- a/HeavenlyWind.Base/CurrentDockExtension.cs
+++ b/HeavenlyWind.Base/CurrentDockExtension.cs
@@ -33,8 +33,8 @@ public override object ProvideValue(IServiceProvider rpServiceProvider)
         {
             var rResult = new MultiBinding() { Mode = BindingMode.OneWay, Converter = CoreConverter.Instance };
             rResult.Bindings.Add(new Binding() { Path = new PropertyPath(MetroWindow.ScreenOrientationProperty), RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(MetroWindow), 1) });
-            rResult.Bindings.Add(new Binding("LandscapeDock.Value") { Source = Preference.Current.Layout });
-            rResult.Bindings.Add(new Binding("PortraitDock.Value") { Source = Preference.Current.Layout });
+            rResult.Bindings.Add(new Binding("LandscapeDock.Value") { Source = Preference.Instance.UI });
+            rResult.Bindings.Add(new Binding("PortraitDock.Value") { Source = Preference.Instance.UI });
             rResult.Bindings.Add(new Binding() { RelativeSource = RelativeSource.Self });
 
             if (Converter != null)
diff --git a/HeavenlyWind.Base/HeavenlyWind.Base.csproj b/HeavenlyWind.Base/HeavenlyWind.Base.csproj
index 021c380a..78ee6cb8 100644
--- a/HeavenlyWind.Base/HeavenlyWind.Base.csproj
+++ b/HeavenlyWind.Base/HeavenlyWind.Base.csproj
@@ -39,6 +39,11 @@
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.SQLite, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Core.1.0.102.0\lib\net45\System.Data.SQLite.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
       <Private>True</Private>
@@ -79,12 +84,14 @@
     <Compile Include="GameConstants.cs" />
     <Compile Include="HasFlagExtension.cs" />
     <Compile Include="IntegerRangeValidationRule.cs" />
-    <Compile Include="Internal\PreferencePropertyJsonConverter.cs" />
+    <Compile Include="Internal\OldPreference.cs" />
+    <Compile Include="Internal\OldPreferenceMappingAttribute.cs" />
     <Compile Include="LanguageInfo.cs" />
     <Compile Include="LogItem.cs" />
     <Compile Include="Logger.cs" />
     <Compile Include="LoggingLevel.cs" />
     <Compile Include="Models\CacheMode.cs" />
+    <Compile Include="Models\ConfirmationMode.cs" />
     <Compile Include="Models\FlashQuality.cs" />
     <Compile Include="Models\FlashRenderMode.cs" />
     <Compile Include="Models\FleetFighterPowerFormula.cs" />
@@ -97,7 +104,6 @@
     <Compile Include="Models\Preferences\GamePreference.cs" />
     <Compile Include="Models\Preferences\HeavyDamageLinePreference.cs" />
     <Compile Include="Models\Preferences\HeavyDamageLineWidthProperty.cs" />
-    <Compile Include="Models\Preferences\LayoutPreference.cs" />
     <Compile Include="Models\Preferences\NetworkPreference.cs" />
     <Compile Include="Models\Preferences\NotificationPreference.cs" />
     <Compile Include="Models\Preferences\OtherPreference.cs" />
@@ -146,6 +152,13 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\System.Data.SQLite.Core.1.0.102.0\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net45\System.Data.SQLite.Core.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>このプロジェクトは、このコンピューター上にない NuGet パッケージを参照しています。それらのパッケージをダウンロードするには、[NuGet パッケージの復元] を使用します。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。見つからないファイルは {0} です。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.102.0\build\net45\System.Data.SQLite.Core.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/HeavenlyWind.Base/Internal/OldPreference.cs b/HeavenlyWind.Base/Internal/OldPreference.cs
new file mode 100644
index 00000000..3c57cc32
--- /dev/null
+++ b/HeavenlyWind.Base/Internal/OldPreference.cs
@@ -0,0 +1,285 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Sakuno.KanColle.Amatsukaze.Models;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Sakuno.KanColle.Amatsukaze.Internal
+{
+    class OldPreference
+    {
+        [JsonProperty("language")]
+        [OldPreferenceMapping("main.language")]
+        public string Language { get; private set; }
+
+        [JsonProperty("language_extra")]
+        [OldPreferenceMapping("main.language_extra")]
+        public string ExtraResourceLanguage { get; private set; }
+
+        [JsonProperty("update")]
+        public UpdatePreference Update { get; private set; }
+
+        [JsonProperty("network")]
+        public NetworkPreference Network { get; private set; }
+
+        [JsonProperty("ui")]
+        public UserInterfacePreference UI { get; private set; }
+
+        [JsonProperty("game")]
+        public GamePreference Game { get; private set; }
+
+        [JsonProperty("cache")]
+        public CachePreference Cache { get; private set; }
+
+        [JsonProperty("browser")]
+        public BrowserPreference Browser { get; private set; }
+
+        [JsonProperty("notification")]
+        public NotificationPreference Notification { get; private set; }
+
+        [JsonProperty("windows")]
+        public WindowsPreference Windows { get; private set; }
+
+        [JsonProperty("layout")]
+        public LayoutPreference Layout { get; private set; } = new LayoutPreference();
+
+        [JsonProperty("other")]
+        public OtherPreference Other { get; private set; } = new OtherPreference();
+
+        public class UpdatePreference
+        {
+            [JsonProperty("notification")]
+            [OldPreferenceMapping("update.notification")]
+            public UpdateNotificationMode NotificationMode { get; private set; }
+
+            [JsonProperty("channel")]
+            [OldPreferenceMapping("update.channel")]
+            public UpdateChannel UpdateChannel { get; private set; }
+        }
+        public class NetworkPreference
+        {
+            [JsonProperty("port")]
+            [OldPreferenceMapping("network.port")]
+            public int Port { get; private set; }
+
+            [JsonProperty("allowremoterequests")]
+            [OldPreferenceMapping("network.allow_remote_requests")]
+            public bool AllowRequestsFromOtherDevices { get; private set; }
+
+            [JsonProperty("upstreamproxy")]
+            public UpstreamProxyPreference UpstreamProxy { get; private set; }
+        }
+        public class UpstreamProxyPreference
+        {
+            [JsonProperty("enabled")]
+            [OldPreferenceMapping("network.upstream_proxy.enabled")]
+            public bool Enabled { get; private set; }
+
+            [JsonProperty("host")]
+            [OldPreferenceMapping("network.upstream_proxy.host")]
+            public string Host { get; private set; }
+
+            [JsonProperty("port")]
+            [OldPreferenceMapping("network.upstream_proxy.port")]
+            public int Port { get; private set; }
+
+            [JsonProperty("http_only")]
+            [OldPreferenceMapping("network.upstream_proxy.http_only")]
+            public bool HttpOnly { get; private set; }
+        }
+        public class UserInterfacePreference
+        {
+            [JsonProperty("font")]
+            [OldPreferenceMapping("ui.font")]
+            public string Font { get; private set; }
+
+            [JsonProperty("zoom")]
+            [OldPreferenceMapping("ui.zoom")]
+            public double Zoom { get; private set; }
+
+            [JsonProperty("hd_line")]
+            public HeavyDamageLinePreference HeavyDamageLine { get; private set; }
+
+            [JsonProperty("use_game_material_icons")]
+            [OldPreferenceMapping("ui.use_game_material_icons")]
+            public bool UseGameMaterialIcons { get; private set; }
+        }
+        public class HeavyDamageLinePreference
+        {
+            [JsonProperty("color")]
+            [OldPreferenceMapping("ui.hd_line.color")]
+            public HeavyDamageLineType Type { get; private set; }
+
+            [JsonProperty("width")]
+            [OldPreferenceMapping("ui.hd_line.width")]
+            public int Width { get; private set; }
+        }
+        public class GamePreference
+        {
+            [JsonProperty("main_los_formula")]
+            [OldPreferenceMapping("game.formula.los")]
+            public FleetLoSFormula MainFleetLoSFormula { get; private set; }
+
+            [JsonProperty("main_fp_formula")]
+            [OldPreferenceMapping("game.formula.fighter_power")]
+            public FleetFighterPowerFormula MainFighterPowerFormula { get; private set; }
+
+            [JsonProperty("fatigue_ceiling")]
+            [OldPreferenceMapping("game.fatigue_ceiling")]
+            public int FatigueCeiling { get; private set; }
+
+            [JsonProperty("show_battle_info")]
+            [OldPreferenceMapping("game.sortie.show_battle_info")]
+            public bool ShowBattleInfo { get; private set; }
+
+            [JsonProperty("show_drop")]
+            [OldPreferenceMapping("game.sortie.show_drop")]
+            public bool ShowDrop { get; private set; }
+        }
+        public class CachePreference
+        {
+            [JsonProperty("mode")]
+            [OldPreferenceMapping("cache.mode")]
+            public CacheMode Mode { get; private set; }
+
+            [JsonProperty("path")]
+            [OldPreferenceMapping("cache.path")]
+            public string Path { get; private set; }
+        }
+        public class BrowserPreference
+        {
+            [JsonProperty("zoom")]
+            [OldPreferenceMapping("browser.zoom")]
+            public double Zoom { get; private set; }
+
+            [JsonProperty("homepage")]
+            [OldPreferenceMapping("browser.homepage")]
+            public string Homepage { get; private set; }
+
+            [JsonProperty("layoutengine")]
+            [OldPreferenceMapping("browser.layout_engine")]
+            public string CurrentLayoutEngine { get; private set; }
+
+            [JsonProperty("flash")]
+            public FlashPreference Flash { get; private set; }
+
+            [JsonProperty("screenshot")]
+            public ScreenshotPreference Screenshot { get; private set; }
+
+            [JsonProperty("action_bar_placement")]
+            [OldPreferenceMapping("browser.action_bar.placement")]
+            public bool ActionBarPlacement { get; private set; }
+
+            [JsonProperty("action_bar_stick_to_browser")]
+            [OldPreferenceMapping("browser.action_bar.stick_to_browser")]
+            public bool ActionBarStickToBrowser { get; private set; }
+        }
+        public class FlashPreference
+        {
+            [JsonProperty("quality")]
+            [OldPreferenceMapping("browser.flash.quality")]
+            public FlashQuality Quality { get; private set; }
+
+            [JsonProperty("rendermode")]
+            [OldPreferenceMapping("browser.flash.render_mode")]
+            public FlashRenderMode RenderMode { get; private set; }
+        }
+        public class ScreenshotPreference
+        {
+            [JsonProperty("destination")]
+            [OldPreferenceMapping("browser.screenshot.path")]
+            public string Destination { get; private set; }
+
+            [JsonProperty("filenameformat")]
+            [OldPreferenceMapping("browser.screenshot.filename_format")]
+            public string FilenameFormat { get; private set; }
+            [JsonProperty("imageformat")]
+            [OldPreferenceMapping("browser.screenshot.image_format")]
+            public ScreenshotImageFormat ImageFormat { get; private set; }
+        }
+        public class NotificationPreference
+        {
+            [JsonProperty("expedition")]
+            [OldPreferenceMapping("notification.expedition")]
+            public bool Expedition { get; private set; }
+
+            [JsonProperty("repair")]
+            [OldPreferenceMapping("notification.repair")]
+            public bool Repair { get; private set; }
+
+            [JsonProperty("construction")]
+            [OldPreferenceMapping("notification.construction")]
+            public bool Construction { get; private set; }
+
+            [JsonProperty("heavily_damaged")]
+            [OldPreferenceMapping("notification.heavy_damage")]
+            public bool HeavilyDamagedWarning { get; private set; }
+
+            [JsonProperty("recovery_from_fatigue")]
+            [OldPreferenceMapping("notification.recovery_from_fatigue")]
+            public bool RecoveryFromFatigue { get; private set; }
+
+            [JsonProperty("anchorage_repair")]
+            [OldPreferenceMapping("notification.anchorage_repair")]
+            public bool AnchorageRepair { get; private set; }
+
+            [JsonProperty("sound")]
+            [OldPreferenceMapping("notification.sound")]
+            public NotificationSound Sound { get; private set; }
+            [JsonProperty("sound_filename")]
+            [OldPreferenceMapping("notification.sound_filename")]
+            public string SoundFilename { get; private set; }
+
+            [JsonProperty("sound_hd")]
+            [OldPreferenceMapping("notification.sound_hd")]
+            public NotificationSound HeavilyDamagedWarningSound { get; private set; }
+            [JsonProperty("sound_filename_hd")]
+            [OldPreferenceMapping("notification.sound_filename_hd")]
+            public string HeavilyDamagedWarningSoundFilename { get; private set; }
+        }
+        public class WindowsPreference
+        {
+            [JsonProperty("landscape")]
+            [OldPreferenceMapping("main.windows")]
+            public JToken LandscapeArray { get; private set; }
+        }
+        public class LayoutPreference : ModelBase
+        {
+            [JsonProperty("landscape")]
+            [OldPreferenceMapping("ui.layout.lanscape")]
+            public Dock LandscapeDock { get; private set; }
+
+            [JsonProperty("portrait")]
+            [OldPreferenceMapping("ui.layout.portrait")]
+            public Dock PortraitDock { get; private set; }
+        }
+        public class OtherPreference
+        {
+            [JsonProperty("panic_key")]
+            public PanicKeyPreference PanicKey { get; private set; }
+
+            [JsonProperty("session_tool")]
+            public SessionToolPreference SessionTool { get; private set; }
+        }
+        public class PanicKeyPreference
+        {
+            [JsonProperty("enabled")]
+            [OldPreferenceMapping("other.panic_key.enabled")]
+            public bool Enabled { get; private set; }
+
+            [JsonProperty("modifier_keys")]
+            [OldPreferenceMapping("other.panic_key.modifier_keys")]
+            public int ModifierKeys { get; private set; }
+
+            [JsonProperty("key")]
+            [OldPreferenceMapping("other.panic_key.key")]
+            public int Key { get; private set; }
+        }
+        public class SessionToolPreference
+        {
+            [JsonProperty("start_recording_on_app_startup")]
+            [OldPreferenceMapping("other.session_tool.start_recording_on_app_startup")]
+            public bool StartRecordingOnAppStartup { get; private set; }
+        }
+    }
+}
diff --git a/HeavenlyWind.Base/Internal/OldPreferenceMappingAttribute.cs b/HeavenlyWind.Base/Internal/OldPreferenceMappingAttribute.cs
new file mode 100644
index 00000000..a8729c31
--- /dev/null
+++ b/HeavenlyWind.Base/Internal/OldPreferenceMappingAttribute.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace Sakuno.KanColle.Amatsukaze.Internal
+{
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
+    class OldPreferenceMappingAttribute : Attribute
+    {
+        public string Key { get; }
+
+        public OldPreferenceMappingAttribute(string rpKey)
+        {
+            Key = rpKey;
+        }
+    }
+}
diff --git a/HeavenlyWind.Base/Internal/PreferencePropertyJsonConverter.cs b/HeavenlyWind.Base/Internal/PreferencePropertyJsonConverter.cs
deleted file mode 100644
index f2b56fac..00000000
--- a/HeavenlyWind.Base/Internal/PreferencePropertyJsonConverter.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Sakuno.KanColle.Amatsukaze.Models.Preferences;
-using System;
-
-namespace Sakuno.KanColle.Amatsukaze.Internal
-{
-    class PreferencePropertyJsonConverter : JsonConverter
-    {
-        public static PreferencePropertyJsonConverter Instance { get; } = new PreferencePropertyJsonConverter();
-
-        public override bool CanConvert(Type rpObjectType) => true;
-
-        public override object ReadJson(JsonReader rpReader, Type rpObjectType, object rpExistingValue, JsonSerializer rpSerializer)
-        {
-            Property rProperty;
-            if (Property.Cache.TryGetValue(rpObjectType, out rProperty))
-            {
-                var rToken = JToken.Load(rpReader);
-                rProperty.Setter.DynamicInvoke(rpExistingValue, rToken);
-
-                return rpExistingValue;
-            }
-
-            throw new InvalidOperationException();
-        }
-
-        public override void WriteJson(JsonWriter rpWriter, object rpValue, JsonSerializer rpSerializer)
-        {
-            var rType = GetBaseType(rpValue.GetType());
-            if (rType == null)
-                throw new InvalidOperationException();
-
-            Property rProperty;
-            if (!Property.Cache.TryGetValue(rType, out rProperty))
-                return;
-
-            rpWriter.WriteValue(rProperty.Getter.DynamicInvoke(rpValue));
-        }
-        static Type GetBaseType(Type rpType)
-        {
-            while (rpType != null && rpType != typeof(object))
-            {
-                var rType = rpType.IsGenericType ? rpType.GetGenericTypeDefinition() : rpType;
-                if (rType == typeof(Property<>))
-                    return rpType;
-
-                rpType = rpType.BaseType;
-            }
-            return null;
-        }
-    }
-}
diff --git a/HeavenlyWind.Base/Logger.cs b/HeavenlyWind.Base/Logger.cs
index f4232ca9..3a9515ac 100644
--- a/HeavenlyWind.Base/Logger.cs
+++ b/HeavenlyWind.Base/Logger.cs
@@ -32,27 +32,8 @@ public class Logger
             if (!rLogDirectory.Exists)
                 rLogDirectory.Create();
 
-            var rOccupied = true;
-            var rID = 1;
-            do
-            {
-                try
-                {
-                    string rFilename;
-                    if (rID == 1)
-                        rFilename = DateTime.Now.ToString("yyyy-MM-dd") + ".log";
-                    else
-                        rFilename = $"{DateTime.Now:yyyy-MM-dd}_{rID}.log";
-
-                    r_Writer = new StreamWriter(Path.Combine(rLogDirectory.FullName, rFilename), true, new UTF8Encoding(true));
-
-                    rOccupied = false;
-                }
-                catch (IOException)
-                {
-                    rID++;
-                }
-            } while (rOccupied);
+            var rStream = File.Open(Path.Combine(rLogDirectory.FullName, DateTime.Now.ToString("yyyy-MM-dd") + ".log"), FileMode.Create, FileAccess.Write, FileShare.Write);
+            r_Writer = new StreamWriter(rStream, new UTF8Encoding(true));
 
             r_Queue = new ConcurrentQueue<LogItem>();
 
diff --git a/HeavenlyWind.Base/Models/ConfirmationMode.cs b/HeavenlyWind.Base/Models/ConfirmationMode.cs
new file mode 100644
index 00000000..2dcd401f
--- /dev/null
+++ b/HeavenlyWind.Base/Models/ConfirmationMode.cs
@@ -0,0 +1,9 @@
+namespace Sakuno.KanColle.Amatsukaze.Models
+{
+    public enum ConfirmationMode
+    {
+        Disabled,
+        DuringSortie,
+        Always,
+    }
+}
diff --git a/HeavenlyWind.Base/Models/Preferences/BrowserPreference.cs b/HeavenlyWind.Base/Models/Preferences/BrowserPreference.cs
index 82f2f1f3..4230cfe6 100644
--- a/HeavenlyWind.Base/Models/Preferences/BrowserPreference.cs
+++ b/HeavenlyWind.Base/Models/Preferences/BrowserPreference.cs
@@ -1,28 +1,21 @@
-using Newtonsoft.Json;
-
-namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
+namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
 {
     public class BrowserPreference
     {
-        [JsonProperty("zoom")]
-        public Property<double> Zoom { get; private set; } = new Property<double>(1.0);
+        public Property<double> Zoom { get; } = new Property<double>("browser.zoom", 1.0);
+
+        public Property<string> Homepage { get; } = new Property<string>("browser.homepage", "http://www.dmm.com/netgame/social/application/-/detail/=/app_id=854854/");
 
-        [JsonProperty("homepage")]
-        public Property<string> Homepage { get; private set; } = new Property<string>("http://www.dmm.com/netgame/social/application/-/detail/=/app_id=854854/");
+        public Property<string> CurrentLayoutEngine { get; } = new Property<string>("browser.layout_engine", "trident");
 
-        [JsonProperty("layoutengine")]
-        public Property<string> CurrentLayoutEngine { get; private set; } = new Property<string>("trident");
+        public FlashPreference Flash { get; } = new FlashPreference();
 
-        [JsonProperty("flash")]
-        public FlashPreference Flash { get; private set; } = new FlashPreference();
+        public ScreenshotPreference Screenshot { get; } = new ScreenshotPreference();
 
-        [JsonProperty("screenshot")]
-        public ScreenshotPreference Screenshot { get; private set; } = new ScreenshotPreference();
+        public Property<bool> ActionBarPlacement { get; } = new Property<bool>("browser.action_bar.placement");
 
-        [JsonProperty("action_bar_placement")]
-        public Property<bool> ActionBarPlacement { get; private set; } = new Property<bool>();
+        public Property<bool> ActionBarStickToBrowser { get; } = new Property<bool>("browser.action_bar.stick_to_browser");
 
-        [JsonProperty("action_bar_stick_to_browser")]
-        public Property<bool> ActionBarStickToBrowser { get; private set; } = new Property<bool>();
+        public Property<ConfirmationMode> RefreshConfirmationMode { get; } = new Property<ConfirmationMode>("browser.refresh_confirmation", ConfirmationMode.DuringSortie);
     }
 }
diff --git a/HeavenlyWind.Base/Models/Preferences/CachePreference.cs b/HeavenlyWind.Base/Models/Preferences/CachePreference.cs
index 6fdf4b39..1d599171 100644
--- a/HeavenlyWind.Base/Models/Preferences/CachePreference.cs
+++ b/HeavenlyWind.Base/Models/Preferences/CachePreference.cs
@@ -1,24 +1,9 @@
-using Newtonsoft.Json;
-using System.IO;
-using System.Linq;
-
-namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
+namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
 {
     public class CachePreference
     {
-        [JsonProperty("mode")]
-        public Property<CacheMode> Mode { get; private set; } = new Property<CacheMode>();
-
-        [JsonProperty("path")]
-        public Property<string> Path { get; private set; } = new Property<string>("Cache");
+        public Property<CacheMode> Mode { get; } = new Property<CacheMode>("cache.mode");
 
-        public CachePreference()
-        {
-            var rDirectory = new DirectoryInfo(Path);
-            if (rDirectory.Exists && rDirectory.EnumerateFiles("*.swf", SearchOption.AllDirectories).Any())
-                Mode.Value = CacheMode.FullTrust;
-            else
-                Mode.Value = CacheMode.Disabled;
-        }
+        public Property<string> Path { get; } = new Property<string>("cache.path", "Cache");
     }
 }
diff --git a/HeavenlyWind.Base/Models/Preferences/FlashPreference.cs b/HeavenlyWind.Base/Models/Preferences/FlashPreference.cs
index d939adcb..1c32ab63 100644
--- a/HeavenlyWind.Base/Models/Preferences/FlashPreference.cs
+++ b/HeavenlyWind.Base/Models/Preferences/FlashPreference.cs
@@ -1,13 +1,9 @@
-using Newtonsoft.Json;
-
-namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
+namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
 {
     public class FlashPreference
     {
-        [JsonProperty("quality")]
-        public Property<FlashQuality> Quality { get; private set; } = new Property<FlashQuality>(FlashQuality.Default);
+        public Property<FlashQuality> Quality { get; } = new Property<FlashQuality>("browser.flash.quality", FlashQuality.Default);
 
-        [JsonProperty("rendermode")]
-        public Property<FlashRenderMode> RenderMode { get; private set; } = new Property<FlashRenderMode>(FlashRenderMode.Default);
+        public Property<FlashRenderMode> RenderMode { get; } = new Property<FlashRenderMode>("browser.flash.render_mode", FlashRenderMode.Default);
     }
 }
diff --git a/HeavenlyWind.Base/Models/Preferences/GamePreference.cs b/HeavenlyWind.Base/Models/Preferences/GamePreference.cs
index 2e9e63cd..755d7472 100644
--- a/HeavenlyWind.Base/Models/Preferences/GamePreference.cs
+++ b/HeavenlyWind.Base/Models/Preferences/GamePreference.cs
@@ -1,22 +1,18 @@
-using Newtonsoft.Json;
-
-namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
+namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
 {
     public class GamePreference
     {
-        [JsonProperty("main_los_formula")]
-        public Property<FleetLoSFormula> MainFleetLoSFormula { get; private set; } = new Property<FleetLoSFormula>(FleetLoSFormula.Formula33);
+        public Property<FleetLoSFormula> MainFleetLoSFormula { get; } = new Property<FleetLoSFormula>("game.formula.los", FleetLoSFormula.Formula33);
+
+        public Property<FleetFighterPowerFormula> MainFighterPowerFormula { get; } = new Property<FleetFighterPowerFormula>("game.formula.fighter_power", FleetFighterPowerFormula.WithBonus);
 
-        [JsonProperty("main_fp_formula")]
-        public Property<FleetFighterPowerFormula> MainFighterPowerFormula { get; private set; } = new Property<FleetFighterPowerFormula>(FleetFighterPowerFormula.WithBonus);
+        public Property<int> FatigueCeiling { get; } = new Property<int>("game.fatigue_ceiling", 40);
 
-        [JsonProperty("fatigue_ceiling")]
-        public Property<int> FatigueCeiling { get; private set; } = new Property<int>(40);
+        public Property<bool> ShowBattleInfo { get; } = new Property<bool>("game.sortie.show_battle_info", true);
 
-        [JsonProperty("show_battle_info")]
-        public Property<bool> ShowBattleInfo { get; private set; } = new Property<bool>(true);
+        public Property<bool> ShowDrop { get; } = new Property<bool>("game.sortie.show_drop", true);
 
-        [JsonProperty("show_drop")]
-        public Property<bool> ShowDrop { get; private set; } = new Property<bool>(true);
+        public Property<int[]> SelectedShipTypes { get; } = new Property<int[]>("game.overview.ship_types");
+        public Property<int[]> SelectedEquipmentTypes { get; } = new Property<int[]>("game.overview.equipment_types");
     }
 }
diff --git a/HeavenlyWind.Base/Models/Preferences/HeavyDamageLinePreference.cs b/HeavenlyWind.Base/Models/Preferences/HeavyDamageLinePreference.cs
index 36942e82..df072cc8 100644
--- a/HeavenlyWind.Base/Models/Preferences/HeavyDamageLinePreference.cs
+++ b/HeavenlyWind.Base/Models/Preferences/HeavyDamageLinePreference.cs
@@ -1,13 +1,9 @@
-using Newtonsoft.Json;
-
-namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
+namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
 {
     public class HeavyDamageLinePreference
     {
-        [JsonProperty("color")]
-        public Property<HeavyDamageLineType> Type { get; private set; } = new Property<HeavyDamageLineType>(HeavyDamageLineType.Default);
+        public Property<HeavyDamageLineType> Type { get; } = new Property<HeavyDamageLineType>("ui.hd_line.color", HeavyDamageLineType.Default);
 
-        [JsonProperty("width")]
-        public Property<int> Width { get; private set; } = new HeavyDamageLineWidthProperty();
+        public Property<int> Width { get; } = new HeavyDamageLineWidthProperty();
     }
 }
diff --git a/HeavenlyWind.Base/Models/Preferences/HeavyDamageLineWidthProperty.cs b/HeavenlyWind.Base/Models/Preferences/HeavyDamageLineWidthProperty.cs
index fd03b522..f1e70e95 100644
--- a/HeavenlyWind.Base/Models/Preferences/HeavyDamageLineWidthProperty.cs
+++ b/HeavenlyWind.Base/Models/Preferences/HeavyDamageLineWidthProperty.cs
@@ -2,7 +2,7 @@
 {
     class HeavyDamageLineWidthProperty : Property<int>
     {
-        public HeavyDamageLineWidthProperty() : base(3) { }
+        public HeavyDamageLineWidthProperty() : base("ui.hd_line.width", 3) { }
 
         public override void SetDirectly(int rpValue) => base.SetDirectly(rpValue.Clamp(0, 22));
     }
diff --git a/HeavenlyWind.Base/Models/Preferences/LayoutPreference.cs b/HeavenlyWind.Base/Models/Preferences/LayoutPreference.cs
deleted file mode 100644
index c3120df0..00000000
--- a/HeavenlyWind.Base/Models/Preferences/LayoutPreference.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Newtonsoft.Json;
-using System.Windows.Controls;
-
-namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
-{
-    public class LayoutPreference : ModelBase
-    {
-        [JsonProperty("landscape")]
-        public Property<Dock> LandscapeDock { get; private set; } = new Property<Dock>(Dock.Left);
-
-        [JsonProperty("portrait")]
-        public Property<Dock> PortraitDock { get; private set; } = new Property<Dock>(Dock.Top);
-    }
-}
diff --git a/HeavenlyWind.Base/Models/Preferences/NetworkPreference.cs b/HeavenlyWind.Base/Models/Preferences/NetworkPreference.cs
index 52b9e02b..0b1017c6 100644
--- a/HeavenlyWind.Base/Models/Preferences/NetworkPreference.cs
+++ b/HeavenlyWind.Base/Models/Preferences/NetworkPreference.cs
@@ -1,19 +1,11 @@
-using Newtonsoft.Json;
-
-namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
+namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
 {
     public class NetworkPreference
     {
-        [JsonProperty("port")]
-        public Property<int> Port { get; private set; } = new Property<int>(15820);
-
-        [JsonProperty("enableforssl")]
-        public Property<bool> EnableForSSL { get; private set; } = new Property<bool>();
+        public Property<int> Port { get; } = new Property<int>("network.port", 15820);
 
-        [JsonProperty("allowremoterequests")]
-        public Property<bool> AllowRequestsFromOtherDevices { get; private set; } = new Property<bool>();
+        public Property<bool> AllowRequestsFromOtherDevices { get; } = new Property<bool>("network.allow_remote_requests");
 
-        [JsonProperty("upstreamproxy")]
-        public UpstreamProxyPreference UpstreamProxy { get; private set; } = new UpstreamProxyPreference();
+        public UpstreamProxyPreference UpstreamProxy { get; } = new UpstreamProxyPreference();
     }
 }
diff --git a/HeavenlyWind.Base/Models/Preferences/NotificationPreference.cs b/HeavenlyWind.Base/Models/Preferences/NotificationPreference.cs
index 22b04db1..fada8e18 100644
--- a/HeavenlyWind.Base/Models/Preferences/NotificationPreference.cs
+++ b/HeavenlyWind.Base/Models/Preferences/NotificationPreference.cs
@@ -1,35 +1,23 @@
-using Newtonsoft.Json;
-
-namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
+namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
 {
     public class NotificationPreference
     {
-        [JsonProperty("expedition")]
-        public Property<bool> Expedition { get; private set; } = new Property<bool>(true);
+        public Property<bool> Expedition { get; } = new Property<bool>("notification.expedition", true);
 
-        [JsonProperty("repair")]
-        public Property<bool> Repair { get; private set; } = new Property<bool>(true);
+        public Property<bool> Repair { get; } = new Property<bool>("notification.repair", true);
 
-        [JsonProperty("construction")]
-        public Property<bool> Construction { get; private set; } = new Property<bool>(true);
+        public Property<bool> Construction { get; } = new Property<bool>("notification.construction", true);
 
-        [JsonProperty("heavily_damaged")]
-        public Property<bool> HeavilyDamagedWarning { get; private set; } = new Property<bool>(true);
+        public Property<bool> HeavyDamageWarning { get; } = new Property<bool>("notification.heavy_damage", true);
 
-        [JsonProperty("recovery_from_fatigue")]
-        public Property<bool> RecoveryFromFatigue { get; private set; } = new Property<bool>(true);
+        public Property<bool> RecoveryFromFatigue { get; } = new Property<bool>("notification.recovery_from_fatigue", true);
 
-        [JsonProperty("anchorage_repair")]
-        public Property<bool> AnchorageRepair { get; private set; } = new Property<bool>(true);
+        public Property<bool> AnchorageRepair { get; } = new Property<bool>("notification.anchorage_repair", true);
 
-        [JsonProperty("sound")]
-        public Property<NotificationSound> Sound { get; private set; } = new Property<NotificationSound>(NotificationSound.SystemSound);
-        [JsonProperty("sound_filename")]
-        public Property<string> SoundFilename { get; private set; } = new Property<string>();
+        public Property<NotificationSound> Sound { get; } = new Property<NotificationSound>("notification.sound", NotificationSound.SystemSound);
+        public Property<string> SoundFilename { get; } = new Property<string>("notification.sound_filename");
 
-        [JsonProperty("sound_hd")]
-        public Property<NotificationSound> HeavilyDamagedWarningSound { get; private set; } = new Property<NotificationSound>(NotificationSound.SystemSound);
-        [JsonProperty("sound_filename_hd")]
-        public Property<string> HeavilyDamagedWarningSoundFilename { get; private set; } = new Property<string>();
+        public Property<NotificationSound> HeavyDamageWarningSound { get; } = new Property<NotificationSound>("notification.sound_hd", NotificationSound.SystemSound);
+        public Property<string> HeavyDamageWarningSoundFilename { get; } = new Property<string>("notification.sound_filename_hd");
     }
 }
diff --git a/HeavenlyWind.Base/Models/Preferences/OtherPreference.cs b/HeavenlyWind.Base/Models/Preferences/OtherPreference.cs
index 2d6d7434..377bcefb 100644
--- a/HeavenlyWind.Base/Models/Preferences/OtherPreference.cs
+++ b/HeavenlyWind.Base/Models/Preferences/OtherPreference.cs
@@ -1,13 +1,9 @@
-using Newtonsoft.Json;
-
-namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
+namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
 {
     public class OtherPreference
     {
-        [JsonProperty("panic_key")]
-        public PanicKeyPreference PanicKey { get; private set; } = new PanicKeyPreference();
+        public PanicKeyPreference PanicKey { get; } = new PanicKeyPreference();
 
-        [JsonProperty("session_tool")]
-        public SessionToolPreference SessionTool { get; private set; } = new SessionToolPreference();
+        public SessionToolPreference SessionTool { get; } = new SessionToolPreference();
     }
 }
diff --git a/HeavenlyWind.Base/Models/Preferences/PanicKeyPreference.cs b/HeavenlyWind.Base/Models/Preferences/PanicKeyPreference.cs
index 9d45ec21..63a7505e 100644
--- a/HeavenlyWind.Base/Models/Preferences/PanicKeyPreference.cs
+++ b/HeavenlyWind.Base/Models/Preferences/PanicKeyPreference.cs
@@ -1,17 +1,12 @@
-using Newtonsoft.Json;
-
-namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
+namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
 {
     public class PanicKeyPreference
     {
-        [JsonProperty("enabled")]
-        public Property<bool> Enabled { get; private set; } = new Property<bool>();
+        public Property<bool> Enabled { get; } = new Property<bool>("other.panic_key.enabled");
 
-        [JsonProperty("modifier_keys")]
-        public Property<int> ModifierKeys { get; private set; } = new Property<int>();
+        public Property<int> ModifierKeys { get; } = new Property<int>("other.panic_key.modifier_keys");
 
-        [JsonProperty("key")]
-        public Property<int> Key { get; private set; } = new Property<int>();
+        public Property<int> Key { get; } = new Property<int>("other.panic_key.key");
 
         public void UpdateKey(int rpModiferKeys, int rpKey)
         {
diff --git a/HeavenlyWind.Base/Models/Preferences/Property.cs b/HeavenlyWind.Base/Models/Preferences/Property.cs
index 1c92058b..aab36a6b 100644
--- a/HeavenlyWind.Base/Models/Preferences/Property.cs
+++ b/HeavenlyWind.Base/Models/Preferences/Property.cs
@@ -1,19 +1,27 @@
 using System;
-using System.Collections.Concurrent;
+using System.Collections.Generic;
 
 namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
 {
-    class Property
+    public abstract class Property : ModelBase
     {
-        public static readonly ConcurrentDictionary<Type, Property> Cache = new ConcurrentDictionary<Type, Property>();
+        internal static Dictionary<string, Property> Instances { get; } = new Dictionary<string, Property>(StringComparer.OrdinalIgnoreCase);
 
-        public Delegate Getter { get; }
-        public Delegate Setter { get; }
+        public string Key { get; }
 
-        public Property(Delegate rpGetter, Delegate rpSetter)
+        public event Action Reloaded;
+
+        internal Property(string rpKey)
         {
-            Getter = rpGetter;
-            Setter = rpSetter;
+            Key = rpKey;
         }
+
+        internal abstract void Reload(object rpValue);
+
+        public abstract void Save();
+
+        internal abstract void SetValue(object rpValue);
+
+        protected void OnPropertyReloaded() => Reloaded?.Invoke();
     }
 }
diff --git a/HeavenlyWind.Base/Models/Preferences/Property`T.cs b/HeavenlyWind.Base/Models/Preferences/Property`T.cs
index 9f2aa5c9..2106124f 100644
--- a/HeavenlyWind.Base/Models/Preferences/Property`T.cs
+++ b/HeavenlyWind.Base/Models/Preferences/Property`T.cs
@@ -1,15 +1,11 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Sakuno.KanColle.Amatsukaze.Internal;
 using System;
 using System.Collections.Generic;
-using System.Linq.Expressions;
 using System.Threading;
 
 namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
 {
-    [JsonConverter(typeof(PreferencePropertyJsonConverter))]
-    public class Property<T> : ModelBase
+    public class Property<T> : Property
     {
         public T Default { get; }
 
@@ -31,51 +27,22 @@ public T Value
 
         public event EventHandler<PropertyValueChangedEventArgs<T>> ValueChanged = delegate { };
 
-        static Property()
-        {
-            var rType = typeof(Property<T>);
-            var rValueType = rType.GetGenericArguments()[0];
-            switch (Type.GetTypeCode(rValueType))
-            {
-                case TypeCode.Empty:
-                case TypeCode.Object:
-                case TypeCode.DBNull:
-                    throw new ArgumentException(rValueType.FullName);
-            }
-
-            var rValueProperty = rType.GetProperty(nameof(Value));
-
-            var rPropertyParameter = Expression.Parameter(typeof(object), "rpProperty");
-            var rConvertToPropertyType = Expression.Convert(rPropertyParameter, rType);
-
-            var rGetter = Expression.Lambda(Expression.Call(rConvertToPropertyType, rValueProperty.GetMethod), rPropertyParameter).Compile();
-
-            var rTokenParameter = Expression.Parameter(typeof(JToken), "rpToken");
-
-            UnaryExpression rConvertToValueType;
-            if (!rValueType.IsEnum)
-                rConvertToValueType = Expression.Convert(rTokenParameter, rValueType);
-            else
-            {
-                var rConvertToUnderlyingType = Expression.Convert(rTokenParameter, rValueType.GetEnumUnderlyingType());
-                rConvertToValueType = Expression.Convert(rConvertToUnderlyingType, rValueType);
-            }
-
-            var rSetter = Expression.Lambda(Expression.Call(rConvertToPropertyType, rValueProperty.SetMethod, rConvertToValueType), rPropertyParameter, rTokenParameter).Compile();
-
-            Property.Cache.TryAdd(rType, new Property(rGetter, rSetter));
-        }
-        public Property() { }
-        public Property(T rpDefaultValue)
+        public Property(string rpKey) : this(rpKey, default(T)) { }
+        public Property(string rpKey, T rpDefaultValue) : base(rpKey)
         {
             Default = r_Value = rpDefaultValue;
+
+            Instances.Add(rpKey, this);
         }
 
         public virtual void SetDirectly(T rpValue)
         {
             r_OldValue = r_Value;
             r_Value = rpValue;
+
+            Save();
         }
+
         public void NotifyUpdate()
         {
             IsModified = !EqualityComparer<T>.Default.Equals(Default, r_Value);
@@ -87,6 +54,66 @@ public void NotifyUpdate()
             r_OldValue = default(T);
         }
 
+        internal override void Reload(object rpValue)
+        {
+            switch (Type.GetTypeCode(typeof(T)))
+            {
+                case TypeCode.Object:
+                    r_Value = JsonConvert.DeserializeObject<T>((string)rpValue);
+                    break;
+
+                case TypeCode.Boolean:
+                    r_Value = (T)(object)Convert.ToBoolean(rpValue);
+                    break;
+
+                case TypeCode.Int16:
+                    r_Value = (T)(object)Convert.ToInt16(rpValue);
+                    break;
+                case TypeCode.UInt16:
+                    r_Value = (T)(object)Convert.ToUInt16(rpValue);
+                    break;
+
+                case TypeCode.Int32:
+                    r_Value = (T)(object)Convert.ToInt32(rpValue);
+                    break;
+                case TypeCode.UInt32:
+                    r_Value = (T)(object)Convert.ToUInt32(rpValue);
+                    break;
+
+                case TypeCode.String:
+                    r_Value = rpValue != DBNull.Value ? (T)rpValue : (T)(object)string.Empty;
+                    break;
+
+                default:
+                    r_Value = (T)rpValue;
+                    break;
+            }
+
+            OnPropertyReloaded();
+        }
+
+        public override void Save()
+        {
+            using (var rCommand = Preference.Instance.Connection.CreateCommand())
+            {
+                rCommand.CommandText = "INSERT OR REPLACE INTO preference(key, value) VALUES(@key, @value);";
+                rCommand.Parameters.AddWithValue("@key", Key);
+
+                object rValue;
+
+                if (Type.GetTypeCode(typeof(T)) != TypeCode.Object)
+                    rValue = r_Value;
+                else
+                    rValue = JsonConvert.SerializeObject(r_Value);
+
+                rCommand.Parameters.AddWithValue("@value", rValue);
+
+                rCommand.ExecuteNonQuery();
+            }
+        }
+
+        internal override void SetValue(object rpValue) => SetDirectly((T)rpValue);
+
         public IDisposable Subscribe(Action<T> rpAction) => Subscribe(rpAction, false);
         public IDisposable Subscribe(Action<T> rpAction, bool rpInvokeFirst)
         {
diff --git a/HeavenlyWind.Base/Models/Preferences/ScreenshotPreference.cs b/HeavenlyWind.Base/Models/Preferences/ScreenshotPreference.cs
index 29e82725..a9b4ed3c 100644
--- a/HeavenlyWind.Base/Models/Preferences/ScreenshotPreference.cs
+++ b/HeavenlyWind.Base/Models/Preferences/ScreenshotPreference.cs
@@ -1,14 +1,9 @@
-using Newtonsoft.Json;
-
-namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
+namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
 {
     public class ScreenshotPreference
     {
-        [JsonProperty("destination")]
-        public Property<string> Destination { get; private set; } = new Property<string>("Screenshot");
-        [JsonProperty("filenameformat")]
-        public Property<string> FilenameFormat { get; private set; } = new Property<string>("ing_{0:yyyyMMdd-HHmmss-ff}.{1}");
-        [JsonProperty("imageformat")]
-        public Property<ScreenshotImageFormat> ImageFormat { get; private set; } = new Property<ScreenshotImageFormat>(ScreenshotImageFormat.Png);
+        public Property<string> Path { get; } = new Property<string>("browser.screenshot.path", "Screenshot");
+        public Property<string> FilenameFormat { get; } = new Property<string>("browser.screenshot.filename_format", "ing_{0:yyyyMMdd-HHmmss-ff}.{1}");
+        public Property<ScreenshotImageFormat> ImageFormat { get; } = new Property<ScreenshotImageFormat>("browser.screenshot.image_format", ScreenshotImageFormat.Png);
     }
 }
diff --git a/HeavenlyWind.Base/Models/Preferences/SessionToolPreference.cs b/HeavenlyWind.Base/Models/Preferences/SessionToolPreference.cs
index 6f0324e7..adc5b210 100644
--- a/HeavenlyWind.Base/Models/Preferences/SessionToolPreference.cs
+++ b/HeavenlyWind.Base/Models/Preferences/SessionToolPreference.cs
@@ -1,10 +1,7 @@
-using Newtonsoft.Json;
-
-namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
+namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
 {
     public class SessionToolPreference
     {
-        [JsonProperty("start_recording_on_app_startup")]
-        public Property<bool> StartRecordingOnAppStartup { get; private set; } = new Property<bool>();
+        public Property<bool> StartRecordingOnAppStartup { get; } = new Property<bool>("other.session_tool.start_recording_on_app_startup");
     }
 }
diff --git a/HeavenlyWind.Base/Models/Preferences/UIFontProperty.cs b/HeavenlyWind.Base/Models/Preferences/UIFontProperty.cs
index 99be6711..7912ef66 100644
--- a/HeavenlyWind.Base/Models/Preferences/UIFontProperty.cs
+++ b/HeavenlyWind.Base/Models/Preferences/UIFontProperty.cs
@@ -5,7 +5,8 @@ namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
 {
     class UIFontProperty : Property<string>
     {
-        public UIFontProperty() : base(GetDefaultFont()) { }
+        public UIFontProperty() : base("ui.font", GetDefaultFont()) { }
+
         static string GetDefaultFont()
         {
             var rCultures = StringResources.GetAncestorsAndSelfCultureNames(CultureInfo.CurrentCulture).ToArray();
diff --git a/HeavenlyWind.Base/Models/Preferences/UpdatePreference.cs b/HeavenlyWind.Base/Models/Preferences/UpdatePreference.cs
index 64399bd9..d17088d5 100644
--- a/HeavenlyWind.Base/Models/Preferences/UpdatePreference.cs
+++ b/HeavenlyWind.Base/Models/Preferences/UpdatePreference.cs
@@ -1,15 +1,11 @@
-using Newtonsoft.Json;
-
-namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
+namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
 {
     using UpdateChannelEnum = UpdateChannel;
 
     public class UpdatePreference
     {
-        [JsonProperty("notification")]
-        public Property<UpdateNotificationMode> NotificationMode { get; private set; } = new Property<UpdateNotificationMode>(UpdateNotificationMode.AlwaysShow);
+        public Property<UpdateNotificationMode> NotificationMode { get; } = new Property<UpdateNotificationMode>("update.notification", UpdateNotificationMode.AlwaysShow);
 
-        [JsonProperty("channel")]
-        public Property<UpdateChannel> UpdateChannel { get; private set; } = new Property<UpdateChannel>(UpdateChannelEnum.Release);
+        public Property<UpdateChannel> UpdateChannel { get; } = new Property<UpdateChannel>("update.channel", UpdateChannelEnum.Release);
     }
 }
diff --git a/HeavenlyWind.Base/Models/Preferences/UpstreamProxyPreference.cs b/HeavenlyWind.Base/Models/Preferences/UpstreamProxyPreference.cs
index 39aea06b..6515b29f 100644
--- a/HeavenlyWind.Base/Models/Preferences/UpstreamProxyPreference.cs
+++ b/HeavenlyWind.Base/Models/Preferences/UpstreamProxyPreference.cs
@@ -1,19 +1,13 @@
-using Newtonsoft.Json;
-
-namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
+namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
 {
     public class UpstreamProxyPreference
     {
-        [JsonProperty("enabled")]
-        public Property<bool> Enabled { get; private set; } = new Property<bool>();
+        public Property<bool> Enabled { get; } = new Property<bool>("network.upstream_proxy.enabled");
 
-        [JsonProperty("host")]
-        public Property<string> Host { get; private set; } = new Property<string>("127.0.0.1");
+        public Property<string> Host { get; } = new Property<string>("network.upstream_proxy.host", "127.0.0.1");
 
-        [JsonProperty("port")]
-        public Property<int> Port { get; private set; } = new Property<int>();
+        public Property<int> Port { get; } = new Property<int>("network.upstream_proxy.port");
 
-        [JsonProperty("http_only")]
-        public Property<bool> HttpOnly { get; private set; } = new Property<bool>();
+        public Property<bool> HttpOnly { get; } = new Property<bool>("network.upstream_proxy.http_only");
     }
 }
diff --git a/HeavenlyWind.Base/Models/Preferences/UserInterfacePreference.cs b/HeavenlyWind.Base/Models/Preferences/UserInterfacePreference.cs
index 0ce8943b..33fe349f 100644
--- a/HeavenlyWind.Base/Models/Preferences/UserInterfacePreference.cs
+++ b/HeavenlyWind.Base/Models/Preferences/UserInterfacePreference.cs
@@ -1,19 +1,20 @@
-using Newtonsoft.Json;
+using System.Windows.Controls;
 
 namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
 {
     public class UserInterfacePreference
     {
-        [JsonProperty("font")]
-        public Property<string> Font { get; private set; } = new UIFontProperty();
+        public Property<string> Font { get; } = new UIFontProperty();
 
-        [JsonProperty("zoom")]
-        public Property<double> Zoom { get; private set; } = new Property<double>(1.0);
+        public Property<ConfirmationMode> CloseConfirmationMode { get; } = new Property<ConfirmationMode>("ui.close_confirmation", ConfirmationMode.DuringSortie);
 
-        [JsonProperty("hd_line")]
-        public HeavyDamageLinePreference HeavyDamageLine { get; private set; } = new HeavyDamageLinePreference();
+        public Property<Dock> LandscapeDock { get; } = new Property<Dock>("ui.layout.lanscape", Dock.Left);
+        public Property<Dock> PortraitDock { get; } = new Property<Dock>("ui.layout.portrait", Dock.Top);
 
-        [JsonProperty("use_game_material_icons")]
-        public Property<bool> UseGameMaterialIcons { get; private set; } = new Property<bool>();
+        public Property<double> Zoom { get; } = new Property<double>("ui.zoom", 1.0);
+
+        public HeavyDamageLinePreference HeavyDamageLine { get; } = new HeavyDamageLinePreference();
+
+        public Property<bool> UseGameMaterialIcons { get; } = new Property<bool>("ui.use_game_material_icons");
     }
 }
diff --git a/HeavenlyWind.Base/Models/Preferences/WindowsPreference.cs b/HeavenlyWind.Base/Models/Preferences/WindowsPreference.cs
index acc7fa1f..2f8c9649 100644
--- a/HeavenlyWind.Base/Models/Preferences/WindowsPreference.cs
+++ b/HeavenlyWind.Base/Models/Preferences/WindowsPreference.cs
@@ -1,69 +1,36 @@
-using Newtonsoft.Json;
-using Sakuno.Collections;
+using Sakuno.Collections;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 
 namespace Sakuno.KanColle.Amatsukaze.Models.Preferences
 {
     public class WindowsPreference
     {
-        ListDictionary<string, WindowPreference> r_Landscape;
-        [JsonIgnore]
-        public IDictionary<string, WindowPreference> Landscape
-        {
-            get
-            {
-                if (r_Landscape == null)
-                    r_Landscape = new ListDictionary<string, WindowPreference>(StringComparer.OrdinalIgnoreCase);
-                return r_Landscape;
-            }
-        }
-        [JsonProperty("landscape")]
-        public WindowPreference[] LandscapeArray
+        Property<WindowPreference[]> Placements { get; } = new Property<WindowPreference[]>("main.windows");
+
+        ListDictionary<string, WindowPreference> r_Placements = new ListDictionary<string, WindowPreference>(StringComparer.OrdinalIgnoreCase);
+
+        internal WindowsPreference()
         {
-            get { return r_Landscape?.Values.ToArray(); }
-            set
+            Placements.Reloaded += delegate
             {
-                if (value == null || value.Length == 0)
-                    r_Landscape = null;
-                else
-                {
-                    r_Landscape = new ListDictionary<string, WindowPreference>();
-
-                    foreach (var rPreference in value)
-                        r_Landscape.Add(rPreference.Name, rPreference);
-                }
-            }
+                if (Placements.Value != null)
+                    foreach (var rPlacement in Placements.Value)
+                        r_Placements.Add(rPlacement.Name, rPlacement);
+            };
         }
 
-        ListDictionary<string, WindowPreference> r_Portrait;
-        [JsonIgnore]
-        public IDictionary<string, WindowPreference> Portrait
+        public WindowPreference LoadPlacement(string rpName)
         {
-            get
-            {
-                if (r_Portrait == null)
-                    r_Portrait = new ListDictionary<string, WindowPreference>(StringComparer.OrdinalIgnoreCase);
-                return r_Portrait;
-            }
+            WindowPreference rResult;
+            r_Placements.TryGetValue(rpName, out rResult);
+            return rResult;
         }
-        [JsonProperty("portrait")]
-        public WindowPreference[] PortraitArray
+        public void SavePlacement(WindowPreference rpPlacement)
         {
-            get { return r_Portrait?.Values.ToArray(); }
-            set
-            {
-                if (value == null || value.Length == 0)
-                    r_Portrait = null;
-                else
-                {
-                    r_Portrait = new ListDictionary<string, WindowPreference>();
+            r_Placements[rpPlacement.Name] = rpPlacement;
 
-                    foreach (var rPreference in value)
-                        r_Portrait.Add(rPreference.Name, rPreference);
-                }
-            }
+            Placements.Value = r_Placements.Values.ToArray();
         }
     }
 }
diff --git a/HeavenlyWind.Base/Preference.Data.cs b/HeavenlyWind.Base/Preference.Data.cs
index 8af34a0c..f4499837 100644
--- a/HeavenlyWind.Base/Preference.Data.cs
+++ b/HeavenlyWind.Base/Preference.Data.cs
@@ -1,56 +1,31 @@
-using Newtonsoft.Json;
-using Sakuno.KanColle.Amatsukaze.Models.Preferences;
+using Sakuno.KanColle.Amatsukaze.Models.Preferences;
 
 namespace Sakuno.KanColle.Amatsukaze
 {
     partial class Preference
     {
+        public Property<string> Language { get; } = new Property<string>("main.language", StringResources.Instance.GetDefaultLanguage().Directory);
 
-        [JsonProperty("version")]
-        public string Version { get; } = ProductInfo.AssemblyVersionString;
+        public Property<string> ExtraResourceLanguage { get; private set; } = new Property<string>("main.language_extra", StringResources.Instance.GetDefaultLanguage().Directory);
 
-        [JsonProperty("language")]
-        public Property<string> Language { get; private set; } = new Property<string>(StringResources.Instance.GetDefaultLanguage().Directory);
+        public Property<bool> FirstRun { get; } = new Property<bool>("main.first_run", true);
 
-        [JsonProperty("language_extra")]
-        public Property<string> ExtraResourceLanguage { get; private set; } = new Property<string>(StringResources.Instance.GetDefaultLanguage().Directory);
+        public UpdatePreference Update { get; } = new UpdatePreference();
 
-        [JsonProperty("firstrun")]
-        public bool FirstRun { get; set; } = true;
+        public NetworkPreference Network { get; } = new NetworkPreference();
 
-        [JsonProperty("update")]
-        public UpdatePreference Update { get; private set; } = new UpdatePreference();
+        public UserInterfacePreference UI { get; } = new UserInterfacePreference();
 
-        [JsonProperty("network")]
-        public NetworkPreference Network { get; private set; } = new NetworkPreference();
+        public GamePreference Game { get; } = new GamePreference();
 
-        [JsonProperty("ui")]
-        public UserInterfacePreference UI { get; private set; } = new UserInterfacePreference();
+        public CachePreference Cache { get; } = new CachePreference();
 
-        [JsonProperty("game")]
-        public GamePreference Game { get; private set; } = new GamePreference();
+        public BrowserPreference Browser { get; } = new BrowserPreference();
 
-        [JsonProperty("cache")]
-        public CachePreference Cache { get; private set; } = new CachePreference();
+        public NotificationPreference Notification { get; } = new NotificationPreference();
 
-        [JsonProperty("browser")]
-        public BrowserPreference Browser { get; private set; } = new BrowserPreference();
+        public WindowsPreference Windows { get; } = new WindowsPreference();
 
-        [JsonProperty("notification")]
-        public NotificationPreference Notification { get; private set; } = new NotificationPreference();
-
-        WindowsPreference r_Windows;
-        [JsonProperty("windows")]
-        public WindowsPreference Windows
-        {
-            get { return r_Windows ?? (r_Windows = new WindowsPreference()); }
-            private set { r_Windows = value; }
-        }
-
-        [JsonProperty("layout")]
-        public LayoutPreference Layout { get; private set; } = new LayoutPreference();
-
-        [JsonProperty("other")]
-        public OtherPreference Other { get; private set; } = new OtherPreference();
+        public OtherPreference Other { get; } = new OtherPreference();
     }
 }
diff --git a/HeavenlyWind.Base/Preference.cs b/HeavenlyWind.Base/Preference.cs
index 56db8145..ae33da77 100644
--- a/HeavenlyWind.Base/Preference.cs
+++ b/HeavenlyWind.Base/Preference.cs
@@ -1,71 +1,126 @@
 using Newtonsoft.Json;
-using System;
+using Newtonsoft.Json.Linq;
+using Sakuno.KanColle.Amatsukaze.Internal;
+using Sakuno.KanColle.Amatsukaze.Models.Preferences;
+using System.Collections.Generic;
+using System.Data.SQLite;
+using System.Diagnostics;
 using System.IO;
-using System.Text;
+using System.Linq;
+using System.Reflection;
 
 namespace Sakuno.KanColle.Amatsukaze
 {
     public partial class Preference
     {
-        const string r_FilePath = @"Preferences\Preference.json";
+        public static Preference Instance { get; } = new Preference();
+        public static Preference Current => Instance;
 
-        public static Preference Current { get; private set; }
+        internal SQLiteConnection Connection { get; private set; }
 
-        static JsonSerializer r_Serializer = new JsonSerializer() { Formatting = Formatting.Indented };
+        static Preference()
+        {
+            var rDirectory = new DirectoryInfo(@"Roaming\Preferences");
+            if (!rDirectory.Exists)
+                rDirectory.Create();
+        }
 
-        public static void Load()
+        public void Initialize()
         {
-            try
+            Connection = new SQLiteConnection(@"Data Source=Roaming\Preferences\Main.db; Page Size=8192").OpenAndReturn();
+
+            using (var rTransaction = Connection.BeginTransaction())
             {
-                if (!File.Exists(r_FilePath))
+                using (var rCommand = Connection.CreateCommand())
                 {
-                    Current = new Preference();
-                    return;
+                    rCommand.CommandText =
+                        "CREATE TABLE IF NOT EXISTS metadata(key TEXT PRIMARY KEY NOT NULL, value) WITHOUT ROWID; " +
+                        "INSERT OR IGNORE INTO metadata(key, value) VALUES('version', 1); " +
+
+                        "CREATE TABLE IF NOT EXISTS preference(key TEXT PRIMARY KEY NOT NULL, value) WITHOUT ROWID; " +
+                        "INSERT OR REPLACE INTO preference(key, value) VALUES('main.version', @version);";
+                    rCommand.Parameters.AddWithValue("@version", ProductInfo.AssemblyVersionString);
+
+                    rCommand.ExecuteNonQuery();
                 }
 
-                LoadCore(r_FilePath);
+                rTransaction.Commit();
             }
-            catch (Exception e)
+
+            Connection.Update += (s, e) => Debug.WriteLine($"Preference: {e.Event} - {e.Table} - {e.RowId}");
+        }
+
+        public void Reload()
+        {
+            using (var rTransaction = Connection.BeginTransaction())
             {
-                try
+                MigrateFromPreviousVersion();
+
+                var rReloadedProperties = new List<Property>(Property.Instances.Count);
+
+                using (var rCommand = Connection.CreateCommand())
                 {
-                    using (var rStreamWriter = new StreamWriter(Logger.GetNewExceptionLogFilename(), false, new UTF8Encoding(true)))
-                    {
-                        rStreamWriter.WriteLine("Loading preference file error.");
-                        rStreamWriter.WriteLine();
-                        rStreamWriter.WriteLine(e.ToString());
-                    }
+                    rCommand.CommandText = "SELECT key, value FROM preference;";
+
+                    using (var rReader = rCommand.ExecuteReader())
+                        while (rReader.Read())
+                        {
+                            Property rProperty;
+                            if (Property.Instances.TryGetValue((string)rReader["key"], out rProperty))
+                            {
+                                rProperty.Reload(rReader["value"]);
+
+                                rReloadedProperties.Add(rProperty);
+                            }
+                        }
                 }
-                catch { }
+
+                var r = Property.Instances.Values.Except(rReloadedProperties).ToArray();
+                foreach (var rProperty in Property.Instances.Values.Except(rReloadedProperties))
+                    rProperty.Save();
+
+                rTransaction.Commit();
             }
-            finally
+        }
+
+        void MigrateFromPreviousVersion()
+        {
+            var rFile = new FileInfo(@"Preferences\Preference.json");
+            if (!rFile.Exists)
+                return;
+
+            using (var rReader = new JsonTextReader(rFile.OpenText()))
             {
-                if (Current == null)
-                    Current = new Preference();
+                var rSerializer = new JsonSerializer();
+                var rOldPreference = rSerializer.Deserialize<OldPreference>(rReader);
+
+                LoadFromOldPreference(rOldPreference);
             }
+
+            rFile.Directory.Delete(true);
         }
-        static void LoadCore(string rpPath)
+        void LoadFromOldPreference(object rpObject)
         {
-            using (var rReader = new JsonTextReader(File.OpenText(rpPath)))
-                Current = r_Serializer.Deserialize<Preference>(rReader);
-        }
+            foreach (var rOldProperty in rpObject.GetType().GetTypeInfo().DeclaredProperties)
+            {
+                if (!rOldProperty.IsDefined(typeof(OldPreferenceMappingAttribute)) && rOldProperty.PropertyType != typeof(JToken))
+                {
+                    LoadFromOldPreference(rOldProperty.GetValue(rpObject));
 
-        public static void Save()
-        {
-            const string rFolder = "Preferences";
+                    continue;
+                }
 
-            if (!Directory.Exists(rFolder))
-                Directory.CreateDirectory(rFolder);
+                var rMapping = rOldProperty.GetCustomAttribute<OldPreferenceMappingAttribute>();
 
-            const string rBackup = r_FilePath + ".bak";
-            if (File.Exists(rBackup))
-                File.Delete(rBackup);
-            if (File.Exists(r_FilePath))
-                File.Move(r_FilePath, rBackup);
+                Property rProperty;
+                if (!Property.Instances.TryGetValue(rMapping.Key, out rProperty))
+                    continue;
 
-            using (var rWriter = new StreamWriter(r_FilePath, false, new UTF8Encoding(true)))
-            using (var rJsonWriter = new JsonTextWriter(rWriter))
-                r_Serializer.Serialize(rJsonWriter, Current);
+                if (rProperty.Key != "main.windows")
+                    rProperty.SetValue(rOldProperty.GetValue(rpObject));
+                else
+                    rProperty.SetValue(((JToken)rOldProperty.GetValue(rpObject)).ToObject<WindowPreference[]>());
+            }
         }
     }
 }
diff --git a/HeavenlyWind.Base/PreferenceExtension.cs b/HeavenlyWind.Base/PreferenceExtension.cs
index 74f66710..7c39cadf 100644
--- a/HeavenlyWind.Base/PreferenceExtension.cs
+++ b/HeavenlyWind.Base/PreferenceExtension.cs
@@ -22,7 +22,7 @@ public PreferenceExtension(string rpPath)
 
         public override object ProvideValue(IServiceProvider rpServiceProvider)
         {
-            var rBinding = new Binding(r_Path) { Source = Preference.Current, Mode = BindingMode.TwoWay, Converter = Converter, ConverterParameter = ConverterParameter, UpdateSourceTrigger = UpdateSourceTrigger };
+            var rBinding = new Binding(r_Path) { Source = Preference.Instance, Mode = BindingMode.TwoWay, Converter = Converter, ConverterParameter = ConverterParameter, UpdateSourceTrigger = UpdateSourceTrigger };
             if (ValidationRule != null)
                 rBinding.ValidationRules.Add(ValidationRule);
 
diff --git a/HeavenlyWind.Base/ProductInfo.cs b/HeavenlyWind.Base/ProductInfo.cs
index 60a1be3e..24b8580d 100644
--- a/HeavenlyWind.Base/ProductInfo.cs
+++ b/HeavenlyWind.Base/ProductInfo.cs
@@ -5,7 +5,7 @@ public static class ProductInfo
         public const string AppName = "いんてりじぇんと連装砲くん";
         public const string ProductName = "Intelligent Naval Gun";
 
-        public const string AssemblyVersionString = "0.1.11.3";
+        public const string AssemblyVersionString = "0.1.11.4";
 
         public static string Version => AssemblyVersionString;
         public static string ReleaseCodeName => "Kraken";
diff --git a/HeavenlyWind.Base/StringResources.Items.cs b/HeavenlyWind.Base/StringResources.Items.cs
index 94eae50b..44ffa42b 100644
--- a/HeavenlyWind.Base/StringResources.Items.cs
+++ b/HeavenlyWind.Base/StringResources.Items.cs
@@ -37,8 +37,8 @@ partial class StringResourcesItems
         public string Notification_Repair_Content => GetString(nameof(Notification_Repair_Content));
         public string Notification_Construction => GetString(nameof(Notification_Construction));
         public string Notification_Construction_Content => GetString(nameof(Notification_Construction_Content));
-        public string Notification_HeavilyDamagedWarning => GetString(nameof(Notification_HeavilyDamagedWarning));
-        public string Notification_HeavilyDamagedWarning_Content => GetString(nameof(Notification_HeavilyDamagedWarning_Content));
+        public string Notification_HeavyDamageWarning => GetString(nameof(Notification_HeavyDamageWarning));
+        public string Notification_HeavyDamageWarning_Content => GetString(nameof(Notification_HeavyDamageWarning_Content));
         public string Notification_AdvanceWarning => GetString(nameof(Notification_AdvanceWarning));
         public string Notification_AdvanceWarning_Content => GetString(nameof(Notification_AdvanceWarning_Content));
         public string Notification_RecoveryFromFatigue => GetString(nameof(Notification_RecoveryFromFatigue));
@@ -310,11 +310,23 @@ partial class StringResourcesItems
 
         public string PreferenceWindow_Network => GetString(nameof(PreferenceWindow_Network));
         public string PreferenceWindow_Network_Port => GetString(nameof(PreferenceWindow_Network_Port));
-        public string PreferenceWindow_Network_EnableForSSL => GetString(nameof(PreferenceWindow_Network_EnableForSSL));
+        public string PreferenceWindow_Network_Port_Customization => GetString(nameof(PreferenceWindow_Network_Port_Customization));
+        public string PreferenceWindow_Network_Port_Customization_Dialog_Instruction => GetString(nameof(PreferenceWindow_Network_Port_Customization_Dialog_Instruction));
+        public string PreferenceWindow_Network_Port_Customization_Dialog_Content => GetString(nameof(PreferenceWindow_Network_Port_Customization_Dialog_Content));
+        public string PreferenceWindow_Network_Port_Customization_Dialog_Button_Yes => GetString(nameof(PreferenceWindow_Network_Port_Customization_Dialog_Button_Yes));
+        public string PreferenceWindow_Network_Port_Customization_Dialog_Button_No => GetString(nameof(PreferenceWindow_Network_Port_Customization_Dialog_Button_No));
         public string PreferenceWindow_Network_AllowRequestsFromOtherDevices => GetString(nameof(PreferenceWindow_Network_AllowRequestsFromOtherDevices));
         public string PreferenceWindow_Network_UseUpstreamProxy => GetString(nameof(PreferenceWindow_Network_UseUpstreamProxy));
         public string PreferenceWindow_Network_UseUpstreamProxy_HttpOnly => GetString(nameof(PreferenceWindow_Network_UseUpstreamProxy_HttpOnly));
+        public string PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Instruction => GetString(nameof(PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Instruction));
+        public string PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Content => GetString(nameof(PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Content));
+        public string PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Button_Yes => GetString(nameof(PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Button_Yes));
+        public string PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Button_No => GetString(nameof(PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Button_No));
         public string PreferenceWindow_Window => GetString(nameof(PreferenceWindow_Window));
+        public string PreferenceWindow_Window_CloseConfirmation => GetString(nameof(PreferenceWindow_Window_CloseConfirmation));
+        public string PreferenceWindow_Window_CloseConfirmation_Disabled => GetString(nameof(PreferenceWindow_Window_CloseConfirmation_Disabled));
+        public string PreferenceWindow_Window_CloseConfirmation_DuringSortie => GetString(nameof(PreferenceWindow_Window_CloseConfirmation_DuringSortie));
+        public string PreferenceWindow_Window_CloseConfirmation_Always => GetString(nameof(PreferenceWindow_Window_CloseConfirmation_Always));
         public string PreferenceWindow_Window_Font => GetString(nameof(PreferenceWindow_Window_Font));
         public string PreferenceWindow_Window_Layout => GetString(nameof(PreferenceWindow_Window_Layout));
         public string PreferenceWindow_Window_Layout_Landscape => GetString(nameof(PreferenceWindow_Window_Layout_Landscape));
@@ -345,11 +357,11 @@ partial class StringResourcesItems
         public string PreferenceWindow_Notification_Construction => GetString(nameof(PreferenceWindow_Notification_Construction));
         public string PreferenceWindow_Notification_Expedition => GetString(nameof(PreferenceWindow_Notification_Expedition));
         public string PreferenceWindow_Notification_Repair => GetString(nameof(PreferenceWindow_Notification_Repair));
-        public string PreferenceWindow_Notification_HeavilyDamagedWarning => GetString(nameof(PreferenceWindow_Notification_HeavilyDamagedWarning));
+        public string PreferenceWindow_Notification_HeavyDamageWarning => GetString(nameof(PreferenceWindow_Notification_HeavyDamageWarning));
         public string PreferenceWindow_Notification_RecoveryFromFatigue => GetString(nameof(PreferenceWindow_Notification_RecoveryFromFatigue));
         public string PreferenceWindow_Notification_AnchorageRepair => GetString(nameof(PreferenceWindow_Notification_AnchorageRepair));
         public string PreferenceWindow_Notification_Sound => GetString(nameof(PreferenceWindow_Notification_Sound));
-        public string PreferenceWindow_Notification_Sound_HeavilyDamagedWarning => GetString(nameof(PreferenceWindow_Notification_Sound_HeavilyDamagedWarning));
+        public string PreferenceWindow_Notification_Sound_HeavyDamageWarning => GetString(nameof(PreferenceWindow_Notification_Sound_HeavyDamageWarning));
         public string PreferenceWindow_Notification_Sound_Slient => GetString(nameof(PreferenceWindow_Notification_Sound_Slient));
         public string PreferenceWindow_Notification_Sound_SystemSound => GetString(nameof(PreferenceWindow_Notification_Sound_SystemSound));
         public string PreferenceWindow_Notification_SoundFileType => GetString(nameof(PreferenceWindow_Notification_SoundFileType));
@@ -365,6 +377,10 @@ partial class StringResourcesItems
         public string PreferenceWindow_Browser_Flash_RenderMode => GetString(nameof(PreferenceWindow_Browser_Flash_RenderMode));
         public string PreferenceWindow_Browser_Placement_AtBottom => GetString(nameof(PreferenceWindow_Browser_Placement_AtBottom));
         public string PreferenceWindow_Browser_Placement_StickToBrowser => GetString(nameof(PreferenceWindow_Browser_Placement_StickToBrowser));
+        public string PreferenceWindow_Browser_RefreshConfirmation => GetString(nameof(PreferenceWindow_Browser_RefreshConfirmation));
+        public string PreferenceWindow_Browser_RefreshConfirmation_Disabled => GetString(nameof(PreferenceWindow_Browser_RefreshConfirmation_Disabled));
+        public string PreferenceWindow_Browser_RefreshConfirmation_DuringSortie => GetString(nameof(PreferenceWindow_Browser_RefreshConfirmation_DuringSortie));
+        public string PreferenceWindow_Browser_RefreshConfirmation_Always => GetString(nameof(PreferenceWindow_Browser_RefreshConfirmation_Always));
         public string PreferenceWindow_Screenshot => GetString(nameof(PreferenceWindow_Screenshot));
         public string PreferenceWindow_Screenshot_Folder => GetString(nameof(PreferenceWindow_Screenshot_Folder));
         public string PreferenceWindow_Other => GetString(nameof(PreferenceWindow_Other));
diff --git a/HeavenlyWind.Base/StringResources.cs b/HeavenlyWind.Base/StringResources.cs
index 47d03c5e..10f9d0c8 100644
--- a/HeavenlyWind.Base/StringResources.cs
+++ b/HeavenlyWind.Base/StringResources.cs
@@ -70,8 +70,8 @@ public void SubscribLanguageChanged()
         {
             if (!r_IsSubscribed)
             {
-                Preference.Current.Language.Subscribe(LoadMainResource);
-                Preference.Current.ExtraResourceLanguage.Subscribe(LoadExtraResource);
+                Preference.Instance.Language.Subscribe(LoadMainResource);
+                Preference.Instance.ExtraResourceLanguage.Subscribe(LoadExtraResource);
 
                 r_IsSubscribed = true;
             }
@@ -80,7 +80,7 @@ public void SubscribLanguageChanged()
         public void LoadMainResource(string rpLanguage)
         {
             if (!InstalledLanguages.Any(r => r.Directory == rpLanguage))
-                Preference.Current.Language.Value = GetDefaultLanguage().Directory;
+                Preference.Instance.Language.Value = GetDefaultLanguage().Directory;
 
             LoadMainResourceCore(rpLanguage);
         }
diff --git a/HeavenlyWind.Base/packages.config b/HeavenlyWind.Base/packages.config
index 75f8f325..5b86f1b8 100644
--- a/HeavenlyWind.Base/packages.config
+++ b/HeavenlyWind.Base/packages.config
@@ -6,4 +6,5 @@
   <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Main" version="2.2.5" targetFramework="net45" />
   <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
+  <package id="System.Data.SQLite.Core" version="1.0.102.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/HeavenlyWind.Game/Models/FleetConditionRegeneration.cs b/HeavenlyWind.Game/Models/FleetConditionRegeneration.cs
index d72139cc..ac4fe851 100644
--- a/HeavenlyWind.Game/Models/FleetConditionRegeneration.cs
+++ b/HeavenlyWind.Game/Models/FleetConditionRegeneration.cs
@@ -23,7 +23,7 @@ internal void Update()
                 return;
             }
 
-            var rCeiling = Preference.Current.Game.FatigueCeiling;
+            var rCeiling = Preference.Instance.Game.FatigueCeiling;
 
             var rLowestCondition = r_Fleet.Ships.Min(r => r.Condition);
             if (rLowestCondition >= rCeiling)
diff --git a/HeavenlyWind.Game/Models/Ship.cs b/HeavenlyWind.Game/Models/Ship.cs
index 426ef6c6..dfe508eb 100644
--- a/HeavenlyWind.Game/Models/Ship.cs
+++ b/HeavenlyWind.Game/Models/Ship.cs
@@ -1,6 +1,7 @@
 using Sakuno.KanColle.Amatsukaze.Game.Models.Raw;
 using Sakuno.KanColle.Amatsukaze.Game.Services;
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 
@@ -163,8 +164,8 @@ public bool CanParticipantInAnchorageRepair
         #region Equipment
 
         int[] r_EquipmentIDs;
-        ReadOnlyCollection<ShipSlot> r_Slots;
-        public ReadOnlyCollection<ShipSlot> Slots
+        IList<ShipSlot> r_Slots;
+        public IList<ShipSlot> Slots
         {
             get { return r_Slots; }
             private set
@@ -191,8 +192,8 @@ private set
             }
         }
 
-        ReadOnlyCollection<Equipment> r_EquipedEquipment;
-        public ReadOnlyCollection<Equipment> EquipedEquipment
+        IList<Equipment> r_EquipedEquipment;
+        public IList<Equipment> EquipedEquipment
         {
             get { return r_EquipedEquipment; }
             private set
@@ -223,7 +224,10 @@ protected override void OnRawDataUpdated()
             else
             {
                 if (Info?.ID != RawData.ShipID)
+                {
                     r_EquipmentIDs = null;
+                    r_Slots = null;
+                }
 
                 Info = rInfo;
                 OnPropertyChanged(nameof(Info));
@@ -272,7 +276,7 @@ void UpdateSlots()
             var rUpdateList = false;
 
             if (Slots == null || Slots.Count != RawData.SlotCount)
-                Slots = Enumerable.Range(0, RawData.SlotCount).Select(r => new ShipSlot(Info.PlaneCountInSlot[r], RawData.PlaneCountInSlot[r])).ToList().AsReadOnly();
+                Slots = Enumerable.Range(0, RawData.SlotCount).Select(r => new ShipSlot(Info.PlaneCountInSlot[r], RawData.PlaneCountInSlot[r])).ToArray();
 
             if (r_EquipmentIDs == null || !r_EquipmentIDs.SequenceEqual(RawData.Equipment))
             {
@@ -319,7 +323,7 @@ void UpdateSlots()
                 if (ExtraSlot != null && ExtraSlot.HasEquipment)
                     rList = rList.Concat(new[] { ExtraSlot.Equipment });
 
-                EquipedEquipment = rList.ToArray().AsReadOnly();
+                EquipedEquipment = rList.ToArray();
                 rUpdateList = false;
             }
         }
diff --git a/HeavenlyWind.Game/Models/ShipSlot.cs b/HeavenlyWind.Game/Models/ShipSlot.cs
index 964b414b..d29b3661 100644
--- a/HeavenlyWind.Game/Models/ShipSlot.cs
+++ b/HeavenlyWind.Game/Models/ShipSlot.cs
@@ -17,7 +17,7 @@ public Equipment Equipment
         }
         public bool HasEquipment => Equipment != null && Equipment != Equipment.Dummy;
 
-        public int MaxPlaneCount { get; set; }
+        public int MaxPlaneCount { get; internal set; }
 
         int r_PlaneCount;
         public int PlaneCount
diff --git a/HeavenlyWind.Game/Parsers/Root/Battle/BattleResultParser.cs b/HeavenlyWind.Game/Parsers/Root/Battle/BattleResultParser.cs
index c4f94366..4530f3ff 100644
--- a/HeavenlyWind.Game/Parsers/Root/Battle/BattleResultParser.cs
+++ b/HeavenlyWind.Game/Parsers/Root/Battle/BattleResultParser.cs
@@ -8,7 +8,7 @@ class BattleResultParser : ApiParser<RawBattleResult>
     {
         public override void Process(RawBattleResult rpData)
         {
-            if (!Preference.Current.Game.ShowDrop)
+            if (!Preference.Instance.Game.ShowDrop)
                 return;
 
             if (rpData.DroppedShip != null && rpData.DroppedItem != null)
diff --git a/HeavenlyWind.Game/Parsers/Root/Expedition/ResultParser.cs b/HeavenlyWind.Game/Parsers/Root/Expedition/ResultParser.cs
index bb64fe96..775e0e09 100644
--- a/HeavenlyWind.Game/Parsers/Root/Expedition/ResultParser.cs
+++ b/HeavenlyWind.Game/Parsers/Root/Expedition/ResultParser.cs
@@ -14,6 +14,16 @@ public override void Process(RawExpeditionResult rpData)
 
             var rLogContent = string.Format(StringResources.Instance.Main.Log_ExpeditionResult,
                 rFleet.ID, rFleet.Name, rExpedition.ID, rExpedition.TranslatedName, GetStringFromExpeditionResult(rpData.Result));
+
+            var rBucketCount = 0;
+            if (rpData.RewardItems[0] == 1)
+                rBucketCount = rpData.Item1.Count;
+            else if (rpData.RewardItems[0] == 1)
+                rBucketCount = rpData.Item2.Count;
+
+            if (rBucketCount > 0)
+                rLogContent += " [icon]bucket[/icon]" + rBucketCount;
+
             Logger.Write(LoggingLevel.Info, rLogContent);
         }
 
diff --git a/HeavenlyWind.Game/Proxy/KanColleProxy.cs b/HeavenlyWind.Game/Proxy/KanColleProxy.cs
index a3d587fa..91a961a9 100644
--- a/HeavenlyWind.Game/Proxy/KanColleProxy.cs
+++ b/HeavenlyWind.Game/Proxy/KanColleProxy.cs
@@ -3,6 +3,7 @@
 using Sakuno.KanColle.Amatsukaze.Game.Services;
 using Sakuno.KanColle.Amatsukaze.Models;
 using System;
+using System.IO;
 using System.Linq;
 using System.Reactive.Subjects;
 using System.Text.RegularExpressions;
@@ -18,6 +19,8 @@ public static class KanColleProxy
 
         static Regex r_SuppressReloadConfirmation = new Regex("(?<=if \\()confirm\\(\"エラーが発生したため、ページ更新します。\"\\)(?=\\) {)");
 
+        static string[] r_BlockingList;
+
         static KanColleProxy()
         {
             FiddlerApplication.BeforeRequest += FiddlerApplication_BeforeRequest;
@@ -26,22 +29,31 @@ static KanColleProxy()
             FiddlerApplication.BeforeResponse += FiddlerApplication_BeforeResponse;
             FiddlerApplication.BeforeReturningError += FiddlerApplication_BeforeReturningError;
             FiddlerApplication.AfterSessionComplete += FiddlerApplication_AfterSessionComplete;
+
+            if (File.Exists(@"Data\BlockingList.lst"))
+                r_BlockingList = File.ReadAllLines(@"Data\BlockingList.lst");
+            else
+                r_BlockingList = ArrayUtil.Empty<string>();
         }
 
         public static void Start()
         {
             var rStartupFlags = FiddlerCoreStartupFlags.ChainToUpstreamGateway;
-            if (Preference.Current.Network.EnableForSSL)
-                rStartupFlags |= FiddlerCoreStartupFlags.DecryptSSL;
-            if (Preference.Current.Network.AllowRequestsFromOtherDevices)
+            if (Preference.Instance.Network.AllowRequestsFromOtherDevices)
                 rStartupFlags |= FiddlerCoreStartupFlags.AllowRemoteClients;
 
-            FiddlerApplication.Startup(Preference.Current.Network.Port, rStartupFlags);
+            FiddlerApplication.Startup(Preference.Instance.Network.Port, rStartupFlags);
         }
 
         static void FiddlerApplication_BeforeRequest(Session rpSession)
         {
-            var rUpstreamProxyPreference = Preference.Current.Network.UpstreamProxy;
+            if (r_BlockingList.Any(rpSession.uriContains))
+            {
+                rpSession.utilCreateResponseAndBypassServer();
+                return;
+            }
+
+            var rUpstreamProxyPreference = Preference.Instance.Network.UpstreamProxy;
             if (rUpstreamProxyPreference.Enabled && (!rUpstreamProxyPreference.HttpOnly || !rpSession.RequestMethod.OICEquals("CONNECT")))
                 rpSession["x-OverrideGateway"] = $"{rUpstreamProxyPreference.Host.Value}:{rUpstreamProxyPreference.Port.Value}";
 
@@ -113,14 +125,14 @@ static void FiddlerApplication_BeforeResponse(Session rpSession)
                     var rScript = rpSession.GetResponseBodyAsString();
                     var rModified = false;
 
-                    var rQuality = Preference.Current.Browser.Flash.Quality;
+                    var rQuality = Preference.Instance.Browser.Flash.Quality;
                     if (rQuality != FlashQuality.Default)
                     {
                         rScript = r_FlashQualityRegex.Replace(rScript, $"$1{rQuality}$2");
                         rModified = true;
                     }
 
-                    var rRenderMode = Preference.Current.Browser.Flash.RenderMode;
+                    var rRenderMode = Preference.Instance.Browser.Flash.RenderMode;
                     if (rRenderMode != FlashRenderMode.Default)
                     {
                         rScript = r_FlashRenderModeRegex.Replace(rScript, $"$1{rRenderMode}$2");
diff --git a/HeavenlyWind.Game/QuestManager.cs b/HeavenlyWind.Game/QuestManager.cs
index a87e2ec8..e7f180a8 100644
--- a/HeavenlyWind.Game/QuestManager.cs
+++ b/HeavenlyWind.Game/QuestManager.cs
@@ -54,6 +54,11 @@ internal QuestManager()
                 IsLoaded = true;
                 OnPropertyChanged(nameof(IsLoaded));
             });
+            SessionService.Instance.Subscribe("api_req_quest/stop", r =>
+            {
+                var rQuestID = int.Parse(r.Parameters["api_quest_id"]);
+                Table[rQuestID].RawData.State = QuestState.None;
+            });
             SessionService.Instance.Subscribe("api_req_quest/clearitemget", r =>
             {
                 var rQuestID = int.Parse(r.Parameters["api_quest_id"]);
diff --git a/HeavenlyWind.Game/Services/CacheService.cs b/HeavenlyWind.Game/Services/CacheService.cs
index 98a5af4d..972f1d19 100644
--- a/HeavenlyWind.Game/Services/CacheService.cs
+++ b/HeavenlyWind.Game/Services/CacheService.cs
@@ -15,8 +15,8 @@ public class CacheService
 
         public static CacheService Instance { get; } = new CacheService();
 
-        public CacheMode CurrentMode => Preference.Current.Cache.Mode;
-        public string CacheDirectory => Preference.Current.Cache.Path;
+        public CacheMode CurrentMode => Preference.Instance.Cache.Mode;
+        public string CacheDirectory => Preference.Instance.Cache.Path;
 
         static object r_ThreadSyncObject = new object();
 
diff --git a/HeavenlyWind.Game/Services/Records/RankingPointsRecords.cs b/HeavenlyWind.Game/Services/Records/RankingPointsRecords.cs
index dcb6b9bf..50fd0caf 100644
--- a/HeavenlyWind.Game/Services/Records/RankingPointsRecords.cs
+++ b/HeavenlyWind.Game/Services/Records/RankingPointsRecords.cs
@@ -6,7 +6,7 @@ namespace Sakuno.KanColle.Amatsukaze.Game.Services.Records
 {
     public class RankingPointsRecords : RecordsGroup
     {
-        static int[] r_Modifier = { 7, 5, 7, 2, 7, 3, 1, 6, 9, 9 };
+        static int[] r_Modifier = { 2, 5, 7, 2, 7, 3, 1, 6, 9, 9 };
 
         public override string GroupName => "ranking_point";
         public override int Version => 2;
diff --git a/HeavenlyWind/App.xaml.cs b/HeavenlyWind/App.xaml.cs
index 5d9ee868..68ccaf11 100644
--- a/HeavenlyWind/App.xaml.cs
+++ b/HeavenlyWind/App.xaml.cs
@@ -64,10 +64,11 @@ protected override void OnStartup(StartupEventArgs e)
             ExpeditionService.Instance.Initialize();
             EnemyEncounterService.Instance.Initialize();
 
-            Preference.Load();
+            Preference.Instance.Initialize();
+            Preference.Instance.Reload();
             StringResources.Instance.SubscribLanguageChanged();
-            StringResources.Instance.LoadMainResource(Preference.Current.Language);
-            StringResources.Instance.LoadExtraResource(Preference.Current.ExtraResourceLanguage);
+            StringResources.Instance.LoadMainResource(Preference.Instance.Language);
+            StringResources.Instance.LoadExtraResource(Preference.Instance.ExtraResourceLanguage);
 
             StatusBarService.Instance.Initialize();
             CacheService.Instance.Initialize();
@@ -94,8 +95,6 @@ protected override void OnExit(ExitEventArgs e)
             base.OnExit(e);
 
             NotificationService.Instance.Dispose();
-
-            Preference.Save();
         }
 
         void App_DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
@@ -129,7 +128,7 @@ void ShowUnhandledExceptionDialog(Exception rpException)
 
             var rDialog = new TaskDialog()
             {
-                Caption = StringResources.Instance.Main.Product_Name,
+                Caption = UnhandledExceptionDialogStringResources.ProductName,
                 Instruction = UnhandledExceptionDialogStringResources.Instruction,
                 Icon = TaskDialogIcon.Error,
                 Content = UnhandledExceptionDialogStringResources.Content,
diff --git a/HeavenlyWind/Controls/FighterPower.cs b/HeavenlyWind/Controls/FighterPower.cs
index c2015ff1..5e61ba75 100644
--- a/HeavenlyWind/Controls/FighterPower.cs
+++ b/HeavenlyWind/Controls/FighterPower.cs
@@ -18,7 +18,7 @@ protected override void OnItemsSourceChanged(IEnumerable rpOldValue, IEnumerable
             if (rpNewValue == null || Items.Count == 0)
                 return;
 
-            SelectedItem = Items[(int)Preference.Current.Game.MainFighterPowerFormula.Value];
+            SelectedItem = Items[(int)Preference.Instance.Game.MainFighterPowerFormula.Value];
         }
     }
 }
diff --git a/HeavenlyWind/Controls/LoSFormulas.cs b/HeavenlyWind/Controls/LoSFormulas.cs
index f5946b38..1fccdd81 100644
--- a/HeavenlyWind/Controls/LoSFormulas.cs
+++ b/HeavenlyWind/Controls/LoSFormulas.cs
@@ -18,7 +18,7 @@ protected override void OnItemsSourceChanged(IEnumerable rpOldValue, IEnumerable
             if (rpNewValue == null || Items.Count == 0)
                 return;
 
-            SelectedItem = Items[(int)Preference.Current.Game.MainFleetLoSFormula.Value];
+            SelectedItem = Items[(int)Preference.Instance.Game.MainFleetLoSFormula.Value];
         }
     }
 }
diff --git a/HeavenlyWind/Internal/HeavyDamageLineColorExtension.cs b/HeavenlyWind/Internal/HeavyDamageLineColorExtension.cs
index 4e644ceb..11026c80 100644
--- a/HeavenlyWind/Internal/HeavyDamageLineColorExtension.cs
+++ b/HeavenlyWind/Internal/HeavyDamageLineColorExtension.cs
@@ -21,7 +21,7 @@ public HeavyDamageLineColorExtension(BattleParticipantState rpState)
 
         public override object ProvideValue(IServiceProvider rpServiceProvider)
         {
-            var rSource = Preference.Current.UI.HeavyDamageLine;
+            var rSource = Preference.Instance.UI.HeavyDamageLine;
             var rResult = new MultiBinding()
             {
                 Mode = BindingMode.OneWay,
diff --git a/HeavenlyWind/Internal/PanicKeyPreferenceExtension.cs b/HeavenlyWind/Internal/PanicKeyPreferenceExtension.cs
index 0d2b60d7..ff82b77e 100644
--- a/HeavenlyWind/Internal/PanicKeyPreferenceExtension.cs
+++ b/HeavenlyWind/Internal/PanicKeyPreferenceExtension.cs
@@ -13,8 +13,8 @@ class PanicKeyPreferenceExtension : MarkupExtension
         public override object ProvideValue(IServiceProvider rpServiceProvider)
         {
             var rResult = new MultiBinding() { Mode = BindingMode.OneWay, Converter = CoreConverter.Instance };
-            rResult.Bindings.Add(new Binding("ModifierKeys.Value") { Source = Preference.Current.Other.PanicKey });
-            rResult.Bindings.Add(new Binding("Key.Value") { Source = Preference.Current.Other.PanicKey });
+            rResult.Bindings.Add(new Binding("ModifierKeys.Value") { Source = Preference.Instance.Other.PanicKey });
+            rResult.Bindings.Add(new Binding("Key.Value") { Source = Preference.Instance.Other.PanicKey });
 
             return rResult.ProvideValue(rpServiceProvider);
         }
diff --git a/HeavenlyWind/Internal/UnhandledExceptionDialogStringResources.cs b/HeavenlyWind/Internal/UnhandledExceptionDialogStringResources.cs
index b64959a3..52e75326 100644
--- a/HeavenlyWind/Internal/UnhandledExceptionDialogStringResources.cs
+++ b/HeavenlyWind/Internal/UnhandledExceptionDialogStringResources.cs
@@ -4,6 +4,24 @@ namespace Sakuno.KanColle.Amatsukaze.Internal
 {
     static class UnhandledExceptionDialogStringResources
     {
+        public static string ProductName
+        {
+            get
+            {
+                switch (CultureInfo.CurrentUICulture.Name)
+                {
+                    case "ja-JP":
+                        return "いんてりじぇんと連装砲くん";
+
+                    case "zh-CN":
+                        return "智能型连装炮君";
+
+                    default:
+                        return "Intelligent Naval Gun";
+                }
+            }
+        }
+
         public static string Instruction
         {
             get
diff --git a/HeavenlyWind/Internal/WindowPlacementPreference.cs b/HeavenlyWind/Internal/WindowPlacementPreference.cs
index 21e14221..cdf15c68 100644
--- a/HeavenlyWind/Internal/WindowPlacementPreference.cs
+++ b/HeavenlyWind/Internal/WindowPlacementPreference.cs
@@ -9,8 +9,8 @@ class WindowPlacementPreference : IWindowPlacementPreference
     {
         public NativeStructs.WINDOWPLACEMENT? Load(Window rpWindow)
         {
-            WindowPreference rPlacement;
-            if (!Preference.Current.Windows.Landscape.TryGetValue(rpWindow.GetType().FullName, out rPlacement))
+            var rPlacement = Preference.Instance.Windows.LoadPlacement(rpWindow.GetType().FullName);
+            if (rPlacement == null)
                 return null;
 
             var rResult = new NativeStructs.WINDOWPLACEMENT()
@@ -41,6 +41,7 @@ public void Save(Window rpWindow, NativeStructs.WINDOWPLACEMENT rpData)
             var rPreference = new WindowPreference()
             {
                 Name = rpWindow.GetType().FullName,
+
                 Left = rpData.rcNormalPosition.Left,
                 Top = rpData.rcNormalPosition.Top,
                 Width = rpData.rcNormalPosition.Right - rpData.rcNormalPosition.Left,
@@ -48,7 +49,7 @@ public void Save(Window rpWindow, NativeStructs.WINDOWPLACEMENT rpData)
                 State = rpWindow.WindowState,
             };
 
-            Preference.Current.Windows.Landscape[rPreference.Name] = rPreference;
+            Preference.Instance.Windows.SavePlacement(rPreference);
         }
     }
 }
diff --git a/HeavenlyWind/Models/UIZoomInfo.cs b/HeavenlyWind/Models/UIZoomInfo.cs
index 7146d43f..0a042389 100644
--- a/HeavenlyWind/Models/UIZoomInfo.cs
+++ b/HeavenlyWind/Models/UIZoomInfo.cs
@@ -6,7 +6,7 @@ public sealed class UIZoomInfo : ZoomInfo
     {
         public UIZoomInfo(double rpZoom, ICommand rpCommand) : base(rpZoom, rpCommand)
         {
-            r_IsSelected = Preference.Current.UI.Zoom == rpZoom;
+            r_IsSelected = Preference.Instance.UI.Zoom == rpZoom;
         }
     }
 }
diff --git a/HeavenlyWind/Services/Browser/BrowserHost.cs b/HeavenlyWind/Services/Browser/BrowserHost.cs
index 110f36ff..f88b7796 100644
--- a/HeavenlyWind/Services/Browser/BrowserHost.cs
+++ b/HeavenlyWind/Services/Browser/BrowserHost.cs
@@ -51,7 +51,7 @@ protected override Size ArrangeOverride(Size rpFinalSize)
 
             if (IsExtracted)
             {
-                var rZoom = DpiUtil.ScaleX + Preference.Current.Browser.Zoom - 1.0;
+                var rZoom = DpiUtil.ScaleX + Preference.Instance.Browser.Zoom - 1.0;
 
                 rWidth = Math.Min(rWidth, GameConstants.GameWidth * rZoom / DpiUtil.ScaleX / DpiUtil.ScaleX);
                 rHeight = Math.Min(rHeight, GameConstants.GameHeight * rZoom / DpiUtil.ScaleY / DpiUtil.ScaleY);
@@ -68,7 +68,7 @@ protected override Size MeasureOverride(Size rpConstraint)
 
             if (IsExtracted)
             {
-                var rZoom = DpiUtil.ScaleX + Preference.Current.Browser.Zoom - 1.0;
+                var rZoom = DpiUtil.ScaleX + Preference.Instance.Browser.Zoom - 1.0;
 
                 rWidth = Math.Min(rWidth, GameConstants.GameWidth * rZoom / DpiUtil.ScaleX / DpiUtil.ScaleX);
                 rHeight = Math.Min(rHeight, GameConstants.GameHeight * rZoom / DpiUtil.ScaleY / DpiUtil.ScaleY);
diff --git a/HeavenlyWind/Services/Browser/BrowserWrapper.cs b/HeavenlyWind/Services/Browser/BrowserWrapper.cs
index 7af78390..639f23a5 100644
--- a/HeavenlyWind/Services/Browser/BrowserWrapper.cs
+++ b/HeavenlyWind/Services/Browser/BrowserWrapper.cs
@@ -196,19 +196,20 @@ void InitializeBrowserControl()
         void LoadBrowser(string rpLayoutEngine)
         {
             if (!r_BrowsersDirectory.Exists)
-                throw new Exception();
+                throw new DirectoryNotFoundException(r_BrowsersDirectory.FullName);
 
             foreach (var rFile in r_BrowsersDirectory.EnumerateFiles("*.dll", SearchOption.AllDirectories))
                 FileSystem.Unblock(rFile.FullName);
 
-            var rInfo = r_BrowsersDirectory.EnumerateFiles("*.json").Select(r =>
+            var rInfos = r_BrowsersDirectory.EnumerateFiles("*.json").Select(r =>
             {
                 using (var rReader = new JsonTextReader(File.OpenText(r.FullName)))
                     return JObject.Load(rReader).ToObject<LayoutEngineInfo>();
-            }).SingleOrDefault(r => r.Name == rpLayoutEngine);
+            }).ToArray();
+            var rInfo = rInfos.SingleOrDefault(r => r.Name == rpLayoutEngine);
 
             if (rInfo == null)
-                throw new Exception();
+                throw new Exception($"Assigned layout engine not found.{Environment.NewLine}Current layout engine: {rpLayoutEngine}{Environment.NewLine}Installed layout engine(s):{Environment.NewLine}{rInfos.Select(r => r.Name).Join(Environment.NewLine)}");
 
             if (rInfo.Dependencies != null)
                 r_LayoutEngineDependencies = rInfo.Dependencies.ToHybridDictionary(r => r.AssemblyName, r => r.Path);
@@ -217,7 +218,7 @@ void LoadBrowser(string rpLayoutEngine)
             var rType = rAssembly.GetTypes().Where(r => r.GetInterface(typeof(IBrowserProvider).FullName) != null).FirstOrDefault();
 
             if (rType == null)
-                throw new Exception();
+                throw new Exception($"IBrowserProvider not found in {rAssembly.FullName}.");
 
             r_BrowserProvider = (IBrowserProvider)rAssembly.CreateInstance(rType.FullName);
         }
diff --git a/HeavenlyWind/Services/Browser/BrowserZoomInfo.cs b/HeavenlyWind/Services/Browser/BrowserZoomInfo.cs
index 949a9ca0..9a67bef0 100644
--- a/HeavenlyWind/Services/Browser/BrowserZoomInfo.cs
+++ b/HeavenlyWind/Services/Browser/BrowserZoomInfo.cs
@@ -7,7 +7,7 @@ class BrowserZoomInfo : ZoomInfo
     {
         public BrowserZoomInfo(double rpZoom, ICommand rpCommand) : base(rpZoom, rpCommand)
         {
-            r_IsSelected = Preference.Current.Browser.Zoom == rpZoom;
+            r_IsSelected = Preference.Instance.Browser.Zoom == rpZoom;
         }
     }
 }
diff --git a/HeavenlyWind/Services/Browser/GameController.cs b/HeavenlyWind/Services/Browser/GameController.cs
index a6e2df70..d4e9d3e0 100644
--- a/HeavenlyWind/Services/Browser/GameController.cs
+++ b/HeavenlyWind/Services/Browser/GameController.cs
@@ -1,4 +1,6 @@
-using Sakuno.KanColle.Amatsukaze.Internal;
+using Sakuno.KanColle.Amatsukaze.Game;
+using Sakuno.KanColle.Amatsukaze.Internal;
+using Sakuno.KanColle.Amatsukaze.Models;
 using Sakuno.KanColle.Amatsukaze.Views.Tools;
 using Sakuno.SystemInterop;
 using Sakuno.UserInterface;
@@ -43,7 +45,7 @@ private set
         public IList<BrowserZoomInfo> ZoomFactors { get; }
         public double Zoom
         {
-            get { return Preference.Current.Browser.Zoom; }
+            get { return Preference.Instance.Browser.Zoom; }
             set
             {
                 if (Zoom != value)
@@ -144,7 +146,7 @@ void AudioManager_NewSession(object sender, AudioSessionCreatedEventArgs e)
 
         void SetZoom(double rpZoom)
         {
-            Preference.Current.Browser.Zoom.Value = rpZoom;
+            Preference.Instance.Browser.Zoom.Value = rpZoom;
             OnPropertyChanged(nameof(Zoom));
 
             foreach (var rInfo in ZoomFactors)
@@ -157,25 +159,30 @@ void SetZoom(double rpZoom)
 
         void RestartGame()
         {
-            var rDialog = new TaskDialog()
+            var rMode = Preference.Instance.Browser.RefreshConfirmationMode.Value;
+            if (rMode == ConfirmationMode.Always || (rMode == ConfirmationMode.DuringSortie && KanColleGame.Current.Sortie != null))
             {
-                Caption = StringResources.Instance.Main.Product_Name,
-                Instruction = StringResources.Instance.Main.Browser_RestartConfirmation_Instruction,
-                Icon = TaskDialogIcon.Information,
-                Buttons =
+                var rDialog = new TaskDialog()
                 {
-                    new TaskDialogCommandLink(TaskDialogCommonButton.Yes, StringResources.Instance.Main.Browser_RestartConfirmation_Button_Refresh),
-                    new TaskDialogCommandLink(TaskDialogCommonButton.No, StringResources.Instance.Main.Browser_RestartConfirmation_Button_Stay),
-                },
-                DefaultCommonButton = TaskDialogCommonButton.No,
+                    Caption = StringResources.Instance.Main.Product_Name,
+                    Instruction = StringResources.Instance.Main.Browser_RestartConfirmation_Instruction,
+                    Icon = TaskDialogIcon.Information,
+                    Buttons =
+                    {
+                        new TaskDialogCommandLink(TaskDialogCommonButton.Yes, StringResources.Instance.Main.Browser_RestartConfirmation_Button_Refresh),
+                        new TaskDialogCommandLink(TaskDialogCommonButton.No, StringResources.Instance.Main.Browser_RestartConfirmation_Button_Stay),
+                    },
+                    DefaultCommonButton = TaskDialogCommonButton.No,
 
-                OwnerWindow = App.Current.MainWindow,
-                ShowAtTheCenterOfOwner = true,
-            };
+                    OwnerWindow = App.Current.MainWindow,
+                    ShowAtTheCenterOfOwner = true,
+                };
 
-            if (rDialog.Show().ClickedCommonButton == TaskDialogCommonButton.Yes)
-                r_Owner.Navigator.Refresh();
-        }
+                if (rDialog.Show().ClickedCommonButton == TaskDialogCommonButton.No)
+                    return;
+            }
 
+            r_Owner.Navigator.Refresh();
+        }
     }
 }
diff --git a/HeavenlyWind/Services/BrowserService.cs b/HeavenlyWind/Services/BrowserService.cs
index 89417984..2d64a4ab 100644
--- a/HeavenlyWind/Services/BrowserService.cs
+++ b/HeavenlyWind/Services/BrowserService.cs
@@ -95,7 +95,7 @@ public void Initialize()
                 var rStartInfo = new ProcessStartInfo()
                 {
                     FileName = typeof(BrowserService).Assembly.Location,
-                    Arguments = $"browser {Preference.Current.Browser.CurrentLayoutEngine} {HostProcessID}",
+                    Arguments = $"browser {Preference.Instance.Browser.CurrentLayoutEngine} {HostProcessID}",
                     UseShellExecute = false,
                     RedirectStandardOutput = true,
                 };
@@ -103,14 +103,14 @@ public void Initialize()
                 r_BrowserProcess.BeginOutputReadLine();
                 r_BrowserProcess.OutputDataReceived += (s, e) => Trace.WriteLine(e.Data);
 
-                Messages.Subscribe(CommunicatorMessages.Ready, _ => Communicator.Write(CommunicatorMessages.SetPort + ":" + Preference.Current.Network.Port));
+                Messages.Subscribe(CommunicatorMessages.Ready, _ => Communicator.Write(CommunicatorMessages.SetPort + ":" + Preference.Instance.Network.Port));
                 Messages.SubscribeOnDispatcher(CommunicatorMessages.Attach, rpHandle => Attach((IntPtr)int.Parse(rpHandle)));
 
                 r_Initialized = true;
 
                 Messages.Subscribe(CommunicatorMessages.LoadCompleted, delegate
                 {
-                    var rZoom = DpiUtil.ScaleX + Preference.Current.Browser.Zoom - 1.0;
+                    var rZoom = DpiUtil.ScaleX + Preference.Instance.Browser.Zoom - 1.0;
                     Communicator.Write(CommunicatorMessages.SetZoom + ":" + rZoom);
                 });
                 Messages.Subscribe(CommunicatorMessages.LoadGamePageCompleted, _ => ResizeBrowserToFitGame());
@@ -161,7 +161,7 @@ void Attach(IntPtr rpHandle)
             BrowserControl = new BrowserHost(rpHandle);
             OnPropertyChanged(nameof(BrowserControl));
 
-            Navigator.Navigate(Preference.Current.Browser.Homepage);
+            Navigator.Navigate(Preference.Instance.Browser.Homepage);
         }
 
         internal void ResizeBrowserToFitGame()
diff --git a/HeavenlyWind/Services/NotificationService.cs b/HeavenlyWind/Services/NotificationService.cs
index 876f4f3c..24911ec9 100644
--- a/HeavenlyWind/Services/NotificationService.cs
+++ b/HeavenlyWind/Services/NotificationService.cs
@@ -46,17 +46,17 @@ public void Initialize()
                     {
                         rFleet.ExpeditionStatus.Returned += (rpFleetName, rpExpeditionName) =>
                         {
-                            if (Preference.Current.Notification.Expedition)
+                            if (Preference.Instance.Notification.Expedition)
                                 Show(StringResources.Instance.Main.Notification_Expedition, string.Format(StringResources.Instance.Main.Notification_Expedition_Content, rpFleetName, rpExpeditionName));
                         };
                         rFleet.ConditionRegeneration.Recovered += rpFleet =>
                         {
-                            if (Preference.Current.Notification.RecoveryFromFatigue)
+                            if (Preference.Instance.Notification.RecoveryFromFatigue)
                                 Show(StringResources.Instance.Main.Notification_RecoveryFromFatigue, string.Format(StringResources.Instance.Main.Notification_RecoveryFromFatigue_Content, rpFleet.Name));
                         };
                         rFleet.AnchorageRepair.InterruptionNotification += () =>
                         {
-                            if (Preference.Current.Notification.AnchorageRepair)
+                            if (Preference.Instance.Notification.AnchorageRepair)
                                 Show(StringResources.Instance.Main.Notification_AnchorageRepair, StringResources.Instance.Main.Notification_AnchorageRepair_Content);
                         };
                     }
@@ -68,7 +68,7 @@ public void Initialize()
                     foreach (var rConstructionDock in rPort.ConstructionDocks.Values)
                         rConstructionDock.ConstructionCompleted += rpShipName =>
                         {
-                            if (Preference.Current.Notification.Construction)
+                            if (Preference.Instance.Notification.Construction)
                                 Show(StringResources.Instance.Main.Notification_Construction, string.Format(StringResources.Instance.Main.Notification_Construction_Content, rpShipName));
                         };
                 });
@@ -77,13 +77,13 @@ public void Initialize()
                     foreach (var rRepairDock in rPort.RepairDocks.Values)
                         rRepairDock.RepairCompleted += rpShipName =>
                         {
-                            if (Preference.Current.Notification.Repair)
+                            if (Preference.Instance.Notification.Repair)
                                 Show(StringResources.Instance.Main.Notification_Repair, string.Format(StringResources.Instance.Main.Notification_Repair_Content, rpShipName));
                         };
                 });
             });
 
-            InitializeHeavilyDamagedWarning(rGamePCEL);
+            InitializeHeavyDamageWarning(rGamePCEL);
         }
         static void InstallShortcut()
         {
@@ -119,14 +119,14 @@ void InitializeNotifyIcon()
                 };
         }
 
-        void InitializeHeavilyDamagedWarning(PropertyChangedEventListener rpGamePCEL)
+        void InitializeHeavyDamageWarning(PropertyChangedEventListener rpGamePCEL)
         {
             SessionService.Instance.Subscribe("api_get_member/mapinfo", delegate
             {
                 var rFleetWithHeavilyDamagedShips = KanColleGame.Current.Port.Fleets.Table.Values.Where(r => (r.State & FleetState.HeavilyDamaged) == FleetState.HeavilyDamaged);
-                if (Preference.Current.Notification.HeavilyDamagedWarning && rFleetWithHeavilyDamagedShips.Any())
+                if (Preference.Instance.Notification.HeavyDamageWarning && rFleetWithHeavilyDamagedShips.Any())
                 {
-                    ShowHeavilyDamagedWarning(StringResources.Instance.Main.Notification_HeavilyDamagedWarning, StringResources.Instance.Main.Notification_HeavilyDamagedWarning_Content, rFleetWithHeavilyDamagedShips.SelectMany(r => r.Ships).Where(r => (r.State & ShipState.HeavilyDamaged) == ShipState.HeavilyDamaged));
+                    ShowHeavyDamageWarning(StringResources.Instance.Main.Notification_HeavyDamageWarning, StringResources.Instance.Main.Notification_HeavyDamageWarning_Content, rFleetWithHeavilyDamagedShips.SelectMany(r => r.Ships).Where(r => (r.State & ShipState.HeavilyDamaged) == ShipState.HeavilyDamaged));
                     FlashWindow();
                 }
             });
@@ -135,9 +135,9 @@ void InitializeHeavilyDamagedWarning(PropertyChangedEventListener rpGamePCEL)
                 var rBattle = BattleInfo.Current.CurrentStage;
 
                 var rHeavilyDamagedShips = rBattle.Friend.Where(r => r.State == BattleParticipantState.HeavilyDamaged).Select(r => ((FriendShip)r.Participant).Ship).ToArray();
-                if (Preference.Current.Notification.HeavilyDamagedWarning && rHeavilyDamagedShips.Length > 0)
+                if (Preference.Instance.Notification.HeavyDamageWarning && rHeavilyDamagedShips.Length > 0)
                 {
-                    ShowHeavilyDamagedWarning(StringResources.Instance.Main.Notification_HeavilyDamagedWarning, StringResources.Instance.Main.Notification_HeavilyDamagedWarning_Content, rHeavilyDamagedShips);
+                    ShowHeavyDamageWarning(StringResources.Instance.Main.Notification_HeavyDamageWarning, StringResources.Instance.Main.Notification_HeavyDamageWarning_Content, rHeavilyDamagedShips);
                     FlashWindow();
                 }
             });
@@ -150,9 +150,9 @@ void InitializeHeavilyDamagedWarning(PropertyChangedEventListener rpGamePCEL)
                     rParticipants = rParticipants.Concat(rSortie.EscortFleet.Ships.Skip(1));
 
                 var rHeavilyDamagedShips = rParticipants.Where(r => r.State == ShipState.HeavilyDamaged && !r.EquipedEquipment.Any(rpEquipment => rpEquipment.Info.Type == EquipmentType.DamageControl)).ToArray();
-                if (Preference.Current.Notification.HeavilyDamagedWarning && rHeavilyDamagedShips.Length > 0)
+                if (Preference.Instance.Notification.HeavyDamageWarning && rHeavilyDamagedShips.Length > 0)
                 {
-                    ShowHeavilyDamagedWarning(StringResources.Instance.Main.Notification_AdvanceWarning, StringResources.Instance.Main.Notification_AdvanceWarning_Content, rHeavilyDamagedShips);
+                    ShowHeavyDamageWarning(StringResources.Instance.Main.Notification_AdvanceWarning, StringResources.Instance.Main.Notification_AdvanceWarning_Content, rHeavilyDamagedShips);
                     FlashWindow();
                 }
             });
@@ -168,8 +168,8 @@ public void Dispose()
             }
         }
 
-        public void Show(string rpTitle, string rpBody) => ShowCore(rpTitle, rpBody, Preference.Current.Notification.Sound, Preference.Current.Notification.SoundFilename);
-        public void ShowHeavilyDamagedWarning(string rpTitle, string rpBody, IEnumerable<Ship> rpHeavilyDamagedShips)
+        public void Show(string rpTitle, string rpBody) => ShowCore(rpTitle, rpBody, Preference.Instance.Notification.Sound, Preference.Instance.Notification.SoundFilename);
+        public void ShowHeavyDamageWarning(string rpTitle, string rpBody, IEnumerable<Ship> rpHeavilyDamagedShips)
         {
             var rBuilder = new StringBuilder(64);
             foreach (var rShip in rpHeavilyDamagedShips)
@@ -180,7 +180,7 @@ public void ShowHeavilyDamagedWarning(string rpTitle, string rpBody, IEnumerable
                 rBuilder.Append(rShip.Info.TranslatedName).Append(' ').Append("Lv.").Append(rShip.Level);
             }
 
-            ShowCore(rpTitle, rpBody, Preference.Current.Notification.HeavilyDamagedWarningSound, Preference.Current.Notification.HeavilyDamagedWarningSoundFilename, rBuilder.ToString());
+            ShowCore(rpTitle, rpBody, Preference.Instance.Notification.HeavyDamageWarningSound, Preference.Instance.Notification.HeavyDamageWarningSoundFilename, rBuilder.ToString());
         }
         void ShowCore(string rpTitle, string rpBody, NotificationSound rpSound, string rpCustomSoundFilename, string rpSecondLine = null)
         {
diff --git a/HeavenlyWind/Services/PanicKeyService.cs b/HeavenlyWind/Services/PanicKeyService.cs
index 8d199ec1..3b810ff6 100644
--- a/HeavenlyWind/Services/PanicKeyService.cs
+++ b/HeavenlyWind/Services/PanicKeyService.cs
@@ -41,8 +41,8 @@ internal void Initialize(IntPtr rpHandle)
 
             r_HotKeyID = NativeMethods.Kernel32.GlobalAddAtomW("Test");
 
-            Preference.Current.Other.PanicKey.Enabled.Subscribe(_ => UpdateHotKey());
-            Preference.Current.Other.PanicKey.Key.Subscribe(_ => UpdateHotKey());
+            Preference.Instance.Other.PanicKey.Enabled.Subscribe(_ => UpdateHotKey());
+            Preference.Instance.Other.PanicKey.Key.Subscribe(_ => UpdateHotKey());
 
             UpdateHotKey();
 
@@ -53,7 +53,7 @@ void UpdateHotKey()
         {
             IsHotKeyRegisteredByOther = false;
 
-            var rPreference = Preference.Current.Other.PanicKey;
+            var rPreference = Preference.Instance.Other.PanicKey;
             if (!rPreference.Enabled)
             {
                 if (IsHotKeyRegistered)
@@ -80,11 +80,11 @@ void UpdateHotKey()
             Debug.Write("PanicKeyService: ");
             Debug.WriteIf(IsHotKeyRegistered, "Registered - ");
             Debug.WriteIf(IsHotKeyRegisteredByOther, "Registered by other - ");
-            Debug.WriteLine(GetModifierKeysString(Preference.Current.Other.PanicKey.ModifierKeys) + KeyInterop.KeyFromVirtualKey(rPreference.Key));
+            Debug.WriteLine(GetModifierKeysString(Preference.Instance.Other.PanicKey.ModifierKeys) + KeyInterop.KeyFromVirtualKey(rPreference.Key));
         }
         NativeEnums.ModifierKeys GetModifierKeys()
         {
-            var rResult = (NativeEnums.ModifierKeys)Preference.Current.Other.PanicKey.ModifierKeys.Value;
+            var rResult = (NativeEnums.ModifierKeys)Preference.Instance.Other.PanicKey.ModifierKeys.Value;
             if (OS.IsWin7OrLater)
                 rResult |= NativeEnums.ModifierKeys.MOD_NOREPEAT;
 
@@ -232,7 +232,7 @@ IntPtr WndProc(IntPtr rpHandle, int rpMessage, IntPtr rpWParam, IntPtr rpLParam,
                 var rModifierKeys = NativeUtils.LoWord(rpLParam);
                 var rKey = NativeUtils.HiWord(rpLParam);
 
-                if (Preference.Current.Other.PanicKey.ModifierKeys == rModifierKeys && Preference.Current.Other.PanicKey.Key == rKey)
+                if (Preference.Instance.Other.PanicKey.ModifierKeys == rModifierKeys && Preference.Instance.Other.PanicKey.Key == rKey)
                 {
                     var rCurrentProcessID = (uint)Process.GetCurrentProcess().Id;
 
diff --git a/HeavenlyWind/Services/ScreenshotService.cs b/HeavenlyWind/Services/ScreenshotService.cs
index ef8862cd..0174ee57 100644
--- a/HeavenlyWind/Services/ScreenshotService.cs
+++ b/HeavenlyWind/Services/ScreenshotService.cs
@@ -124,7 +124,7 @@ public void OutputToClipboard(BitmapSource rpImage)
         }
         public void OutputAsFile(BitmapSource rpImage)
         {
-            var rPreference = Preference.Current.Browser.Screenshot;
+            var rPreference = Preference.Instance.Browser.Screenshot;
 
             string rExtension;
             BitmapEncoder rEncoder;
@@ -148,7 +148,7 @@ public void OutputAsFile(BitmapSource rpImage)
                 default: throw new InvalidEnumArgumentException(nameof(rPreference.ImageFormat), (int)rPreference.ImageFormat.Value, typeof(ScreenshotImageFormat));
             }
 
-            var rPath = Path.Combine(rPreference.Destination, string.Format(rPreference.FilenameFormat, DateTime.Now, rExtension));
+            var rPath = Path.Combine(rPreference.Path, string.Format(rPreference.FilenameFormat, DateTime.Now, rExtension));
             var rDirectory = Path.GetDirectoryName(rPath);
             if (!Directory.Exists(rDirectory))
                 Directory.CreateDirectory(rDirectory);
diff --git a/HeavenlyWind/Services/StatusBarService.cs b/HeavenlyWind/Services/StatusBarService.cs
index 01789b52..4f0c50c1 100644
--- a/HeavenlyWind/Services/StatusBarService.cs
+++ b/HeavenlyWind/Services/StatusBarService.cs
@@ -1,5 +1,8 @@
-using Sakuno.KanColle.Amatsukaze.Models;
+using Sakuno.KanColle.Amatsukaze.Controls;
+using Sakuno.KanColle.Amatsukaze.Game.Models;
+using Sakuno.KanColle.Amatsukaze.Models;
 using Sakuno.UserInterface;
+using Sakuno.UserInterface.Controls;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -9,6 +12,8 @@
 using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Documents;
 using System.Windows.Input;
 
 namespace Sakuno.KanColle.Amatsukaze.Services
@@ -94,12 +99,14 @@ public void Initialize()
                     }
             }));
 
-            UIZoom = Preference.Current.UI.Zoom;
+            UIZoom = Preference.Instance.UI.Zoom;
 
             UISetZoomCommand = new DelegatedCommand<double>(SetZoom);
             UIZoomFactors = new[] { .25, .5, .75, 1.0, 1.25, 1.5, 1.75, 2.0, 3.0, 4.0 }.Select(r => new UIZoomInfo(r, UISetZoomCommand)).ToArray();
             UIZoomInCommand = new DelegatedCommand(() => SetZoom(UIZoom + .05));
             UIZoomOutCommand = new DelegatedCommand(() => SetZoom(UIZoom - .05));
+
+            RegisterCustomBBCodeTag();
         }
 
         async Task<bool> QueryCurrentTime(string rpHostname)
@@ -159,12 +166,46 @@ void SetZoom(double rpZoom)
             UpdateZoomSelection(rpZoom);
 
             UIZoom = rpZoom;
-            Preference.Current.UI.Zoom.Value = rpZoom;
+            Preference.Instance.UI.Zoom.Value = rpZoom;
         }
         void UpdateZoomSelection(double rpZoom)
         {
             foreach (var rInfo in UIZoomFactors)
                 rInfo.IsSelected = rInfo.Zoom == rpZoom;
         }
+
+        void RegisterCustomBBCodeTag()
+        {
+            BBCodeBlock.AddCustomTag("icon", rpInline =>
+            {
+                var rSpan = rpInline as Span;
+                if (rSpan == null || rSpan.Inlines.Count != 1)
+                    return null;
+
+                var rRun = rSpan.Inlines.FirstInline as Run;
+                if (rRun == null)
+                    return null;
+
+                var rMaterial = rRun.Text;
+                if (rMaterial.OICEquals("fuel"))
+                    return new InlineUIContainer(new MaterialIcon() { Type = MaterialType.Fuel }) { BaselineAlignment = BaselineAlignment.Center };
+                if (rMaterial.OICEquals("bullet"))
+                    return new InlineUIContainer(new MaterialIcon() { Type = MaterialType.Bullet }) { BaselineAlignment = BaselineAlignment.Center };
+                if (rMaterial.OICEquals("steel"))
+                    return new InlineUIContainer(new MaterialIcon() { Type = MaterialType.Steel }) { BaselineAlignment = BaselineAlignment.Center };
+                if (rMaterial.OICEquals("bauxite"))
+                    return new InlineUIContainer(new MaterialIcon() { Type = MaterialType.Bauxite }) { BaselineAlignment = BaselineAlignment.Center };
+                if (rMaterial.OICEquals("ic"))
+                    return new InlineUIContainer(new MaterialIcon() { Type = MaterialType.InstantConstruction }) { BaselineAlignment = BaselineAlignment.Center };
+                if (rMaterial.OICEquals("bucket"))
+                    return new InlineUIContainer(new MaterialIcon() { Type = MaterialType.Bucket }) { BaselineAlignment = BaselineAlignment.Center };
+                if (rMaterial.OICEquals("dm"))
+                    return new InlineUIContainer(new MaterialIcon() { Type = MaterialType.DevelopmentMaterial }) { BaselineAlignment = BaselineAlignment.Center };
+                if (rMaterial.OICEquals("im"))
+                    return new InlineUIContainer(new MaterialIcon() { Type = MaterialType.ImprovementMaterial }) { BaselineAlignment = BaselineAlignment.Center };
+
+                return null;
+            });
+        }
     }
 }
diff --git a/HeavenlyWind/Services/UpdateService.cs b/HeavenlyWind/Services/UpdateService.cs
index 9037ff90..accb9baf 100644
--- a/HeavenlyWind/Services/UpdateService.cs
+++ b/HeavenlyWind/Services/UpdateService.cs
@@ -84,7 +84,7 @@ async Task CheckForUpdateCore()
                 Info = rResult.Update;
 
                 if (Info.IsAvailable)
-                    switch (Preference.Current.Update.NotificationMode.Value)
+                    switch (Preference.Instance.Update.NotificationMode.Value)
                     {
                         case UpdateNotificationMode.Disabled:
                             Info.IsAvailable = false;
@@ -180,7 +180,7 @@ void HideNotification(UpdateNotificationMode rpMode)
             if (Info == null)
                 return;
 
-            Preference.Current.Update.NotificationMode.Value = rpMode;
+            Preference.Instance.Update.NotificationMode.Value = rpMode;
             Info.IsAvailable = false;
             OnPropertyChanged(nameof(Info));
         }
diff --git a/HeavenlyWind/ViewModels/Game/QuestsViewModel.cs b/HeavenlyWind/ViewModels/Game/QuestsViewModel.cs
index dc7ec6df..ab89ce36 100644
--- a/HeavenlyWind/ViewModels/Game/QuestsViewModel.cs
+++ b/HeavenlyWind/ViewModels/Game/QuestsViewModel.cs
@@ -22,6 +22,7 @@ public override string Name
         public bool IsLoaded { get; private set; }
 
         IDTable<QuestViewModel> r_Quests = new IDTable<QuestViewModel>();
+        QuestViewModel r_Dummy = new QuestViewModel(Quest.Dummy);
 
         public IList<QuestViewModel> All { get; private set; }
         public IList<QuestViewModel> Active { get; private set; }
@@ -74,7 +75,7 @@ void UpdateActiveQuests()
             var rActiveQuests = KanColleGame.Current.Port.Quests.Active;
             if (rActiveQuests != null)
             {
-                Active = rActiveQuests.Where(r => r != Quest.Dummy).Select(r => r_Quests[r.ID]).ToArray();
+                Active = rActiveQuests.Select(r => r != Quest.Dummy ? r_Quests[r.ID] : r_Dummy).ToArray();
                 r_Owner.Overview.ActiveQuests = Active;
 
                 OnPropertyChanged(nameof(Active));
diff --git a/HeavenlyWind/ViewModels/InitializationPageViewModel.cs b/HeavenlyWind/ViewModels/InitializationPageViewModel.cs
index e635650d..81de7075 100644
--- a/HeavenlyWind/ViewModels/InitializationPageViewModel.cs
+++ b/HeavenlyWind/ViewModels/InitializationPageViewModel.cs
@@ -63,8 +63,8 @@ public async void Start()
 
         unsafe void CheckProxyPort()
         {
-            var rPort = Preference.Current.Network.Port;
-            var rUpstreamProxy = Preference.Current.Network.UpstreamProxy;
+            var rPort = Preference.Instance.Network.Port;
+            var rUpstreamProxy = Preference.Instance.Network.UpstreamProxy;
 
             var rIsPortAvailable = true;
             var rIsUpstreamProxyAvailable = false;
diff --git a/HeavenlyWind/ViewModels/Overviews/EquipmentOverviewViewModel.cs b/HeavenlyWind/ViewModels/Overviews/EquipmentOverviewViewModel.cs
index 14d39231..878094e0 100644
--- a/HeavenlyWind/ViewModels/Overviews/EquipmentOverviewViewModel.cs
+++ b/HeavenlyWind/ViewModels/Overviews/EquipmentOverviewViewModel.cs
@@ -60,7 +60,18 @@ internal EquipmentOverviewViewModel()
             r_TypeMap = KanColleGame.Current.MasterInfo.Equipment.Values.Select(r => r.Icon).Distinct().ToDictionary(IdentityFunction<EquipmentIconType>.Instance, r => new EquipmentTypeViewModel(r) { IsSelectedChangedCallback = UpdateSelection });
             Types = r_TypeMap.Values.ToArray().AsReadOnly();
 
+            var rSelectedTypes = Preference.Instance.Game.SelectedEquipmentTypes.Value;
+            if (rSelectedTypes != null)
+                foreach (var rID in rSelectedTypes)
+                {
+                    EquipmentTypeViewModel rTypeVM;
+                    if (r_TypeMap.TryGetValue((EquipmentIconType)rID, out rTypeVM))
+                        rTypeVM.SetIsSelectedWithoutCallback(true);
+                }
+
             r_UpdateSubscription = r_UpdateObservable.Do(_ => IsLoading = true).Throttle(TimeSpan.FromSeconds(.75)).Subscribe(_ => UpdateCore());
+
+            UpdateSelectionCore();
         }
 
         public void Dispose()
@@ -73,6 +84,12 @@ public void Dispose()
         }
 
         void UpdateSelection()
+        {
+            UpdateSelectionCore();
+
+            Preference.Instance.Game.SelectedEquipmentTypes.Value = Types.Where(r => r.IsSelected).Select(r => (int)r.Type).ToArray();
+        }
+        void UpdateSelectionCore()
         {
             var rTypeCount = Types.Count;
             var rSelectedCount = Types.Count(r => r.IsSelected);
@@ -84,8 +101,9 @@ void UpdateSelection()
             else
                 r_SelectAllTypes = null;
 
-            r_UpdateObservable.OnNext(Unit.Default);
             OnPropertyChanged(nameof(SelectAllTypes));
+
+            r_UpdateObservable.OnNext(Unit.Default);
         }
 
         void UpdateCore()
diff --git a/HeavenlyWind/ViewModels/Overviews/ShipOverviewViewModel.cs b/HeavenlyWind/ViewModels/Overviews/ShipOverviewViewModel.cs
index 9bc90a77..c1470713 100644
--- a/HeavenlyWind/ViewModels/Overviews/ShipOverviewViewModel.cs
+++ b/HeavenlyWind/ViewModels/Overviews/ShipOverviewViewModel.cs
@@ -113,7 +113,19 @@ internal ShipOverviewViewModel()
             r_TypeMap = KanColleGame.Current.MasterInfo.ShipTypes.Values.Where(r => r.ID != 12 && r.ID != 15).ToDictionary(IdentityFunction<ShipTypeInfo>.Instance, r => new ShipTypeViewModel(r) { IsSelectedChangedCallback = UpdateSelection });
             Types = r_TypeMap.Values.ToArray().AsReadOnly();
 
+            var rSelectedTypes = Preference.Instance.Game.SelectedShipTypes.Value;
+            if (rSelectedTypes != null)
+                foreach (var rID in rSelectedTypes)
+                {
+                    ShipTypeInfo rShipType;
+                    ShipTypeViewModel rTypeVM;
+                    if (KanColleGame.Current.MasterInfo.ShipTypes.TryGetValue(rID, out rShipType) && r_TypeMap.TryGetValue(rShipType, out rTypeVM))
+                        rTypeVM.SetIsSelectedWithoutCallback(true);
+                }
+
             r_UpdateSubscription = r_UpdateObservable.Do(_ => IsLoading = true).Throttle(TimeSpan.FromSeconds(.75)).Subscribe(_ => UpdateCore());
+
+            UpdateSelectionCore();
         }
 
         public void Dispose()
@@ -136,6 +148,12 @@ internal void Sort(GridViewColumnHeader rpColumnHeader)
         }
 
         void UpdateSelection()
+        {
+            UpdateSelectionCore();
+
+            Preference.Instance.Game.SelectedShipTypes.Value = Types.Where(r => r.IsSelected).Select(r => r.ID).ToArray();
+        }
+        void UpdateSelectionCore()
         {
             var rTypeCount = Types.Count;
             var rSelectedCount = Types.Count(r => r.IsSelected);
@@ -147,8 +165,9 @@ void UpdateSelection()
             else
                 r_SelectAllTypes = null;
 
-            r_UpdateObservable.OnNext(Unit.Default);
             OnPropertyChanged(nameof(SelectAllTypes));
+
+            r_UpdateObservable.OnNext(Unit.Default);
         }
 
         void UpdateCore()
diff --git a/HeavenlyWind/ViewModels/Preferences/PreferencesWindowViewModel.cs b/HeavenlyWind/ViewModels/Preferences/PreferencesWindowViewModel.cs
index 8a00118c..196fb386 100644
--- a/HeavenlyWind/ViewModels/Preferences/PreferencesWindowViewModel.cs
+++ b/HeavenlyWind/ViewModels/Preferences/PreferencesWindowViewModel.cs
@@ -3,7 +3,6 @@
 using Sakuno.KanColle.Amatsukaze.ViewModels.Plugins;
 using Sakuno.SystemInterop.Dialogs;
 using Sakuno.UserInterface;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Input;
@@ -28,7 +27,7 @@ public class PreferencesWindowViewModel : WindowViewModel
         PreferencesWindowViewModel()
         {
             var rSystemFonts = Fonts.SystemFontFamilies.Select(r => new SystemFont(r)).ToList();
-            var rCurrentFont = Preference.Current.UI.Font;
+            var rCurrentFont = Preference.Instance.UI.Font;
             if (!rSystemFonts.Any(r => r.FontFamily.Source == rCurrentFont))
                 rSystemFonts.Insert(0, new SystemFont(rCurrentFont));
 
@@ -47,11 +46,11 @@ public class PreferencesWindowViewModel : WindowViewModel
                         switch (rpType)
                         {
                             case "Cache":
-                                Preference.Current.Cache.Path.Value = rPath;
+                                Preference.Instance.Cache.Path.Value = rPath;
                                 break;
 
                             case "Screenshot":
-                                Preference.Current.Browser.Screenshot.Destination.Value = rPath;
+                                Preference.Instance.Browser.Screenshot.Path.Value = rPath;
                                 break;
                         }
                     }
@@ -71,11 +70,11 @@ public class PreferencesWindowViewModel : WindowViewModel
                         switch (rpType)
                         {
                             case "General":
-                                Preference.Current.Notification.SoundFilename.Value = rFilename;
+                                Preference.Instance.Notification.SoundFilename.Value = rFilename;
                                 break;
 
-                            case "HeavilyDamaged":
-                                Preference.Current.Notification.HeavilyDamagedWarningSoundFilename.Value = rFilename;
+                            case "HeavyDamage":
+                                Preference.Instance.Notification.HeavyDamageWarningSoundFilename.Value = rFilename;
                                 break;
                         }
                     }
diff --git a/HeavenlyWind/ViewModels/Tools/SessionToolViewModel.cs b/HeavenlyWind/ViewModels/Tools/SessionToolViewModel.cs
index 839360e8..3fa6f2fa 100644
--- a/HeavenlyWind/ViewModels/Tools/SessionToolViewModel.cs
+++ b/HeavenlyWind/ViewModels/Tools/SessionToolViewModel.cs
@@ -43,7 +43,7 @@ public bool AutoScroll
 
         public SessionToolViewModel()
         {
-            if (Preference.Current.Other.SessionTool.StartRecordingOnAppStartup)
+            if (Preference.Instance.Other.SessionTool.StartRecordingOnAppStartup)
                 r_IsRecording = true;
 
             ClearCommand = new DelegatedCommand(() => Sessions.Clear());
diff --git a/HeavenlyWind/Views/Browser.xaml.cs b/HeavenlyWind/Views/Browser.xaml.cs
index 9f287432..b7657ee2 100644
--- a/HeavenlyWind/Views/Browser.xaml.cs
+++ b/HeavenlyWind/Views/Browser.xaml.cs
@@ -1,7 +1,6 @@
 using Sakuno.KanColle.Amatsukaze.Services;
 using System.ComponentModel;
 using System.Windows;
-using System.Windows.Controls;
 
 namespace Sakuno.KanColle.Amatsukaze.Views
 {
@@ -19,8 +18,12 @@ public Browser()
             Instance = this;
 
             if (!DesignerProperties.GetIsInDesignMode(this))
+            {
                 BrowserService.Instance.Initialize();
 
+                ((MainWindow)App.Current.MainWindow).SubscribeBrowserPreferenceChanged();
+            }
+
             InitializeComponent();
         }
 
diff --git a/HeavenlyWind/Views/MainWindow.xaml.cs b/HeavenlyWind/Views/MainWindow.xaml.cs
index 39c126a1..bc76d0b3 100644
--- a/HeavenlyWind/Views/MainWindow.xaml.cs
+++ b/HeavenlyWind/Views/MainWindow.xaml.cs
@@ -1,4 +1,6 @@
-using Sakuno.KanColle.Amatsukaze.Services;
+using Sakuno.KanColle.Amatsukaze.Game;
+using Sakuno.KanColle.Amatsukaze.Models;
+using Sakuno.KanColle.Amatsukaze.Services;
 using Sakuno.SystemInterop;
 using Sakuno.UserInterface;
 using Sakuno.UserInterface.Controls;
@@ -22,14 +24,6 @@ static MainWindow()
         public MainWindow()
         {
             InitializeComponent();
-
-            if (!BrowserService.Instance.NoInstalledLayoutEngines)
-            {
-                BrowserService.Instance.Resized += (s, e) => Dispatcher.BeginInvoke(new Action(UpdateSize));
-
-                Preference.Current.Layout.LandscapeDock.Subscribe(OnDockChanged);
-                Preference.Current.Layout.PortraitDock.Subscribe(OnDockChanged);
-            }
         }
 
         protected override void OnSourceInitialized(EventArgs e)
@@ -45,33 +39,48 @@ protected override void OnSourceInitialized(EventArgs e)
 
         protected override void OnClosing(CancelEventArgs e)
         {
-            var rDialog = new TaskDialog()
+            var rMode = Preference.Instance.Browser.RefreshConfirmationMode.Value;
+            if (rMode == ConfirmationMode.Always || (rMode == ConfirmationMode.DuringSortie && KanColleGame.Current.Sortie != null))
             {
-                Caption = StringResources.Instance.Main.Product_Name,
-                Instruction = StringResources.Instance.Main.Window_ClosingConfirmation_Instruction,
-                Icon = TaskDialogIcon.Information,
-                Buttons =
+                var rDialog = new TaskDialog()
                 {
-                    new TaskDialogCommandLink(TaskDialogCommonButton.Yes, StringResources.Instance.Main.Window_ClosingConfirmation_Button_Yes),
-                    new TaskDialogCommandLink(TaskDialogCommonButton.No, StringResources.Instance.Main.Window_ClosingConfirmation_Button_No),
-                },
-                DefaultCommonButton = TaskDialogCommonButton.No,
-
-                OwnerWindow = this,
-                ShowAtTheCenterOfOwner = true,
-            };
-            if (rDialog.Show().ClickedCommonButton == TaskDialogCommonButton.No)
-            {
-                e.Cancel = true;
-                return;
+                    Caption = StringResources.Instance.Main.Product_Name,
+                    Instruction = StringResources.Instance.Main.Window_ClosingConfirmation_Instruction,
+                    Icon = TaskDialogIcon.Information,
+                    Buttons =
+                    {
+                        new TaskDialogCommandLink(TaskDialogCommonButton.Yes, StringResources.Instance.Main.Window_ClosingConfirmation_Button_Yes),
+                        new TaskDialogCommandLink(TaskDialogCommonButton.No, StringResources.Instance.Main.Window_ClosingConfirmation_Button_No),
+                    },
+                    DefaultCommonButton = TaskDialogCommonButton.No,
+
+                    OwnerWindow = this,
+                    ShowAtTheCenterOfOwner = true,
+                };
+                if (rDialog.Show().ClickedCommonButton == TaskDialogCommonButton.No)
+                {
+                    e.Cancel = true;
+                    return;
+                }
             }
 
             base.OnClosing(e);
         }
 
+        internal void SubscribeBrowserPreferenceChanged()
+        {
+            if (!BrowserService.Instance.NoInstalledLayoutEngines)
+            {
+                BrowserService.Instance.Resized += (s, e) => Dispatcher.BeginInvoke(new Action(UpdateSize));
+
+                Preference.Instance.UI.LandscapeDock.Subscribe(OnDockChanged);
+                Preference.Instance.UI.PortraitDock.Subscribe(OnDockChanged);
+            }
+        }
+
         void UpdateSize()
         {
-            var rZoom = DpiUtil.ScaleX + Preference.Current.Browser.Zoom - 1.0;
+            var rZoom = DpiUtil.ScaleX + Preference.Instance.Browser.Zoom - 1.0;
             var rBrowserWidth = GameConstants.GameWidth * rZoom / DpiUtil.ScaleX / DpiUtil.ScaleX;
             var rBrowserHeight = GameConstants.GameHeight * rZoom / DpiUtil.ScaleX / DpiUtil.ScaleX + Browser.Instance.GetBarSize().Height;
 
@@ -83,7 +92,7 @@ void OnDockChanged(Dock rpDock)
         {
             Dispatcher.BeginInvoke(new Action(() =>
             {
-                var rZoom = DpiUtil.ScaleX + Preference.Current.Browser.Zoom - 1.0;
+                var rZoom = DpiUtil.ScaleX + Preference.Instance.Browser.Zoom - 1.0;
                 var rWidth = GameConstants.GameWidth * rZoom / DpiUtil.ScaleX / DpiUtil.ScaleX;
                 var rHeight = GameConstants.GameHeight * rZoom / DpiUtil.ScaleX / DpiUtil.ScaleX + Browser.Instance.GetBarSize().Height;
 
diff --git a/HeavenlyWind/Views/Overviews/EquipmentOverviewWindow.xaml b/HeavenlyWind/Views/Overviews/EquipmentOverviewWindow.xaml
index a13c6810..89ecdd84 100644
--- a/HeavenlyWind/Views/Overviews/EquipmentOverviewWindow.xaml
+++ b/HeavenlyWind/Views/Overviews/EquipmentOverviewWindow.xaml
@@ -10,6 +10,7 @@
                   mc:Ignorable="d"
                   Title="{rb:StringResource Main.Window_EquipmentOverview}"
                   Width="1024" Height="600"
+                  WindowPlacementPreference="{StaticResource WindowPlacementPreference}"
                   UseLayoutRounding="True">
     <Window.Resources>
         <Style x:Key="ShipItemsControlStyle" TargetType="{x:Type ItemsControl}">
diff --git a/HeavenlyWind/Views/Overviews/ShipOverviewWindow.xaml b/HeavenlyWind/Views/Overviews/ShipOverviewWindow.xaml
index 9a2e7e0a..a1e2cd61 100644
--- a/HeavenlyWind/Views/Overviews/ShipOverviewWindow.xaml
+++ b/HeavenlyWind/Views/Overviews/ShipOverviewWindow.xaml
@@ -11,6 +11,7 @@
                   mc:Ignorable="d"
                   Title="{rb:StringResource Main.Window_ShipOverview}"
                   Width="1200" Height="720"
+                  WindowPlacementPreference="{StaticResource WindowPlacementPreference}"
                   UseLayoutRounding="True">
     <ruic:MetroWindow.Resources>
         <ResourceDictionary>
diff --git a/HeavenlyWind/Views/Preferences/Browser.xaml b/HeavenlyWind/Views/Preferences/Browser.xaml
index cbefaea5..6034506e 100644
--- a/HeavenlyWind/Views/Preferences/Browser.xaml
+++ b/HeavenlyWind/Views/Preferences/Browser.xaml
@@ -59,5 +59,18 @@
         <CheckBox IsChecked="{rb:Preference Browser.ActionBarStickToBrowser}" Margin="0, 0, 0, 6">
             <TextBlock Text="{rb:StringResource Main.PreferenceWindow_Browser_Placement_StickToBrowser}" />
         </CheckBox>
+
+        <Rectangle Fill="{DynamicResource InactiveForegroundBrushKey}" Height="1" Margin="0, 6" />
+
+        <StackPanel Orientation="Horizontal" Margin="0, 6, 0, 0">
+            <TextBlock Text="{rb:StringResource Main.PreferenceWindow_Browser_RefreshConfirmation}" />
+            <ComboBox ItemsSource="{rb:Enumeration {x:Type rbm:ConfirmationMode}}" SelectedValue="{rb:Preference Browser.RefreshConfirmationMode}" Width="150" Margin="6, 0, 0, 0">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{rb:EnumToStringResource ., PreferenceWindow_Browser_RefreshConfirmation}" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+        </StackPanel>
     </StackPanel>
 </UserControl>
diff --git a/HeavenlyWind/Views/Preferences/Network.xaml b/HeavenlyWind/Views/Preferences/Network.xaml
index 3789d143..34d9abe0 100644
--- a/HeavenlyWind/Views/Preferences/Network.xaml
+++ b/HeavenlyWind/Views/Preferences/Network.xaml
@@ -1,4 +1,5 @@
 <UserControl x:Class="Sakuno.KanColle.Amatsukaze.Views.Preferences.Network"
+             x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,7 +14,10 @@
     </UserControl.Resources>
 
     <StackPanel>
-        <StackPanel Orientation="Horizontal">
+        <CheckBox Name="EnablePortCustomization" Checked="EnablePortCustomization_Checked">
+            <TextBlock Text="{rb:StringResource Main.PreferenceWindow_Network_Port_Customization}" />
+        </CheckBox>
+        <StackPanel Orientation="Horizontal" IsEnabled="{Binding IsChecked, ElementName=EnablePortCustomization}" Margin="0, 6, 0, 0">
             <TextBlock Text="{rb:StringResource Main.PreferenceWindow_Network_Port}" />
             <TextBox Text="{rb:Preference Network.Port, UpdateSourceTrigger=PropertyChanged, ValidationRule={StaticResource PortRangeValidationRule}}" Width="60" Margin="6, 0, 0, 0">
                 <i:Interaction.Behaviors>
@@ -21,9 +25,6 @@
                 </i:Interaction.Behaviors>
             </TextBox>
         </StackPanel>
-        <CheckBox IsChecked="{rb:Preference Network.EnableForSSL}" Margin="0, 6, 0, 0">
-            <TextBlock Text="{rb:StringResource Main.PreferenceWindow_Network_EnableForSSL}" />
-        </CheckBox>
         <CheckBox IsChecked="{rb:Preference Network.AllowRequestsFromOtherDevices}" Margin="0, 6, 0, 0">
             <TextBlock Text="{rb:StringResource PreferenceWindow_Network_AllowRequestsFromOtherDevices}" />
         </CheckBox>
@@ -39,7 +40,7 @@
                 </i:Interaction.Behaviors>
             </TextBox>
 
-            <CheckBox IsChecked="{rb:Preference Network.UpstreamProxy.HttpOnly}" Margin="12, 0, 0, 0">
+            <CheckBox Name="HttpOnly" IsChecked="{rb:Preference Network.UpstreamProxy.HttpOnly}" Margin="12, 0, 0, 0" Checked="HttpOnly_Checked">
                 <TextBlock Text="{rb:StringResource Main.PreferenceWindow_Network_UseUpstreamProxy_HttpOnly}" />
             </CheckBox>
         </StackPanel>
diff --git a/HeavenlyWind/Views/Preferences/Network.xaml.cs b/HeavenlyWind/Views/Preferences/Network.xaml.cs
index 8bdf11fc..8ac58f9e 100644
--- a/HeavenlyWind/Views/Preferences/Network.xaml.cs
+++ b/HeavenlyWind/Views/Preferences/Network.xaml.cs
@@ -1,15 +1,69 @@
-using System.Windows.Controls;
+using Sakuno.SystemInterop;
+using Sakuno.UserInterface;
+using System.Windows;
 
 namespace Sakuno.KanColle.Amatsukaze.Views.Preferences
 {
     /// <summary>
     /// Network.xaml の相互作用ロジック
     /// </summary>
-    public partial class Network : UserControl
+    partial class Network
     {
         public Network()
         {
             InitializeComponent();
         }
+
+        void EnablePortCustomization_Checked(object sender, RoutedEventArgs e)
+        {
+            if (!EnablePortCustomization.IsChecked.Value)
+                return;
+
+            var rDialog = new TaskDialog()
+            {
+                Caption = StringResources.Instance.Main.Product_Name,
+                Instruction = StringResources.Instance.Main.PreferenceWindow_Network_Port_Customization_Dialog_Instruction,
+                Icon = TaskDialogIcon.Information,
+                Content = StringResources.Instance.Main.PreferenceWindow_Network_Port_Customization_Dialog_Content,
+                Buttons =
+                {
+                    new TaskDialogButton(TaskDialogCommonButton.Yes, StringResources.Instance.Main.PreferenceWindow_Network_Port_Customization_Dialog_Button_Yes),
+                    new TaskDialogButton(TaskDialogCommonButton.No, StringResources.Instance.Main.PreferenceWindow_Network_Port_Customization_Dialog_Button_No),
+                },
+                DefaultCommonButton = TaskDialogCommonButton.No,
+
+                OwnerWindow = WindowUtil.GetTopWindow(),
+                ShowAtTheCenterOfOwner = true,
+            };
+
+            if (rDialog.Show().ClickedCommonButton == TaskDialogCommonButton.No)
+                EnablePortCustomization.IsChecked = false;
+        }
+
+        void HttpOnly_Checked(object sender, RoutedEventArgs e)
+        {
+            if (!HttpOnly.IsChecked.Value)
+                return;
+
+            var rDialog = new TaskDialog()
+            {
+                Caption = StringResources.Instance.Main.Product_Name,
+                Instruction = StringResources.Instance.Main.PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Instruction,
+                Icon = TaskDialogIcon.Information,
+                Content = StringResources.Instance.Main.PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Content,
+                Buttons =
+                {
+                    new TaskDialogButton(TaskDialogCommonButton.Yes, StringResources.Instance.Main.PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Button_Yes),
+                    new TaskDialogButton(TaskDialogCommonButton.No, StringResources.Instance.Main.PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Button_No),
+                },
+                DefaultCommonButton = TaskDialogCommonButton.No,
+
+                OwnerWindow = WindowUtil.GetTopWindow(),
+                ShowAtTheCenterOfOwner = true,
+            };
+
+            if (rDialog.Show().ClickedCommonButton == TaskDialogCommonButton.No)
+                HttpOnly.IsChecked = false;
+        }
     }
 }
diff --git a/HeavenlyWind/Views/Preferences/Notification.xaml b/HeavenlyWind/Views/Preferences/Notification.xaml
index aeecee71..f05ea469 100644
--- a/HeavenlyWind/Views/Preferences/Notification.xaml
+++ b/HeavenlyWind/Views/Preferences/Notification.xaml
@@ -20,8 +20,8 @@
             <TextBlock Text="{rb:StringResource PreferenceWindow_Notification_Repair}" />
         </CheckBox>
 
-        <CheckBox IsChecked="{rb:Preference Notification.HeavilyDamagedWarning}" Margin="0, 12, 0, 0">
-            <TextBlock Text="{rb:StringResource PreferenceWindow_Notification_HeavilyDamagedWarning}" />
+        <CheckBox IsChecked="{rb:Preference Notification.HeavyDamageWarning}" Margin="0, 12, 0, 0">
+            <TextBlock Text="{rb:StringResource PreferenceWindow_Notification_HeavyDamageWarning}" />
         </CheckBox>
 
         <CheckBox IsChecked="{rb:Preference Notification.RecoveryFromFatigue}" Margin="0, 12, 0, 0">
@@ -46,18 +46,18 @@
             <TextBox Text="{rb:Preference Notification.SoundFilename}" IsEnabled="{Binding IsChecked, ElementName=CustomSound}" Margin="6, 0, 0, 0" />
         </DockPanel>
 
-        <TextBlock Text="{rb:StringResource PreferenceWindow_Notification_Sound_HeavilyDamagedWarning}" FontSize="14" FontWeight="Bold" Margin="0, 12, 0, 0" />
+        <TextBlock Text="{rb:StringResource PreferenceWindow_Notification_Sound_HeavyDamageWarning}" FontSize="14" FontWeight="Bold" Margin="0, 12, 0, 0" />
 
-        <RadioButton GroupName="SoundHD" IsChecked="{rb:Preference Notification.HeavilyDamagedWarningSound, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static rbm:NotificationSound.Slient}}" Margin="0, 6, 0, 0">
+        <RadioButton GroupName="SoundHD" IsChecked="{rb:Preference Notification.HeavyDamageWarningSound, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static rbm:NotificationSound.Slient}}" Margin="0, 6, 0, 0">
             <TextBlock Text="{rb:StringResource PreferenceWindow_Notification_Sound_Slient}" />
         </RadioButton>
-        <RadioButton GroupName="SoundHD" IsChecked="{rb:Preference Notification.HeavilyDamagedWarningSound, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static rbm:NotificationSound.SystemSound}}" Margin="0, 6, 0, 0">
+        <RadioButton GroupName="SoundHD" IsChecked="{rb:Preference Notification.HeavyDamageWarningSound, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static rbm:NotificationSound.SystemSound}}" Margin="0, 6, 0, 0">
             <TextBlock Text="{rb:StringResource PreferenceWindow_Notification_Sound_SystemSound}" />
         </RadioButton>
         <DockPanel  Margin="0, 6, 0, 0">
-            <RadioButton Name="CustomSoundHD" GroupName="SoundHD" IsChecked="{rb:Preference Notification.HeavilyDamagedWarningSound, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static rbm:NotificationSound.Custom}}" />
-            <Button Content="..." Command="{Binding OpenCustomSoundFileDialogCommand}" CommandParameter="HeavilyDamaged" IsEnabled="{Binding IsChecked, ElementName=CustomSoundHD}" Margin="6, 0, 0, 0" DockPanel.Dock="Right" />
-            <TextBox Text="{rb:Preference Notification.HeavilyDamagedWarningSoundFilename}" IsEnabled="{Binding IsChecked, ElementName=CustomSoundHD}" Margin="6, 0, 0, 0" />
+            <RadioButton Name="CustomSoundHD" GroupName="SoundHD" IsChecked="{rb:Preference Notification.HeavyDamageWarningSound, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static rbm:NotificationSound.Custom}}" />
+            <Button Content="..." Command="{Binding OpenCustomSoundFileDialogCommand}" CommandParameter="HeavyDamage" IsEnabled="{Binding IsChecked, ElementName=CustomSoundHD}" Margin="6, 0, 0, 0" DockPanel.Dock="Right" />
+            <TextBox Text="{rb:Preference Notification.HeavyDamageWarningSoundFilename}" IsEnabled="{Binding IsChecked, ElementName=CustomSoundHD}" Margin="6, 0, 0, 0" />
         </DockPanel>
     </StackPanel>
 </UserControl>
diff --git a/HeavenlyWind/Views/Preferences/Other.xaml.cs b/HeavenlyWind/Views/Preferences/Other.xaml.cs
index 820657cb..f76ed961 100644
--- a/HeavenlyWind/Views/Preferences/Other.xaml.cs
+++ b/HeavenlyWind/Views/Preferences/Other.xaml.cs
@@ -40,7 +40,7 @@ void PanicKey_PreviewKeyDown(object sender, KeyEventArgs e)
             r_OldKey = rKey;
             r_OldModifierKeys = Keyboard.Modifiers;
 
-            Preference.Current.Other.PanicKey.UpdateKey((int)Keyboard.Modifiers, KeyInterop.VirtualKeyFromKey(rKey));
+            Preference.Instance.Other.PanicKey.UpdateKey((int)Keyboard.Modifiers, KeyInterop.VirtualKeyFromKey(rKey));
         }
     }
 }
diff --git a/HeavenlyWind/Views/Preferences/Screenshot.xaml b/HeavenlyWind/Views/Preferences/Screenshot.xaml
index beec102e..62f8e622 100644
--- a/HeavenlyWind/Views/Preferences/Screenshot.xaml
+++ b/HeavenlyWind/Views/Preferences/Screenshot.xaml
@@ -11,7 +11,7 @@
         <DockPanel>
             <TextBlock Text="{rb:StringResource Main.PreferenceWindow_Screenshot_Folder}" />
             <Button Content="..." Command="{Binding OpenFolderPickerCommand}" CommandParameter="Screenshot" Margin="6, 0, 0, 0" DockPanel.Dock="Right" />
-            <TextBox Text="{rb:Preference Browser.Screenshot.Destination, UpdateSourceTrigger=PropertyChanged}" Margin="6, 0, 0, 0" />
+            <TextBox Text="{rb:Preference Browser.Screenshot.Path, UpdateSourceTrigger=PropertyChanged}" Margin="6, 0, 0, 0" />
         </DockPanel>
 
         <StackPanel Orientation="Horizontal" Margin="0, 8, 0, 0">
diff --git a/HeavenlyWind/Views/Preferences/UI.xaml b/HeavenlyWind/Views/Preferences/UI.xaml
index de8db068..0a8be7fd 100644
--- a/HeavenlyWind/Views/Preferences/UI.xaml
+++ b/HeavenlyWind/Views/Preferences/UI.xaml
@@ -12,7 +12,23 @@
              mc:Ignorable="d"
              d:DesignWidth="300" d:DesignHeight="300">
     <StackPanel>
-        <Grid>
+        <StackPanel Orientation="Horizontal">
+            <TextBlock Text="{rb:StringResource Main.PreferenceWindow_Window_Font}" />
+            <ComboBox ItemsSource="{Binding SystemFonts}" IsSynchronizedWithCurrentItem="True" SelectedValue="{rb:Preference UI.Font}" SelectedValuePath="FontFamily" Width="200" Margin="4, 0, 0, 0">
+                <ComboBox.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <VirtualizingStackPanel />
+                    </ItemsPanelTemplate>
+                </ComboBox.ItemsPanel>
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Name}" FontFamily="{Binding FontFamily}" FontSize="14" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+        </StackPanel>
+
+        <Grid Margin="0, 12, 0, 0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="20" />
diff --git a/HeavenlyWind/Views/Preferences/Window.xaml b/HeavenlyWind/Views/Preferences/Window.xaml
index a70dd781..c3296074 100644
--- a/HeavenlyWind/Views/Preferences/Window.xaml
+++ b/HeavenlyWind/Views/Preferences/Window.xaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:rb="clr-namespace:Sakuno.KanColle.Amatsukaze;assembly=HeavenlyWind.Base"
+             xmlns:rbm="clr-namespace:Sakuno.KanColle.Amatsukaze.Models;assembly=HeavenlyWind.Base"
              mc:Ignorable="d"
              d:DesignWidth="640" d:DesignHeight="300">
     <UserControl.Resources>
@@ -19,21 +20,18 @@
 
     <StackPanel>
         <StackPanel Orientation="Horizontal">
-            <TextBlock Text="{rb:StringResource Main.PreferenceWindow_Window_Font}" />
-            <ComboBox ItemsSource="{Binding SystemFonts}" IsSynchronizedWithCurrentItem="True" SelectedValue="{rb:Preference UI.Font}" SelectedValuePath="FontFamily" Width="200" Margin="4, 0, 0, 0">
-                <ComboBox.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <VirtualizingStackPanel />
-                    </ItemsPanelTemplate>
-                </ComboBox.ItemsPanel>
+            <TextBlock Text="{rb:StringResource Main.PreferenceWindow_Window_CloseConfirmation}" />
+            <ComboBox ItemsSource="{rb:Enumeration {x:Type rbm:ConfirmationMode}}" SelectedValue="{rb:Preference UI.CloseConfirmationMode}" Width="150" Margin="6, 0, 0, 0">
                 <ComboBox.ItemTemplate>
                     <DataTemplate>
-                        <TextBlock Text="{Binding Name}" FontFamily="{Binding FontFamily}" FontSize="14" />
+                        <TextBlock Text="{rb:EnumToStringResource ., PreferenceWindow_Window_CloseConfirmation}" />
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
             </ComboBox>
         </StackPanel>
 
+        <Rectangle Fill="{DynamicResource InactiveForegroundBrushKey}" Height="1" Margin="0, 6" />
+
         <TextBlock Text="{rb:StringResource Main.PreferenceWindow_Window_Layout}" FontSize="14" FontWeight="Bold" Margin="0, 12, 0, 0" />
 
         <StackPanel Orientation="Horizontal" Margin="0, 6, 0, 0">
@@ -103,10 +101,10 @@
 
                         <Control Style="{StaticResource GameStyle}" Grid.Column="1" Grid.Row="1" />
 
-                        <RadioButton IsChecked="{rb:Preference Layout.LandscapeDock, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static Dock.Bottom}}" Grid.Column="1" />
-                        <RadioButton IsChecked="{rb:Preference Layout.LandscapeDock, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static Dock.Right}}" Grid.Row="1" />
-                        <RadioButton IsChecked="{rb:Preference Layout.LandscapeDock, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static Dock.Left}}" Grid.Column="2" Grid.Row="1" />
-                        <RadioButton IsChecked="{rb:Preference Layout.LandscapeDock, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static Dock.Top}}" Grid.Column="1" Grid.Row="2" />
+                        <RadioButton IsChecked="{rb:Preference UI.LandscapeDock, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static Dock.Bottom}}" Grid.Column="1" />
+                        <RadioButton IsChecked="{rb:Preference UI.LandscapeDock, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static Dock.Right}}" Grid.Row="1" />
+                        <RadioButton IsChecked="{rb:Preference UI.LandscapeDock, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static Dock.Left}}" Grid.Column="2" Grid.Row="1" />
+                        <RadioButton IsChecked="{rb:Preference UI.LandscapeDock, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static Dock.Top}}" Grid.Column="1" Grid.Row="2" />
                     </Grid>
                 </Grid>
             </Border>
@@ -136,10 +134,10 @@
 
                         <Control Style="{StaticResource GameStyle}" Grid.Column="1" Grid.Row="1" />
 
-                        <RadioButton IsChecked="{rb:Preference Layout.PortraitDock, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static Dock.Bottom}}" Grid.Column="1" />
-                        <RadioButton IsChecked="{rb:Preference Layout.PortraitDock, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static Dock.Right}}" Grid.Row="1" />
-                        <RadioButton IsChecked="{rb:Preference Layout.PortraitDock, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static Dock.Left}}" Grid.Column="2" Grid.Row="1" />
-                        <RadioButton IsChecked="{rb:Preference Layout.PortraitDock, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static Dock.Top}}" Grid.Column="1" Grid.Row="2" />
+                        <RadioButton IsChecked="{rb:Preference UI.PortraitDock, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static Dock.Bottom}}" Grid.Column="1" />
+                        <RadioButton IsChecked="{rb:Preference UI.PortraitDock, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static Dock.Right}}" Grid.Row="1" />
+                        <RadioButton IsChecked="{rb:Preference UI.PortraitDock, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static Dock.Left}}" Grid.Column="2" Grid.Row="1" />
+                        <RadioButton IsChecked="{rb:Preference UI.PortraitDock, Converter={StaticResource EqualityToBooleanConverter}, ConverterParameter={x:Static Dock.Top}}" Grid.Column="1" Grid.Row="2" />
                     </Grid>
                 </Grid>
             </Border>
diff --git a/HeavenlyWind/Views/StatusBar.xaml b/HeavenlyWind/Views/StatusBar.xaml
index b9711b49..b8473cb9 100644
--- a/HeavenlyWind/Views/StatusBar.xaml
+++ b/HeavenlyWind/Views/StatusBar.xaml
@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:rb="clr-namespace:Sakuno.KanColle.Amatsukaze;assembly=HeavenlyWind.Base"
              xmlns:ruic="clr-namespace:Sakuno.UserInterface.Controls;assembly=Sakuno.UserInterface"
+             xmlns:rc="clr-namespace:Sakuno.KanColle.Amatsukaze.Controls"
              xmlns:rs="clr-namespace:Sakuno.KanColle.Amatsukaze.Services"
              mc:Ignorable="d"
              DataContext="{Binding Source={x:Static rs:StatusBarService.Instance}}"
@@ -98,9 +99,16 @@
                     </StackPanel>
                 </ruic:DropDownButton>
 
-                <TextBlock Text="{Binding Message}" TextWrapping="NoWrap">
+                <ruic:BBCodeBlock BBCode="{Binding Message}" TextWrapping="NoWrap">
                     <TextBlock.Style>
-                        <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlockStyle}">
+                        <Style TargetType="{x:Type ruic:BBCodeBlock}" BasedOn="{StaticResource BaseTextBlockStyle}">
+                            <Style.Resources>
+                                <Style TargetType="{x:Type rc:MaterialIcon}">
+                                    <Setter Property="Width" Value="16" />
+                                    <Setter Property="Height" Value="16" />
+                                </Style>
+                            </Style.Resources>
+
                             <Style.Triggers>
                                 <DataTrigger Binding="{Binding IsMessageObsolete}" Value="True">
                                     <DataTrigger.EnterActions>
@@ -117,7 +125,7 @@
                             </Style.Triggers>
                         </Style>
                     </TextBlock.Style>
-                </TextBlock>
+                </ruic:BBCodeBlock>
             </DockPanel>
         </DockPanel>
 
diff --git a/Library b/Library
index 3d90376a..e2c2cdf7 160000
--- a/Library
+++ b/Library
@@ -1 +1 @@
-Subproject commit 3d90376a6a4b6e58f52d10390ae68247e0846384
+Subproject commit e2c2cdf71fb95d2cd9ce8b07a0e906bdc1e155fc
diff --git a/Resources/Strings/English/Main.xml b/Resources/Strings/English/Main.xml
index 24868e0c..188e5d24 100644
--- a/Resources/Strings/English/Main.xml
+++ b/Resources/Strings/English/Main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Strings CultureName="en" Name="English" Version="0.1.11">
+<Strings CultureName="en" Name="English" Version="0.1.11.4">
 
   <String Key="Product_Name">Intelligent Naval Gun</String>
 
@@ -13,14 +13,14 @@
   <String Key="Log_Exception_API_Failed">Error code from API「{0}」: {1}</String>
   <String Key="Log_Exception_API_ParseException">Error occured when parsing API: {0}</String>
   <String Key="Log_Exception_Cache_FailedToSaveFile">Failed to save file: {0}</String>
-  <String Key="Log_ExpeditionResult">/{0}"{1}" has returned from expedition {2}:{3}.(Result:{4})</String>
-  <String Key="Log_StartConstruction">Start construction of {0} (Material Consumption:{1}/{2}/{3}/{4}-{5})</String>
-  <String Key="Log_Development_Success">{0} was successfully developed.(Material Consumption:{1}/{2}/{3}/{4})</String>
-  <String Key="Log_Development_Failure">Development failed. (Material Consumption:{0}/{1}/{2}/{3})</String>
+  <String Key="Log_ExpeditionResult">/{0}"{1}" has returned from expedition {2}:{3}.(Result: [b]{4}[/b])</String>
+  <String Key="Log_StartConstruction">Start construction of {0} (Material Consumption: [icon]fuel[/icon] {1} [icon]bullet[/icon] {2} [icon]steel[/icon] {3} [icon]bauxite[/icon] {4} [icon]dm[/icon] {5})</String>
+  <String Key="Log_Development_Success">{0} was successfully developed.(Material Consumption: [icon]fuel[/icon] {1} [icon]bullet[/icon] {2} [icon]steel[/icon] {3} [icon]bauxite[/icon] {4})</String>
+  <String Key="Log_Development_Failure">Development failed. (Material Consumption: [icon]fuel[/icon] {0} [icon]bullet[/icon] {1} [icon]steel[/icon] {2} [icon]bauxite[/icon] {3})</String>
   <String Key="Log_Sortie">/{0}"{1}" sorties to {2} ({3}-{4})</String>
   <String Key="Log_Sortie_Event">/{0}"{1}" sorties to {2} (E{3} {4})</String>
-  <String Key="Log_ShipOrItem_Dropped">{0} dropped</String>
-  <String Key="Log_ShipAndItem_Dropped">{0} and {1} dropped</String>
+  <String Key="Log_ShipOrItem_Dropped">[b]{0}[/b] dropped</String>
+  <String Key="Log_ShipAndItem_Dropped">[b]{0}[/b] and [b]{1}[/b] dropped</String>
   <String Key="Log_Screenshot_Failed">Fail to save screenshot: {0}</String>
   <String Key="Log_Screenshot_Failed_FlashElementNotFound">The flash element cannot be found</String>
   <String Key="Log_Screenshot_Failed_NoData">No screenshot data from the browser</String>
@@ -28,13 +28,13 @@
   <String Key="Log_Screenshot_Succeeded_File">Screenshot was saved: {0}</String>
 
   <String Key="Notification_Expedition">Expedition Completed</String>
-  <String Key="Notification_Expedition_Content">"{0}" has returned from expedition {1}.</String>
+  <String Key="Notification_Expedition_Content">"{0}" has returned from {1}.</String>
   <String Key="Notification_Repair">Repairs Completed</String>
   <String Key="Notification_Repair_Content">Repairs on {0} have been completed.</String>
   <String Key="Notification_Construction">Construction Completed</String>
   <String Key="Notification_Construction_Content">Construction of {0} has been completed.</String>
-  <String Key="Notification_HeavilyDamagedWarning">Warning</String>
-  <String Key="Notification_HeavilyDamagedWarning_Content">You have heavily damaged ship(s).</String>
+  <String Key="Notification_HeavyDamageWarning">Warning</String>
+  <String Key="Notification_HeavyDamageWarning_Content">You have heavily damaged ship(s).</String>
   <String Key="Notification_AdvanceWarning">Warning</String>
   <String Key="Notification_AdvanceWarning_Content">Advancing with your ship heavily damaged may result in being sunk.</String>
   <String Key="Notification_RecoveryFromFatigue">Recovery From Fatigue</String>
@@ -307,12 +307,24 @@ The current version can't handle this problem. To mute/unmute, please do it with
   <String Key="Window_ClosingConfirmation_Button_No">Don't Exit</String>
 
   <String Key="PreferenceWindow_Network">Network</String>
-  <String Key="PreferenceWindow_Network_Port">Port</String>
-  <String Key="PreferenceWindow_Network_EnableForSSL">Use proxy for SSL connections</String>
+  <String Key="PreferenceWindow_Network_Port">Local proxy port</String>
+  <String Key="PreferenceWindow_Network_Port_Customization">Set local proxy port</String>
+  <String Key="PreferenceWindow_Network_Port_Customization_Dialog_Instruction">Do you want to modify this port?</String>
+  <String Key="PreferenceWindow_Network_Port_Customization_Dialog_Content">This is the port of the local proxy used to receive data from the browser. Unless it's occupied, it's not recommended to modify it.</String>
+  <String Key="PreferenceWindow_Network_Port_Customization_Dialog_Button_Yes">Yes, I do</String>
+  <String Key="PreferenceWindow_Network_Port_Customization_Dialog_Button_No">No, I don't</String>
   <String Key="PreferenceWindow_Network_AllowRequestsFromOtherDevices">Allow requests from other devices (WARNING: Security Risk)</String>
   <String Key="PreferenceWindow_Network_UseUpstreamProxy">Use upstream proxy</String>
   <String Key="PreferenceWindow_Network_UseUpstreamProxy_HttpOnly">HTTP Only</String>
+  <String Key="PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Instruction">Hold it!</String>
+  <String Key="PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Content">Are you sure that this upstream proxy refuse HTTPS connections?</String>
+  <String Key="PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Button_Yes">Yes</String>
+  <String Key="PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Button_No">No</String>
   <String Key="PreferenceWindow_Window">Window</String>
+  <String Key="PreferenceWindow_Window_CloseConfirmation">Close confirmation</String>
+  <String Key="PreferenceWindow_Window_CloseConfirmation_Disabled">Disabled</String>
+  <String Key="PreferenceWindow_Window_CloseConfirmation_DuringSortie">Show during a sortie</String>
+  <String Key="PreferenceWindow_Window_CloseConfirmation_Always">Always show</String>
   <String Key="PreferenceWindow_Window_Font">Font</String>
   <String Key="PreferenceWindow_Window_Layout">Layout</String>
   <String Key="PreferenceWindow_Window_Layout_Landscape">Layout mode</String>
@@ -344,11 +356,11 @@ The current version can't handle this problem. To mute/unmute, please do it with
   <String Key="PreferenceWindow_Notification_Construction">Notify the completion of construction</String>
   <String Key="PreferenceWindow_Notification_Expedition">Notify the return from an expedition</String>
   <String Key="PreferenceWindow_Notification_Repair">Notify the completion of ship repair</String>
-  <String Key="PreferenceWindow_Notification_HeavilyDamagedWarning">Warn if advancing with heavily damaged ship</String>
+  <String Key="PreferenceWindow_Notification_HeavyDamageWarning">Warn if advancing with heavily damaged ship</String>
   <String Key="PreferenceWindow_Notification_RecoveryFromFatigue">Notify the recovery from fatigue</String>
   <String Key="PreferenceWindow_Notification_AnchorageRepair">Anchorage Repair Notification</String>
   <String Key="PreferenceWindow_Notification_Sound">Sound</String>
-  <String Key="PreferenceWindow_Notification_Sound_HeavilyDamagedWarning">Sound (Heavily damaged)</String>
+  <String Key="PreferenceWindow_Notification_Sound_HeavyDamageWarning">Sound (Heavily damaged)</String>
   <String Key="PreferenceWindow_Notification_Sound_Slient">Slient</String>
   <String Key="PreferenceWindow_Notification_Sound_SystemSound">System Sound</String>
   <String Key="PreferenceWindow_Notification_SoundFileType">Audio file</String>
@@ -364,6 +376,10 @@ The current version can't handle this problem. To mute/unmute, please do it with
   <String Key="PreferenceWindow_Browser_Flash_RenderMode">Render Mode</String>
   <String Key="PreferenceWindow_Browser_Placement_AtBottom">Show action bar at the bottom</String>
   <String Key="PreferenceWindow_Browser_Placement_StickToBrowser">Stick to the browser</String>
+  <String Key="PreferenceWindow_Browser_RefreshConfirmation">Refresh confirmation</String>
+  <String Key="PreferenceWindow_Browser_RefreshConfirmation_Disabled">Disabled</String>
+  <String Key="PreferenceWindow_Browser_RefreshConfirmation_DuringSortie">Show during a sortie</String>
+  <String Key="PreferenceWindow_Browser_RefreshConfirmation_Always">Always show</String>
   <String Key="PreferenceWindow_Screenshot">Screenshot</String>
   <String Key="PreferenceWindow_Screenshot_Folder">Destination</String>
   <String Key="PreferenceWindow_Other">MISC.</String>
diff --git a/Resources/Strings/Japanese/Main.xml b/Resources/Strings/Japanese/Main.xml
index da890d81..93d77a9e 100644
--- a/Resources/Strings/Japanese/Main.xml
+++ b/Resources/Strings/Japanese/Main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Strings CultureName="ja-JP" Name="日本語" Version="0.1.11">
+<Strings CultureName="ja-JP" Name="日本語" Version="0.1.11.4">
 
   <String Key="Product_Name">いんてりじぇんと連装砲くん</String>
 
@@ -13,14 +13,14 @@
   <String Key="Log_Exception_API_Failed">API「{0}」のエラーコードを受信しました: {1}</String>
   <String Key="Log_Exception_API_ParseException">API の解析中にエラーが発生しました: {0}</String>
   <String Key="Log_Exception_Cache_FailedToSaveFile">ファイルの保存に失敗しました: {0}</String>
-  <String Key="Log_ExpeditionResult">/{0}「{1}」が遠征「{2}:{3}」から帰投しました。(結果:{4})</String>
-  <String Key="Log_StartConstruction">「{0}」の建造を開始しました。(投入した資材:{1}/{2}/{3}/{4}-{5})</String>
-  <String Key="Log_Development_Success">「{0}」の開発に成功しました。(投入した資材:{1}/{2}/{3}/{4})</String>
-  <String Key="Log_Development_Failure">開発に失敗しました。(投入した資材:{0}/{1}/{2}/{3})</String>
+  <String Key="Log_ExpeditionResult">/{0}「{1}」が遠征「{2}:{3}」から帰投しました。(結果: [b]{4}[/b])</String>
+  <String Key="Log_StartConstruction">「{0}」の建造を開始しました。(投入した資材: [icon]fuel[/icon] {1} [icon]bullet[/icon] {2} [icon]steel[/icon] {3} [icon]bauxite[/icon] {4} [icon]dm[/icon] {5})</String>
+  <String Key="Log_Development_Success">「{0}」の開発に成功しました。(投入した資材: [icon]fuel[/icon] {1} [icon]bullet[/icon] {2} [icon]steel[/icon] {3} [icon]bauxite[/icon] {4})</String>
+  <String Key="Log_Development_Failure">開発に失敗しました。(投入した資材: [icon]fuel[/icon] {0} [icon]bullet[/icon] {1} [icon]steel[/icon] {2} [icon]bauxite[/icon] {3})</String>
   <String Key="Log_Sortie">/{0}「{1}」が「{2} ({3}-{4})」へ出撃しました</String>
   <String Key="Log_Sortie_Event">/{0}「{1}」が「{2} (E{3} {4})」へ出撃しました</String>
-  <String Key="Log_ShipOrItem_Dropped">「{0}」がドロップしました</String>
-  <String Key="Log_ShipAndItem_Dropped">「{0}」や「{1}」がドロップしました</String>
+  <String Key="Log_ShipOrItem_Dropped">「[b]{0}[/b]」がドロップしました</String>
+  <String Key="Log_ShipAndItem_Dropped">「[b]{0}[/b]」や「[b]{0}[/b]」がドロップしました</String>
   <String Key="Log_Screenshot_Failed">スクリーンショットの保存に失敗しました: {0}</String>
   <String Key="Log_Screenshot_Failed_FlashElementNotFound">Flash 要素が見つかりません</String>
   <String Key="Log_Screenshot_Failed_NoData">ブラウザからのスクリーンショットデータはありません</String>
@@ -33,8 +33,8 @@
   <String Key="Notification_Repair_Content">「{0}」の修理が完了しました。</String>
   <String Key="Notification_Construction">建造完了</String>
   <String Key="Notification_Construction_Content">「{0}」の建造が完了しました。</String>
-  <String Key="Notification_HeavilyDamagedWarning">大破警告</String>
-  <String Key="Notification_HeavilyDamagedWarning_Content">大破した艦娘がいます。</String>
+  <String Key="Notification_HeavyDamageWarning">大破警告</String>
+  <String Key="Notification_HeavyDamageWarning_Content">大破した艦娘がいます。</String>
   <String Key="Notification_AdvanceWarning">進撃警告</String>
   <String Key="Notification_AdvanceWarning_Content">大破状態で進撃し、轟沈の恐れがあります。</String>
   <String Key="Notification_RecoveryFromFatigue">疲労回復完了</String>
@@ -306,11 +306,24 @@
 
   <String Key="PreferenceWindow_Network">通信</String>
   <String Key="PreferenceWindow_Network_Port">待ち受けポート</String>
-  <String Key="PreferenceWindow_Network_EnableForSSL">SSL 接続時もプロキシを使用する</String>
+  <String Key="PreferenceWindow_Network_Port_Customization">待ち受けポート設定</String>
+  <String Key="PreferenceWindow_Network_Port_Customization_Dialog_Instruction">ちょっと待ってください</String>
+  <String Key="PreferenceWindow_Network_Port_Customization_Dialog_Content">これはブラウザからのデータを受信するために使用される	
+ローカルプロキシのポートです。</String>
+  <String Key="PreferenceWindow_Network_Port_Customization_Dialog_Button_Yes">設定します</String>
+  <String Key="PreferenceWindow_Network_Port_Customization_Dialog_Button_No">設定しません</String>
   <String Key="PreferenceWindow_Network_AllowRequestsFromOtherDevices">他のデバイスからのリクエストを許可する (非推奨：セキュリティリスク)</String>
   <String Key="PreferenceWindow_Network_UseUpstreamProxy">上流プロキシを使用する</String>
   <String Key="PreferenceWindow_Network_UseUpstreamProxy_HttpOnly">HTTP 接続のみ</String>
+  <String Key="PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Instruction">ちょっと待ってください</String>
+  <String Key="PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Content">この上流プロキシが HTTPS 接続を受信しないことを確信しますか？</String>
+  <String Key="PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Button_Yes">はい</String>
+  <String Key="PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Button_No">いいえ</String>
   <String Key="PreferenceWindow_Window">ウィンドウ</String>
+  <String Key="PreferenceWindow_Window_CloseConfirmation">アプリ終了時の確認動作</String>
+  <String Key="PreferenceWindow_Window_CloseConfirmation_Disabled">確認しない</String>
+  <String Key="PreferenceWindow_Window_CloseConfirmation_DuringSortie">出撃の時に確認する</String>
+  <String Key="PreferenceWindow_Window_CloseConfirmation_Always">常に確認する</String>
   <String Key="PreferenceWindow_Window_Font">フォント</String>
   <String Key="PreferenceWindow_Window_Layout">レイアウト</String>
   <String Key="PreferenceWindow_Window_Layout_Landscape">レイアウトモード</String>
@@ -341,11 +354,11 @@
   <String Key="PreferenceWindow_Notification_Construction">建造完了を通知する</String>
   <String Key="PreferenceWindow_Notification_Expedition">遠征帰投を通知する</String>
   <String Key="PreferenceWindow_Notification_Repair">入渠完了を通知する</String>
-  <String Key="PreferenceWindow_Notification_HeavilyDamagedWarning">大破艦・大破進撃を通知する</String>
+  <String Key="PreferenceWindow_Notification_HeavyDamageWarning">大破艦・大破進撃を通知する</String>
   <String Key="PreferenceWindow_Notification_RecoveryFromFatigue">疲労回復を通知する</String>
   <String Key="PreferenceWindow_Notification_AnchorageRepair">泊地修理の開始から 20 分が経過して通知する</String>
   <String Key="PreferenceWindow_Notification_Sound">サウンド</String>
-  <String Key="PreferenceWindow_Notification_Sound_HeavilyDamagedWarning">サウンド (大破警告)</String>
+  <String Key="PreferenceWindow_Notification_Sound_HeavyDamageWarning">サウンド (大破警告)</String>
   <String Key="PreferenceWindow_Notification_Sound_Slient">なし</String>
   <String Key="PreferenceWindow_Notification_Sound_SystemSound">システムサウンド</String>
   <String Key="PreferenceWindow_Notification_SoundFileType">音声ファイル</String>
@@ -361,6 +374,10 @@
   <String Key="PreferenceWindow_Browser_Flash_RenderMode">レンダーモード</String>
   <String Key="PreferenceWindow_Browser_Placement_AtBottom">アクションバーを下部に表示する</String>
   <String Key="PreferenceWindow_Browser_Placement_StickToBrowser">アクションバーをブラウザの隣に表示する</String>
+  <String Key="PreferenceWindow_Browser_RefreshConfirmation">ブラウザを再読み込み時の確認動作</String>
+  <String Key="PreferenceWindow_Browser_RefreshConfirmation_Disabled">確認しない</String>
+  <String Key="PreferenceWindow_Browser_RefreshConfirmation_DuringSortie">出撃の時に確認する</String>
+  <String Key="PreferenceWindow_Browser_RefreshConfirmation_Always">常に確認する</String>
   <String Key="PreferenceWindow_Screenshot">スクリーンショット</String>
   <String Key="PreferenceWindow_Screenshot_Folder">保存先</String>
   <String Key="PreferenceWindow_Other">その他</String>
diff --git a/Resources/Strings/SimplifiedChinese/Main.xml b/Resources/Strings/SimplifiedChinese/Main.xml
index 14991f3e..a68accd5 100644
--- a/Resources/Strings/SimplifiedChinese/Main.xml
+++ b/Resources/Strings/SimplifiedChinese/Main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Strings CultureName="zh-Hans" Name="简体中文" Version="0.1.11">
+<Strings CultureName="zh-Hans" Name="简体中文" Version="0.1.11.4">
 
   <String Key="Product_Name">智能型连装炮君</String>
 
@@ -13,14 +13,14 @@
   <String Key="Log_Exception_API_Failed">API「{0}」返回错误代码：{1} </String>
   <String Key="Log_Exception_API_ParseException">解析 API 时发生错误: {0}</String>
   <String Key="Log_Exception_Cache_FailedToSaveFile">保存缓存文件失败: {0}</String>
-  <String Key="Log_ExpeditionResult">/{0}「{1}」从远征「{2}:{3}」归来。(结果:{4})</String>
-  <String Key="Log_StartConstruction">开始建造「{0}」。(投入的资材:{1}/{2}/{3}/{4}-{5})</String>
-  <String Key="Log_Development_Success">「{0}」开发成功。(投入的资材:{1}/{2}/{3}/{4})</String>
-  <String Key="Log_Development_Failure">开发失败。(投入的资材:{0}/{1}/{2}/{3})</String>
+  <String Key="Log_ExpeditionResult">/{0}「{1}」从远征「{2}:{3}」归来。(结果: [b]{4}[/b])</String>
+  <String Key="Log_StartConstruction">开始建造「{0}」。(投入的资材: [icon]fuel[/icon] {1} [icon]bullet[/icon] {2} [icon]steel[/icon] {3} [icon]bauxite[/icon] {4} [icon]dm[/icon] {5})</String>
+  <String Key="Log_Development_Success">「{0}」开发成功。(投入的资材: [icon]fuel[/icon] {1} [icon]bullet[/icon] {2} [icon]steel[/icon] {3} [icon]bauxite[/icon] {4})</String>
+  <String Key="Log_Development_Failure">开发失败。(投入的资材: [icon]fuel[/icon] {0} [icon]bullet[/icon] {1} [icon]steel[/icon] {2} [icon]bauxite[/icon] {3})</String>
   <String Key="Log_Sortie">/{0}「{1}」向「{2} ({3}-{4})」出击</String>
   <String Key="Log_Sortie_Event">/{0}「{1}」向「{2} (E{3} {4})」出击</String>
-  <String Key="Log_ShipOrItem_Dropped">获得「{0}」</String>
-  <String Key="Log_ShipAndItem_Dropped">获得「{0}」和「{1}」</String>
+  <String Key="Log_ShipOrItem_Dropped">获得「[b]{0}[/b]」</String>
+  <String Key="Log_ShipAndItem_Dropped">获得「[b]{0}[/b]」和「[b]{1}[/b]」</String>
   <String Key="Log_Screenshot_Failed">截图失败: {0}</String>
   <String Key="Log_Screenshot_Failed_FlashElementNotFound">找不到 Flash 元素</String>
   <String Key="Log_Screenshot_Failed_NoData">浏览器没有返回截图信息</String>
@@ -33,8 +33,8 @@
   <String Key="Notification_Repair_Content">「{0}」修理完毕。</String>
   <String Key="Notification_Construction">建造完成</String>
   <String Key="Notification_Construction_Content">已完成「{0}」的建造。</String>
-  <String Key="Notification_HeavilyDamagedWarning">大破警告</String>
-  <String Key="Notification_HeavilyDamagedWarning_Content">有舰娘处于大破状态。</String>
+  <String Key="Notification_HeavyDamageWarning">大破警告</String>
+  <String Key="Notification_HeavyDamageWarning_Content">有舰娘处于大破状态。</String>
   <String Key="Notification_AdvanceWarning">大破进击</String>
   <String Key="Notification_AdvanceWarning_Content">有舰娘处于大破状态，继续进击有被击沉的风险。</String>
   <String Key="Notification_RecoveryFromFatigue">疲劳恢复</String>
@@ -307,12 +307,26 @@
   <String Key="Window_ClosingConfirmation_Button_No">不退出</String>
 
   <String Key="PreferenceWindow_Network">网络</String>
-  <String Key="PreferenceWindow_Network_Port">端口</String>
-  <String Key="PreferenceWindow_Network_EnableForSSL">对 SSL 连接也使用代理</String>
+  <String Key="PreferenceWindow_Network_Port">本地代理端口</String>
+  <String Key="PreferenceWindow_Network_Port_Customization">指定本地代理端口</String>
+  <String Key="PreferenceWindow_Network_Port_Customization_Dialog_Instruction">真的要修改吗？</String>
+  <String Key="PreferenceWindow_Network_Port_Customization_Dialog_Content">该端口属于用于接收来自浏览器的数据包的本地代理。除非遇到端口被占用等情况，一般不建议修改该端口值。
+
+如果你需要设定浏览器的代理，请设置下面的「上游代理」。</String>
+  <String Key="PreferenceWindow_Network_Port_Customization_Dialog_Button_Yes">真的要修改</String>
+  <String Key="PreferenceWindow_Network_Port_Customization_Dialog_Button_No">好吧，不改了</String>
   <String Key="PreferenceWindow_Network_AllowRequestsFromOtherDevices">允许来自其它设备的请求 (不推荐：有安全风险)</String>
   <String Key="PreferenceWindow_Network_UseUpstreamProxy">使用上游代理</String>
   <String Key="PreferenceWindow_Network_UseUpstreamProxy_HttpOnly">仅 HTTP 请求使用</String>
+  <String Key="PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Instruction">等等</String>
+  <String Key="PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Content">在勾选这个之前，请确认所用的上游代理是否不允许 HTTPS 连接</String>
+  <String Key="PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Button_Yes">是的</String>
+  <String Key="PreferenceWindow_Network_UseUpstreamProxy_HttpOnly_Dialog_Button_No">不是</String>
   <String Key="PreferenceWindow_Window">窗口</String>
+  <String Key="PreferenceWindow_Window_CloseConfirmation">退出确认</String>
+  <String Key="PreferenceWindow_Window_CloseConfirmation_Disabled">禁用</String>
+  <String Key="PreferenceWindow_Window_CloseConfirmation_DuringSortie">仅出击时询问</String>
+  <String Key="PreferenceWindow_Window_CloseConfirmation_Always">总是询问</String>
   <String Key="PreferenceWindow_Window_Font">字体</String>
   <String Key="PreferenceWindow_Window_Layout">布局</String>
   <String Key="PreferenceWindow_Window_Layout_Landscape">布局模式</String>
@@ -343,11 +357,11 @@
   <String Key="PreferenceWindow_Notification_Construction">在建造完成时通知</String>
   <String Key="PreferenceWindow_Notification_Expedition">在远征归来时通知</String>
   <String Key="PreferenceWindow_Notification_Repair">在入渠结束时通知</String>
-  <String Key="PreferenceWindow_Notification_HeavilyDamagedWarning">在有大破船以及大破进击时发出警告</String>
+  <String Key="PreferenceWindow_Notification_HeavyDamageWarning">在有大破船以及大破进击时发出警告</String>
   <String Key="PreferenceWindow_Notification_RecoveryFromFatigue">在疲劳恢复时发出通知</String>
   <String Key="PreferenceWindow_Notification_AnchorageRepair">泊地修理开始 20 分钟后发出通知</String>
   <String Key="PreferenceWindow_Notification_Sound">音效</String>
-  <String Key="PreferenceWindow_Notification_Sound_HeavilyDamagedWarning">音效 (大破警告)</String>
+  <String Key="PreferenceWindow_Notification_Sound_HeavyDamageWarning">音效 (大破警告)</String>
   <String Key="PreferenceWindow_Notification_Sound_Slient">静音</String>
   <String Key="PreferenceWindow_Notification_Sound_SystemSound">系统音效</String>
   <String Key="PreferenceWindow_Notification_SoundFileType">音频文件</String>
@@ -363,6 +377,10 @@
   <String Key="PreferenceWindow_Browser_Flash_RenderMode">渲染模式</String>
   <String Key="PreferenceWindow_Browser_Placement_AtBottom">工具栏显示在底部</String>
   <String Key="PreferenceWindow_Browser_Placement_StickToBrowser">工具栏粘附在浏览器旁</String>
+  <String Key="PreferenceWindow_Browser_RefreshConfirmation">刷新询问</String>
+  <String Key="PreferenceWindow_Browser_RefreshConfirmation_Disabled">禁用</String>
+  <String Key="PreferenceWindow_Browser_RefreshConfirmation_DuringSortie">仅出击时询问</String>
+  <String Key="PreferenceWindow_Browser_RefreshConfirmation_Always">总是询问</String>
   <String Key="PreferenceWindow_Screenshot">截图</String>
   <String Key="PreferenceWindow_Screenshot_Folder">截图文件夹</String>
   <String Key="PreferenceWindow_Other">其它</String>