diff --git a/samples/Sample.WPF/App.xaml b/samples/Sample.WPF/App.xaml
index 9c8bf78..7926177 100644
--- a/samples/Sample.WPF/App.xaml
+++ b/samples/Sample.WPF/App.xaml
@@ -8,12 +8,12 @@
             <Style TargetType="{x:Type Rectangle}" />
 
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/ModernWPF;component/Themes/ModernBaseDesktop.xaml" />
-                <ResourceDictionary Source="/ModernWPF;component/Themes/ModernLight.xaml" />
-                <ResourceDictionary Source="/ModernWPF;component/Themes/ModernStyles.xaml" />
+                <ResourceDictionary Source="/ModernWpf;component/Themes/BaseValues.xaml" />
+                <ResourceDictionary Source="/ModernWpf;component/Themes/ColorLight.xaml" />
+                <ResourceDictionary Source="/ModernWpf;component/Themes/ModernStyles.xaml" />
                 
                 <ResourceDictionary>
-                    <Style x:Key="AppWindow" TargetType="Window" BasedOn="{StaticResource ModernWindowV2}"/>
+                    <Style x:Key="AppWindow" TargetType="Window" BasedOn="{StaticResource ModernWindow}"/>
                     <Style x:Key="AppListBoxItem" TargetType="ListBoxItem" BasedOn="{StaticResource ModernListBoxItem}">
                         <Setter Property="BorderThickness" Value="1"/>
                         <Style.Triggers>
diff --git a/samples/Sample.WPF/App.xaml.cs b/samples/Sample.WPF/App.xaml.cs
index 1fad94f..9c74199 100644
--- a/samples/Sample.WPF/App.xaml.cs
+++ b/samples/Sample.WPF/App.xaml.cs
@@ -1,16 +1,17 @@
-using ModernWPF;
+using ModernWpf;
 using System.Windows;
 
 namespace Sample.WPF
 {
-	/// <summary>
-	/// Interaction logic for App.xaml
-	/// </summary>
-	public partial class App : Application
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
 	{
 		protected override void OnStartup(StartupEventArgs e)
 		{
-            ModernTheme.ApplyTheme(ModernTheme.Theme.Light, Accent.Green);
+            UIHooks.EnableHighDpiSupport();
+            Theme.ApplyTheme(ThemeColor.Light, Accent.Green);
 			base.OnStartup(e);
 		}
 	}
diff --git a/samples/Sample.WPF/MainWindow.xaml b/samples/Sample.WPF/MainWindow.xaml
index 5145ab1..e4b8627 100644
--- a/samples/Sample.WPF/MainWindow.xaml
+++ b/samples/Sample.WPF/MainWindow.xaml
@@ -79,14 +79,16 @@
         <StackPanel Orientation="Horizontal" Grid.Column="3" >
             <Label Content="State:"></Label>
             <TextBlock Text="{Binding State}"></TextBlock>
-            <Button Content="_Driver settings" Command="{Binding ShowDriverCommand}"></Button>
-            <Button Content="_Start capture" Command="{Binding CaptureCommand}"></Button>
+            <Button Content="S_ettings" Command="{Binding ShowDriverCommand}"></Button>
+            <Button Content="S_tart" Command="{Binding CaptureCommand}"></Button>
+            <CheckBox Content="Show _UI" IsChecked="{Binding ShowUI}"></CheckBox>
             <Slider Maximum="{Binding MaxThumbnailSize}" Minimum="{Binding MinThumbnailSize}" 
                     Value="{Binding ThumbnailSize}" Width="100" LargeChange="20" SmallChange="10"
                     VerticalAlignment="Center"
                     ToolTip="{Binding ThumbnailSize}"></Slider>
             <TextBlock Text="{Binding CapturedImages.Count, StringFormat='{}{0} pages'}"></TextBlock>
             <Button Content="_Clear pages" Command="{Binding ClearCommand}"></Button>
+            <!--<Button Content="_Save" Command="{Binding SaveCommand}"></Button>-->
         </StackPanel>
 
         <ListBox Grid.Row="1" Grid.RowSpan="2" Grid.Column="3"
diff --git a/samples/Sample.WPF/MainWindow.xaml.cs b/samples/Sample.WPF/MainWindow.xaml.cs
index 55b8aa0..16930c0 100644
--- a/samples/Sample.WPF/MainWindow.xaml.cs
+++ b/samples/Sample.WPF/MainWindow.xaml.cs
@@ -1,7 +1,7 @@
 using GalaSoft.MvvmLight.Messaging;
-using ModernWPF;
-using ModernWPF.Controls;
-using ModernWPF.Messages;
+using ModernWpf;
+using ModernWpf.Controls;
+using ModernWpf.Messages;
 using NTwain;
 using NTwain.Data;
 using System;
@@ -32,6 +32,13 @@ namespace Sample.WPF
                 _twainVM = this.DataContext as TwainVM;
                 _twainVM.PropertyChanged += _twainVM_PropertyChanged;
                 Messenger.Default.Register<RefreshCommandsMessage>(this, m => m.HandleIt());
+                Messenger.Default.Register<ChooseFileMessage>(this, m =>
+                {
+                    if (m.Sender == DataContext)
+                    {
+                        m.HandleWithPlatform(this);
+                    }
+                });
                 Messenger.Default.Register<MessageBoxMessage>(this, msg =>
                 {
                     if (Dispatcher.CheckAccess())
@@ -55,11 +62,11 @@ namespace Sample.WPF
             {
                 if (_twainVM.State == 5)
                 {
-                    ModernTheme.ApplyTheme(ModernTheme.Theme.Light, Accent.Orange);
+                    Theme.ApplyTheme(ThemeColor.Light, Accent.Orange);
                 }
                 else if (_twainVM.State == 4)
                 {
-                    ModernTheme.ApplyTheme(ModernTheme.Theme.Light, Accent.Green);
+                    Theme.ApplyTheme(ThemeColor.Light, Accent.Green);
                 }
             }
         }
diff --git a/samples/Sample.WPF/Properties/AssemblyInfo.cs b/samples/Sample.WPF/Properties/AssemblyInfo.cs
index 3c604b8..bc6268c 100644
--- a/samples/Sample.WPF/Properties/AssemblyInfo.cs
+++ b/samples/Sample.WPF/Properties/AssemblyInfo.cs
@@ -1,6 +1,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
+using System.Windows.Media;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -30,12 +31,12 @@ using System.Windows;
 
 
 [assembly: ThemeInfo(
-	ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-	//(used if a resource is not found in the page, 
-	// or application resource dictionaries)
-	ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-	//(used if a resource is not found in the page, 
-	// app, or any theme specific resource dictionaries)
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page, 
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page, 
+                                              // app, or any theme specific resource dictionaries)
 )]
 
 
@@ -51,3 +52,5 @@ using System.Windows;
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: DisableDpiAwareness]
\ No newline at end of file
diff --git a/samples/Sample.WPF/Sample.WPF.csproj b/samples/Sample.WPF/Sample.WPF.csproj
index 26cd224..cac386e 100644
--- a/samples/Sample.WPF/Sample.WPF.csproj
+++ b/samples/Sample.WPF/Sample.WPF.csproj
@@ -25,6 +25,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>true</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>x64</PlatformTarget>
@@ -43,10 +44,6 @@
     <ApplicationIcon>scanner.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommonWin32, Version=2.0.0.0, Culture=neutral, PublicKeyToken=a0a4edcfe233918d, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\CommonWin32.2.0.5.6\lib\net35-Client\CommonWin32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="GalaSoft.MvvmLight, Version=5.2.0.37223, Culture=neutral, PublicKeyToken=0e453835af4ee6ce, processorArchitecture=MSIL">
       <HintPath>..\..\packages\MvvmLightLibs.5.2.0.0\lib\net40\GalaSoft.MvvmLight.dll</HintPath>
       <Private>True</Private>
@@ -69,8 +66,12 @@
     <Reference Include="Microsoft.WindowsAPICodePack.ShellExtensions">
       <HintPath>..\..\packages\Microsoft.WindowsAPICodePack-Shell.1.1.0.0\lib\Microsoft.WindowsAPICodePack.ShellExtensions.dll</HintPath>
     </Reference>
-    <Reference Include="ModernWPF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=c99d0cfbea7491ef, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\ModernWPF.1.3.9\lib\net40-Client\ModernWPF.dll</HintPath>
+    <Reference Include="ModernWpf, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c99d0cfbea7491ef, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\ModernWpf.2.0.0-alpha1\lib\net40-Client\ModernWpf.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="ModernWpf.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c99d0cfbea7491ef, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\ModernWpf.Core.2.0.0-alpha1\lib\net40-Client\ModernWpf.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="ModernWPF.Mvvm, Version=0.7.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/samples/Sample.WPF/ViewModels/TwainVM.cs b/samples/Sample.WPF/ViewModels/TwainVM.cs
index cf03964..d48173f 100644
--- a/samples/Sample.WPF/ViewModels/TwainVM.cs
+++ b/samples/Sample.WPF/ViewModels/TwainVM.cs
@@ -1,20 +1,17 @@
-using CommonWin32;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
 using GalaSoft.MvvmLight.Messaging;
+using ModernWpf.Messages;
 using NTwain;
 using NTwain.Data;
 using System;
-using System.Linq;
+using System.Collections.ObjectModel;
 using System.IO;
+using System.Linq;
 using System.Reflection;
-using System.Threading;
+using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Collections.ObjectModel;
-using GalaSoft.MvvmLight;
-using System.Windows.Input;
-using GalaSoft.MvvmLight.Command;
-using ModernWPF;
-using ModernWPF.Messages;
 
 namespace Sample.WPF
 {
@@ -106,6 +103,12 @@ namespace Sample.WPF
             }
         }
 
+        public bool ShowUI
+        {
+            get; set;
+        }
+
+
 
         private ICommand _showDriverCommand;
         public ICommand ShowDriverCommand
@@ -144,7 +147,8 @@ namespace Sample.WPF
                         //    this.CurrentSource.ICapXferMech.Set(XferMech.File);
                         //}
 
-                        var rc = _session.CurrentSource.Enable(SourceEnableMode.NoUI, false, WindowHandle);
+                        var rc = _session.CurrentSource.Enable(
+                            ShowUI ? SourceEnableMode.ShowUI : SourceEnableMode.NoUI, false, WindowHandle);
                     }
                 }, () =>
                 {
@@ -154,6 +158,30 @@ namespace Sample.WPF
         }
 
 
+        //private ICommand _saveCommand;
+        //public ICommand SaveCommand
+        //{
+        //    get
+        //    {
+        //        return _saveCommand ?? (_saveCommand = new RelayCommand(() =>
+        //        {
+        //            Messenger.Default.Send(new ChooseFileMessage(this, files =>
+        //            {
+        //                var tiffPath = files.FirstOrDefault();
+
+        //                var srcFiles = CapturedImages.Select(ci=>ci.)
+        //            })
+        //            {
+        //                Caption = "Save to File",
+        //                Filters = "Tiff files|*.tif,*.tiff"
+        //            });
+        //        }, () =>
+        //        {
+        //            return CapturedImages.Count > 0;
+        //        }));
+        //    }
+        //}
+
         private ICommand _clearCommand;
         public ICommand ClearCommand
         {
@@ -225,7 +253,7 @@ namespace Sample.WPF
             {
                 if (e.Exception != null)
                 {
-                    Messenger.Default.Send(new MessageBoxMessage    (e.Exception.Message, null)
+                    Messenger.Default.Send(new MessageBoxMessage(e.Exception.Message, null)
                     {
                         Caption = "Transfer Error Exception",
                         Icon = System.Windows.MessageBoxImage.Error,
diff --git a/samples/Sample.WPF/packages.config b/samples/Sample.WPF/packages.config
index 3f5f135..96492f7 100644
--- a/samples/Sample.WPF/packages.config
+++ b/samples/Sample.WPF/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonServiceLocator" version="1.3" targetFramework="net4-client" />
-  <package id="CommonWin32" version="2.0.5.6" targetFramework="net4-client" />
   <package id="Microsoft.WindowsAPICodePack-Core" version="1.1.0.2" targetFramework="net4-client" />
   <package id="Microsoft.WindowsAPICodePack-Shell" version="1.1.0.0" targetFramework="net4-client" />
-  <package id="ModernWPF" version="1.3.9" targetFramework="net40-client" />
+  <package id="ModernWpf" version="2.0.0-alpha1" targetFramework="net40-client" />
+  <package id="ModernWpf.Core" version="2.0.0-alpha1" targetFramework="net40-client" />
   <package id="ModernWPF.Mvvm" version="0.7.5" targetFramework="net4-client" />
   <package id="MvvmLightLibs" version="5.2.0.0" targetFramework="net4-client" />
 </packages>
\ No newline at end of file
diff --git a/samples/Sample.Winform/Properties/Resources.Designer.cs b/samples/Sample.Winform/Properties/Resources.Designer.cs
index 50e2b0e..350ef60 100644
--- a/samples/Sample.Winform/Properties/Resources.Designer.cs
+++ b/samples/Sample.Winform/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.0
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/samples/Sample.Winform/Properties/Settings.Designer.cs b/samples/Sample.Winform/Properties/Settings.Designer.cs
index 2a7239d..21924a5 100644
--- a/samples/Sample.Winform/Properties/Settings.Designer.cs
+++ b/samples/Sample.Winform/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.0
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace Sample.Winform.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/samples/Sample.Winform/Sample.Winform.csproj b/samples/Sample.Winform/Sample.Winform.csproj
index efa2bb7..326e60b 100644
--- a/samples/Sample.Winform/Sample.Winform.csproj
+++ b/samples/Sample.Winform/Sample.Winform.csproj
@@ -16,7 +16,7 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
diff --git a/src/NTwain/TwainSessionInternal.cs b/src/NTwain/TwainSessionInternal.cs
index 3113108..cf9ce1d 100644
--- a/src/NTwain/TwainSessionInternal.cs
+++ b/src/NTwain/TwainSessionInternal.cs
@@ -87,6 +87,7 @@ namespace NTwain
         void ITwainSessionInternal.ChangeCurrentSource(DataSource source)
         {
             CurrentSource = source;
+            DisableReason = Message.Null;
             OnPropertyChanged("CurrentSource");
             SafeAsyncSyncableRaiseOnEvent(OnSourceChanged, SourceChanged);
         }