diff --git a/CUERipper/CUERipper.csproj b/CUERipper/CUERipper.csproj
index a0e0284..6368487 100644
--- a/CUERipper/CUERipper.csproj
+++ b/CUERipper/CUERipper.csproj
@@ -17,12 +17,14 @@
     <ApplicationIcon>cue2.ico</ApplicationIcon>
     <ManifestCertificateThumbprint>F89503BB83CA42A647C506D67956D6F32C1C6E7E</ManifestCertificateThumbprint>
     <ManifestKeyFile>CUERipper_TemporaryKey.pfx</ManifestKeyFile>
-    <GenerateManifests>true</GenerateManifests>
-    <SignManifests>true</SignManifests>
+    <GenerateManifests>false</GenerateManifests>
+    <SignManifests>false</SignManifests>
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>
     </AssemblyOriginatorKeyFile>
+    <TargetZone>LocalIntranet</TargetZone>
+    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
@@ -229,6 +231,7 @@
     <Content Include="Plugins\CUETools.Codecs.FlaCuda.dll" />
     <Content Include="Plugins\CUETools.Codecs.FLAKE.dll" />
     <Content Include="Plugins\CUETools.Ripper.SCSI.dll" />
+    <None Include="Properties\app.manifest" />
     <None Include="Properties\DataSources\frmFreedbSubmitData.datasource" />
     <None Include="Resources\freedb16.png" />
     <None Include="Resources\edit-list-order.png" />
@@ -248,114 +251,6 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <PublishFile Include="Plugins %28win32%29\CUETools.Codecs.APE.dll">
-      <Visible>False</Visible>
-      <Group>Plugins %28win32%29</Group>
-      <TargetPath>
-      </TargetPath>
-      <PublishState>Auto</PublishState>
-      <IncludeHash>True</IncludeHash>
-      <FileType>File</FileType>
-    </PublishFile>
-    <PublishFile Include="Plugins %28win32%29\CUETools.Codecs.FLAC.dll">
-      <Visible>False</Visible>
-      <Group>Plugins %28win32%29</Group>
-      <TargetPath>
-      </TargetPath>
-      <PublishState>Auto</PublishState>
-      <IncludeHash>True</IncludeHash>
-      <FileType>File</FileType>
-    </PublishFile>
-    <PublishFile Include="Plugins %28win32%29\CUETools.Codecs.HDCD.dll">
-      <Visible>False</Visible>
-      <Group>Plugins %28win32%29</Group>
-      <TargetPath>
-      </TargetPath>
-      <PublishState>Auto</PublishState>
-      <IncludeHash>True</IncludeHash>
-      <FileType>File</FileType>
-    </PublishFile>
-    <PublishFile Include="Plugins %28win32%29\CUETools.Codecs.TTA.dll">
-      <Visible>False</Visible>
-      <Group>Plugins %28win32%29</Group>
-      <TargetPath>
-      </TargetPath>
-      <PublishState>Auto</PublishState>
-      <IncludeHash>True</IncludeHash>
-      <FileType>File</FileType>
-    </PublishFile>
-    <PublishFile Include="Plugins %28win32%29\CUETools.Codecs.WavPack.dll">
-      <Visible>False</Visible>
-      <Group>Plugins %28win32%29</Group>
-      <TargetPath>
-      </TargetPath>
-      <PublishState>Auto</PublishState>
-      <IncludeHash>True</IncludeHash>
-      <FileType>File</FileType>
-    </PublishFile>
-    <PublishFile Include="Plugins %28win32%29\hdcd.dll">
-      <Visible>False</Visible>
-      <Group>Plugins %28win32%29</Group>
-      <TargetPath>
-      </TargetPath>
-      <PublishState>Auto</PublishState>
-      <IncludeHash>True</IncludeHash>
-      <FileType>File</FileType>
-    </PublishFile>
-    <PublishFile Include="Plugins %28x64%29\CUETools.Codecs.APE.dll">
-      <Visible>False</Visible>
-      <Group>Plugins %28x64%29</Group>
-      <TargetPath>
-      </TargetPath>
-      <PublishState>Auto</PublishState>
-      <IncludeHash>True</IncludeHash>
-      <FileType>File</FileType>
-    </PublishFile>
-    <PublishFile Include="Plugins %28x64%29\CUETools.Codecs.FLAC.dll">
-      <Visible>False</Visible>
-      <Group>Plugins %28x64%29</Group>
-      <TargetPath>
-      </TargetPath>
-      <PublishState>Auto</PublishState>
-      <IncludeHash>True</IncludeHash>
-      <FileType>File</FileType>
-    </PublishFile>
-    <PublishFile Include="Plugins %28x64%29\CUETools.Codecs.HDCD.dll">
-      <Visible>False</Visible>
-      <Group>Plugins %28x64%29</Group>
-      <TargetPath>
-      </TargetPath>
-      <PublishState>Auto</PublishState>
-      <IncludeHash>True</IncludeHash>
-      <FileType>File</FileType>
-    </PublishFile>
-    <PublishFile Include="Plugins %28x64%29\CUETools.Codecs.TTA.dll">
-      <Visible>False</Visible>
-      <Group>Plugins %28x64%29</Group>
-      <TargetPath>
-      </TargetPath>
-      <PublishState>Auto</PublishState>
-      <IncludeHash>True</IncludeHash>
-      <FileType>File</FileType>
-    </PublishFile>
-    <PublishFile Include="Plugins %28x64%29\CUETools.Codecs.WavPack.dll">
-      <Visible>False</Visible>
-      <Group>Plugins %28x64%29</Group>
-      <TargetPath>
-      </TargetPath>
-      <PublishState>Auto</PublishState>
-      <IncludeHash>True</IncludeHash>
-      <FileType>File</FileType>
-    </PublishFile>
-    <PublishFile Include="Plugins %28x64%29\hdcd.dll">
-      <Visible>False</Visible>
-      <Group>Plugins %28x64%29</Group>
-      <TargetPath>
-      </TargetPath>
-      <PublishState>Auto</PublishState>
-      <IncludeHash>True</IncludeHash>
-      <FileType>File</FileType>
-    </PublishFile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/CUERipper/Properties/app.manifest b/CUERipper/Properties/app.manifest
new file mode 100644
index 0000000..70f40fe
--- /dev/null
+++ b/CUERipper/Properties/app.manifest
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+            If you want to change the Windows User Account Control level replace the 
+            requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            If you want to utilize File and Registry Virtualization for backward 
+            compatibility then delete the requestedExecutionLevel node.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+      <applicationRequestMinimum>
+        <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />
+        <defaultAssemblyRequest permissionSetReference="Custom" />
+      </applicationRequestMinimum>
+    </security>
+  </trustInfo>
+</asmv1:assembly>
\ No newline at end of file
diff --git a/CUETools.Codecs.FLAC/CUETools.Codecs.FLAC.vcproj b/CUETools.Codecs.FLAC/CUETools.Codecs.FLAC.vcproj
index a6633bc..9e945a2 100644
--- a/CUETools.Codecs.FLAC/CUETools.Codecs.FLAC.vcproj
+++ b/CUETools.Codecs.FLAC/CUETools.Codecs.FLAC.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="CUETools.Codecs.FLAC"
 	ProjectGUID="{E70FA90A-7012-4A52-86B5-362B699D1540}"
 	RootNamespace="CUETools.Codecs.FLAC"
@@ -333,6 +333,10 @@
 			CopyLocal="false"
 			RelativePathToProject="..\CUETools.Codecs\CUETools.Codecs.csproj"
 		/>
+		<ProjectReference
+			ReferencedProjectIdentifier="{4CEFBC84-C215-11DB-8314-0800200C9A66}"
+			RelativePathToProject="..\flac\src\libFLAC\libFLAC_static.vcproj"
+		/>
 	</References>
 	<Files>
 		<Filter
diff --git a/CUETools.Codecs.FLACCL/CUETools.Codecs.FLACCL.csproj b/CUETools.Codecs.FLACCL/CUETools.Codecs.FLACCL.csproj
index 9fbebf1..de8ce07 100644
--- a/CUETools.Codecs.FLACCL/CUETools.Codecs.FLACCL.csproj
+++ b/CUETools.Codecs.FLACCL/CUETools.Codecs.FLACCL.csproj
@@ -35,6 +35,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="OpenCLNet, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\ThirdParty\OpenCLNet.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
@@ -49,10 +53,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\ATI Stream\OpenCL.Net 0.6\source\OpenCLNet\OpenCLNet.csproj">
-      <Project>{758285C6-1ACA-458A-9906-EE6701D5AF87}</Project>
-      <Name>OpenCLNet</Name>
-    </ProjectReference>
     <ProjectReference Include="..\CUETools.Codecs.FLAKE\CUETools.Codecs.FLAKE.csproj">
       <Project>{082D6B9E-326E-4D15-9798-EDAE9EDE70A6}</Project>
       <Name>CUETools.Codecs.FLAKE</Name>
diff --git a/CUETools.FLACCL.cmd/CUETools.FLACL.cmd.csproj b/CUETools.FLACCL.cmd/CUETools.FLACL.cmd.csproj
index a2ebb00..7a82597 100644
--- a/CUETools.FLACCL.cmd/CUETools.FLACL.cmd.csproj
+++ b/CUETools.FLACCL.cmd/CUETools.FLACL.cmd.csproj
@@ -35,6 +35,10 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="OpenCLNet, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\ThirdParty\OpenCLNet.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
@@ -44,10 +48,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\ATI Stream\OpenCL.Net 0.6\source\OpenCLNet\OpenCLNet.csproj">
-      <Project>{758285C6-1ACA-458A-9906-EE6701D5AF87}</Project>
-      <Name>OpenCLNet</Name>
-    </ProjectReference>
     <ProjectReference Include="..\CUETools.Codecs.FLAKE\CUETools.Codecs.FLAKE.csproj">
       <Project>{082D6B9E-326E-4D15-9798-EDAE9EDE70A6}</Project>
       <Name>CUETools.Codecs.FLAKE</Name>
diff --git a/CUETools/CUETools.csproj b/CUETools/CUETools.csproj
index 51febb1..0b7faa8 100644
--- a/CUETools/CUETools.csproj
+++ b/CUETools/CUETools.csproj
@@ -13,7 +13,7 @@
     <ManifestCertificateThumbprint>611F49E043614FEDCFF1B128868CC8DC0B6656C5</ManifestCertificateThumbprint>
     <ManifestKeyFile>CUETools_TemporaryKey.pfx</ManifestKeyFile>
     <GenerateManifests>false</GenerateManifests>
-    <SignManifests>true</SignManifests>
+    <SignManifests>false</SignManifests>
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <TargetZone>LocalIntranet</TargetZone>
     <FileUpgradeFlags>
diff --git a/CUETools/Properties/Resources.Designer.cs b/CUETools/Properties/Resources.Designer.cs
index 4b72c30..b35b35e 100644
--- a/CUETools/Properties/Resources.Designer.cs
+++ b/CUETools/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4206
+//     Runtime Version:2.0.50727.5446
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/CUETools/Properties/Resources.resx b/CUETools/Properties/Resources.resx
index f9f8684..184766f 100644
--- a/CUETools/Properties/Resources.resx
+++ b/CUETools/Properties/Resources.resx
@@ -230,7 +230,7 @@
     <value>..\Resources\report.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="puzzle--arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\more\icon\puzzle--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\puzzle--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="folder_page" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\more\icons\folder_page.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -248,7 +248,7 @@
     <value>..\resources\accuraterip_16.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="alarm-clock--minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\more\icon\alarm-clock--minus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\alarm-clock--minus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="alarm_clock" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\alarm-clock.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
diff --git a/ThirdParty/OpenCLNet.dll b/ThirdParty/OpenCLNet.dll
new file mode 100644
index 0000000..b415408
Binary files /dev/null and b/ThirdParty/OpenCLNet.dll differ