diff --git a/SabreHelper/App.config b/SabreHelper/App.config
index 764bdd32..2853cdb1 100644
--- a/SabreHelper/App.config
+++ b/SabreHelper/App.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
@@ -11,14 +11,16 @@
       </parameters>
     </defaultConnectionFactory>
     <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
       <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
     </providers>
   </entityFramework>
   <system.data>
     <DbProviderFactories>
       <remove invariant="System.Data.SQLite.EF6" />
       <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
-    <remove invariant="System.Data.SQLite" /><add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" /></DbProviderFactories>
+      <remove invariant="System.Data.SQLite" />
+      <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" />
+    </DbProviderFactories>
   </system.data>
 </configuration>
\ No newline at end of file
diff --git a/SabreHelper/Build.cs b/SabreHelper/Build.cs
index 49f2beba..9d404d8f 100644
--- a/SabreHelper/Build.cs
+++ b/SabreHelper/Build.cs
@@ -23,17 +23,6 @@ namespace SabreTools.Helper
 			get { return (Type.GetType("Mono.Runtime") != null); }
 		}
 
-		/// <summary>
-		/// The path to the root of the 7z binaries and DLLs
-		/// </summary>
-		public static string SevenZipPath
-		{
-			get
-			{
-				return Environment.CurrentDirectory + Path.DirectorySeparatorChar + (Environment.Is64BitOperatingSystem ? "x64" : "x86") + Path.DirectorySeparatorChar;
-			}
-		}
-
 		/// <summary>
 		/// Show the help dialog for a given class
 		/// </summary>
diff --git a/SabreHelper/SabreHelper.csproj b/SabreHelper/SabreHelper.csproj
index 240016f2..af4206a9 100644
--- a/SabreHelper/SabreHelper.csproj
+++ b/SabreHelper/SabreHelper.csproj
@@ -33,11 +33,15 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SharpCompress, Version=0.11.6.0, Culture=neutral, PublicKeyToken=beaf6f427e128133, processorArchitecture=MSIL">
+      <HintPath>..\packages\sharpcompress.0.11.6\lib\net40\SharpCompress.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -85,24 +89,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="x86\7za.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x86\7za.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x86\7zxa.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\7za.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\7za.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\7zxa.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="Mappings\MAME.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/SabreHelper/packages.config b/SabreHelper/packages.config
index dac74cbf..98908ad2 100644
--- a/SabreHelper/packages.config
+++ b/SabreHelper/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EntityFramework" version="6.0.0" targetFramework="net452" />
+  <package id="EntityFramework" version="6.1.3" targetFramework="net452" />
+  <package id="sharpcompress" version="0.11.6" targetFramework="net452" />
   <package id="System.Data.SQLite" version="1.0.99.0" targetFramework="net452" />
   <package id="System.Data.SQLite.Core" version="1.0.99.0" targetFramework="net452" />
   <package id="System.Data.SQLite.EF6" version="1.0.99.0" targetFramework="net452" />
diff --git a/SabreHelper/x64/7za.dll b/SabreHelper/x64/7za.dll
deleted file mode 100644
index 444c4ffc..00000000
Binary files a/SabreHelper/x64/7za.dll and /dev/null differ
diff --git a/SabreHelper/x64/7za.exe b/SabreHelper/x64/7za.exe
deleted file mode 100644
index 881b7dd9..00000000
Binary files a/SabreHelper/x64/7za.exe and /dev/null differ
diff --git a/SabreHelper/x64/7zxa.dll b/SabreHelper/x64/7zxa.dll
deleted file mode 100644
index f72ab631..00000000
Binary files a/SabreHelper/x64/7zxa.dll and /dev/null differ
diff --git a/SabreHelper/x86/7za.dll b/SabreHelper/x86/7za.dll
deleted file mode 100644
index 46f6e8e2..00000000
Binary files a/SabreHelper/x86/7za.dll and /dev/null differ
diff --git a/SabreHelper/x86/7za.exe b/SabreHelper/x86/7za.exe
deleted file mode 100644
index 710bda2f..00000000
Binary files a/SabreHelper/x86/7za.exe and /dev/null differ
diff --git a/SabreHelper/x86/7zxa.dll b/SabreHelper/x86/7zxa.dll
deleted file mode 100644
index afa96d4c..00000000
Binary files a/SabreHelper/x86/7zxa.dll and /dev/null differ