diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/EverythingSDK/Everything64.dll b/Plugins/Flow.Launcher.Plugin.Explorer/EverythingSDK/Everything64.dll
deleted file mode 100644
index 6d093b793..000000000
Binary files a/Plugins/Flow.Launcher.Plugin.Explorer/EverythingSDK/Everything64.dll and /dev/null differ
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/EverythingSDK/Everything86.dll b/Plugins/Flow.Launcher.Plugin.Explorer/EverythingSDK/Everything86.dll
deleted file mode 100644
index de73b87d1..000000000
Binary files a/Plugins/Flow.Launcher.Plugin.Explorer/EverythingSDK/Everything86.dll and /dev/null differ
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj b/Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj
index 2f2e7b9f6..c4bcc90ab 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj
@@ -36,7 +36,10 @@
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="EverythingSDK\*.dll">
+    <Content Update="EverythingSDK\x64\Everything.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="EverythingSDK\x86\Everything.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Main.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Main.cs
index 439e0bf8e..7201347c4 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Main.cs
@@ -67,7 +67,7 @@ namespace Flow.Launcher.Plugin.Explorer
             SortOptionTranslationHelper.API = context.API;
 
             EverythingApiDllImport.Load(Path.Combine(Context.CurrentPluginMetadata.PluginDirectory, "EverythingSDK",
-                Environment.Is64BitProcess ? "Everything64.dll" : "Everything86.dll"));
+                Environment.Is64BitProcess ? "x64" : "x86"));
             return Task.CompletedTask;
         }
 
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingApiDllImport.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingApiDllImport.cs
index b100a6026..f9eec929b 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingApiDllImport.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingApiDllImport.cs
@@ -1,5 +1,6 @@
 using Flow.Launcher.Plugin.Everything.Everything;
 using System;
+using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
 
@@ -9,14 +10,19 @@ namespace Flow.Launcher.Plugin.Explorer.Search.Everything
     {
         public static void Load(string path)
         {
-            LoadLibrary(path);
+            int code = LoadLibrary(Path.Combine(path, DLL));
+            if (code == 0)
+            {
+                int err = Marshal.GetLastPInvokeError();
+                Marshal.ThrowExceptionForHR(err);
+            }
         }
-        
-        [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
         private static extern int LoadLibrary(string name);
-        
+
         private const string DLL = "Everything.dll";
-        
+
         [DllImport(DLL, CharSet = CharSet.Unicode)]
         internal static extern int Everything_SetSearchW(string lpSearchString);
 
@@ -150,4 +156,4 @@ namespace Flow.Launcher.Plugin.Explorer.Search.Everything
         [DllImport(DLL)]
         public static extern uint Everything_IncRunCountFromFileName(string lpFileName);
     }
-}
\ No newline at end of file
+}
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index feccd5c50..43391df0b 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -279,7 +279,7 @@
                                 DockPanel.Dock="Top"
                                 DragEnter="lbxAccessLinks_DragEnter"
                                 Drop="LbxExcludedPaths_OnDrop"
-                                ItemTemplate="{StaticResource ListViewActionKeywords}"
+                                ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
                                 ItemsSource="{Binding Settings.IndexSearchExcludedSubdirectoryPaths}"
                                 SelectedItem="{Binding SelectedIndexSearchExcludedPath}" />
                             <StackPanel HorizontalAlignment="Right"