diff --git a/source/Aehnlich/Aehnlich/ViewModels/DocDiff/DocDiffDocViewViewModel.cs b/source/Aehnlich/Aehnlich/ViewModels/DocDiff/DocDiffDocViewViewModel.cs
index 4f5b58c..6923285 100644
--- a/source/Aehnlich/Aehnlich/ViewModels/DocDiff/DocDiffDocViewViewModel.cs
+++ b/source/Aehnlich/Aehnlich/ViewModels/DocDiff/DocDiffDocViewViewModel.cs
@@ -1,6 +1,7 @@
 namespace Aehnlich.ViewModels.Documents
 {
 	using Aehnlich.Interfaces;
+	using AehnlichLib.Enums;
 	using AehnlichViewModelsLib.Enums;
 	using HL.Interfaces;
 	using System;
@@ -35,9 +36,11 @@ internal class DocDiffDocViewViewModel : DocumentBaseViewModel, TextDocDifferenc
 		/// <param name="docManager"></param>
 		/// <param name="leftDirPath"></param>
 		/// <param name="rightDirPath"></param>
+		/// <param name="compareAs"></param>
 		public DocDiffDocViewViewModel(IDocumentManagerViewModel docManager,
 									   string leftFilePath,
-									   string rightFilePath)
+									   string rightFilePath,
+									   CompareType compareAs)
 			: this()
 		{
 			_DocumentManager = docManager;
@@ -45,7 +48,7 @@ public DocDiffDocViewViewModel(IDocumentManagerViewModel docManager,
 
 			Title = GetTitle(leftFilePath, rightFilePath, false);
 			ToolTip = GetTooltip(leftFilePath, rightFilePath);
-			DocDiffDoc = AehnlichViewModelsLib.ViewModels.Factory.ConstructAppViewModel(leftFilePath, rightFilePath);
+			DocDiffDoc = AehnlichViewModelsLib.ViewModels.Factory.ConstructAppViewModel(leftFilePath, rightFilePath, compareAs);
 
 			DocDiffDoc.DocumentPropertyChanged += DocDiffDoc_DocumentPropertyChanged;
 		}
diff --git a/source/Aehnlich/Aehnlich/ViewModels/DocumentManagerViewModel.cs b/source/Aehnlich/Aehnlich/ViewModels/DocumentManagerViewModel.cs
index 407ebc1..79d07ce 100644
--- a/source/Aehnlich/Aehnlich/ViewModels/DocumentManagerViewModel.cs
+++ b/source/Aehnlich/Aehnlich/ViewModels/DocumentManagerViewModel.cs
@@ -116,7 +116,7 @@ public void DocDiffDoc_CompareFilesRequest(object sender, OpenFileDiffEventArgs
 
 			if (oldDoc == null)  // Add new document and activate it
 			{
-				var newDoc = new DocDiffDocViewViewModel(this, e.ItemPathA, e.ItemPathB);
+				var newDoc = new DocDiffDocViewViewModel(this, e.ItemPathA, e.ItemPathB, e.CompareAs);
 
 				// CompareFilesCommand is executed via ViewLoadedCommand()
 				AddDocument(newDoc, true);
diff --git a/source/Aehnlich/Aehnlich/Views/Dir/DirDiffDocView.xaml b/source/Aehnlich/Aehnlich/Views/Dir/DirDiffDocView.xaml
index e59d83d..39ab8af 100644
--- a/source/Aehnlich/Aehnlich/Views/Dir/DirDiffDocView.xaml
+++ b/source/Aehnlich/Aehnlich/Views/Dir/DirDiffDocView.xaml
@@ -1,13 +1,13 @@
 <UserControl
-    x:Class="Aehnlich.Views.Dir.DirDiffDocView"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:views="clr-namespace:AehnlichDirViewModelLib.Views;assembly=AehnlichDirViewModelLib"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
+	x:Class="Aehnlich.Views.Dir.DirDiffDocView"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:views="clr-namespace:AehnlichDirViewModelLib.Views;assembly=AehnlichDirViewModelLib"
+	d:DesignHeight="450"
+	d:DesignWidth="800"
+	mc:Ignorable="d">
 
-    <views:DirDiffView Margin="3" DataContext="{Binding DirDiffDoc}" />
+	<views:DirDiffView Margin="3" DataContext="{Binding DirDiffDoc}" />
 </UserControl>
diff --git a/source/Demos/Dir/AehnlichDirViewModelLib/Events/OpenFileDiffEvent.cs b/source/Demos/Dir/AehnlichDirViewModelLib/Events/OpenFileDiffEvent.cs
index d44274c..d626279 100644
--- a/source/Demos/Dir/AehnlichDirViewModelLib/Events/OpenFileDiffEvent.cs
+++ b/source/Demos/Dir/AehnlichDirViewModelLib/Events/OpenFileDiffEvent.cs
@@ -1,6 +1,7 @@
 namespace AehnlichDirViewModelLib.Events
 {
 	using AehnlichDirViewModelLib.Interfaces;
+	using AehnlichLib.Enums;
 	using System;
 
 	/// <summary>
@@ -10,6 +11,17 @@
 	public class OpenFileDiffEventArgs : EventArgs
 	{
 		#region ctors
+		/// <summary>
+		/// Class constructor
+		/// </summary>
+		/// <param name="pathItem"></param>
+		/// <param name="compareAs"></param>
+		public OpenFileDiffEventArgs(IDirEntryViewModel pathItem, CompareType compareAs)
+			: this(pathItem)
+		{
+			CompareAs = compareAs;
+		}
+
 		/// <summary>
 		/// Class constructor
 		/// </summary>
@@ -31,6 +43,7 @@ public OpenFileDiffEventArgs(IDirEntryViewModel pathItem)
 		/// </summary>
 		protected OpenFileDiffEventArgs()
 		{
+			CompareAs = CompareType.Auto;
 		}
 		#endregion ctors
 
@@ -65,6 +78,11 @@ protected OpenFileDiffEventArgs()
 		/// Gets whether this entry represent a file (true), or not (directory or drive).
 		/// </summary>
 		public bool IsFile { get; }
+
+		/// <summary>
+		/// Determines the mode of comparison when files are compared (default is Auto).
+		/// </summary>
+		public CompareType CompareAs { get; }
 		#endregion properties
 	}
 }
diff --git a/source/Demos/Dir/AehnlichDirViewModelLib/ViewModels/DirDiffDocViewModel.cs b/source/Demos/Dir/AehnlichDirViewModelLib/ViewModels/DirDiffDocViewModel.cs
index 5ad7f52..985df16 100644
--- a/source/Demos/Dir/AehnlichDirViewModelLib/ViewModels/DirDiffDocViewModel.cs
+++ b/source/Demos/Dir/AehnlichDirViewModelLib/ViewModels/DirDiffDocViewModel.cs
@@ -6,6 +6,7 @@
 	using AehnlichDirViewModelLib.Models;
 	using AehnlichDirViewModelLib.ViewModels.Base;
 	using AehnlichLib.Dir;
+	using AehnlichLib.Enums;
 	using AehnlichLib.Interfaces;
 	using System;
 	using System.Collections.Generic;
@@ -33,6 +34,7 @@ internal class DirDiffDocViewModel : Base.ViewModelBase, IDirDiffDocViewModel
 		private DiffViewModeEnum _CurrentViewMode = DiffViewModeEnum.DirectoriesAndFiles;
 
 		private ICommand _BrowseItemCommand;
+		private ICommand _CompareFilesCommand;
 		private ICommand _BrowseUpCommand;
 		private ICommand _OpenContainingFolderCommand;
 		private ICommand _OpenInWindowsCommand;
@@ -350,6 +352,90 @@ public ICommand BrowseItemCommand
 			}
 		}
 
+		/// <summary>
+		/// Gets a command to browse the current directory diff view by one level down
+		/// (if there is a current view and a remaining level down is available).
+		/// </summary>
+		public ICommand CompareFilesCommand
+		{
+			get
+			{
+				if (_CompareFilesCommand == null)
+				{
+					_CompareFilesCommand = new RelayCommand<object>((p) =>
+					{
+						IDirEntryViewModel param = null;
+						CompareType compareAs = CompareType.Auto;
+						bool hasParams = ConvertParameter(p, out param, out compareAs);
+
+						if (hasParams == false)
+						{
+							bool? fromA;
+							param = GetSelectedItem(out fromA);
+
+							if (param == null)
+								return;
+						}
+
+						if (param.IsFile == false)
+							return;
+
+						// Send an event to Open a (text) file diff view for this
+						// If there is a listner doing the open part and view ...
+						this.CompareFilesRequest?.Invoke(this, new OpenFileDiffEventArgs(param, compareAs));
+						return;
+
+					}, ((p) =>
+					{
+						IDirEntryViewModel param = null;
+						CompareType compareAs = CompareType.Auto;
+						bool hasParams = ConvertParameter(p, out param, out compareAs);
+
+						if (hasParams == false)
+						{
+							bool? fromA;
+							param = GetSelectedItem(out fromA);
+
+							if (param == null)
+								return false;
+						}
+
+						if (param.IsFile == false)
+							return false;
+
+						return true;
+					}));
+				}
+
+				return _CompareFilesCommand;
+			}
+		}
+
+		private static bool ConvertParameter(object p, out IDirEntryViewModel param, out CompareType compareAs)
+		{
+			param = null;
+			compareAs = CompareType.Auto;
+
+			if (p == null)
+				return false;
+
+			var paras = p as object[];
+			if (paras == null)
+				return false;
+
+			if (paras.Length != 2)
+				return false;
+
+			if (paras[0] is IDirEntryViewModel == false || paras[1] is CompareType == false)
+				return false;
+
+			param = paras[0] as IDirEntryViewModel;
+			compareAs = (CompareType)paras[1];
+
+			return true;
+		}
+
+
 		/// <summary>
 		/// Gets a command to browse the current directory diff view by one level
 		/// up in the directory hierarchy
diff --git a/source/Demos/Dir/AehnlichDirViewModelLib/Views/DirDiffView.xaml b/source/Demos/Dir/AehnlichDirViewModelLib/Views/DirDiffView.xaml
index 9d90f31..528ff31 100644
--- a/source/Demos/Dir/AehnlichDirViewModelLib/Views/DirDiffView.xaml
+++ b/source/Demos/Dir/AehnlichDirViewModelLib/Views/DirDiffView.xaml
@@ -1,455 +1,559 @@
 <UserControl
-    x:Class="AehnlichDirViewModelLib.Views.DirDiffView"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:behav1="clr-namespace:AehnlichDirViewModelLib.Behaviors"
-    xmlns:conv="clr-namespace:AehnlichViewLib.Converters;assembly=AehnlichViewLib"
-    xmlns:conv1="clr-namespace:AehnlichDirViewModelLib.Converters"
-    xmlns:ctrl="clr-namespace:AehnlichViewLib.Controls;assembly=AehnlichViewLib"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:icon_src="clr-namespace:AehnlichViewLib.Themes;assembly=AehnlichViewLib"
-    xmlns:local="clr-namespace:AehnlichDirViewModelLib.Views"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:reskeys="clr-namespace:AehnlichViewLib.Themes;assembly=AehnlichViewLib"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
-    <Grid>
-        <Grid.Resources>
-            <conv:BoolToVisibilityPropConverter x:Key="BoolToVisibilityPropConverter" />
-            <conv:BoolToVisibilityPropConverter
-                x:Key="BoolToVisibilityPropConverter1"
-                FalseValue="Hidden"
-                TrueValue="Visible" />
-            <conv:BoolToVisibilityPropConverter
-                x:Key="BoolToVisibilityPropConverter2"
-                FalseValue="Collapsed"
-                TrueValue="Visible" />
-            <conv1:MultiParToParConverter x:Key="MultiParToParConverter" />
-            <conv:BooleanInvertConverter x:Key="BooleanInvertConverter" />
-            <conv1:MultiBoolToVisibilityPropConverter x:Key="MultiBoolToVisibilityPropConverter" />
-        </Grid.Resources>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-
-        <Grid Grid.Row="0">
-            <StackPanel Orientation="Horizontal">
-                <Button
-                    Width="{Binding Path=ActualHeight, RelativeSource={RelativeSource Self}}"
-                    MinWidth="16"
-                    MinHeight="16"
-                    Margin="0,0,3,0"
-                    Padding="0"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    Command="{Binding CompareDirectoriesCommand}"
-                    ToolTip="Input 2 valid directory paths and compare their content"
-                    ToolTipService.ShowOnDisabled="true">
-                    <Button.CommandParameter>
-                        <MultiBinding Converter="{StaticResource MultiParToParConverter}">
-                            <Binding
-                                Mode="OneWay"
-                                Path="LeftDirPath"
-                                UpdateSourceTrigger="PropertyChanged" />
-                            <Binding
-                                Mode="OneWay"
-                                Path="RightDirPath"
-                                UpdateSourceTrigger="PropertyChanged" />
-                        </MultiBinding>
-                    </Button.CommandParameter>
-
-                    <Image
-                        Height="16"
-                        SnapsToDevicePixels="True"
-                        Source="{DynamicResource {x:Static icon_src:ResourceKeys.ICON_RefreshKey}}" />
-                </Button>
-
-                <!--  File Diff Mode Selection (Last Update, Length, Byte-By-Byte compare)  -->
-                <ComboBox
-                    Width="200"
-                    DisplayMemberPath="Name"
-                    IsEnabled="{Binding DiffProgress.IsProgressbarVisible, Converter={StaticResource BooleanInvertConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-                    ItemsSource="{Binding FileDiffMode.DiffFileModes}"
-                    SelectedItem="{Binding FileDiffMode.DiffFileModeSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                    ToolTipService.ShowOnDisabled="true">
-                    <ComboBox.ToolTip>
-                        <StackPanel>
-                            <TextBlock Text="Select a diff file mode to determine speed and quality of file comparison" />
-                            <Separator />
-                            <TextBlock Text="{Binding FileDiffMode.DiffFileModeSelected.Description, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-                        </StackPanel>
-                    </ComboBox.ToolTip>
-                </ComboBox>
-
-                <StackPanel Orientation="Horizontal">
-                    <StackPanel.Visibility>
-                        <MultiBinding Converter="{StaticResource MultiBoolToVisibilityPropConverter}">
-                            <Binding
-                                Mode="OneWay"
-                                Path="DirDiffDoc.IsDiffDataAvailable"
-                                UpdateSourceTrigger="PropertyChanged" />
-                            <Binding
-                                Mode="OneWay"
-                                Path="DiffProgress.IsProgressbarVisible"
-                                UpdateSourceTrigger="PropertyChanged" />
-                        </MultiBinding>
-                    </StackPanel.Visibility>
-
-                    <Separator Margin="3,0,3,0" />
-
-                    <Button
-                        Width="{Binding Path=ActualHeight, RelativeSource={RelativeSource Self}}"
-                        MinWidth="16"
-                        MinHeight="16"
-                        Margin="0,0,3,0"
-                        Padding="0"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Command="{Binding DirDiffDoc.OpenFileFromActiveViewCommand}"
-                        ToolTip="Open in Windows">
-                        <Image
-                            Height="16"
-                            SnapsToDevicePixels="True"
-                            Source="{DynamicResource {x:Static icon_src:ResourceKeys.ICON_OpenFileKey}}" />
-                    </Button>
-
-                    <Button
-                        Width="{Binding Path=ActualHeight, RelativeSource={RelativeSource Self}}"
-                        MinWidth="16"
-                        MinHeight="16"
-                        Margin="0,0,3,0"
-                        Padding="0"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Command="{Binding DirDiffDoc.BrowseUpCommand}"
-                        ToolTip="Go one folder up from current folder"
-                        ToolTipService.ShowOnDisabled="true">
-                        <Image
-                            Height="16"
-                            SnapsToDevicePixels="True"
-                            Source="{DynamicResource {x:Static icon_src:ResourceKeys.ICON_FolderUpKey}}" />
-                    </Button>
-
-                    <Button
-                        Width="{Binding Path=ActualHeight, RelativeSource={RelativeSource Self}}"
-                        MinWidth="16"
-                        MinHeight="16"
-                        Margin="0,0,3,0"
-                        Padding="0"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Command="{Binding DirDiffDoc.BrowseItemCommand}"
-                        ToolTip="Select a folder to browse it"
-                        ToolTipService.ShowOnDisabled="true">
-                        <Image
-                            Height="16"
-                            SnapsToDevicePixels="True"
-                            Source="{DynamicResource {x:Static icon_src:ResourceKeys.ICON_FolderDownKey}}" />
-                    </Button>
-
-                    <ComboBox
-                        Name="ViewModeSelector"
-                        Width="150"
-                        behav1:SelectionChangedCommand.ChangedCommand="{Binding DiffViewModeSelectCommand}"
-                        behav1:SelectionChangedCommand.CommandParameter="{Binding Path=SelectedItem, ElementName=ViewModeSelector}"
-                        DisplayMemberPath="Name"
-                        IsEnabled="{Binding DirDiffDoc.IsDiffDataAvailable, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-                        ItemsSource="{Binding DiffViewModes}"
-                        SelectedItem="{Binding DiffViewModeSelected, Mode=OneWay}"
-                        ToolTip="Change between hierarchical and simple file view"
-                        ToolTipService.ShowOnDisabled="true" />
-
-                    <Separator Margin="3,0,3,0" />
-
-                    <Border
-                        Margin="0,0,3,0"
-                        Background="{DynamicResource {x:Static reskeys:ResourceKeys.ColorBackgroundContextBrushKey}}"
-                        BorderBrush="Gray"
-                        BorderThickness="1">
-                        <Grid
-                            Width="{Binding Path=ActualHeight, RelativeSource={RelativeSource Self}}"
-                            MinWidth="16"
-                            MinHeight="16"
-                            HorizontalAlignment="Stretch">
-                            <Grid.Background>
-                                <ImageBrush ImageSource="{DynamicResource {x:Static icon_src:ResourceKeys.ICON_ChangedKey}}" />
-                            </Grid.Background>
-                            <Grid.ToolTip>
-                                <TextBlock>
-                                    <TextBlock Text="{Binding DirDiffDoc.CountFilesChanged}" /> 
-                                    <TextBlock Text="files changed." />
-                                </TextBlock>
-                            </Grid.ToolTip>
-                        </Grid>
-                    </Border>
-
-                    <Border
-                        Margin="0,0,3,0"
-                        Background="{DynamicResource {x:Static reskeys:ResourceKeys.ColorBackgroundDeletedBrushKey}}"
-                        BorderBrush="Gray"
-                        BorderThickness="1">
-                        <Grid
-                            Width="{Binding Path=ActualHeight, RelativeSource={RelativeSource Self}}"
-                            MinWidth="16"
-                            MinHeight="16"
-                            HorizontalAlignment="Stretch">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="7*" />
-                                <RowDefinition Height="2*" />
-                            </Grid.RowDefinitions>
-                            <Grid.Background>
-                                <ImageBrush ImageSource="{DynamicResource {x:Static icon_src:ResourceKeys.ICON_DeletedKey}}" />
-                            </Grid.Background>
-                            <Grid.ToolTip>
-                                <TextBlock>
-                                    <TextBlock Text="{Binding DirDiffDoc.CountFilesDeleted}" /> 
-                                    <TextBlock Text="files deleted." />
-                                </TextBlock>
-                            </Grid.ToolTip>
-                        </Grid>
-                    </Border>
-
-                    <Border
-                        Margin="0,0,3,0"
-                        Background="{DynamicResource {x:Static reskeys:ResourceKeys.ColorBackgroundAddedBrushKey}}"
-                        BorderBrush="Gray"
-                        BorderThickness="1">
-                        <Grid
-                            Width="{Binding Path=ActualHeight, RelativeSource={RelativeSource Self}}"
-                            MinWidth="16"
-                            MinHeight="16"
-                            HorizontalAlignment="Stretch">
-                            <Grid.Background>
-                                <ImageBrush ImageSource="{DynamicResource {x:Static icon_src:ResourceKeys.ICON_AddedKey}}" />
-                            </Grid.Background>
-                            <Grid.ToolTip>
-                                <TextBlock>
-                                    <TextBlock Text="{Binding DirDiffDoc.CountFilesAdded}" /> 
-                                    <TextBlock Text="files added." />
-                                </TextBlock>
-                            </Grid.ToolTip>
-                        </Grid>
-                    </Border>
-
-                    <Separator Margin="3,0,3,0" />
-
-                    <TextBlock
-                        Margin="0,0,3,0"
-                        Text="{Binding DirDiffDoc.LblFilter}"
-                        ToolTip="Filter Criteria" />
-                </StackPanel>
-            </StackPanel>
-        </Grid>
-
-        <Grid
-            Grid.Row="1"
-            Margin="3"
-            Visibility="{Binding DiffProgress.IsProgressbarVisible, Mode=OneWay, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BoolToVisibilityPropConverter}}">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-
-            <Grid Grid.Row="0" Margin="3">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <Button
-                    Grid.Column="0"
-                    MinWidth="85"
-                    MinHeight="23"
-                    VerticalAlignment="Top"
-                    Command="{Binding CancelCompareCommand}"
-                    Content="Cancel" />
-
-                <Grid Grid.Column="1" Margin="6,3">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-
-                    <StackPanel
-                        Margin="0,3,0,0"
-                        DataContext="{Binding DiffProgress}"
-                        Orientation="Horizontal">
-                        <TextBlock Text="Scanning ">
-                            <TextBlock Text="{Binding ProgressValue, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-                            <TextBlock Text="of ">
-                                <TextBlock Text="{Binding MaximumProgressValue, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-                                <TextBlock Text="directories... " />
-                            </TextBlock>
-                        </TextBlock>
-                    </StackPanel>
-
-                    <ProgressBar
-                        Grid.Row="1"
-                        Height="3"
-                        Margin="0,3,0,0"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Bottom"
-                        DataContext="{Binding DiffProgress}"
-                        IsIndeterminate="{Binding IsIndeterminate, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-                        Maximum="{Binding MaximumProgressValue, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-                        Minimum="{Binding MinimumProgressValue, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-                        Value="{Binding ProgressValue, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-                </Grid>
-            </Grid>
-        </Grid>
-
-        <Grid Grid.Row="2" Margin="3">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Name="TopColumnA" Width="*" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Name="TopColumnB" Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-
-            <TextBox
-                Name="LeftDirPath"
-                Grid.Row="0"
-                Grid.Column="0"
-                Margin="0,0,0,3"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Center"
-                IsEnabled="{Binding DiffProgress.IsProgressbarVisible, Converter={StaticResource BooleanInvertConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-                Text="{Binding LeftDirPath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-
-            <TextBox
-                Grid.Row="1"
-                Grid.Column="0"
-                Margin="0,3,0,3"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Center"
-                IsReadOnly="True"
-                Text="{Binding DirDiffDoc.PathA, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-                Visibility="{Binding ElementName=DiffDir, Path=Visibility, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-
-            <GridSplitter
-                Grid.Row="0"
-                Grid.RowSpan="2"
-                Grid.Column="1"
-                Width="6"
-                HorizontalAlignment="Stretch"
-                Background="Transparent"
-                DragCompleted="MainSplitter_DragCompleted"
-                DragDelta="MainSplitter_DragDelta"
-                />
-
-            <TextBox
-                Name="RightDirPath"
-                Grid.Row="0"
-                Grid.Column="2"
-                Margin="0,0,0,3"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Center"
-                IsEnabled="{Binding DiffProgress.IsProgressbarVisible, Converter={StaticResource BooleanInvertConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-                Text="{Binding RightDirPath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-
-            <TextBox
-                Grid.Row="1"
-                Grid.Column="2"
-                Margin="0,3,0,3"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Center"
-                IsReadOnly="True"
-                Text="{Binding DirDiffDoc.PathB, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-                Visibility="{Binding ElementName=DiffDir, Path=Visibility, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-
-            <ctrl:DiffDirView
-                Name="DiffDir"
-                Grid.Row="2"
-                Grid.Column="0"
-                Grid.ColumnSpan="3"
-                ActivationTimeStamp_A="{Binding DirDiffDoc.ViewActivation_A, UpdateSourceTrigger=PropertyChanged, Mode=OneWayToSource}"
-                ActivationTimeStamp_B="{Binding DirDiffDoc.ViewActivation_B, UpdateSourceTrigger=PropertyChanged, Mode=OneWayToSource}"
-                ColumnWidthChanged="DiffDir_ColumnWidthChanged"
-                ItemsSource="{Binding DirDiffDoc.DirEntries, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
-                SelectedItem_A="{Binding DirDiffDoc.SelectedItem_A, UpdateSourceTrigger=PropertyChanged, Mode=OneWayToSource}"
-                SelectedItem_B="{Binding DirDiffDoc.SelectedItem_B, UpdateSourceTrigger=PropertyChanged, Mode=OneWayToSource}"
-                SelectedItemsSourceA="{Binding DirDiffDoc.SelectedItemsA, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
-                SelectedItemsSourceB="{Binding DirDiffDoc.SelectedItemsB, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}">
-                <ctrl:DiffDirView.Resources>
-                    <conv:BindingProxy x:Key="ControlContextProxy" Data="{Binding DirDiffDoc}" />
-                </ctrl:DiffDirView.Resources>
-                <ctrl:DiffDirView.Visibility>
-                    <MultiBinding Converter="{StaticResource MultiBoolToVisibilityPropConverter}">
-                        <Binding
-                            Mode="OneWay"
-                            Path="DirDiffDoc.IsDiffDataAvailable"
-                            UpdateSourceTrigger="PropertyChanged" />
-                        <Binding
-                            Mode="OneWay"
-                            Path="DiffProgress.IsProgressbarVisible"
-                            UpdateSourceTrigger="PropertyChanged" />
-                    </MultiBinding>
-                </ctrl:DiffDirView.Visibility>
-                <ctrl:DiffDirView.ContextMenuA>
-                    <ContextMenu>
-                        <MenuItem
-                            Command="{Binding Data.BrowseItemCommand, Source={StaticResource ControlContextProxy}}"
-                            CommandParameter="{Binding Path=PlacementTarget.DataContext.ItemPathA, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}"
-                            Header="Compare..."
-                            IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInA, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}" />
-                        <Separator/>
-                        
-                        <MenuItem
-                            Command="{Binding Data.OpenContainingFolderCommand, Source={StaticResource ControlContextProxy}}"
-                            CommandParameter="{Binding Path=PlacementTarget.DataContext.ItemPathA, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}"
-                            Header="Open Containing Folder"
-                            IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInA, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}" />
-
-                        <MenuItem
-                            Command="{Binding Data.CopyPathAToClipboardCommand, Source={StaticResource ControlContextProxy}}"
-                            CommandParameter="{Binding Data.SelectedItemsA, Source={StaticResource ControlContextProxy}}"
-                            Header="Copy Path to Clipboard"
-                            IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInA, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}" />
-
-                        <MenuItem
-                            Command="{Binding Data.OpenInWindowsCommand, Source={StaticResource ControlContextProxy}}"
-                            CommandParameter="{Binding Path=PlacementTarget.DataContext.ItemPathA, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}"
-                            Header="Open in Windows"
-                            IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInA, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}" />
-                    </ContextMenu>
-                </ctrl:DiffDirView.ContextMenuA>
-                <ctrl:DiffDirView.ContextMenuB>
-                    <ContextMenu>
-                        <MenuItem
-                            Command="{Binding Data.BrowseItemCommand, Source={StaticResource ControlContextProxy}}"
-                            CommandParameter="{Binding Path=PlacementTarget.DataContext.ItemPathB, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}"
-                            Header="Compare..."
-                            IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInB, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}" />
-                        <Separator/>
-
-                        <MenuItem
-                            Command="{Binding Data.OpenContainingFolderCommand, Source={StaticResource ControlContextProxy}}"
-                            CommandParameter="{Binding Path=PlacementTarget.DataContext.ItemPathB, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}"
-                            Header="Open Containing Folder"
-                            IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInB, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}" />
-
-                        <MenuItem
-                            Command="{Binding Data.CopyPathBToClipboardCommand, Source={StaticResource ControlContextProxy}}"
-                            CommandParameter="{Binding Data.SelectedItemsB, Source={StaticResource ControlContextProxy}}"
-                            Header="Copy Path to Clipboard"
-                            IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInB, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}" />
-
-                        <MenuItem
-                            Command="{Binding Data.OpenInWindowsCommand, Source={StaticResource ControlContextProxy}}"
-                            CommandParameter="{Binding Path=PlacementTarget.DataContext.ItemPathB, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}"
-                            Header="Open in Windows"
-                            IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInB, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}" />
-                    </ContextMenu>
-                </ctrl:DiffDirView.ContextMenuB>
-            </ctrl:DiffDirView>
-        </Grid>
-    </Grid>
+	x:Class="AehnlichDirViewModelLib.Views.DirDiffView"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:aehnlichLibEnums="clr-namespace:AehnlichLib.Enums;assembly=AehnlichLib"
+	xmlns:behav1="clr-namespace:AehnlichDirViewModelLib.Behaviors"
+	xmlns:conv="clr-namespace:AehnlichViewLib.Converters;assembly=AehnlichViewLib"
+	xmlns:conv1="clr-namespace:AehnlichDirViewModelLib.Converters"
+	xmlns:ctrl="clr-namespace:AehnlichViewLib.Controls;assembly=AehnlichViewLib"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:icon_src="clr-namespace:AehnlichViewLib.Themes;assembly=AehnlichViewLib"
+	xmlns:local="clr-namespace:AehnlichDirViewModelLib.Views"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:reskeys="clr-namespace:AehnlichViewLib.Themes;assembly=AehnlichViewLib"
+	d:DesignHeight="450"
+	d:DesignWidth="800"
+	mc:Ignorable="d">
+	<Grid>
+		<Grid.Resources>
+			<conv:BoolToVisibilityPropConverter x:Key="BoolToVisibilityPropConverter" />
+			<conv:BoolToVisibilityPropConverter
+				x:Key="BoolToVisibilityPropConverter1"
+				FalseValue="Hidden"
+				TrueValue="Visible" />
+			<conv:BoolToVisibilityPropConverter
+				x:Key="BoolToVisibilityPropConverter2"
+				FalseValue="Collapsed"
+				TrueValue="Visible" />
+			<conv1:MultiParToParConverter x:Key="MultiParToParConverter" />
+			<conv:BooleanInvertConverter x:Key="BooleanInvertConverter" />
+			<conv1:MultiBoolToVisibilityPropConverter x:Key="MultiBoolToVisibilityPropConverter" />
+		</Grid.Resources>
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto" />
+			<RowDefinition Height="Auto" />
+			<RowDefinition Height="*" />
+		</Grid.RowDefinitions>
+
+		<Grid Grid.Row="0">
+			<StackPanel Orientation="Horizontal">
+				<Button
+					Width="{Binding Path=ActualHeight, RelativeSource={RelativeSource Self}}"
+					MinWidth="16"
+					MinHeight="16"
+					Margin="0,0,3,0"
+					Padding="0"
+					HorizontalAlignment="Stretch"
+					VerticalAlignment="Stretch"
+					Command="{Binding CompareDirectoriesCommand}"
+					ToolTip="Input 2 valid directory paths and compare their content"
+					ToolTipService.ShowOnDisabled="true">
+					<Button.CommandParameter>
+						<MultiBinding Converter="{StaticResource MultiParToParConverter}">
+							<Binding
+								Mode="OneWay"
+								Path="LeftDirPath"
+								UpdateSourceTrigger="PropertyChanged" />
+							<Binding
+								Mode="OneWay"
+								Path="RightDirPath"
+								UpdateSourceTrigger="PropertyChanged" />
+						</MultiBinding>
+					</Button.CommandParameter>
+
+					<Image
+						Height="16"
+						SnapsToDevicePixels="True"
+						Source="{DynamicResource {x:Static icon_src:ResourceKeys.ICON_RefreshKey}}" />
+				</Button>
+
+				<!--  File Diff Mode Selection (Last Update, Length, Byte-By-Byte compare)  -->
+				<ComboBox
+					Width="200"
+					DisplayMemberPath="Name"
+					IsEnabled="{Binding DiffProgress.IsProgressbarVisible, Converter={StaticResource BooleanInvertConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+					ItemsSource="{Binding FileDiffMode.DiffFileModes}"
+					SelectedItem="{Binding FileDiffMode.DiffFileModeSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+					ToolTipService.ShowOnDisabled="true">
+					<ComboBox.ToolTip>
+						<StackPanel>
+							<TextBlock Text="Select a diff file mode to determine speed and quality of file comparison" />
+							<Separator />
+							<TextBlock Text="{Binding FileDiffMode.DiffFileModeSelected.Description, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+						</StackPanel>
+					</ComboBox.ToolTip>
+				</ComboBox>
+
+				<StackPanel Orientation="Horizontal">
+					<StackPanel.Visibility>
+						<MultiBinding Converter="{StaticResource MultiBoolToVisibilityPropConverter}">
+							<Binding
+								Mode="OneWay"
+								Path="DirDiffDoc.IsDiffDataAvailable"
+								UpdateSourceTrigger="PropertyChanged" />
+							<Binding
+								Mode="OneWay"
+								Path="DiffProgress.IsProgressbarVisible"
+								UpdateSourceTrigger="PropertyChanged" />
+						</MultiBinding>
+					</StackPanel.Visibility>
+
+					<Separator Margin="3,0,3,0" />
+
+					<Button
+						Width="{Binding Path=ActualHeight, RelativeSource={RelativeSource Self}}"
+						MinWidth="16"
+						MinHeight="16"
+						Margin="0,0,3,0"
+						Padding="0"
+						HorizontalAlignment="Stretch"
+						VerticalAlignment="Stretch"
+						Command="{Binding DirDiffDoc.OpenFileFromActiveViewCommand}"
+						ToolTip="Open in Windows">
+						<Image
+							Height="16"
+							SnapsToDevicePixels="True"
+							Source="{DynamicResource {x:Static icon_src:ResourceKeys.ICON_OpenFileKey}}" />
+					</Button>
+
+					<Button
+						Width="{Binding Path=ActualHeight, RelativeSource={RelativeSource Self}}"
+						MinWidth="16"
+						MinHeight="16"
+						Margin="0,0,3,0"
+						Padding="0"
+						HorizontalAlignment="Stretch"
+						VerticalAlignment="Stretch"
+						Command="{Binding DirDiffDoc.BrowseUpCommand}"
+						ToolTip="Go one folder up from current folder"
+						ToolTipService.ShowOnDisabled="true">
+						<Image
+							Height="16"
+							SnapsToDevicePixels="True"
+							Source="{DynamicResource {x:Static icon_src:ResourceKeys.ICON_FolderUpKey}}" />
+					</Button>
+
+					<Button
+						Width="{Binding Path=ActualHeight, RelativeSource={RelativeSource Self}}"
+						MinWidth="16"
+						MinHeight="16"
+						Margin="0,0,3,0"
+						Padding="0"
+						HorizontalAlignment="Stretch"
+						VerticalAlignment="Stretch"
+						Command="{Binding DirDiffDoc.BrowseItemCommand}"
+						ToolTip="Select a folder to browse it"
+						ToolTipService.ShowOnDisabled="true">
+						<Image
+							Height="16"
+							SnapsToDevicePixels="True"
+							Source="{DynamicResource {x:Static icon_src:ResourceKeys.ICON_FolderDownKey}}" />
+					</Button>
+
+					<ComboBox
+						Name="ViewModeSelector"
+						Width="150"
+						behav1:SelectionChangedCommand.ChangedCommand="{Binding DiffViewModeSelectCommand}"
+						behav1:SelectionChangedCommand.CommandParameter="{Binding Path=SelectedItem, ElementName=ViewModeSelector}"
+						DisplayMemberPath="Name"
+						IsEnabled="{Binding DirDiffDoc.IsDiffDataAvailable, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+						ItemsSource="{Binding DiffViewModes}"
+						SelectedItem="{Binding DiffViewModeSelected, Mode=OneWay}"
+						ToolTip="Change between hierarchical and simple file view"
+						ToolTipService.ShowOnDisabled="true" />
+
+					<Separator Margin="3,0,3,0" />
+
+					<Border
+						Margin="0,0,3,0"
+						Background="{DynamicResource {x:Static reskeys:ResourceKeys.ColorBackgroundContextBrushKey}}"
+						BorderBrush="Gray"
+						BorderThickness="1">
+						<Grid
+							Width="{Binding Path=ActualHeight, RelativeSource={RelativeSource Self}}"
+							MinWidth="16"
+							MinHeight="16"
+							HorizontalAlignment="Stretch">
+							<Grid.Background>
+								<ImageBrush ImageSource="{DynamicResource {x:Static icon_src:ResourceKeys.ICON_ChangedKey}}" />
+							</Grid.Background>
+							<Grid.ToolTip>
+								<TextBlock>
+									<TextBlock Text="{Binding DirDiffDoc.CountFilesChanged}" />
+									<TextBlock Text="files changed." />
+								</TextBlock>
+							</Grid.ToolTip>
+						</Grid>
+					</Border>
+
+					<Border
+						Margin="0,0,3,0"
+						Background="{DynamicResource {x:Static reskeys:ResourceKeys.ColorBackgroundDeletedBrushKey}}"
+						BorderBrush="Gray"
+						BorderThickness="1">
+						<Grid
+							Width="{Binding Path=ActualHeight, RelativeSource={RelativeSource Self}}"
+							MinWidth="16"
+							MinHeight="16"
+							HorizontalAlignment="Stretch">
+							<Grid.RowDefinitions>
+								<RowDefinition Height="7*" />
+								<RowDefinition Height="2*" />
+							</Grid.RowDefinitions>
+							<Grid.Background>
+								<ImageBrush ImageSource="{DynamicResource {x:Static icon_src:ResourceKeys.ICON_DeletedKey}}" />
+							</Grid.Background>
+							<Grid.ToolTip>
+								<TextBlock>
+									<TextBlock Text="{Binding DirDiffDoc.CountFilesDeleted}" />
+									<TextBlock Text="files deleted." />
+								</TextBlock>
+							</Grid.ToolTip>
+						</Grid>
+					</Border>
+
+					<Border
+						Margin="0,0,3,0"
+						Background="{DynamicResource {x:Static reskeys:ResourceKeys.ColorBackgroundAddedBrushKey}}"
+						BorderBrush="Gray"
+						BorderThickness="1">
+						<Grid
+							Width="{Binding Path=ActualHeight, RelativeSource={RelativeSource Self}}"
+							MinWidth="16"
+							MinHeight="16"
+							HorizontalAlignment="Stretch">
+							<Grid.Background>
+								<ImageBrush ImageSource="{DynamicResource {x:Static icon_src:ResourceKeys.ICON_AddedKey}}" />
+							</Grid.Background>
+							<Grid.ToolTip>
+								<TextBlock>
+									<TextBlock Text="{Binding DirDiffDoc.CountFilesAdded}" />
+									<TextBlock Text="files added." />
+								</TextBlock>
+							</Grid.ToolTip>
+						</Grid>
+					</Border>
+
+					<Separator Margin="3,0,3,0" />
+
+					<TextBlock
+						Margin="0,0,3,0"
+						Text="{Binding DirDiffDoc.LblFilter}"
+						ToolTip="Filter Criteria" />
+				</StackPanel>
+			</StackPanel>
+		</Grid>
+
+		<Grid
+			Grid.Row="1"
+			Margin="3"
+			Visibility="{Binding DiffProgress.IsProgressbarVisible, Mode=OneWay, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BoolToVisibilityPropConverter}}">
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+			</Grid.RowDefinitions>
+
+			<Grid Grid.Row="0" Margin="3">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="Auto" />
+					<ColumnDefinition Width="*" />
+				</Grid.ColumnDefinitions>
+
+				<Button
+					Grid.Column="0"
+					MinWidth="85"
+					MinHeight="23"
+					VerticalAlignment="Top"
+					Command="{Binding CancelCompareCommand}"
+					Content="Cancel" />
+
+				<Grid Grid.Column="1" Margin="6,3">
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+
+					<StackPanel
+						Margin="0,3,0,0"
+						DataContext="{Binding DiffProgress}"
+						Orientation="Horizontal">
+						<TextBlock Text="Scanning ">
+							<TextBlock Text="{Binding ProgressValue, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+							<TextBlock Text="of ">
+								<TextBlock Text="{Binding MaximumProgressValue, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+								<TextBlock Text="directories... " />
+							</TextBlock>
+						</TextBlock>
+					</StackPanel>
+
+					<ProgressBar
+						Grid.Row="1"
+						Height="3"
+						Margin="0,3,0,0"
+						HorizontalAlignment="Stretch"
+						VerticalAlignment="Bottom"
+						DataContext="{Binding DiffProgress}"
+						IsIndeterminate="{Binding IsIndeterminate, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+						Maximum="{Binding MaximumProgressValue, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+						Minimum="{Binding MinimumProgressValue, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+						Value="{Binding ProgressValue, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+				</Grid>
+			</Grid>
+		</Grid>
+
+		<Grid Grid.Row="2" Margin="3">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Name="TopColumnA" Width="*" />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Name="TopColumnB" Width="*" />
+			</Grid.ColumnDefinitions>
+
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition Height="Auto" />
+				<RowDefinition Height="*" />
+			</Grid.RowDefinitions>
+
+			<TextBox
+				Name="LeftDirPath"
+				Grid.Row="0"
+				Grid.Column="0"
+				Margin="0,0,0,3"
+				HorizontalAlignment="Stretch"
+				VerticalAlignment="Center"
+				IsEnabled="{Binding DiffProgress.IsProgressbarVisible, Converter={StaticResource BooleanInvertConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+				Text="{Binding LeftDirPath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
+			<TextBox
+				Grid.Row="1"
+				Grid.Column="0"
+				Margin="0,3,0,3"
+				HorizontalAlignment="Stretch"
+				VerticalAlignment="Center"
+				IsReadOnly="True"
+				Text="{Binding DirDiffDoc.PathA, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+				Visibility="{Binding ElementName=DiffDir, Path=Visibility, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+
+			<GridSplitter
+				Grid.Row="0"
+				Grid.RowSpan="2"
+				Grid.Column="1"
+				Width="6"
+				HorizontalAlignment="Stretch"
+				Background="Transparent"
+				DragCompleted="MainSplitter_DragCompleted"
+				DragDelta="MainSplitter_DragDelta" />
+
+			<TextBox
+				Name="RightDirPath"
+				Grid.Row="0"
+				Grid.Column="2"
+				Margin="0,0,0,3"
+				HorizontalAlignment="Stretch"
+				VerticalAlignment="Center"
+				IsEnabled="{Binding DiffProgress.IsProgressbarVisible, Converter={StaticResource BooleanInvertConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+				Text="{Binding RightDirPath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
+			<TextBox
+				Grid.Row="1"
+				Grid.Column="2"
+				Margin="0,3,0,3"
+				HorizontalAlignment="Stretch"
+				VerticalAlignment="Center"
+				IsReadOnly="True"
+				Text="{Binding DirDiffDoc.PathB, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+				Visibility="{Binding ElementName=DiffDir, Path=Visibility, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+
+			<ctrl:DiffDirView
+				Name="DiffDir"
+				Grid.Row="2"
+				Grid.Column="0"
+				Grid.ColumnSpan="3"
+				ActivationTimeStamp_A="{Binding DirDiffDoc.ViewActivation_A, UpdateSourceTrigger=PropertyChanged, Mode=OneWayToSource}"
+				ActivationTimeStamp_B="{Binding DirDiffDoc.ViewActivation_B, UpdateSourceTrigger=PropertyChanged, Mode=OneWayToSource}"
+				ColumnWidthChanged="DiffDir_ColumnWidthChanged"
+				ItemsSource="{Binding DirDiffDoc.DirEntries, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
+				SelectedItem_A="{Binding DirDiffDoc.SelectedItem_A, UpdateSourceTrigger=PropertyChanged, Mode=OneWayToSource}"
+				SelectedItem_B="{Binding DirDiffDoc.SelectedItem_B, UpdateSourceTrigger=PropertyChanged, Mode=OneWayToSource}"
+				SelectedItemsSourceA="{Binding DirDiffDoc.SelectedItemsA, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
+				SelectedItemsSourceB="{Binding DirDiffDoc.SelectedItemsB, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}">
+				<ctrl:DiffDirView.Resources>
+					<conv:BindingProxy x:Key="ControlContextProxy" Data="{Binding DirDiffDoc}" />
+				</ctrl:DiffDirView.Resources>
+				<ctrl:DiffDirView.Visibility>
+					<MultiBinding Converter="{StaticResource MultiBoolToVisibilityPropConverter}">
+						<Binding
+							Mode="OneWay"
+							Path="DirDiffDoc.IsDiffDataAvailable"
+							UpdateSourceTrigger="PropertyChanged" />
+						<Binding
+							Mode="OneWay"
+							Path="DiffProgress.IsProgressbarVisible"
+							UpdateSourceTrigger="PropertyChanged" />
+					</MultiBinding>
+				</ctrl:DiffDirView.Visibility>
+				<ctrl:DiffDirView.ContextMenuA>
+					<ContextMenu>
+						<MenuItem
+							Command="{Binding Data.BrowseItemCommand, Source={StaticResource ControlContextProxy}}"
+							CommandParameter="{Binding Path=PlacementTarget.DataContext, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}"
+							Header="Compare..."
+							IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInA, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}" />
+
+						<MenuItem
+							Command="{Binding Data.CompareFilesCommand, Source={StaticResource ControlContextProxy}}"
+							Header="Compare Binary Files"
+							IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInA, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}">
+							<MenuItem.CommandParameter>
+								<MultiBinding Converter="{StaticResource MultiParToParConverter}">
+									<Binding
+										Mode="OneWay"
+										Path="PlacementTarget.DataContext"
+										RelativeSource="{RelativeSource Mode=FindAncestor,
+																		AncestorType={x:Type ContextMenu}}"
+										UpdateSourceTrigger="PropertyChanged" />
+									<Binding Source="{x:Static aehnlichLibEnums:CompareType.Binary}" />
+								</MultiBinding>
+							</MenuItem.CommandParameter>
+						</MenuItem>
+
+						<MenuItem
+							Command="{Binding Data.CompareFilesCommand, Source={StaticResource ControlContextProxy}}"
+							Header="Compare Text Files"
+							IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInA, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}">
+							<MenuItem.CommandParameter>
+								<MultiBinding Converter="{StaticResource MultiParToParConverter}">
+									<Binding
+										Mode="OneWay"
+										Path="PlacementTarget.DataContext"
+										RelativeSource="{RelativeSource Mode=FindAncestor,
+																		AncestorType={x:Type ContextMenu}}"
+										UpdateSourceTrigger="PropertyChanged" />
+									<Binding Source="{x:Static aehnlichLibEnums:CompareType.Text}" />
+								</MultiBinding>
+							</MenuItem.CommandParameter>
+						</MenuItem>
+
+						<MenuItem
+							Command="{Binding Data.CompareFilesCommand, Source={StaticResource ControlContextProxy}}"
+							Header="Compare Xml Files"
+							IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInA, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}">
+							<MenuItem.CommandParameter>
+								<MultiBinding Converter="{StaticResource MultiParToParConverter}">
+									<Binding
+										Mode="OneWay"
+										Path="PlacementTarget.DataContext"
+										RelativeSource="{RelativeSource Mode=FindAncestor,
+																		AncestorType={x:Type ContextMenu}}"
+										UpdateSourceTrigger="PropertyChanged" />
+									<Binding Source="{x:Static aehnlichLibEnums:CompareType.Xml}" />
+								</MultiBinding>
+							</MenuItem.CommandParameter>
+						</MenuItem>
+
+						<Separator />
+
+						<MenuItem
+							Command="{Binding Data.OpenContainingFolderCommand, Source={StaticResource ControlContextProxy}}"
+							CommandParameter="{Binding Path=PlacementTarget.DataContext.ItemPathA, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}"
+							Header="Open Containing Folder"
+							IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInA, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}" />
+
+						<MenuItem
+							Command="{Binding Data.CopyPathAToClipboardCommand, Source={StaticResource ControlContextProxy}}"
+							CommandParameter="{Binding Data.SelectedItemsA, Source={StaticResource ControlContextProxy}}"
+							Header="Copy Path to Clipboard"
+							IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInA, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}" />
+
+						<MenuItem
+							Command="{Binding Data.OpenInWindowsCommand, Source={StaticResource ControlContextProxy}}"
+							CommandParameter="{Binding Path=PlacementTarget.DataContext.ItemPathA, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}"
+							Header="Open in Windows"
+							IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInA, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}" />
+					</ContextMenu>
+				</ctrl:DiffDirView.ContextMenuA>
+				<ctrl:DiffDirView.ContextMenuB>
+					<ContextMenu>
+						<MenuItem
+							Command="{Binding Data.BrowseItemCommand, Source={StaticResource ControlContextProxy}}"
+							CommandParameter="{Binding Path=PlacementTarget.DataContext, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}"
+							Header="Compare..."
+							IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInB, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}" />
+
+						<MenuItem
+							Command="{Binding Data.CompareFilesCommand, Source={StaticResource ControlContextProxy}}"
+							Header="Compare Binary Files"
+							IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInA, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}">
+							<MenuItem.CommandParameter>
+								<MultiBinding Converter="{StaticResource MultiParToParConverter}">
+									<Binding
+										Mode="OneWay"
+										Path="PlacementTarget.DataContext"
+										RelativeSource="{RelativeSource Mode=FindAncestor,
+																		AncestorType={x:Type ContextMenu}}"
+										UpdateSourceTrigger="PropertyChanged" />
+									<Binding Source="{x:Static aehnlichLibEnums:CompareType.Binary}" />
+								</MultiBinding>
+							</MenuItem.CommandParameter>
+						</MenuItem>
+
+						<MenuItem
+							Command="{Binding Data.CompareFilesCommand, Source={StaticResource ControlContextProxy}}"
+							Header="Compare Text Files"
+							IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInA, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}">
+							<MenuItem.CommandParameter>
+								<MultiBinding Converter="{StaticResource MultiParToParConverter}">
+									<Binding
+										Mode="OneWay"
+										Path="PlacementTarget.DataContext"
+										RelativeSource="{RelativeSource Mode=FindAncestor,
+																		AncestorType={x:Type ContextMenu}}"
+										UpdateSourceTrigger="PropertyChanged" />
+									<Binding Source="{x:Static aehnlichLibEnums:CompareType.Text}" />
+								</MultiBinding>
+							</MenuItem.CommandParameter>
+						</MenuItem>
+
+						<MenuItem
+							Command="{Binding Data.CompareFilesCommand, Source={StaticResource ControlContextProxy}}"
+							Header="Compare Xml Files"
+							IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInA, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}">
+							<MenuItem.CommandParameter>
+								<MultiBinding Converter="{StaticResource MultiParToParConverter}">
+									<Binding
+										Mode="OneWay"
+										Path="PlacementTarget.DataContext"
+										RelativeSource="{RelativeSource Mode=FindAncestor,
+																		AncestorType={x:Type ContextMenu}}"
+										UpdateSourceTrigger="PropertyChanged" />
+									<Binding Source="{x:Static aehnlichLibEnums:CompareType.Xml}" />
+								</MultiBinding>
+							</MenuItem.CommandParameter>
+						</MenuItem>
+
+						<Separator />
+
+						<MenuItem
+							Command="{Binding Data.OpenContainingFolderCommand, Source={StaticResource ControlContextProxy}}"
+							CommandParameter="{Binding Path=PlacementTarget.DataContext.ItemPathB, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}"
+							Header="Open Containing Folder"
+							IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInB, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}" />
+
+						<MenuItem
+							Command="{Binding Data.CopyPathBToClipboardCommand, Source={StaticResource ControlContextProxy}}"
+							CommandParameter="{Binding Data.SelectedItemsB, Source={StaticResource ControlContextProxy}}"
+							Header="Copy Path to Clipboard"
+							IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInB, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}" />
+
+						<MenuItem
+							Command="{Binding Data.OpenInWindowsCommand, Source={StaticResource ControlContextProxy}}"
+							CommandParameter="{Binding Path=PlacementTarget.DataContext.ItemPathB, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}"
+							Header="Open in Windows"
+							IsEnabled="{Binding Path=PlacementTarget.DataContext.IsItemInB, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}" />
+					</ContextMenu>
+				</ctrl:DiffDirView.ContextMenuB>
+			</ctrl:DiffDirView>
+		</Grid>
+	</Grid>
 
 </UserControl>
diff --git a/source/Demos/TextFileDemo/AehnlichViewModelsLib/Interfaces/IDiffDocViewModel.cs b/source/Demos/TextFileDemo/AehnlichViewModelsLib/Interfaces/IDiffDocViewModel.cs
index c17571f..84e9287 100644
--- a/source/Demos/TextFileDemo/AehnlichViewModelsLib/Interfaces/IDiffDocViewModel.cs
+++ b/source/Demos/TextFileDemo/AehnlichViewModelsLib/Interfaces/IDiffDocViewModel.cs
@@ -51,6 +51,12 @@ public interface IDiffDocViewModel : IDisposable, INotifyPropertyChanged
 		int SynchronizedLine { get; set; }
 		#endregion Synchronized Caret Position
 
+		/// <summary>Gets whether the returned data was interpreted as binary, text, or XML.</summary>
+		CompareType IsComparedAs { get; }
+
+		/// <summary>Gets whether the data should be compared in a specific way (binary, text, or XML) or using the Auto option.</summary>
+		CompareType ShouldBeComparedAs { get; }
+
 		/// <summary>
 		/// Gets the similarity value (0% - 100%) between 2 as formated text things
 		/// to be shown as tooltip in toolbar.
diff --git a/source/Demos/TextFileDemo/AehnlichViewModelsLib/ViewModels/AppViewModel.cs b/source/Demos/TextFileDemo/AehnlichViewModelsLib/ViewModels/AppViewModel.cs
index 2d6efd1..30e9faa 100644
--- a/source/Demos/TextFileDemo/AehnlichViewModelsLib/ViewModels/AppViewModel.cs
+++ b/source/Demos/TextFileDemo/AehnlichViewModelsLib/ViewModels/AppViewModel.cs
@@ -1,5 +1,6 @@
 namespace AehnlichViewModelsLib.ViewModels
 {
+	using AehnlichLib.Enums;
 	using AehnlichLib.Files;
 	using AehnlichLib.Interfaces;
 	using AehnlichLib.Text;
@@ -16,7 +17,6 @@
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
-	using System.Runtime.CompilerServices;
 	using System.Threading;
 	using System.Threading.Tasks;
 	using System.Windows.Input;
@@ -64,11 +64,17 @@ internal class AppViewModel : Base.ViewModelBase, IAppViewModel, IDiffSideViewMo
 		/// <summary>
 		/// Parameterized class constructor
 		/// </summary>
-		public AppViewModel(string fileA, string fileB)
+		/// <param name="fileA"></param>
+		/// <param name="fileB"></param>
+		/// <param name="compareAs"></param>
+		public AppViewModel(string fileA, string fileB,
+						   CompareType compareAs)
 			: this()
 		{
 			_FilePathA.FilePath = fileA;
 			_FilePathB.FilePath = fileB;
+
+			_DiffCtrl = new DiffDocViewModel(this, compareAs);
 		}
 
 		/// <summary>
@@ -91,7 +97,7 @@ public AppViewModel()
 			_FilePathB = new SuggestSourceViewModel();
 
 			_InlineDialog = InlineDialogMode.None;
-			_DiffCtrl = new DiffDocViewModel(this);
+			_DiffCtrl = new DiffDocViewModel(this, CompareType.Auto);
 
 			_GotoLineController = new GotoLineControllerViewModel(DiffCtrl.GotoTextLine, ToogleInlineDialog);
 			_OptionsController = new OptionsControllerViewModel(ToogleInlineDialog);
@@ -622,6 +628,10 @@ private void CompareTextFilesCommand_Executed(string filePathA, string filePathB
 			{
 				DiffCtrl.SetDiffViewOptions(_OptionsController.DiffDisplayOptions);
 				var args = _OptionsController.GetTextBinaryDiffSetup(filePathA, filePathB, reloadFromFile);
+				
+				// Overwrite this on a document specific base (this may indicate Auto or specifc Binary, Xml, Text etc...)
+				args.CompareType = DiffCtrl.ShouldBeComparedAs;
+
 				var processDiff = new ProcessTextDiff(args);
 
 				if (args.ReloadFromFile == false)
diff --git a/source/Demos/TextFileDemo/AehnlichViewModelsLib/ViewModels/DiffDocViewModel.cs b/source/Demos/TextFileDemo/AehnlichViewModelsLib/ViewModels/DiffDocViewModel.cs
index aae9a53..72a2248 100644
--- a/source/Demos/TextFileDemo/AehnlichViewModelsLib/ViewModels/DiffDocViewModel.cs
+++ b/source/Demos/TextFileDemo/AehnlichViewModelsLib/ViewModels/DiffDocViewModel.cs
@@ -57,19 +57,23 @@ internal class DiffDocViewModel : Base.ViewModelBase, IDiffDocViewModel, IDiffSi
 		private bool _CanSyncDisplay;
 
 		private IDiffSideViewModelParent _diffSideViewModelParent;
+		private CompareType _ShouldBeComparedAs;
 		#endregion fields
 
 		#region ctors
 		/// <summary>class constructor</summary>
 		/// <param name="diffSideViewModelParent"></param>
-		public DiffDocViewModel(IDiffSideViewModelParent diffSideViewModelParent)
+		/// <param name="compareAs"></param>
+		public DiffDocViewModel(IDiffSideViewModelParent diffSideViewModelParent,
+								CompareType compareAs)
 			: this()
 		{
 			this._diffSideViewModelParent = diffSideViewModelParent;
+			_ShouldBeComparedAs = compareAs;
 		}
 
-		/// <summary>class constructor</summary>
-		public DiffDocViewModel()
+		/// <summary>hidden class constructor</summary>
+		protected DiffDocViewModel()
 		{
 			_DiffViewOptions = new TextEditorOptions()
 			{
@@ -85,7 +89,7 @@ public DiffDocViewModel()
 			_ViewA.CaretPositionChanged += OnViewACaretPositionChanged;
 			_ViewB.CaretPositionChanged += OnViewBCaretPositionChanged;
 
-			_IsComparedAs = CompareType.Auto;
+			_IsComparedAs = _ShouldBeComparedAs = CompareType.Auto;
 			_CanSyncDisplay = true;
 		}
 		#endregion ctors
@@ -182,15 +186,12 @@ public int SynchronizedLine
 				}
 			}
 		}
+		#endregion Synchronized Caret Position
 
 		/// <summary>Gets whether the returned data was interpreted as binary, text, or XML.</summary>
 		public CompareType IsComparedAs
 		{
-			get
-			{
-				return _IsComparedAs;
-			}
-
+			get => _IsComparedAs;
 			private set
 			{
 				if (_IsComparedAs != value)
@@ -201,7 +202,8 @@ private set
 			}
 		}
 
-		#endregion Synchronized Caret Position
+		/// <summary>Gets whether the data should be compared in a specific way (binary, text, or XML) or using the Auto option.</summary>
+		public CompareType ShouldBeComparedAs => _ShouldBeComparedAs;
 
 		/// <summary>
 		/// Gets the similarity value (0% - 100%) between 2 as formated text things
diff --git a/source/Demos/TextFileDemo/AehnlichViewModelsLib/ViewModels/Factory.cs b/source/Demos/TextFileDemo/AehnlichViewModelsLib/ViewModels/Factory.cs
index 2b990c3..6b54fcb 100644
--- a/source/Demos/TextFileDemo/AehnlichViewModelsLib/ViewModels/Factory.cs
+++ b/source/Demos/TextFileDemo/AehnlichViewModelsLib/ViewModels/Factory.cs
@@ -1,10 +1,25 @@
-namespace AehnlichViewModelsLib.ViewModels
+using AehnlichLib.Enums;
+
+namespace AehnlichViewModelsLib.ViewModels
 {
 	/// <summary>
 	/// Implements a factory that constructs, initiates and returns internal objects.
 	/// </summary>
 	public static class Factory
 	{
+		/// <summary>
+		/// Gets an initialized application viewmodel.
+		/// </summary>
+		/// <param name="fileA"></param>
+		/// <param name="fileB"></param>
+		/// <param name="compareAs"></param>
+		/// <returns></returns>
+		public static IAppViewModel ConstructAppViewModel(string fileA, string fileB,
+														CompareType compareAs)
+		{
+			return new AppViewModel(fileA, fileB, compareAs);
+		}
+
 		/// <summary>
 		/// Gets an initialized application viewmodel.
 		/// </summary>
@@ -13,7 +28,8 @@ public static class Factory
 		/// <returns></returns>
 		public static IAppViewModel ConstructAppViewModel(string fileA, string fileB)
 		{
-			return new AppViewModel(fileA, fileB);
+			return new AppViewModel(fileA, fileB, CompareType.Auto);
 		}
+
 	}
 }