Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj
===================================================================
diff -u -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4 -rbd8291af14687d29a602b64864c37f2e254459f8
--- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
+++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision bd8291af14687d29a602b64864c37f2e254459f8)
@@ -115,6 +115,7 @@
     </Compile>
     <Compile Include="Appenders\RingtoetsUserDataFolderConverter.cs" />
     <Compile Include="Appenders\RunReportLogAppender.cs" />
+    <Compile Include="Forms\MainWindow\Interop\NativeWin32.cs" />
     <Compile Include="Theme\ColorTheme.cs" />
     <Compile Include="Theme\ColorThemeExtensions.cs" />
     <Compile Include="ContextMenu\ContextMenuBuilderException.cs" />
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/Interop/NativeWin32.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/Interop/NativeWin32.cs	(revision 0)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/Interop/NativeWin32.cs	(revision bd8291af14687d29a602b64864c37f2e254459f8)
@@ -0,0 +1,10 @@
+using System.Runtime.InteropServices;
+
+namespace Core.Common.Gui.Forms.MainWindow.Interop
+{
+    public static class NativeWin32
+    {
+        [DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+        public static extern bool EnableWindow(HandleRef hWnd, bool enable);
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r80d33e42292f20775a8230ba6d14e357a002e4ae -rbd8291af14687d29a602b64864c37f2e254459f8
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 80d33e42292f20775a8230ba6d14e357a002e4ae)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision bd8291af14687d29a602b64864c37f2e254459f8)
@@ -16,13 +16,15 @@
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media.Imaging;
+
+using Core.Common.Gui.Forms.MainWindow.Interop;
 using Core.Common.Gui.Forms.MessageWindow;
 using Core.Common.Gui.Forms.Options;
 using Core.Common.Gui.Properties;
 using Core.Common.Gui.Theme;
 using Core.Common.Utils;
 using Core.Common.Utils.Collections;
-using Core.Common.Utils.Interop;
+
 using Fluent;
 using log4net;
 using Microsoft.Win32;
Fisheye: Tag bd8291af14687d29a602b64864c37f2e254459f8 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Collections/Extensions/ListExtensions.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag bd8291af14687d29a602b64864c37f2e254459f8 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Comparer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj
===================================================================
diff -u -r23981d00366f6ee42b7b3c2b776a687c1dc70d07 -rbd8291af14687d29a602b64864c37f2e254459f8
--- Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision 23981d00366f6ee42b7b3c2b776a687c1dc70d07)
+++ Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision bd8291af14687d29a602b64864c37f2e254459f8)
@@ -88,14 +88,12 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="Comparer.cs" />
     <Compile Include="ComponentModel\DynamicEditorAttribute.cs" />
     <Compile Include="ComponentModel\DynamicVisibleAttribute.cs" />
     <Compile Include="ComponentModel\DynamicVisibleValidationMethodAttribute.cs" />
     <Compile Include="CultureUtils.cs" />
     <Compile Include="DisplayFormatAttribute.cs" />
     <Compile Include="GraphicsUtils.cs" />
-    <Compile Include="Interop\NativeWin32.cs" />
     <Compile Include="Reflection\DynamicTypeUtils.cs" />
     <Compile Include="Properties\Resource.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -117,7 +115,6 @@
     <Compile Include="INotifyPropertyChange.cs" />
     <Compile Include="Collections\CollectionExtensions.cs" />
     <Compile Include="Collections\EnumerableExtensions.cs" />
-    <Compile Include="Collections\Extensions\ListExtensions.cs" />
     <Compile Include="Collections\Generic\EnumerableList.cs" />
     <Compile Include="Collections\Generic\IEnumerableList.cs" />
     <Compile Include="Collections\Generic\IEnumerableListEditor.cs" />
@@ -128,12 +125,9 @@
     <Compile Include="ComponentModel\DynamicReadOnlyValidationMethodAttribute.cs" />
     <Compile Include="PropertyBag\Dynamic\DynamicPropertyBag.cs" />
     <Compile Include="ComponentModel\DynamicReadOnlyAttribute.cs" />
-    <Compile Include="SnappingCalculator.cs" />
     <Compile Include="Drawing\ImageExtensions.cs" />
     <Compile Include="EnumDescriptionAttributeTypeConverter.cs" />
     <Compile Include="EventArgs.cs" />
-    <Compile Include="IDeepCloneable.cs" />
-    <Compile Include="Interop\NativeLibrary.cs" />
     <Compile Include="IO\FileWatcher.cs" />
     <Compile Include="MathUtils.cs" />
     <Compile Include="PropertyBag\PropertyBag.cs" />
Index: Core/Common/src/Core.Common.Utils/Drawing/ImageExtensions.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rbd8291af14687d29a602b64864c37f2e254459f8
--- Core/Common/src/Core.Common.Utils/Drawing/ImageExtensions.cs	(.../ImageExtensions.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Utils/Drawing/ImageExtensions.cs	(.../ImageExtensions.cs)	(revision bd8291af14687d29a602b64864c37f2e254459f8)
@@ -6,25 +6,6 @@
     {
         /// <summary>
         /// Draws <paramref name="overlayImage"/> on top of <paramref name="originalImage"/> at the provided x and y offset
-        /// </summary>
-        /// <param name="originalImage">Original image</param>
-        /// <param name="overlayImage">Overlay image</param>
-        /// <param name="xOffSet">X offset for overlay drawing</param>
-        /// <param name="yOffSet">Y offset for overlay drawing</param>
-        public static Image AddOverlayImage(this Image originalImage, Image overlayImage, int xOffSet, int yOffSet)
-        {
-            var image = (Image) originalImage.Clone();
-
-            using (var gfx = Graphics.FromImage(image))
-            {
-                gfx.DrawImage(overlayImage, new Point(xOffSet, yOffSet));
-            }
-
-            return image;
-        }
-
-        /// <summary>
-        /// Draws <paramref name="overlayImage"/> on top of <paramref name="originalImage"/> at the provided x and y offset
         /// and scales <paramref name="overlayImage"/> down/up to the provided <paramref name="width"/> and <paramref name="height"/>
         /// </summary>
         /// <param name="originalImage">Original image</param>
Fisheye: Tag bd8291af14687d29a602b64864c37f2e254459f8 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/IDeepCloneable.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag bd8291af14687d29a602b64864c37f2e254459f8 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Interop/NativeLibrary.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag bd8291af14687d29a602b64864c37f2e254459f8 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Interop/NativeWin32.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Utils/Properties/Resource.Designer.cs
===================================================================
diff -u -r83b9621346f7f3ca887096468de965815eb609ac -rbd8291af14687d29a602b64864c37f2e254459f8
--- Core/Common/src/Core.Common.Utils/Properties/Resource.Designer.cs	(.../Resource.Designer.cs)	(revision 83b9621346f7f3ca887096468de965815eb609ac)
+++ Core/Common/src/Core.Common.Utils/Properties/Resource.Designer.cs	(.../Resource.Designer.cs)	(revision bd8291af14687d29a602b64864c37f2e254459f8)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18063
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -196,17 +196,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Kon {0} niet vinden, dan wel laden.
-        ///Fout: {1} - {2}
-        ///Bestand: {3}\{0}.
-        /// </summary>
-        internal static string NativeLibrary_LoadNativeDll_Could_not_find_load_0_Error_1_2_File_3_0_ {
-            get {
-                return ResourceManager.GetString("NativeLibrary_LoadNativeDll_Could_not_find_load_0_Error_1_2_File_3_0_", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Geprobeerd het kenmerk in de beschikbare spatiale data te vervangen, maar kon kenmerk niet vinden in de oorspronkelijke context: {0}..
         /// </summary>
         internal static string ObjectHelper_CouldNotFindFeatureInOriginalContext {
Index: Core/Common/src/Core.Common.Utils/Properties/Resource.resx
===================================================================
diff -u -r83b9621346f7f3ca887096468de965815eb609ac -rbd8291af14687d29a602b64864c37f2e254459f8
--- Core/Common/src/Core.Common.Utils/Properties/Resource.resx	(.../Resource.resx)	(revision 83b9621346f7f3ca887096468de965815eb609ac)
+++ Core/Common/src/Core.Common.Utils/Properties/Resource.resx	(.../Resource.resx)	(revision bd8291af14687d29a602b64864c37f2e254459f8)
@@ -153,11 +153,6 @@
   <data name="DynamicVisibleAttribute_IsDynamicVisible_0_uses_DynamicVisibleAttribute_but_does_not_have_method_marked_using_DynamicVisibleValidationMethodAttribute" xml:space="preserve">
     <value>{0} gebruikt DynamicVisibleAttribute, maar heeft geen methode gemarkeerd met DynamicVisibleValidationMethodAttribute.</value>
   </data>
-  <data name="NativeLibrary_LoadNativeDll_Could_not_find_load_0_Error_1_2_File_3_0_" xml:space="preserve">
-    <value>Kon {0} niet vinden, dan wel laden.
-Fout: {1} - {2}
-Bestand: {3}\{0}</value>
-  </data>
   <data name="TypeUtils_CreateInstance_No_default_constructor_available_for_type_0_" xml:space="preserve">
     <value>Geen 'default constructor' gevonden voor type {0}.</value>
   </data>
Fisheye: Tag bd8291af14687d29a602b64864c37f2e254459f8 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/SnappingCalculator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Utils/TypeConverter.cs
===================================================================
diff -u -r8a9a2efad299327b082088189b9a37c32c55a890 -rbd8291af14687d29a602b64864c37f2e254459f8
--- Core/Common/src/Core.Common.Utils/TypeConverter.cs	(.../TypeConverter.cs)	(revision 8a9a2efad299327b082088189b9a37c32c55a890)
+++ Core/Common/src/Core.Common.Utils/TypeConverter.cs	(.../TypeConverter.cs)	(revision bd8291af14687d29a602b64864c37f2e254459f8)
@@ -7,20 +7,9 @@
     /// Type conversion ie string conversion, works with nullable types.
     /// </summary>
     /// <remarks>http://www.dogaoztuzun.com/post/C-Generic-Type-Conversion.aspx</remarks>
-    public class TypeConverter
+    public static class TypeConverter
     {
         /// <summary>
-        /// Convert (and cast) value to given type using the current type's TypeConverter
-        /// </summary>
-        /// <typeparam name="T">The target type to convert to</typeparam>
-        /// <param name="value">The value object to convert from</param>
-        /// <returns>The value object, converted and casted into the target type</returns>
-        public static T ConvertValueToTargetType<T>(object value)
-        {
-            return (T) ConvertValueToTargetType(typeof(T), value);
-        }
-
-        /// <summary>
         /// Converts value to given type using the current type's TypeConverter
         /// </summary>
         /// <param name="t">The target type to convert to</param>
@@ -31,32 +20,5 @@
             System.ComponentModel.TypeConverter tc = TypeDescriptor.GetConverter(t);
             return tc.ConvertFrom(value);
         }
-
-        /// <summary>
-        /// Convert the object value using a specified TypeConveter, circumventing the Type's TypeConverter
-        /// </summary>
-        /// <param name="value">The original object to convert from</param>
-        /// <param name="tc">The type converter that will be used</param>
-        /// <returns></returns>
-        public static object ConvertValueToTargetType(object value, System.ComponentModel.TypeConverter tc)
-        {
-            //System.ComponentModel.TypeConverter tc = TypeDescriptor.GetConverter(t);
-            return tc.ConvertFrom(value);
-        }
-
-        /// <summary>
-        /// Overrides the original TypeConverter with the specified TypeConverter
-        /// <remarks>Usefull for registering TypeConverters to Types that are closed such as library types</remarks>
-        /// </summary>
-        /// <typeparam name="T">The type to attach the specified converter to</typeparam>
-        /// <typeparam name="TC">The converter that will handle all type conversions to and from the type</typeparam>
-        public static void RegisterTypeConverter<T, TC>() where TC : System.ComponentModel.TypeConverter
-        {
-            TypeConverterAttribute tca = new TypeConverterAttribute(typeof(TC));
-            if (!TypeDescriptor.GetAttributes(typeof(T)).Contains(tca))
-            {
-                TypeDescriptor.AddAttributes(typeof(T), tca);
-            }
-        }
     }
 }
\ No newline at end of file
Fisheye: Tag bd8291af14687d29a602b64864c37f2e254459f8 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Utils.Test/Collections/Extensions/ListExtensions.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag bd8291af14687d29a602b64864c37f2e254459f8 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Utils.Test/ComparerTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj
===================================================================
diff -u -rd6e6eadf4a2521df75b6d371bacbb181a43058a3 -rbd8291af14687d29a602b64864c37f2e254459f8
--- Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj	(.../Core.Common.Utils.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
+++ Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj	(.../Core.Common.Utils.Test.csproj)	(revision bd8291af14687d29a602b64864c37f2e254459f8)
@@ -89,13 +89,10 @@
   <ItemGroup>
     <Compile Include="ChartViewDateTimeFormatProviderTest.cs" />
     <Compile Include="Collections\EnumerableExtensionsTest.cs" />
-    <Compile Include="Collections\Extensions\ListExtensions.cs" />
     <Compile Include="Collections\Generic\EnumerableListTest.cs" />
     <Compile Include="Collections\Generic\EventedListTest.cs" />
     <Compile Include="ComparableExtensionsTest.cs" />
-    <Compile Include="ComparerTest.cs" />
     <Compile Include="ConversionHelperTest.cs" />
-    <Compile Include="General\TypeConverterTest.cs" />
     <Compile Include="IO\FileUtilsTest.cs" />
     <Compile Include="IO\FileWatcherTest.cs" />
     <Compile Include="MathUtilsTest.cs" />
@@ -111,7 +108,6 @@
     <Compile Include="Reflection\TypeConverterTest.cs" />
     <Compile Include="Reflection\TypeExtensionsTest.cs" />
     <Compile Include="Reflection\TypeUtilsTest.cs" />
-    <Compile Include="SnappingCalculatorTest.cs" />
     <Compile Include="StringExtensionsTests.cs" />
     <Compile Include="TestHelperTests.cs" />
     <Compile Include="TextDocumentTest.cs" />
Fisheye: Tag bd8291af14687d29a602b64864c37f2e254459f8 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Utils.Test/General/TypeConverterTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag bd8291af14687d29a602b64864c37f2e254459f8 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Utils.Test/SnappingCalculatorTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/GIS/src/Core.GIS.SharpMap.Extensions/Core.GIS.SharpMap.Extensions.csproj
===================================================================
diff -u -r495f1fccd6473bf385415a762cfa49d020b54784 -rbd8291af14687d29a602b64864c37f2e254459f8
--- Core/GIS/src/Core.GIS.SharpMap.Extensions/Core.GIS.SharpMap.Extensions.csproj	(.../Core.GIS.SharpMap.Extensions.csproj)	(revision 495f1fccd6473bf385415a762cfa49d020b54784)
+++ Core/GIS/src/Core.GIS.SharpMap.Extensions/Core.GIS.SharpMap.Extensions.csproj	(.../Core.GIS.SharpMap.Extensions.csproj)	(revision bd8291af14687d29a602b64864c37f2e254459f8)
@@ -105,6 +105,8 @@
   <ItemGroup>
     <Compile Include="CoordinateSystems\OgrCoordinateSystemFactory.cs" />
     <Compile Include="GdalConfiguration.cs" />
+    <Compile Include="Interop\NativeLibrary.cs" />
+    <Compile Include="Interop\NativeWin32.cs" />
     <Compile Include="Layers\AsyncTileHandler.cs" />
     <Compile Include="Layers\AsyncTileLayer.cs" />
     <Compile Include="Layers\FileCache.cs" />
@@ -186,6 +188,7 @@
   <ItemGroup>
     <None Include="CoordinateSystems\cs.ids.txt" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Core/GIS/src/Core.GIS.SharpMap.Extensions/GdalConfiguration.cs
===================================================================
diff -u -rf1c02b2d47dc561deec70a24128d8dd49d9bed6a -rbd8291af14687d29a602b64864c37f2e254459f8
--- Core/GIS/src/Core.GIS.SharpMap.Extensions/GdalConfiguration.cs	(.../GdalConfiguration.cs)	(revision f1c02b2d47dc561deec70a24128d8dd49d9bed6a)
+++ Core/GIS/src/Core.GIS.SharpMap.Extensions/GdalConfiguration.cs	(.../GdalConfiguration.cs)	(revision bd8291af14687d29a602b64864c37f2e254459f8)
@@ -30,7 +30,9 @@
 using System;
 using System.IO;
 using System.Reflection;
-using Core.Common.Utils.Interop;
+
+using Core.GIS.SharpMap.Extensions.Interop;
+
 using OSGeo.GDAL;
 using OSGeo.OGR;
 
Index: Core/GIS/src/Core.GIS.SharpMap.Extensions/Interop/NativeLibrary.cs
===================================================================
diff -u
--- Core/GIS/src/Core.GIS.SharpMap.Extensions/Interop/NativeLibrary.cs	(revision 0)
+++ Core/GIS/src/Core.GIS.SharpMap.Extensions/Interop/NativeLibrary.cs	(revision bd8291af14687d29a602b64864c37f2e254459f8)
@@ -0,0 +1,95 @@
+using System;
+using System.ComponentModel;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Text;
+using Core.GIS.SharpMap.Extensions.Properties;
+
+namespace Core.GIS.SharpMap.Extensions.Interop
+{
+    public static class NativeLibrary
+    {
+        [DllImport("kernel32", SetLastError = true, CharSet = CharSet.Unicode)]
+        public static extern IntPtr LoadLibrary(string lpFileName);
+
+        [DllImport("kernel32", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool FreeLibrary(IntPtr hModule);
+
+        //private: use SwitchDllSearchDirectory with a using instead
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+        public static extern void SetDllDirectory(string lpPathName);
+
+        public static string GetDllDirectory()
+        {
+            var tmp = new StringBuilder(4096);
+            GetDllDirectory(4096, tmp);
+            return tmp.ToString();
+        }
+
+        /// <summary>
+        /// Call this from a static constructor in a class that has DllImport external methods. This 
+        /// method uses LoadLibrary to load the correct dll for the current process (32bit or 64bit) 
+        /// before DllImport has the chance to resolve the external calls. As long as the dll name is 
+        /// the same this works.
+        /// </summary>
+        /// <param name="dllFileName">The dll file to load.</param>
+        /// <param name="baseDirectory">The directory where x64 and x86 are situated.</param>
+        public static void LoadNativeDllForCurrentPlatform(string dllFileName, string baseDirectory)
+        {
+            var platform = Environment.Is64BitProcess ? "x64" : "x86";
+            var nativeDirectory = Path.Combine(baseDirectory, platform);
+
+            LoadNativeDll(dllFileName, nativeDirectory);
+        }
+
+        /// <summary>
+        /// Call this from a static constructor in a class that has DllImport external methods. This 
+        /// method uses LoadLibrary to load the correct dll for the current process (32bit or 64bit) 
+        /// before DllImport has the chance to resolve the external calls. As long as the dll name is 
+        /// the same this works.
+        /// </summary>
+        /// <param name="dllFileName">The dll file to load.</param>
+        /// <param name="directory">The directory to load the dll from.</param>
+        public static void LoadNativeDll(string dllFileName, string directory)
+        {
+            using (SwitchDllSearchDirectory(directory))
+            {
+                // attempt to load the library
+                var ptr = LoadLibrary(dllFileName);
+                if (ptr == IntPtr.Zero)
+                {
+                    var error = Marshal.GetLastWin32Error();
+                    var exception = new Win32Exception(error);
+                    throw new FileNotFoundException(
+                        string.Format(Resources.NativeLibrary_LoadNativeDll_Could_not_find_load_0_Error_1_2_File_3_0_,
+                                      dllFileName, error, exception.Message, directory, dllFileName));
+                }
+            }
+        }
+
+        public static IDisposable SwitchDllSearchDirectory(string dllDirectory)
+        {
+            return new SwitchDllSearchDirectoryHelper(dllDirectory);
+        }
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        private static extern int GetDllDirectory(int nBufferLength, StringBuilder lpPathName);
+
+        private class SwitchDllSearchDirectoryHelper : IDisposable // ???
+        {
+            private readonly string oldDirectory;
+
+            public SwitchDllSearchDirectoryHelper(string dllDirectory)
+            {
+                oldDirectory = GetDllDirectory();
+                SetDllDirectory(dllDirectory);
+            }
+
+            public void Dispose()
+            {
+                SetDllDirectory(oldDirectory);
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/GIS/src/Core.GIS.SharpMap.Extensions/Interop/NativeWin32.cs
===================================================================
diff -u
--- Core/GIS/src/Core.GIS.SharpMap.Extensions/Interop/NativeWin32.cs	(revision 0)
+++ Core/GIS/src/Core.GIS.SharpMap.Extensions/Interop/NativeWin32.cs	(revision bd8291af14687d29a602b64864c37f2e254459f8)
@@ -0,0 +1,30 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Core.GIS.SharpMap.Extensions.Interop
+{
+    public static class NativeWin32
+    {
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool GetIconInfo(IntPtr hIcon, ref IconInfo pIconInfo);
+
+        [DllImport("user32.dll")]
+        public static extern IntPtr CreateIconIndirect(ref IconInfo icon);
+
+        [DllImport("user32.dll")]
+        public static extern bool DestroyIcon(IntPtr handle);
+
+        [DllImport("gdi32")]
+        public static extern bool DeleteObject(IntPtr hObject);
+
+        public struct IconInfo
+        {
+            public bool fIcon;
+            public int xHotspot;
+            public int yHotspot;
+            public IntPtr hbmMask;
+            public IntPtr hbmColor;
+        } 
+    }
+}
\ No newline at end of file
Index: Core/GIS/src/Core.GIS.SharpMap.Extensions/Properties/Resources.Designer.cs
===================================================================
diff -u -r7284f9def6464e4b6f36dda3b29aba7d58108dc9 -rbd8291af14687d29a602b64864c37f2e254459f8
--- Core/GIS/src/Core.GIS.SharpMap.Extensions/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 7284f9def6464e4b6f36dda3b29aba7d58108dc9)
+++ Core/GIS/src/Core.GIS.SharpMap.Extensions/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision bd8291af14687d29a602b64864c37f2e254459f8)
@@ -1,14 +1,17 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18047
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace Core.GIS.SharpMap.Extensions.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -58,112 +61,34 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to # geographical
-        /// 3819
-        /// 3821
-        /// 3824
-        /// 3889
-        /// 3906
-        /// 4001
-        /// 4002
-        /// 4003
-        /// 4004
-        /// 4005
-        /// 4006
-        /// 4007
-        /// 4008
-        /// 4009
-        /// 4010
-        /// 4011
-        /// 4012
-        /// 4013
-        /// 4014
-        /// 4015
-        /// 4016
-        /// 4018
-        /// 4019
-        /// 4020
-        /// 4021
-        /// 4022
-        /// 4023
-        /// 4024
-        /// 4025
-        /// 4027
-        /// 4028
-        /// 4029
-        /// 4030
-        /// 4031
-        /// 4032
-        /// 4033
-        /// 4034
-        /// 4035
-        /// 4036
-        /// 4041
-        /// 4042
-        /// 4043
-        /// 4044
-        /// 4045
-        /// 4046
-        /// 4047
-        /// 4052
-        /// 4053
-        /// 4054
-        /// 4055
-        /// 4075
-        /// 4081
-        /// 4120
-        /// 4121
-        /// 4122
-        /// 4123
-        /// 4124
-        /// 4125
-        /// 4126
-        /// 4127
-        /// 4128
-        /// 4129
-        /// 4130
-        /// 4131
-        /// 4132
-        /// 4133
-        /// 4134
-        /// 4135
-        /// 4136
-        /// 4137
-        /// 4138
-        /// 4139
-        /// 4140
-        /// 4141
-        /// 4142
-        /// 4143
-        /// 4144
-        /// 4145
-        /// 4146
-        /// 4147
-        /// 4148
-        /// 4149
-        /// 4150
-        /// 4151
-        /// 4152
-        /// 4153
-        /// 4154
-        /// 4155
-        /// 4156
-        /// 4157
-        /// 4158
-        /// 4159
-        /// 4160
-        /// 4161
-        /// 4162
-        /// 4163
-        /// 4164
-        /// 4165
-        /// 4166
-        /// 41 [rest of string was truncated]&quot;;.
+        ///   Looks up a localized string similar to #EPSG;Name;IsGeographic
+        ///3819;&quot;HD1909&quot;;True
+        ///3821;&quot;TWD67&quot;;True
+        ///3824;&quot;TWD97&quot;;True
+        ///3889;&quot;IGRS&quot;;True
+        ///3906;&quot;MGI 1901&quot;;True
+        ///4001;&quot;Unknown datum based upon the Airy 1830 ellipsoid&quot;;True
+        ///4002;&quot;Unknown datum based upon the Airy Modified 1849 ellipsoid&quot;;True
+        ///4003;&quot;Unknown datum based upon the Australian National Spheroid&quot;;True
+        ///4004;&quot;Unknown datum based upon the Bessel 1841 ellipsoid&quot;;True
+        ///4005;&quot;Unknown datum based upon the Bessel Modified ellipsoid&quot;;True
+        ///4006;&quot;Unknown datum based upon the Bessel Namibia ell [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string cs_ids {
             get {
                 return ResourceManager.GetString("cs_ids", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Kon {0} niet vinden, dan wel laden.
+        ///Fout: {1} - {2}
+        ///Bestand: {3}\{0}.
+        /// </summary>
+        internal static string NativeLibrary_LoadNativeDll_Could_not_find_load_0_Error_1_2_File_3_0_ {
+            get {
+                return ResourceManager.GetString("NativeLibrary_LoadNativeDll_Could_not_find_load_0_Error_1_2_File_3_0_", resourceCulture);
+            }
+        }
     }
 }
Index: Core/GIS/src/Core.GIS.SharpMap.Extensions/Properties/Resources.resx
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rbd8291af14687d29a602b64864c37f2e254459f8
--- Core/GIS/src/Core.GIS.SharpMap.Extensions/Properties/Resources.resx	(.../Resources.resx)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/GIS/src/Core.GIS.SharpMap.Extensions/Properties/Resources.resx	(.../Resources.resx)	(revision bd8291af14687d29a602b64864c37f2e254459f8)
@@ -121,4 +121,9 @@
   <data name="cs_ids" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\CoordinateSystems\cs.ids.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;windows-1251</value>
   </data>
+  <data name="NativeLibrary_LoadNativeDll_Could_not_find_load_0_Error_1_2_File_3_0_" xml:space="preserve">
+    <value>Kon {0} niet vinden, dan wel laden.
+Fout: {1} - {2}
+Bestand: {3}\{0}</value>
+  </data>
 </root>
\ No newline at end of file
Index: Core/GIS/src/Core.GIS.SharpMap.UI/Core.GIS.SharpMap.UI.csproj
===================================================================
diff -u -r3f1a2b8718a744b49b160c89df46dee6b7fb5fdd -rbd8291af14687d29a602b64864c37f2e254459f8
--- Core/GIS/src/Core.GIS.SharpMap.UI/Core.GIS.SharpMap.UI.csproj	(.../Core.GIS.SharpMap.UI.csproj)	(revision 3f1a2b8718a744b49b160c89df46dee6b7fb5fdd)
+++ Core/GIS/src/Core.GIS.SharpMap.UI/Core.GIS.SharpMap.UI.csproj	(.../Core.GIS.SharpMap.UI.csproj)	(revision bd8291af14687d29a602b64864c37f2e254459f8)
@@ -172,6 +172,10 @@
       <Name>Core.GIS.SharpMap.Api</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\Core.GIS.SharpMap.Extensions\Core.GIS.SharpMap.Extensions.csproj">
+      <Project>{a4140c12-53f5-438c-8d24-9e48c504fecf}</Project>
+      <Name>Core.GIS.SharpMap.Extensions</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Core.GIS.SharpMap\Core.GIS.SharpMap.csproj">
       <Project>{C83777FC-AABB-47D9-911F-D76255D4D541}</Project>
       <Name>Core.GIS.SharpMap</Name>
Index: Core/GIS/src/Core.GIS.SharpMap.UI/Helpers/MapCursors.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rbd8291af14687d29a602b64864c37f2e254459f8
--- Core/GIS/src/Core.GIS.SharpMap.UI/Helpers/MapCursors.cs	(.../MapCursors.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/GIS/src/Core.GIS.SharpMap.UI/Helpers/MapCursors.cs	(.../MapCursors.cs)	(revision bd8291af14687d29a602b64864c37f2e254459f8)
@@ -3,7 +3,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 using Core.Common.Utils.Drawing;
-using Core.Common.Utils.Interop;
+using Core.GIS.SharpMap.Extensions.Interop;
 using Core.GIS.SharpMap.UI.Properties;
 
 namespace Core.GIS.SharpMap.UI.Helpers
Index: Core/GIS/src/Core.GIS.SharpMap/Editors/Interactors/LineStringInteractor.cs
===================================================================
diff -u -r22469012664426d8196f8cd350cde57a8a50bc70 -rbd8291af14687d29a602b64864c37f2e254459f8
--- Core/GIS/src/Core.GIS.SharpMap/Editors/Interactors/LineStringInteractor.cs	(.../LineStringInteractor.cs)	(revision 22469012664426d8196f8cd350cde57a8a50bc70)
+++ Core/GIS/src/Core.GIS.SharpMap/Editors/Interactors/LineStringInteractor.cs	(.../LineStringInteractor.cs)	(revision bd8291af14687d29a602b64864c37f2e254459f8)
@@ -3,7 +3,6 @@
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
-using Core.Common.Utils.Collections.Extensions;
 using Core.GIS.GeoAPI.Extensions.Feature;
 using Core.GIS.GeoAPI.Geometries;
 using Core.GIS.SharpMap.Api.Editors;
@@ -95,8 +94,11 @@
             }
 
             Trackers.Clear();
-            Trackers.AddRange(CreateTrackersForGeometry(SourceFeature.Geometry));
-
+            foreach (TrackerFeature feature in CreateTrackersForGeometry(SourceFeature.Geometry))
+            {
+                Trackers.Add(feature);
+            }
+            
             AllTracker = new TrackerFeature(this, null, -1, null);
         }
 
Index: Core/GIS/src/Core.GIS.SharpMap/Map/Map.cs
===================================================================
diff -u -r9b3ad522b72ddb7f06ce04cab7a0acb508c268bb -rbd8291af14687d29a602b64864c37f2e254459f8
--- Core/GIS/src/Core.GIS.SharpMap/Map/Map.cs	(.../Map.cs)	(revision 9b3ad522b72ddb7f06ce04cab7a0acb508c268bb)
+++ Core/GIS/src/Core.GIS.SharpMap/Map/Map.cs	(.../Map.cs)	(revision bd8291af14687d29a602b64864c37f2e254459f8)
@@ -27,6 +27,7 @@
 using Core.Common.Utils;
 using Core.Common.Utils.Collections;
 using Core.Common.Utils.Collections.Generic;
+using Core.Common.Utils.Drawing;
 using Core.GIS.GeoAPI.CoordinateSystems;
 using Core.GIS.GeoAPI.Extensions.Feature;
 using Core.GIS.GeoAPI.Geometries;
@@ -380,7 +381,7 @@
 
                 if (Math.Abs(layer.Opacity - 1.0) > 0.0000001)
                 {
-                    GraphicsUtils.DrawImageTransparent(g, layer.Image, layer.Opacity);
+                    g.DrawImageTransparent(layer.Image, layer.Opacity);
                 }
                 else
                 {