diff --git a/ServerBrowser/ServerBrowserForm.cs b/ServerBrowser/ServerBrowserForm.cs
index 9e14fc1..7f28d95 100644
--- a/ServerBrowser/ServerBrowserForm.cs
+++ b/ServerBrowser/ServerBrowserForm.cs
@@ -30,7 +30,7 @@ namespace ServerBrowser
 {
   public partial class ServerBrowserForm : XtraForm
   {
-    private const string Version = "2.17";
+    private const string Version = "2.18";
     private const string DevExpressVersion = "v15.1";
     private const string CustomDetailColumnPrefix = "ServerInfo.";
     private const string CustomRuleColumnPrefix = "custRule.";
@@ -372,6 +372,7 @@ protected virtual void ApplyAppSettings(IniFile ini)
     #region ApplyAppSettingsFromIni()
     private int ApplyAppSettingsFromIni(IniFile ini, IniFile.Section options, out string[] masterServers)
     {
+      UserLookAndFeel.Default.SkinName = options.GetString("Skin") ?? "Office 2010 Black";
       masterServers = (options.GetString("ApplyAppSettingsFromXml") ?? "").Split(',');
       this.miShowOptions.Down = options.GetBool("ShowOptions", true);
       this.miShowServerQuery.Down = options.GetBool("ShowServerQuery", true);
diff --git a/ServerBrowser/SkinPicker.cs b/ServerBrowser/SkinPicker.cs
index 1e17786..4294504 100644
--- a/ServerBrowser/SkinPicker.cs
+++ b/ServerBrowser/SkinPicker.cs
@@ -65,15 +65,16 @@ private void InitGallery()
     #region btnReset_Click
     private void btnReset_Click(object sender, EventArgs e)
     {
+      const string DefaultSkin = "Office 2010 Black";
       foreach (var galItem in gallery.Gallery.GetAllItems())
       {
-        if (galItem.Caption == DevExpress.LookAndFeel.UserLookAndFeel.Default.SkinName)
+        if (galItem.Caption == DefaultSkin)
         {
           galItem.Checked = true;
           break;
         }
       }
-      DevExpress.LookAndFeel.UserLookAndFeel.Default.SkinName = this.initialSkinName;
+      DevExpress.LookAndFeel.UserLookAndFeel.Default.SkinName = DefaultSkin;
     }
     #endregion
 
diff --git a/changelog.md b/changelog.md
index cfcb406..e9a1fdb 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,8 @@
+2.18
+---
+- fixed: last used skin will be loaded when the program is restarted
+- fixed: "Use Default Skin" button in the skin selection dialog had no effect
+
 2.17
 ---
 - fixed "max players" display for non-team modes (Duel, FFA, Race)