diff --git a/CUERipper/CUERipper.csproj b/CUERipper/CUERipper.csproj
index 3bc7d96..3c51530 100644
--- a/CUERipper/CUERipper.csproj
+++ b/CUERipper/CUERipper.csproj
@@ -91,6 +91,12 @@
     <Compile Include="frmFreedbSubmit.Designer.cs">
       <DependentUpon>frmFreedbSubmit.cs</DependentUpon>
     </Compile>
+    <Compile Include="Options.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Options.Designer.cs">
+      <DependentUpon>Options.cs</DependentUpon>
+    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="frmCUERipper.de-DE.resx">
@@ -106,6 +112,9 @@
     <EmbeddedResource Include="frmFreedbSubmit.resx">
       <DependentUpon>frmFreedbSubmit.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Options.resx">
+      <DependentUpon>Options.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -235,6 +244,7 @@
     <Content Include="Plugins\CUETools.Codecs.FlaCuda.dll" />
     <Content Include="Plugins\CUETools.Codecs.FLAKE.dll" />
     <Content Include="Plugins\CUETools.Ripper.SCSI.dll" />
+    <None Include="Resources\cog.ico" />
     <None Include="Properties\app.manifest" />
     <None Include="Properties\DataSources\frmFreedbSubmitData.datasource" />
     <None Include="Resources\freedb16.png" />
diff --git a/CUERipper/Options.Designer.cs b/CUERipper/Options.Designer.cs
new file mode 100644
index 0000000..5798080
--- /dev/null
+++ b/CUERipper/Options.Designer.cs
@@ -0,0 +1,83 @@
+
+namespace CUERipper
+{
+    partial class Options
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Options));
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.propertyGrid1 = new System.Windows.Forms.PropertyGrid();
+            this.SuspendLayout();
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.buttonCancel.Location = new System.Drawing.Point(308, 315);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(75, 25);
+            this.buttonCancel.TabIndex = 19;
+            this.buttonCancel.Text = "Close";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // propertyGrid1
+            // 
+            this.propertyGrid1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.propertyGrid1.HelpVisible = false;
+            this.propertyGrid1.Location = new System.Drawing.Point(0, 0);
+            this.propertyGrid1.Name = "propertyGrid1";
+            this.propertyGrid1.PropertySort = System.Windows.Forms.PropertySort.Categorized;
+            this.propertyGrid1.Size = new System.Drawing.Size(395, 309);
+            this.propertyGrid1.TabIndex = 21;
+            this.propertyGrid1.ToolbarVisible = false;
+            // 
+            // Options
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.buttonCancel;
+            this.ClientSize = new System.Drawing.Size(395, 352);
+            this.Controls.Add(this.propertyGrid1);
+            this.Controls.Add(this.buttonCancel);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "Options";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Options";
+            this.Load += new System.EventHandler(this.Options_Load);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button buttonCancel;
+        private System.Windows.Forms.PropertyGrid propertyGrid1;
+    }
+}
\ No newline at end of file
diff --git a/CUERipper/Options.cs b/CUERipper/Options.cs
new file mode 100644
index 0000000..5daa3b6
--- /dev/null
+++ b/CUERipper/Options.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using CUETools.CTDB;
+using Microsoft.Win32;
+using System.Runtime.Serialization.Formatters.Binary;
+using CUETools.Processor;
+
+namespace CUERipper
+{
+    public partial class Options : Form
+    {
+        private CUEConfig config;
+
+        public Options(CUEConfig config)
+        {
+            this.config = config;
+            this.InitializeComponent();
+        }
+
+        private void Options_Load(object sender, EventArgs e)
+        {
+            this.propertyGrid1.SelectedObject = new CUERipperSettings(this.config);
+        }
+    }
+
+    public class CUERipperSettings
+    {
+        private CUEConfig config;
+
+        public CUERipperSettings(CUEConfig config)
+        {
+            this.config = config;
+        }
+
+        [DefaultValue("db.cuetools.net"), Category("CTDB"), DisplayName("CTDB Server")]
+        public string CTDBServer { get { return config.advanced.CTDBServer; } set { config.advanced.CTDBServer = value; } }
+
+        [DefaultValue(CUETools.Processor.CUEConfigAdvanced.ProxyMode.System), Category("Proxy"), DisplayName("Proxy mode")]
+        public CUETools.Processor.CUEConfigAdvanced.ProxyMode UseProxyMode { get { return config.advanced.UseProxyMode; } set { config.advanced.UseProxyMode = value; } }
+
+        [DefaultValue("127.0.0.1"), Category("Proxy"), DisplayName("Proxy server host")]
+        public string ProxyServer { get { return config.advanced.ProxyServer; } set { config.advanced.ProxyServer = value; } }
+
+        [DefaultValue(8080), Category("Proxy"), DisplayName("Proxy server port")]
+        public int ProxyPort { get { return config.advanced.ProxyPort; } set { config.advanced.ProxyPort = value; } }
+
+        [DefaultValue(""), Category("Proxy"), DisplayName("Proxy auth user")]
+        public string ProxyUser { get { return config.advanced.ProxyUser; } set { config.advanced.ProxyUser = value; } }
+
+        [DefaultValue(""), Category("Proxy"), DisplayName("Proxy auth password")]
+        public string ProxyPassword { get { return config.advanced.ProxyPassword; } set { config.advanced.ProxyPassword = value; } }
+
+        [DefaultValue(true), Category("Extraction"), DisplayName("Preserve HTOA")]
+        public bool preserveHTOA { get { return config.preserveHTOA; } set { config.preserveHTOA = value; } }
+
+        [DefaultValue(true), Category("Extraction"), DisplayName("EAC log style")]
+        public bool createEACLOG { get { return config.createEACLOG; } set { config.createEACLOG = value; } }
+
+        [DefaultValue(false), Category("Extraction"), DisplayName("Create M3U playlist")]
+        public bool createM3U { get { return config.createM3U; } set { config.createM3U = value; } }
+
+        [DefaultValue(true), Category("Extraction"), DisplayName("Embed album art")]
+        public bool embedAlbumArt { get { return config.embedAlbumArt; } set { config.embedAlbumArt = value; } }
+
+        [DefaultValue("%tracknumber%. %title%"), Category("Extraction"), DisplayName("Track filename")]
+        public string trackFilenameFormat { get { return config.trackFilenameFormat; } set { config.trackFilenameFormat = value; } }
+
+        [DefaultValue(CUETools.CTDB.CTDBMetadataSearch.Default), Category("CTDB"), DisplayName("Metadata search")]
+        public CUETools.CTDB.CTDBMetadataSearch metadataSearch { get { return config.advanced.metadataSearch; } set { config.advanced.metadataSearch = value; } }
+
+        [DefaultValue(CUETools.Processor.CUEConfigAdvanced.CTDBCoversSearch.Small), Category("CTDB"), DisplayName("Album art search")]
+        public CUETools.Processor.CUEConfigAdvanced.CTDBCoversSearch coversSearch { get { return config.advanced.coversSearch; } set { config.advanced.coversSearch = value; } }
+    }
+}
diff --git a/CUERipper/Options.resx b/CUERipper/Options.resx
new file mode 100644
index 0000000..630a3fe
--- /dev/null
+++ b/CUERipper/Options.resx
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAYWFhAGNiYQBkZGMAZWRjAGtqaABramoAa2trAGxragBtbW0Abm1sAG5ubgBvb28AcW9sAHJx
+        cQB2dHEAfnt3AHl5eQCAgIAAhYWFAIaGhQCHh4YAiomIAI+OjQCUkIoAkJCPAJKQjgCTko8AlpWUAJuX
+        kgCdmZMAnZyZAJycnACgm5QAoJ2ZAKKemACqpZ8AoaGhAKOiogClpaUApqamAKenpwCpp6UAq6iiAK+r
+        pQCoqKgAqqqqAKyqqACsrKwAra2sAK+urQC1sq0AubOrALu1rQC8tqwAvbevALCwsACxsbEAsrKyALW0
+        swC1tbUAt7e3ALu3sQC+urUAubm5ALq6ugC8vLwAvb29AL6+vgC/v78AwbuzAMK7sgDCvLQAw721AMa/
+        tQDIwbcAwcC/AMvDuQDMxLoAysW/AMzFvADOx70A0Mi+ANHJvgDQyb8A0cq/AMDAwADBwcEAwsLBAMPC
+        wQDCwsIAw8PDAMTEwwDFxMMAx8XCAMTExADFxcUAxsbGAMfHxgDHx8cAy8fCAMnHxADPysMAycjGAM7K
+        xADIyMgAycnJAMrKyADLy8sAzMzMAM3NzQDOzc0Azs7OAM/PzwDRy8EA0czHANHOyQDR0dEA0tLSANTU
+        1ADV1dUA1tbWANjY2ADZ2dkA29vbANzc3ADd3d0A3t7eAOLi4gDk5OQA5eXlAOfn5wDp6ekA7e3tAE9O
+        TgBcAF4AIOSDBQEAAABgAoQF5AioAGzy+nYANvp2AAAAAAAAAAAAAAAAADb6dmAJqABSSJN2AAAAAAIQ
+        AAAMC6gAAQAAABgAAAAAAAAASAmoAEIAAAAAAAAALAmoAAAAAAAAAAAAAAAAAAAAAAAMAAAAAgAAAAEB
+        AAAAAAAAAAAAAAAAAAACAAAAZAAaAmgChAV3tCIAAAAAAGgChAUFAAAAhAmoACosk3a8BQAAAAAAwIj6
+        +naDY3B2AAA6AwAAAACcAToDrAmoAD7TOAAHABoApBnqAP0D+naRJZN2vAUAAAAAAAAAAAAAAAAAANgJ
+        qABA8VMDdQz/dQO18T0gN+/G/3UQ//////9xx//FyeA4ALl5N57yma+ama+a8pryma8gAAAAr5rymcng
+        OAAkCqgAHIM7AAwKqACx4DgAGAAAAAEAAADyma+ama+a8q+a8pma8pmv8pmvmpmvmvKa8pmvr5rymRYA
+        AAAWAAAADAuoAIgKqACH4TgAwGs+ABYAAAAMC6gAFgAAAAAANgAAADYAAAA2AET/YQFE/2EBRP9hAUT/
+        YQEw/2EBzP5hAcz+YQEw/2EBqGI+ACAjOACoYD4AAQAAAK+a8pmsCqgAvD1NALwFAABA8VMDFgAAALgK
+        qAAAAAAAAAAAAAAAJA8NIQAAAAAAAAAAAEdOUxVDOgNTTTYAAAAAACIMCksWbGMISgKGEAAAAD5CfygU
+        E19aCQ4odhIYAAA/KHhgbHVqY21gQ2wLHgAAAD9gV2BjLilXRDwuHQAALxwmcWFtKkhGH1dCQAYEBUWA
+        dmFuOUYAAEYtWj1WdgFchHlqcCc3AABJMF9BYX4HZ11Mem5CGzQ1H1tabhkXGgAAZHdtakEgJVphVz0r
+        AAAAaFx9d3t8eXd7dmxpESMAAHN9hXxYRHl3ODFsgz0sAAAAdG9rVFl/fjtRMikzAAAAAAByVVVigoEy
+        U1JQAAAAAAAAAAAAZmVeTwAAAAAAAPw/AADgBwAAwAMAAIABAACAAQAAwAMAAAAAAAABgAAAAYAAAAAA
+        AADAAwAAgAEAAIABAADAAwAA4AcAAPw/AAA=
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/CUERipper/Properties/Resources.Designer.cs b/CUERipper/Properties/Resources.Designer.cs
index 6e24536..c9e5dc0 100644
--- a/CUERipper/Properties/Resources.Designer.cs
+++ b/CUERipper/Properties/Resources.Designer.cs
@@ -102,6 +102,20 @@ namespace CUERipper.Properties {
             }
         }
         
+        internal static System.Drawing.Bitmap cog {
+            get {
+                object obj = ResourceManager.GetObject("cog", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Icon cog1 {
+            get {
+                object obj = ResourceManager.GetObject("cog1", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Detecting drives.
         /// </summary>
diff --git a/CUERipper/Properties/Resources.resx b/CUERipper/Properties/Resources.resx
index f9fee35..d488a4f 100644
--- a/CUERipper/Properties/Resources.resx
+++ b/CUERipper/Properties/Resources.resx
@@ -117,95 +117,102 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ExceptionMessage" xml:space="preserve">
-    <value>Exception</value>
-  </data>
-  <data name="LookingUpVia" xml:space="preserve">
-    <value>Looking up album via</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="ipod_sound" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ipod_sound.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="wave" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\wave.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="tta" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\tta.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="PausedMessage" xml:space="preserve">
-    <value>Paused</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="cddb" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\cddb.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="DoneRippingErrors" xml:space="preserve">
     <value>Rip probably contains errors</value>
   </data>
-  <data name="musicbrainz" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\musicbrainz.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="freedb" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\freedb.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="arok" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\arok.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="cdrepair" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\cdrepair.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="users--arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\users--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="cddb" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\cddb.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ogg" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ogg.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="NoDrives" xml:space="preserve">
-    <value>No CD drives found</value>
-  </data>
-  <data name="tag-label" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\tag-label.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="wv" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\wv.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="accuraterip16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\accuraterip_16.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="arrow-circle-double" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrow-circle-double.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ape" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ape.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="mp3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\mp3.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="spellcheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\spellcheck.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="DoneRippingRepair" xml:space="preserve">
-    <value>You can try to repair it using CUETools</value>
-  </data>
-  <data name="DoneRipping" xml:space="preserve">
-    <value>Done ripping</value>
-  </data>
   <data name="DetectingDrives" xml:space="preserve">
     <value>Detecting drives</value>
   </data>
+  <data name="ExceptionMessage" xml:space="preserve">
+    <value>Exception</value>
+  </data>
+  <data name="wv" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\wv.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="musicbrainz" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\musicbrainz.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="DoneRipping" xml:space="preserve">
+    <value>Done ripping</value>
+  </data>
+  <data name="arrow-circle-double" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrow-circle-double.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="wave" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\wave.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="FailedToLoadRipperModule" xml:space="preserve">
     <value>Failed to load ripper module</value>
   </data>
+  <data name="ape" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ape.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="tag-label" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\tag-label.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="spellcheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\spellcheck.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="freedb" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\freedb.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="tta" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\tta.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="DoneRippingRepair" xml:space="preserve">
+    <value>You can try to repair it using CUETools</value>
+  </data>
+  <data name="NoDrives" xml:space="preserve">
+    <value>No CD drives found</value>
+  </data>
   <data name="flac" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\flac.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Retry" xml:space="preserve">
-    <value>retry</value>
+  <data name="LookingUpVia" xml:space="preserve">
+    <value>Looking up album via</value>
   </data>
   <data name="edit-list-order" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\edit-list-order.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="arok" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\arok.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ogg" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ogg.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="freedb16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\freedb16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="users--arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\users--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="mp3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mp3.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ipod_sound" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ipod_sound.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Retry" xml:space="preserve">
+    <value>retry</value>
+  </data>
+  <data name="PausedMessage" xml:space="preserve">
+    <value>Paused</value>
+  </data>
+  <data name="cdrepair" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cdrepair.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="cog" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cog.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="cog1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cog.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/CUERipper/Resources/cog.ico b/CUERipper/Resources/cog.ico
new file mode 100644
index 0000000..3eec272
Binary files /dev/null and b/CUERipper/Resources/cog.ico differ
diff --git a/CUERipper/frmCUERipper.Designer.cs b/CUERipper/frmCUERipper.Designer.cs
index 34f36f2..728b368 100644
--- a/CUERipper/frmCUERipper.Designer.cs
+++ b/CUERipper/frmCUERipper.Designer.cs
@@ -55,7 +55,6 @@ namespace CUERipper
             this.buttonPause = new System.Windows.Forms.Button();
             this.numericWriteOffset = new System.Windows.Forms.NumericUpDown();
             this.lblWriteOffset = new System.Windows.Forms.Label();
-            this.checkBoxEACMode = new System.Windows.Forms.CheckBox();
             this.groupBoxSettings = new System.Windows.Forms.GroupBox();
             this.bnComboBoxLosslessOrNot = new CUEControls.ImgComboBox();
             this.losslessOrNotBindingSource = new System.Windows.Forms.BindingSource(this.components);
@@ -102,6 +101,7 @@ namespace CUERipper
             this.panel1 = new System.Windows.Forms.Panel();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.backgroundWorkerArtwork = new System.ComponentModel.BackgroundWorker();
+            this.buttonSettings = new System.Windows.Forms.Button();
             this.statusStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numericWriteOffset)).BeginInit();
             this.groupBoxSettings.SuspendLayout();
@@ -268,13 +268,6 @@ namespace CUERipper
             resources.ApplyResources(this.lblWriteOffset, "lblWriteOffset");
             this.lblWriteOffset.Name = "lblWriteOffset";
             // 
-            // checkBoxEACMode
-            // 
-            resources.ApplyResources(this.checkBoxEACMode, "checkBoxEACMode");
-            this.checkBoxEACMode.Name = "checkBoxEACMode";
-            this.checkBoxEACMode.UseVisualStyleBackColor = true;
-            this.checkBoxEACMode.CheckedChanged += new System.EventHandler(this.checkBoxEACMode_CheckedChanged);
-            // 
             // groupBoxSettings
             // 
             this.groupBoxSettings.Controls.Add(this.bnComboBoxLosslessOrNot);
@@ -288,7 +281,6 @@ namespace CUERipper
             this.groupBoxSettings.Controls.Add(this.trackBarEncoderMode);
             this.groupBoxSettings.Controls.Add(this.trackBarSecureMode);
             this.groupBoxSettings.Controls.Add(this.lblWriteOffset);
-            this.groupBoxSettings.Controls.Add(this.checkBoxEACMode);
             this.groupBoxSettings.Controls.Add(this.numericWriteOffset);
             resources.ApplyResources(this.groupBoxSettings, "groupBoxSettings");
             this.groupBoxSettings.Name = "groupBoxSettings";
@@ -704,10 +696,19 @@ namespace CUERipper
             this.backgroundWorkerArtwork.ProgressChanged += new System.ComponentModel.ProgressChangedEventHandler(this.backgroundWorkerArtwork_ProgressChanged);
             this.backgroundWorkerArtwork.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.backgroundWorkerArtwork_RunWorkerCompleted);
             // 
+            // buttonSettings
+            // 
+            this.buttonSettings.Image = global::CUERipper.Properties.Resources.cog;
+            resources.ApplyResources(this.buttonSettings, "buttonSettings");
+            this.buttonSettings.Name = "buttonSettings";
+            this.buttonSettings.UseVisualStyleBackColor = true;
+            this.buttonSettings.Click += new System.EventHandler(this.buttonSettings_Click);
+            // 
             // frmCUERipper
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.buttonSettings);
             this.Controls.Add(this.pictureBox1);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.buttonFreedbSubmit);
@@ -771,8 +772,7 @@ namespace CUERipper
 		private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel2;
 		private System.Windows.Forms.ToolStripStatusLabel toolStripStatusAr;
 		private System.Windows.Forms.NumericUpDown numericWriteOffset;
-		private System.Windows.Forms.Label lblWriteOffset;
-		private System.Windows.Forms.CheckBox checkBoxEACMode;
+        private System.Windows.Forms.Label lblWriteOffset;
 		private System.Windows.Forms.GroupBox groupBoxSettings;
 		private System.Windows.Forms.ToolStripStatusLabel toolStripStatusCTDB;
 		private System.Windows.Forms.TrackBar trackBarEncoderMode;
@@ -821,6 +821,7 @@ namespace CUERipper
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.PictureBox pictureBox1;
         private System.ComponentModel.BackgroundWorker backgroundWorkerArtwork;
+        private System.Windows.Forms.Button buttonSettings;
 	}
 }
 
diff --git a/CUERipper/frmCUERipper.cs b/CUERipper/frmCUERipper.cs
index 3a1d733..35ddec1 100644
--- a/CUERipper/frmCUERipper.cs
+++ b/CUERipper/frmCUERipper.cs
@@ -158,7 +158,6 @@ namespace CUERipper
 				bnComboBoxOutputFormat.Items.Add(sr.Load(string.Format("OutputPathUseTemplate{0}", iFormat)) ?? "");
 
 			bnComboBoxOutputFormat.Text = sr.Load("PathFormat") ?? "%music%\\%artist%\\[%year% - ]%album%\\%artist% - %album%.cue";
-			checkBoxEACMode.Checked = _config.createEACLOG;
 			SelectedOutputAudioType = (AudioEncoderType?)sr.LoadInt32("OutputAudioType", null, null) ?? AudioEncoderType.Lossless;
 			bnComboBoxImage.SelectedIndex = sr.LoadInt32("ComboImage", 0, bnComboBoxImage.Items.Count - 1) ?? 0;
 			trackBarSecureMode.Value = sr.LoadInt32("SecureMode", 0, trackBarSecureMode.Maximum - 1) ?? 1;
@@ -303,6 +302,7 @@ namespace CUERipper
 			buttonEncoding.Enabled = data.selectedRelease != null && !running &&
 				data.selectedRelease.ImageKey == "freedb" && (new CUEMetadata(data.selectedRelease.metadata)).FreedbToEncoding();
 			buttonReload.Enabled = data.selectedRelease != null && !running;
+            buttonSettings.Enabled = !running;
 		}
 
 		private void CheckStop()
@@ -587,9 +587,10 @@ namespace CUERipper
 			CheckStop();
 			//_progress.percentDisk = (1.0 + _progress.percentDisk) / 2;
 			//_progress.input = e.Uri.ToString();
+            string text = Properties.Resources.LookingUpVia + " FreeDB..." + (sender is string ? " " + (sender as string) : "");
 			this.BeginInvoke((MethodInvoker)delegate()
 			{
-				toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " FreeDB...";
+				toolStripStatusLabel1.Text = text;
 				toolStripProgressBar1.Value = (100 + 2 * toolStripProgressBar1.Value) / 3;
 			});
 		}
@@ -643,7 +644,7 @@ namespace CUERipper
             cueSheet.Action = CUEAction.Encode;
 
             this.BeginInvoke((MethodInvoker)delegate() { toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " CTDB..."; });
-            cueSheet.UseCUEToolsDB("CUERipper " + CUESheet.CUEToolsVersion, selectedDriveInfo.drive.ARName, false, CTDBMetadataSearch.Default);
+            cueSheet.UseCUEToolsDB("CUERipper " + CUESheet.CUEToolsVersion, selectedDriveInfo.drive.ARName, false, loadAllMetadata ? CTDBMetadataSearch.Extensive : _config.advanced.metadataSearch);
             cueSheet.CTDB.UploadHelper.onProgress += new EventHandler<Krystalware.UploadHelper.UploadProgressEventArgs>(UploadProgress);
             this.BeginInvoke((MethodInvoker)delegate() { toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " AccurateRip..."; });
             cueSheet.UseAccurateRip();
@@ -717,13 +718,20 @@ namespace CUERipper
                     code = m_freedb.Query(AccurateRipVerify.CalculateCDDBQuery(audioSource.TOC), out queryResult, out coll);
                     if (code == FreedbHelper.ResponseCodes.CODE_200)
                     {
-                        CDEntry cdEntry;
-                        FreeDB_LookupProgress(this);
-                        code = m_freedb.Read(queryResult, out cdEntry);
-                        if (code == FreedbHelper.ResponseCodes.CODE_210)
+                        bool duplicate = false;
+                        foreach (var ctdbMeta in cueSheet.CTDB.Metadata)
+                            if (ctdbMeta.source == "freedb" && ctdbMeta.id == queryResult.Category + "/" + queryResult.Discid)
+                                duplicate = true;
+                        if (!duplicate)
                         {
-                            CUEMetadataEntry r = CreateCUESheet(audioSource, cdEntry);
-                            data.Releases.Add(r);
+                            FreeDB_LookupProgress(queryResult.Category + "/" + queryResult.Discid);
+                            CDEntry cdEntry;
+                            code = m_freedb.Read(queryResult, out cdEntry);
+                            if (code == FreedbHelper.ResponseCodes.CODE_210)
+                            {
+                                CUEMetadataEntry r = CreateCUESheet(audioSource, cdEntry);
+                                data.Releases.Add(r);
+                            }
                         }
                     }
                     else
@@ -732,13 +740,20 @@ namespace CUERipper
                         {
                             foreach (QueryResult qr in coll)
                             {
-                                CDEntry cdEntry;
-                                FreeDB_LookupProgress(this);
-                                code = m_freedb.Read(qr, out cdEntry);
-                                if (code == FreedbHelper.ResponseCodes.CODE_210)
+                                bool duplicate = false;
+                                foreach (var ctdbMeta in cueSheet.CTDB.Metadata)
+                                    if (ctdbMeta.source == "freedb" && ctdbMeta.id == qr.Category + "/" + qr.Discid)
+                                        duplicate = true;
+                                if (!duplicate)
                                 {
-                                    CUEMetadataEntry r = CreateCUESheet(audioSource, cdEntry);
-                                    data.Releases.Add(r);
+                                    CDEntry cdEntry;
+                                    FreeDB_LookupProgress(qr.Category + "/" + qr.Discid);
+                                    code = m_freedb.Read(qr, out cdEntry);
+                                    if (code == FreedbHelper.ResponseCodes.CODE_210)
+                                    {
+                                        CUEMetadataEntry r = CreateCUESheet(audioSource, cdEntry);
+                                        data.Releases.Add(r);
+                                    }
                                 }
                             }
                         }
@@ -776,7 +791,8 @@ namespace CUERipper
                 toolStripStatusLabelMusicBrainz.BorderStyle = mbresults_count > 0 ? Border3DStyle.SunkenInner : Border3DStyle.RaisedInner;
                 toolStripStatusLabelMusicBrainz.Text = mbresults_count > 0 ? mbresults_count.ToString() : "";
                 toolStripStatusLabelMusicBrainz.ToolTipText = "Musicbrainz: " + (mbresults_count > 0 ? mbresults_count.ToString() + " entries found." : (musicbrainzError + "click to submit."));
-                backgroundWorkerArtwork.RunWorkerAsync(new BackgroundWorkerArtworkArgs() { cueSheet = cueSheet, meta = data.selectedRelease });
+                if (_config.advanced.coversSearch != CUEConfigAdvanced.CTDBCoversSearch.None)
+                    backgroundWorkerArtwork.RunWorkerAsync(new BackgroundWorkerArtworkArgs() { cueSheet = cueSheet, meta = data.selectedRelease });
             });
         }
 
@@ -939,11 +955,6 @@ namespace CUERipper
 			}
 		}
 
-		private void checkBoxEACMode_CheckedChanged(object sender, EventArgs e)
-		{
-			_config.createEACLOG = checkBoxEACMode.Checked;
-		}
-
 		private void bnComboBoxEncoder_SelectedValueChanged(object sender, EventArgs e)
 		{
 			if (SelectedOutputAudioFormat == null)
@@ -1452,8 +1463,7 @@ namespace CUERipper
                         continue;
                     foreach (var coverart in metadata.coverart)
                     {
-                        bool large = false;
-                        var uri = large ?
+                        var uri = _config.advanced.coversSearch == CUEConfigAdvanced.CTDBCoversSearch.Large ?
                             coverart.uri : coverart.uri150 ?? coverart.uri;
                         if (knownUrls.Contains(uri) || !coverart.primary)
                             continue;
@@ -1497,6 +1507,12 @@ namespace CUERipper
                 UpdateAlbumArt(false);
             }
         }
+
+        private void buttonSettings_Click(object sender, EventArgs e)
+        {
+            var form = new Options(this._config);
+            form.ShowDialog(this);
+        }
 	}
 
     internal class BackgroundWorkerArtworkArgs
diff --git a/CUERipper/frmCUERipper.resx b/CUERipper/frmCUERipper.resx
index 91c4825..a14e215 100644
--- a/CUERipper/frmCUERipper.resx
+++ b/CUERipper/frmCUERipper.resx
@@ -196,7 +196,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;statusStrip1.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>15</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="listTracks.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
@@ -263,7 +263,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;listTracks.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>14</value>
   </data>
   <data name="buttonGo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
@@ -383,7 +383,7 @@
     <value>groupBoxSettings</value>
   </data>
   <data name="&gt;&gt;numericWriteOffset.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>11</value>
   </data>
   <data name="lblWriteOffset.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -415,36 +415,6 @@
   <data name="&gt;&gt;lblWriteOffset.ZOrder" xml:space="preserve">
     <value>10</value>
   </data>
-  <data name="checkBoxEACMode.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="checkBoxEACMode.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="checkBoxEACMode.Location" type="System.Drawing.Point, System.Drawing">
-    <value>192, 47</value>
-  </data>
-  <data name="checkBoxEACMode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>88, 17</value>
-  </data>
-  <data name="checkBoxEACMode.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="checkBoxEACMode.Text" xml:space="preserve">
-    <value>EAC log style</value>
-  </data>
-  <data name="&gt;&gt;checkBoxEACMode.Name" xml:space="preserve">
-    <value>checkBoxEACMode</value>
-  </data>
-  <data name="&gt;&gt;checkBoxEACMode.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;checkBoxEACMode.Parent" xml:space="preserve">
-    <value>groupBoxSettings</value>
-  </data>
-  <data name="&gt;&gt;checkBoxEACMode.ZOrder" xml:space="preserve">
-    <value>11</value>
-  </data>
   <metadata name="losslessOrNotBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 95</value>
   </metadata>
@@ -767,7 +737,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;groupBoxSettings.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>13</value>
   </data>
   <metadata name="drivesBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>882, 56</value>
@@ -780,7 +750,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABy
-        CQAAAk1TRnQBSQFMAgEBBAEAAWQBAAFkAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBBAEAAYQBAAGEAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -914,7 +884,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;txtOutputPath.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>16</value>
   </data>
   <data name="bnComboBoxRelease.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
@@ -930,7 +900,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADy
-        EAAAAk1TRnQBSQFMAgEBCgEAAWQBAAFkAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        EAAAAk1TRnQBSQFMAgEBCgEAAYQBAAGEAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -1027,7 +997,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;bnComboBoxRelease.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>10</value>
   </data>
   <data name="bnComboBoxDrives.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
@@ -1054,7 +1024,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;bnComboBoxDrives.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>11</value>
   </data>
   <data name="bnComboBoxOutputFormat.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
@@ -1081,7 +1051,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;bnComboBoxOutputFormat.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>12</value>
   </data>
   <data name="listMetadata.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
@@ -1126,7 +1096,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;listMetadata.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>17</value>
   </data>
   <data name="buttonTrackMetadata.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
     <value>Flat</value>
@@ -1138,7 +1108,7 @@
     <value>NoControl</value>
   </data>
   <data name="buttonTrackMetadata.Location" type="System.Drawing.Point, System.Drawing">
-    <value>483, 63</value>
+    <value>595, 64</value>
   </data>
   <data name="buttonTrackMetadata.Size" type="System.Drawing.Size, System.Drawing">
     <value>19, 17</value>
@@ -1159,7 +1129,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;buttonTrackMetadata.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
   </data>
   <data name="buttonMetadata.Location" type="System.Drawing.Point, System.Drawing">
     <value>7, 60</value>
@@ -1186,7 +1156,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;buttonMetadata.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
   </data>
   <data name="buttonVA.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1216,7 +1186,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;buttonVA.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>9</value>
   </data>
   <data name="buttonReload.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1246,7 +1216,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;buttonReload.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
   </data>
   <data name="buttonEncoding.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1276,7 +1246,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;buttonEncoding.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="buttonTracks.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1309,7 +1279,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;buttonTracks.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="buttonFreedbSubmit.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1339,7 +1309,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;buttonFreedbSubmit.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="panel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -1363,7 +1333,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="pictureBox1.Location" type="System.Drawing.Point, System.Drawing">
     <value>332, 339</value>
@@ -1387,11 +1357,41 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;pictureBox1.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <metadata name="backgroundWorkerArtwork.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1148, 17</value>
   </metadata>
+  <data name="buttonSettings.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="buttonSettings.Location" type="System.Drawing.Point, System.Drawing">
+    <value>443, 60</value>
+  </data>
+  <data name="buttonSettings.Size" type="System.Drawing.Size, System.Drawing">
+    <value>80, 23</value>
+  </data>
+  <data name="buttonSettings.TabIndex" type="System.Int32, mscorlib">
+    <value>44</value>
+  </data>
+  <data name="buttonSettings.Text" xml:space="preserve">
+    <value>Options</value>
+  </data>
+  <data name="buttonSettings.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+    <value>ImageBeforeText</value>
+  </data>
+  <data name="&gt;&gt;buttonSettings.Name" xml:space="preserve">
+    <value>buttonSettings</value>
+  </data>
+  <data name="&gt;&gt;buttonSettings.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;buttonSettings.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;buttonSettings.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
diff --git a/CUETools.Processor/CUEConfigAdvanced.cs b/CUETools.Processor/CUEConfigAdvanced.cs
index de99c76..fa236c5 100644
--- a/CUETools.Processor/CUEConfigAdvanced.cs
+++ b/CUETools.Processor/CUEConfigAdvanced.cs
@@ -14,6 +14,13 @@ namespace CUETools.Processor
             Custom
         }
 
+        public enum CTDBCoversSearch
+        {
+            Large,
+            Small,
+            None
+        }
+
         public CUEConfigAdvanced()
         {
             // Iterate through each property and call ResetValue()
@@ -68,5 +75,11 @@ namespace CUETools.Processor
 
         [DefaultValue("db.cuetools.net"), Category("CTDB"), DisplayName("CTDB Server")]
         public string CTDBServer { get; set; }
+
+        [DefaultValue(CUETools.CTDB.CTDBMetadataSearch.Default), Category("CTDB"), DisplayName("Metadata search")]
+        public CUETools.CTDB.CTDBMetadataSearch metadataSearch { get; set; }
+
+        [DefaultValue(CTDBCoversSearch.Small), Category("CTDB"), DisplayName("Album art search")]
+        public CTDBCoversSearch coversSearch { get; set; }
     }
 }