diff --git a/Wox.Infrastructure/Storage/BinaryStorage.cs b/Wox.Infrastructure/Storage/BinaryStorage.cs
index c0e8be63cf..e6bc9dd8c1 100644
--- a/Wox.Infrastructure/Storage/BinaryStorage.cs
+++ b/Wox.Infrastructure/Storage/BinaryStorage.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Text;
 using Wox.Infrastructure.Logger;
@@ -23,6 +24,8 @@ namespace Wox.Infrastructure.Storage
 
         protected override void LoadInternal()
         {
+            //http://stackoverflow.com/questions/2120055/binaryformatter-deserialize-gives-serializationexception
+            AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
             try
             {
                 using (FileStream fileStream = new FileStream(ConfigPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
@@ -43,7 +46,32 @@ namespace Wox.Infrastructure.Storage
             catch (Exception)
             {
                 serializedObject = LoadDefault();
+#if (DEBUG)
+                {
+                    throw;
+                }
+#endif
             }
+            finally
+            {
+                AppDomain.CurrentDomain.AssemblyResolve -= CurrentDomain_AssemblyResolve;
+            }
+        }
+
+        private System.Reflection.Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
+        {
+            Assembly ayResult = null;
+            string sShortAssemblyName = args.Name.Split(',')[0];
+            Assembly[] ayAssemblies = AppDomain.CurrentDomain.GetAssemblies();
+            foreach (Assembly ayAssembly in ayAssemblies)
+            {
+                if (sShortAssemblyName == ayAssembly.FullName.Split(',')[0])
+                {
+                    ayResult = ayAssembly;
+                    break;
+                }
+            }
+            return ayResult;
         }
 
         protected override void SaveInternal()
@@ -58,11 +86,11 @@ namespace Wox.Infrastructure.Storage
             catch (Exception e)
             {
                 Log.Error(e.Message);
-                #if (DEBUG)
-                {  
-                    throw e;
+#if (DEBUG)
+                {
+                    throw;
                 }
-                #endif
+#endif
             }
         }
     }
diff --git a/Wox/Themes/ThemeBuilder/Template.xaml b/Wox/Themes/ThemeBuilder/Template.xaml
index c0978b4ba5..8d1c4845a4 100644
--- a/Wox/Themes/ThemeBuilder/Template.xaml
+++ b/Wox/Themes/ThemeBuilder/Template.xaml
@@ -2,7 +2,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Default.xaml"></ResourceDictionary>
+        <ResourceDictionary Source="Base.xaml"></ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">