diff --git a/CVS History Viewer.sln b/CVS History Viewer.sln
index 7db84a2..66f8a1c 100644
--- a/CVS History Viewer.sln	
+++ b/CVS History Viewer.sln	
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.168
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29613.14
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CVS History Viewer", "CVS History Viewer\CVS History Viewer.csproj", "{8F95ECA1-9EB2-4D79-B596-5EEBE5F1A1A2}"
 EndProject
diff --git a/CVS History Viewer/CVS History Viewer.csproj b/CVS History Viewer/CVS History Viewer.csproj
index dc07a7e..dcc073a 100644
--- a/CVS History Viewer/CVS History Viewer.csproj	
+++ b/CVS History Viewer/CVS History Viewer.csproj	
@@ -82,6 +82,7 @@
     <Compile Include="Resources\Classes\CVSCalls.cs" />
     <Compile Include="Resources\Classes\CVSFile.cs" />
     <Compile Include="Resources\Classes\Database.cs" />
+    <Compile Include="Resources\Classes\DatabaseMigration.cs" />
     <Compile Include="Resources\Classes\DiffBlock.cs" />
     <Compile Include="Resources\Classes\GlobalFunctions.cs" />
     <Compile Include="Resources\Classes\JSONParser.cs" />
@@ -92,6 +93,9 @@
     <Compile Include="Resources\Windows\CrashReport.xaml.cs">
       <DependentUpon>CrashReport.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Resources\Windows\SettingsUI.xaml.cs">
+      <DependentUpon>SettingsUI.xaml</DependentUpon>
+    </Compile>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -112,6 +116,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Resources\Windows\SettingsUI.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -131,6 +139,9 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="..\.editorconfig">
+      <Link>.editorconfig</Link>
+    </None>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
diff --git a/CVS History Viewer/MainWindow.xaml b/CVS History Viewer/MainWindow.xaml
index 7e14443..de14e47 100644
--- a/CVS History Viewer/MainWindow.xaml	
+++ b/CVS History Viewer/MainWindow.xaml	
@@ -6,6 +6,15 @@
         xmlns:local="clr-namespace:CVS_History_Viewer"
         mc:Ignorable="d"
         Title="CVS History Viewer" Name="MWindow" Height="800" Width="1280" Loaded="Window_Loaded" ContentRendered="Window_ContentRendered" Style="{StaticResource CustomChrome}" WindowStartupLocation="CenterScreen" Icon="Resources/Images/icon.ico">
+
+    <Window.Resources>
+        <ContextMenu x:Key="RevisionContextMenu" x:Shared ="false">
+            <MenuItem Header="Open current Revision" Click="MenuItem_OpenCurrentRevisionClick"/>
+            <MenuItem Header="Open selected Revision" Click="MenuItem_OpenSelectedRevisionClick"/>
+            <MenuItem Header="Show in Explorer" Click="MenuItem_ShowInExplorerClick"/>            
+        </ContextMenu>
+    </Window.Resources>
+    
     <Grid SnapsToDevicePixels="True">
 
         <Grid.RowDefinitions>
@@ -21,6 +30,7 @@
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
                 <Button Name="uiShowAbout" Content="?" FontWeight="Bold" Click="ShowAbout_Click"  Height="20" Width="20" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource Button}"/>
                 <Button Name="uiMinimize" Content="&#xf2d1;" FontFamily="{StaticResource FontAwesomeRegular}" Click="Minimize_Click" WindowChrome.IsHitTestVisibleInChrome="True" Height="20" Width="20" Style="{StaticResource Button}"/>
+                <Button Name="uiOpenSettings" Content="&#xf013;" FontFamily="{StaticResource FontAwesomeSolid}" Click="uiOpenSettings_Click" WindowChrome.IsHitTestVisibleInChrome="True" Height="20" Width="20" Style="{StaticResource Button}"/>
                 <Button Name="uiMaximize" Content="&#xf2d0;" FontFamily="{StaticResource FontAwesomeRegular}" Click="Maximize_Click" WindowChrome.IsHitTestVisibleInChrome="True" Height="20" Width="20">
                     <Button.Style>
                         <Style TargetType="Button" BasedOn="{StaticResource Button}">
diff --git a/CVS History Viewer/MainWindow.xaml.cs b/CVS History Viewer/MainWindow.xaml.cs
index 86fe38b..6b9beab 100644
--- a/CVS History Viewer/MainWindow.xaml.cs	
+++ b/CVS History Viewer/MainWindow.xaml.cs	
@@ -11,6 +11,7 @@
 using Microsoft.WindowsAPICodePack.Dialogs;
 using System.Windows.Media;
 using System.Windows.Threading;
+using System.Text;
 
 namespace CVS_History_Viewer
 {
@@ -19,25 +20,26 @@ namespace CVS_History_Viewer
     /// </summary>
     public partial class MainWindow : Window
     {
-        private string sAppDataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\CVS History Viewer";
-        private string sSyntaxPath = Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location) + "\\Resources\\Syntax";
+        private readonly string sAppDataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\CVS History Viewer";
+        private readonly string sSyntaxPath = Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location) + "\\Resources\\Syntax";
 
-        private Database oDatabase;
-        private Settings oSettings;
-        private BackgroundStuff oBackgroundStuff;
-        private SyntaxHighlighting oSyntaxHighlighting;
+        private readonly Database oDatabase;
+        private readonly Settings oSettings;
+        private readonly BackgroundStuff oBackgroundStuff;
+        private readonly SyntaxHighlighting oSyntaxHighlighting;
 
-        private BackgroundWorker oUpdateCommitsWorker;
+        private readonly BackgroundWorker oUpdateCommitsWorker;
+
+        private readonly Dictionary<string, int> PreviousRevisionSelection = new Dictionary<string, int>();
+
+        private readonly DispatcherTimer oDiffFetchDelay = new DispatcherTimer();
 
         private List<CVSFile> cFiles = new List<CVSFile>();
         private List<Tag> cTags = new List<Tag>();
         private List<CommitTag> cCommitTags = new List<CommitTag>();
         private List<Commit> cCommits = new List<Commit>();
-        private List<Commit> cDummy = new List<Commit>();
 
-        private Dictionary<string, int> PreviousRevisionSelection = new Dictionary<string, int>();
-
-        private DispatcherTimer oDiffFetchDelay = new DispatcherTimer();
+        private readonly char sPathSeparator = Path.DirectorySeparatorChar;
 
         private bool bIssueOnLoad = true;
 
@@ -69,7 +71,7 @@ public MainWindow()
 
         private void Close_Click(object sender, RoutedEventArgs e)
         {
-            this.Close();
+            Application.Current.Shutdown();
         }
 
         private void Minimize_Click(object sender, RoutedEventArgs e)
@@ -177,7 +179,7 @@ private void UpdateCommits_BackgroundWorker_DoWork(object sender, DoWorkEventArg
                 bool bFound = false;
                 for(int i = cTempFileList.Count - 1; i >= 0; i--)
                 {
-                    if (cTempFileList[i].sName == oFileInfo.Name && cTempFileList[i].sPath == oFileInfo.DirectoryName)
+                    if (cTempFileList[i].sName.ToLower() == oFileInfo.Name.ToLower() && cTempFileList[i].sPath.ToLower() == oFileInfo.DirectoryName.ToLower())
                     {
                         bFound = true;
 
@@ -212,19 +214,16 @@ private void UpdateCommits_BackgroundWorker_DoWork(object sender, DoWorkEventArg
             //Look for newly deleted files (files known to the DB, not already marked as deleted, but not findable in the directory)
             foreach (CVSFile oFile in cTempFileList)
             {
-                if (!oFile.bDeleted)
+                if (IsNewlyDeletedFile(oFile))
                 {
-                    if (!File.Exists(oFile.sPath + "\\" + oFile.sName))
-                    {
-                        //For future checks the file will be marked as deleted...
-                        oFile.bDeleted = true;
-                        //...but it does get one last check.
-                        cOutDatedFiles.Add(oFile);
-                        oProgress.iTotal = cOutDatedFiles.Count;
-                        oUpdateCommitsWorker.ReportProgress(0, oProgress);
-                    }
+                    //For future checks the file will be marked as deleted...
+                    oFile.bDeleted = true;
+                    //...but it does get one last check.
+                    cOutDatedFiles.Add(oFile);
+                    oProgress.iTotal = cOutDatedFiles.Count;
+                    oUpdateCommitsWorker.ReportProgress(0, oProgress);
                 }
-            }            
+            }
 
             oProgress.iTotal = cOutDatedFiles.Count;
 
@@ -242,6 +241,11 @@ private void UpdateCommits_BackgroundWorker_DoWork(object sender, DoWorkEventArg
             }                    
         }
 
+        private bool IsNewlyDeletedFile(CVSFile oFile)
+        {
+            return !oFile.bDeleted && !File.Exists(oFile.sPath + sPathSeparator + oFile.sName);
+        }
+
         private void UpdateCommits_BackgroundWorker_ProgressChanged(object sender, ProgressChangedEventArgs e)
         {
             UpdateProgress oProgress = (UpdateProgress)e.UserState;
@@ -380,24 +384,25 @@ private void Search(string sText, bool bFolowUpSearch = false)
                 cPairs.Add(new KeyValuePair<string, object>("description", "%" + sText.Trim(' ') + "%"));
             }
 
-            string sWhere = "";
+            string sWhere;
             string sLimit = "";
+            StringBuilder oWhereBuilder = new StringBuilder();
 
             foreach (KeyValuePair<string, object> oPair in cPairs)
             {
                 switch (oPair.Key)
                 {
                     case "date":
-                        sWhere += $" AND strftime('%Y-%m-%d', date) = '{((DateTime)oPair.Value).ToString("yyyy-MM-dd")}'";
+                        oWhereBuilder.Append($" AND strftime('%Y-%m-%d', date) = '{(DateTime)oPair.Value:yyyy-MM-dd}'");
                         break;
                     case "from":
-                        sWhere += $" AND strftime('%Y-%m-%d', date) >= '{((DateTime)oPair.Value).ToString("yyyy-MM-dd")}'";
+                        oWhereBuilder.Append($" AND strftime('%Y-%m-%d', date) >= '{(DateTime)oPair.Value:yyyy-MM-dd}'");
                         break;
                     case "to":
-                        sWhere += $" AND strftime('%Y-%m-%d', date) <= '{((DateTime)oPair.Value).ToString("yyyy-MM-dd")}'";
+                        oWhereBuilder.Append($" AND strftime('%Y-%m-%d', date) <= '{(DateTime)oPair.Value:yyyy-MM-dd}'");
                         break;
                     case "description":
-                        sWhere += $" AND {oPair.Key} LIKE '{oPair.Value.ToString().Replace("'", @"''")}'";
+                        oWhereBuilder.Append($" AND {oPair.Key} LIKE '{oPair.Value.ToString().Replace("'", @"''")}'");
                         break;
                     case "limit":
                         sLimit = " LIMIT " + oPair.Value;
@@ -436,9 +441,10 @@ private void Search(string sText, bool bFolowUpSearch = false)
             {
                 if (oSubWhere.Value != "")
                 {
-                    sWhere += " AND (" + oSubWhere.Value + ")";
+                    oWhereBuilder.Append(" AND (" + oSubWhere.Value + ")");
                 }
             }
+            sWhere = oWhereBuilder.ToString();
 
             if (sLimit != "")
             {
@@ -486,7 +492,7 @@ private void Commits_SelectionChanged(object sender, SelectionChangedEventArgs e
 
             this.uiCommitHASH.Text = oCommit.sHASH + $" [{oCommit.sShortHASH}]";
             this.uiCommitAuthor.Text = oCommit.sAuthor;
-            this.uiCommitDate.Text = oCommit.dDate.ToLongDateString() + " " + oCommit.dDate.ToLongTimeString();
+            this.uiCommitDate.Text = oCommit.dLocalDate.ToLongDateString() + " " + oCommit.dLocalDate.ToLongTimeString();
             this.uiCommitDescription.Text = oCommit.sDescription;
 
             this.uiCommitRevisions.Items.Clear();
@@ -511,7 +517,9 @@ private void Commits_SelectionChanged(object sender, SelectionChangedEventArgs e
                 oItem.Content = $"  {oRevision.oFile.sName } {oRevision.sRevision}";
                 oItem.Tag = oRevision;
                 oItem.ToolTip = oRevision.oFile.sPath + "\\" + oRevision.oFile.sName;
-                
+                oItem.ContextMenu = (ContextMenu)FindResource("RevisionContextMenu");
+                oItem.ContextMenu.Tag = oRevision;
+
                 this.uiCommitRevisions.Items.Add(oItem);
             }
 
@@ -537,9 +545,9 @@ private void CommitRevisions_MouseDoubleClick(object sender, MouseButtonEventArg
             if (this.uiCommitRevisions.SelectedItem != null && e.OriginalSource.GetType() == typeof(TextBlock))
             {
                 CVSFile oFile = ((Revision)((ListBoxItem)this.uiCommitRevisions.SelectedItem).Tag).oFile;
-                if(System.IO.File.Exists(oFile.sPath + "\\" + oFile.sName))
+                if(System.IO.File.Exists(oFile.sPath + sPathSeparator + oFile.sName))
                 {
-                    System.Diagnostics.Process.Start(oFile.sPath + "\\" + oFile.sName);
+                    System.Diagnostics.Process.Start(oFile.sPath + sPathSeparator + oFile.sName);
                 }                
             }
         }
@@ -612,7 +620,6 @@ private void CommitRevisions_SelectionChanged(object sender, SelectionChangedEve
                 return;
             }
 
-            Revision oRevision = (Revision)((ListBoxItem)this.uiCommitRevisions.SelectedItem).Tag;
             Commit oCommit = (Commit)this.uiCommits.SelectedItem;
 
             if (this.PreviousRevisionSelection.ContainsKey(oCommit.sHASH))
@@ -742,6 +749,35 @@ private void LoadDiffView(Revision oRevision)
 
             this.uiDiffLoading.Visibility = Visibility.Collapsed;
         }
+
+        private void MenuItem_ShowInExplorerClick(object sender, RoutedEventArgs e)
+        {
+            CVSFile oFile = ((Revision)((ContextMenu)((MenuItem)sender).Parent).Tag).oFile;
+            if (System.IO.File.Exists(oFile.sPath + sPathSeparator + oFile.sName))
+            {
+                System.Diagnostics.Process.Start("explorer.exe", $"/select, \"{oFile.sPath}\\{oFile.sName}\"");
+            }            
+        }
+
+        private void MenuItem_OpenCurrentRevisionClick(object sender, RoutedEventArgs e)
+        {
+            CVSFile oFile = ((Revision)((ContextMenu)((MenuItem)sender).Parent).Tag).oFile;
+            if (System.IO.File.Exists(oFile.sPath + sPathSeparator + oFile.sName))
+            {
+                System.Diagnostics.Process.Start(oFile.sPath + sPathSeparator + oFile.sName);
+            }
+        }
+
+        private void MenuItem_OpenSelectedRevisionClick(object sender, RoutedEventArgs e)
+        {
+            string newFile = CVSCalls.OutputRevisionToFile((Revision)((ContextMenu)((MenuItem)sender).Parent).Tag);
+            System.Diagnostics.Process.Start(newFile);
+        }
+
+        private void uiOpenSettings_Click(object sender, RoutedEventArgs e)
+        {
+            new SettingsUI(oSettings).ShowDialog();
+        }
     }
 
     class UpdateProgress
diff --git a/CVS History Viewer/Properties/AssemblyInfo.cs b/CVS History Viewer/Properties/AssemblyInfo.cs
index 2ffb29d..31b0bbe 100644
--- a/CVS History Viewer/Properties/AssemblyInfo.cs	
+++ b/CVS History Viewer/Properties/AssemblyInfo.cs	
@@ -52,4 +52,4 @@
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.1.1.0")]
-[assembly: AssemblyFileVersion("1.1.1.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
diff --git a/CVS History Viewer/Resources/Classes/BackgroundStuff.cs b/CVS History Viewer/Resources/Classes/BackgroundStuff.cs
index 5143425..b004dac 100644
--- a/CVS History Viewer/Resources/Classes/BackgroundStuff.cs	
+++ b/CVS History Viewer/Resources/Classes/BackgroundStuff.cs	
@@ -1,16 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace CVS_History_Viewer.Resources.Classes
 {
     class BackgroundStuff
     {
-        private Database oDatabase;
-        private List<BackgroundWorker> cDiffWorkers = new List<BackgroundWorker>();
+        private readonly Database oDatabase;
+        private readonly List<BackgroundWorker> cDiffWorkers = new List<BackgroundWorker>();
 
         public delegate void DiffCompleted(object sender, DiffCompletedEventArgs e);
         public event DiffCompleted OnDiffCompleted;
diff --git a/CVS History Viewer/Resources/Classes/CVSCalls.cs b/CVS History Viewer/Resources/Classes/CVSCalls.cs
index d902a84..ea8b743 100644
--- a/CVS History Viewer/Resources/Classes/CVSCalls.cs	
+++ b/CVS History Viewer/Resources/Classes/CVSCalls.cs	
@@ -20,12 +20,12 @@ private static List<string> RunCommand(string sPath, string sCommand)
 
             System.Diagnostics.Process oProcess = new System.Diagnostics.Process();
 
-            oProcess.StartInfo.FileName = "cmd.exe";
-            oProcess.StartInfo.Arguments = "/C " + sCommand;
+            oProcess.StartInfo.FileName = "powershell.exe";
+            oProcess.StartInfo.Arguments = "/C cvs " + sCommand;
             oProcess.StartInfo.UseShellExecute = false;
             oProcess.StartInfo.RedirectStandardOutput = true;
             oProcess.StartInfo.WorkingDirectory = sPath;
-            oProcess.StartInfo.CreateNoWindow = true; //hide console window
+            oProcess.StartInfo.CreateNoWindow = true;
             oProcess.Start();
 
             string sOutput = oProcess.StandardOutput.ReadToEnd();
@@ -62,7 +62,7 @@ public static List<Commit> GetCommits(CVSFile oFile, List<Tag> cTags)
                 return cCommits;
             }
 
-            List<string> cLines = CVSCalls.RunCommand(oFile.sPath, $"cvs log \"{oFile.sName}\"");            
+            List<string> cLines = CVSCalls.RunCommand(oFile.sPath, $"log \"{oFile.sName}\"");            
 
             //If output is just 5 line, it probably means the file is not known in cvs (yet) or some other error.
             if (cLines.Count <= 5)
@@ -74,13 +74,10 @@ public static List<Commit> GetCommits(CVSFile oFile, List<Tag> cTags)
             int iLine = 0;
             List<KeyValuePair<string, string>> cRawTags = new List<KeyValuePair<string, string>>();
             string sRCS = null;
-            if (oFile.iID == 0)
+            if (oFile.iID == 0 && cLines[1].Contains("RCS file:"))
             {
-                if (cLines[1].Contains("RCS file:"))
-                {
-                    sRCS = cLines[1].Replace("RCS file: ", "").Replace("/" + oFile.sName + ",v", "");                    
-                }
-            }           
+                sRCS = cLines[1].Replace("RCS file: ", "").Replace("/" + oFile.sName + ",v", "");
+            }  
 
             //Find begin of symbolic names.
             for (int i = iLine; i < cLines.Count; i++)
@@ -124,20 +121,18 @@ public static List<Commit> GetCommits(CVSFile oFile, List<Tag> cTags)
             //Process commits
             for (int i = iLine; i < cLines.Count; i++)
             {
-                Commit oCommit = new Commit();
-                Revision oRevision = new Revision();
-
-                oRevision.sRevision = cLines[i + 1].Replace("revision ", "");
-
-                Match oMatch;
-
-                oMatch = new Regex("date: (.*?);").Match(cLines[i + 2]);
-
-                oCommit.dDate = GlobalFunctions.ParseDateTime(oMatch.Groups[1].ToString());
+                Commit oCommit = new Commit
+                {
+                    dDate = GlobalFunctions.ParseDateTime(new Regex("date: (.*?);").Match(cLines[i + 2]).Groups[1].ToString()),
+                    sAuthor = new Regex("author: (.*?);").Match(cLines[i + 2]).Groups[1].ToString()
+                };
 
-                oCommit.sAuthor = new Regex("author: (.*?);").Match(cLines[i + 2]).Groups[1].ToString();
-                oRevision.sState = new Regex("state: (.*?);").Match(cLines[i + 2]).Groups[1].ToString();
-                oRevision.sLinesChanged = new Regex("lines: (.*)").Match(cLines[i + 2]).Groups[1].ToString();
+                Revision oRevision = new Revision
+                {
+                    sRevision = cLines[i + 1].Replace("revision ", ""),
+                    sState = new Regex("state: (.*?);").Match(cLines[i + 2]).Groups[1].ToString(),
+                    sLinesChanged = new Regex("lines: (.*)").Match(cLines[i + 2]).Groups[1].ToString()
+                };
 
                 int iDescriptionStart = 3;
 
@@ -149,6 +144,7 @@ public static List<Commit> GetCommits(CVSFile oFile, List<Tag> cTags)
                 oCommit.sDescription = cLines[i + iDescriptionStart];
 
                 //Collect additional description lines
+                StringBuilder oAdditionalDescriptionLines = new StringBuilder();
                 for (int j = i + iDescriptionStart + 1; j < cLines.Count; j++)
                 {
                     if (cLines[j] == "----------------------------" ||
@@ -159,10 +155,11 @@ public static List<Commit> GetCommits(CVSFile oFile, List<Tag> cTags)
                     }
                     else
                     {
-                        oCommit.sDescription += Environment.NewLine + cLines[j];
+                        oAdditionalDescriptionLines.Append(Environment.NewLine + cLines[j]);
                     }
                 }
 
+                oCommit.sDescription = oAdditionalDescriptionLines.ToString();
                 oCommit.sDescription = oCommit.sDescription.Trim();
 
                 //Tags
@@ -209,12 +206,9 @@ public static List<Commit> GetCommits(CVSFile oFile, List<Tag> cTags)
                 oRevision.oFile = oFile;
 
                 //Check if this file was re-added to the repository.
-                if (cCommits.Count > 0 && !oRevision.bReAdded)
+                if (cCommits.Count > 0 && oRevision.sState == "dead")
                 {
-                    if (cCommits[cCommits.Count - 1].cRevisions[0].sState != "dead" && oRevision.sState == "dead")
-                    {
-                        cCommits[cCommits.Count - 1].cRevisions[0].bReAdded = true;
-                    }
+                    cCommits[cCommits.Count - 1].cRevisions[0].bReAdded = true;
                 }
 
                 //Finally
@@ -256,7 +250,7 @@ public static List<Commit> GetCommits(CVSFile oFile, List<Tag> cTags)
 
                 List<string> cSplitFile = new List<string>(oFile.sPath.Split('\\'));
 
-                int iCount = 0;
+                int iCount;
                 if (cSplitRCS.Count < cSplitFile.Count)
                 {
                     iCount = cSplitRCS.Count;
@@ -282,10 +276,12 @@ public static List<Commit> GetCommits(CVSFile oFile, List<Tag> cTags)
                     }
                 }
 
+                StringBuilder oCVSPathBuilder = new StringBuilder();
                 for (int g = cMatches.Count - 1; g >= 0; g--)
                 {
-                    oFile.sCVSPath += cMatches[g] + ((g != 0) ? "/" : "");
+                    oCVSPathBuilder.Append(cMatches[g] + ((g != 0) ? "/" : ""));
                 }
+                oFile.sCVSPath = oCVSPathBuilder.ToString();
             }
 
             return cCommits;
@@ -310,8 +306,8 @@ private static Revision GetDiffPrevious(Revision oRevision, int iWhitespace)
             int iPrevRevision = int.Parse(oRevision.sRevision.Substring(oRevision.sRevision.LastIndexOf('.') + 1)) - 1;
             string sPrevRevision = oRevision.sRevision.Substring(0, oRevision.sRevision.LastIndexOf('.') + 1) + iPrevRevision.ToString();
             
-            List<string> cWhitespace = CVSCalls.RunCommand(oRevision.oFile.sPath, $"cvs co -r {oRevision.sRevision} -p \"{oRevision.oFile.sCVSPath}/{oRevision.oFile.sName}\"");
-            List<string> cLines = CVSCalls.RunCommand(oRevision.oFile.sPath, $"cvs diff -r {oRevision.sRevision} -r {sPrevRevision} \"{oRevision.oFile.sName}\"");
+            List<string> cWhitespace = CVSCalls.RunCommand(oRevision.oFile.sPath, $"co -r {oRevision.sRevision} -p \"{oRevision.oFile.sCVSPath}/{oRevision.oFile.sName}\"");
+            List<string> cLines = CVSCalls.RunCommand(oRevision.oFile.sPath, $"diff -r {oRevision.sRevision} -r {sPrevRevision} \"{oRevision.oFile.sName}\"");
 
             DiffBlock oDiffBlock = new DiffBlock();
             string sBlockKind = "";
@@ -359,9 +355,11 @@ private static Revision GetDiffPrevious(Revision oRevision, int iWhitespace)
                         oDiffBlock.sBlockKind = sBlockKind;
                         oRevision.cDiffBlocks.Add(oDiffBlock);
                     }
-                    oDiffBlock = new DiffBlock();
-                    oDiffBlock.iStartLine = int.Parse(oMatch.Groups[1].Value);
-                    oDiffBlock.iEndLine = int.Parse((!string.IsNullOrWhiteSpace(oMatch.Groups[2].Value))? oMatch.Groups[2].Value : oMatch.Groups[1].Value);
+                    oDiffBlock = new DiffBlock
+                    {
+                        iStartLine = int.Parse(oMatch.Groups[1].Value),
+                        iEndLine = int.Parse((!string.IsNullOrWhiteSpace(oMatch.Groups[2].Value)) ? oMatch.Groups[2].Value : oMatch.Groups[1].Value)
+                    };
                     sBlockKind = oMatch.Groups[3].Value;
                 }
             }
@@ -387,29 +385,29 @@ private static Revision GetDiffPrevious(Revision oRevision, int iWhitespace)
                 else
                 {
                     //No merge means that the block needs bottom whitespace.
-                    oRevision.cDiffBlocks[i] = AddWhitespace(oRevision.cDiffBlocks[i], cWhitespace, iWhitespace, (oRevision.cDiffBlocks[i].sBlockKind == "a") ? true : false, 2);
+                    oRevision.cDiffBlocks[i] = AddWhitespace(oRevision.cDiffBlocks[i], cWhitespace, iWhitespace, WhitespaceMode.bottom);
                 }
 
-                if(i - 1 >= 0)
+                if (i - 1 >= 0)
                 {
                     int iDiff = oRevision.cDiffBlocks[i].iStartLine - oRevision.cDiffBlocks[i - 1].iEndLine - 1;
                     if(iDiff < iWhitespace * 2)
                     {
                         bMergeRequired = true;
                         oMergeInto = oRevision.cDiffBlocks[i];
-                        oMergeInto = AddWhitespace(oMergeInto, cWhitespace, iDiff, (oMergeInto.sBlockKind == "a") ? true : false, 1);
+                        oMergeInto = AddWhitespace(oMergeInto, cWhitespace, iDiff, WhitespaceMode.top);
                     }
                     else
                     {
                         //it seems that the next block is far enough to treat them separately. Add max top whitespace.
                         bMergeRequired = false;
-                        oRevision.cDiffBlocks[i] = AddWhitespace(oRevision.cDiffBlocks[i], cWhitespace, iWhitespace, (oRevision.cDiffBlocks[i].sBlockKind == "a") ? true : false, 1);
+                        oRevision.cDiffBlocks[i] = AddWhitespace(oRevision.cDiffBlocks[i], cWhitespace, iWhitespace, WhitespaceMode.top);
                     }
                 }
                 else
                 {
                     //This is the top-most block in the list, so we need to add max top whitespace.
-                    oRevision.cDiffBlocks[i] = AddWhitespace(oRevision.cDiffBlocks[i], cWhitespace, iWhitespace, (oRevision.cDiffBlocks[i].sBlockKind == "a") ? true : false, 1);
+                    oRevision.cDiffBlocks[i] = AddWhitespace(oRevision.cDiffBlocks[i], cWhitespace, iWhitespace, WhitespaceMode.top);
                     break;
                 }
             }
@@ -417,25 +415,31 @@ private static Revision GetDiffPrevious(Revision oRevision, int iWhitespace)
             return oRevision;
         }
 
+        private static bool IsDeletion(string sBlockKind)
+        {
+            return sBlockKind == "a";
+        }
+
         private static Revision GetBaseVersion(Revision oRevision)
         {
-            List<string> cLines = new List<string>();
+            List<string> cLines;
 
             if (oRevision.sState != "dead")
             {
-                cLines = CVSCalls.RunCommand(oRevision.oFile.sPath, $"cvs co -r {oRevision.sRevision} -p \"{oRevision.oFile.sCVSPath}/{oRevision.oFile.sName}\"");
+                cLines = CVSCalls.RunCommand(oRevision.oFile.sPath, $"co -r {oRevision.sRevision} -p \"{oRevision.oFile.sCVSPath}/{oRevision.oFile.sName}\"");
             }
             else
             {
                 int iPrevRevision = int.Parse(oRevision.sRevision.Substring(oRevision.sRevision.LastIndexOf('.') + 1)) - 1;
                 string sPrevRevision = oRevision.sRevision.Substring(0, oRevision.sRevision.LastIndexOf('.') + 1) + iPrevRevision.ToString();
-                cLines = CVSCalls.RunCommand(oRevision.oFile.sPath, $"cvs co -r {sPrevRevision} -p \"{oRevision.oFile.sCVSPath}/{oRevision.oFile.sName}\"");
-            }            
-
-            DiffBlock oDiffBlock = new DiffBlock();
+                cLines = CVSCalls.RunCommand(oRevision.oFile.sPath, $"co -r {sPrevRevision} -p \"{oRevision.oFile.sCVSPath}/{oRevision.oFile.sName}\"");
+            }
 
-            oDiffBlock.iStartLine = (cLines.Count == 0) ? 0 : 1;
-            oDiffBlock.iEndLine = cLines.Count;
+            DiffBlock oDiffBlock = new DiffBlock
+            {
+                iStartLine = (cLines.Count == 0) ? 0 : 1,
+                iEndLine = cLines.Count
+            };
 
             List<DiffBlock.LineChange> cChanges = new List<DiffBlock.LineChange>();
             for(int i = 0; i < cLines.Count; i++)
@@ -455,14 +459,12 @@ private static Revision GetBaseVersion(Revision oRevision)
             return oRevision;
         }
 
-        private static DiffBlock AddWhitespace(DiffBlock oDiffBlock, List<string> cWhitespace, int iWhitespace, bool bDeletion = false, int iMode = 3)
+        private static DiffBlock AddWhitespace(DiffBlock oDiffBlock, List<string> cWhitespace, int iWhitespace, WhitespaceMode iMode)
         {
-            //iMode 1 = Only Top
-            //iMode 2 = Only Bottom
-            //iMode 3 = Both
-
-            if(iMode == 1 || iMode == 3)
+            if(iMode == WhitespaceMode.top)
             {
+                bool bDeletion = IsDeletion(oDiffBlock.sBlockKind);
+
                 //Top Whitespace
                 int iNewLine = oDiffBlock.iStartLine;
                 //When it's a deletion, then the "Startline" is the first line that we need as whitespace, where in any other case we would go for the line above that.
@@ -483,7 +485,7 @@ private static DiffBlock AddWhitespace(DiffBlock oDiffBlock, List<string> cWhite
                 oDiffBlock.iStartLine = iNewLine;
             }
 
-            if (iMode == 2 || iMode == 3)
+            if (iMode == WhitespaceMode.bottom)
             {
                 //Bottom Whitespace
                 int iNewLine = oDiffBlock.iEndLine;
@@ -505,5 +507,38 @@ private static DiffBlock AddWhitespace(DiffBlock oDiffBlock, List<string> cWhite
 
             return oDiffBlock;
         }
+
+        /// <summary>
+        /// Outputs the given Revision to a randomly generated temp file and returns the full path to this file.
+        /// </summary>
+        /// <param name="oRevision">Revision to be outputted</param>
+        /// <returns>Full path to the newly created file</returns>
+        public static string OutputRevisionToFile(Revision oRevision)
+        {
+            string randomFile = Path.GetTempFileName();
+            string targetExtension = Path.GetExtension(oRevision.oFile.sName);
+
+            File.Move(randomFile, randomFile + targetExtension);
+            randomFile += targetExtension;
+
+            if (oRevision.sState != "dead")
+            {
+                CVSCalls.RunCommand(oRevision.oFile.sPath, $"co -r {oRevision.sRevision} -p \"{oRevision.oFile.sCVSPath}/{oRevision.oFile.sName}\" >> \"{randomFile}\"");
+            }
+            else
+            {
+                int iPrevRevision = int.Parse(oRevision.sRevision.Substring(oRevision.sRevision.LastIndexOf('.') + 1)) - 1;
+                string sPrevRevision = oRevision.sRevision.Substring(0, oRevision.sRevision.LastIndexOf('.') + 1) + iPrevRevision.ToString();
+                CVSCalls.RunCommand(oRevision.oFile.sPath, $"co -r {sPrevRevision} -p \"{oRevision.oFile.sCVSPath}/{oRevision.oFile.sName}\" >> \"{randomFile}\"");
+            }
+
+            return randomFile;
+        }
+
+        private enum WhitespaceMode
+        {
+            top,
+            bottom
+        }
     }
 }
diff --git a/CVS History Viewer/Resources/Classes/CVSFile.cs b/CVS History Viewer/Resources/Classes/CVSFile.cs
index fc6151b..3c6f592 100644
--- a/CVS History Viewer/Resources/Classes/CVSFile.cs	
+++ b/CVS History Viewer/Resources/Classes/CVSFile.cs	
@@ -4,13 +4,13 @@ namespace CVS_History_Viewer.Resources.Classes
 {
     public class CVSFile
     {
-        public int iID;
-        public string sName;
-        public string sPath;
-        public DateTime dLastUpdated;
-        public bool bDeleted = false;
-        public string sCVSPath;
-        public bool bIgnored = false;
+        public int iID { get; set; }
+        public string sName { get; set; }
+        public string sPath { get; set; }
+        public DateTime dLastUpdated { get; set; }
+        public bool bDeleted { get; set; }  = false;
+        public string sCVSPath { get; set; }
+        public bool bIgnored { get; set; }= false;
 
         public CVSFile()
         {
diff --git a/CVS History Viewer/Resources/Classes/Commit.cs b/CVS History Viewer/Resources/Classes/Commit.cs
index 146f1d6..4b1d9ed 100644
--- a/CVS History Viewer/Resources/Classes/Commit.cs	
+++ b/CVS History Viewer/Resources/Classes/Commit.cs	
@@ -13,6 +13,6 @@ public class Commit
         public string sHASH { get; set; }
         public string sShortHASH { get; set; }
         public string sDescriptionTable { get; set; }
-        public List<Revision> cRevisions = new List<Revision>();
+        public List<Revision> cRevisions { get; set; } = new List<Revision>();
     }
 }
diff --git a/CVS History Viewer/Resources/Classes/CommitTag.cs b/CVS History Viewer/Resources/Classes/CommitTag.cs
index 3cef0c1..58f855c 100644
--- a/CVS History Viewer/Resources/Classes/CommitTag.cs	
+++ b/CVS History Viewer/Resources/Classes/CommitTag.cs	
@@ -3,7 +3,7 @@ namespace CVS_History_Viewer.Resources.Classes
 {
     public class CommitTag
     {
-        public Tag oTag;
-        public int iCommitID;
+        public Tag oTag { get; set; }
+        public int iCommitID { get; set; }
     }
 }
diff --git a/CVS History Viewer/Resources/Classes/Database.cs b/CVS History Viewer/Resources/Classes/Database.cs
index 243989b..520cec0 100644
--- a/CVS History Viewer/Resources/Classes/Database.cs	
+++ b/CVS History Viewer/Resources/Classes/Database.cs	
@@ -6,10 +6,9 @@ namespace CVS_History_Viewer.Resources.Classes
 {
     class Database
     {
-        private const int iVersion = 1;
-        private string sDatabasePath;
+        private readonly string sDatabasePath;
 
-        private SQLiteConnection SQLConnection()
+        private SQLiteConnection NewSQLConnection()
         {
             return new SQLiteConnection($"Data Source={sDatabasePath}\\CVS History Viewer.db;Version=3;foreign keys=true;");
         }
@@ -23,201 +22,19 @@ public Database(string sDatabasePath)
             this.sDatabasePath = sDatabasePath;
             System.IO.Directory.CreateDirectory(sDatabasePath);
 
-            using(SQLiteConnection oSQLiteConnection = SQLConnection())
+            using(SQLiteConnection oSQLiteConnection = NewSQLConnection())
             {
                 oSQLiteConnection.Open();
-
-                bool bExist = false;
-                string sSQL = "";
-                using (SQLiteCommand oCmd = new SQLiteCommand("SELECT sql FROM sqlite_master WHERE type='table' AND name='Files';",
-                                                              oSQLiteConnection))
-                {
-                    using (SQLiteDataReader oReader = oCmd.ExecuteReader())
-                    {
-                        while (oReader.Read())
-                        {
-                            bExist = true;
-                            sSQL = oReader["sql"].ToString();
-                            break;
-                        }
-                    }
-                }
-
-                if (!bExist)
-                {
-                    new SQLiteCommand(@"CREATE TABLE Files (
-	                                    ID	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	                                    Name	TEXT NOT NULL,
-	                                    Path	TEXT NOT NULL,
-                                        CVSPath TEXT NOT NULL,
-	                                    LastUpdated	DATETIME NOT NULL,
-                                        Deleted	INTEGER NOT NULL DEFAULT 0,
-                                        Ignored INTEGER NOT NULL DEFAULT 0,
-                                        UNIQUE(Name, Path)
-                                    );", oSQLiteConnection).ExecuteNonQuery();
-                }
-                else
-                {
-                    if (!sSQL.ToLower().Contains("ignored integer"))
-                    {
-                        new SQLiteCommand(@"ALTER TABLE Files
-                                            ADD Ignored INTEGER DEFAULT (0)
-                                            NOT NULL;", oSQLiteConnection).ExecuteNonQuery();
-                    }
-                }
-
-                bExist = false;
-                using (SQLiteCommand oCmd = new SQLiteCommand("SELECT sql FROM sqlite_master WHERE type='table' AND name='Tags';",
-                                                              oSQLiteConnection))
-                {
-                    using (SQLiteDataReader oReader = oCmd.ExecuteReader())
-                    {
-                        while (oReader.Read())
-                        {
-                            bExist = true;
-                            break;
-                        }
-                    }
-                }
-
-                if (!bExist)
-                {
-                    new SQLiteCommand(@"CREATE TABLE Tags (
-	                                    ID	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	                                    Label	TEXT NOT NULL UNIQUE
-                                    );", oSQLiteConnection).ExecuteNonQuery();
-                }
-
-                bExist = false;
-                using (SQLiteCommand oCmd = new SQLiteCommand("SELECT sql FROM sqlite_master WHERE type='table' AND name='Commits';",
-                                                              oSQLiteConnection))
-                {
-                    using (SQLiteDataReader oReader = oCmd.ExecuteReader())
-                    {
-                        while (oReader.Read())
-                        {
-                            bExist = true;
-                            sSQL = oReader["sql"].ToString();
-                            break;
-                        }
-                    }
-                }
-
-                if (!bExist)
-                {
-                    new SQLiteCommand(@"CREATE TABLE Commits (
-	                                    ID	INTEGER NOT NULL,
-	                                    Revision	TEXT NOT NULL,
-	                                    FileID	INTEGER NOT NULL,
-	                                    Description	TEXT NOT NULL,
-	                                    Date	DATETIME NOT NULL,
-	                                    Author	TEXT NOT NULL,
-	                                    State	TEXT NOT NULL,
-	                                    LinesChanged	TEXT NOT NULL,
-	                                    HASH	TEXT NOT NULL,
-                                        ReAdded	INTEGER NOT NULL DEFAULT 0,
-                                        Whitespace INTEGER  DEFAULT (0) NOT NULL,
-	                                    PRIMARY KEY('FileID','Revision'),
-	                                    FOREIGN KEY('FileID') REFERENCES 'Files'('ID')
-                                    );", oSQLiteConnection).ExecuteNonQuery();
-                }
-                else
-                {
-                    if (!sSQL.ToLower().Contains("whitespace integer"))
-                    {
-                        new SQLiteCommand(@"ALTER TABLE Commits
-                                            ADD Whitespace INTEGER DEFAULT (0)
-                                            NOT NULL;", oSQLiteConnection).ExecuteNonQuery();
-                    }
-                }
-
-                bExist = false;
-                using (SQLiteCommand oCmd = new SQLiteCommand("SELECT sql FROM sqlite_master WHERE type='table' AND name='CommitTags';",
-                                                              oSQLiteConnection))
-                {
-                    using (SQLiteDataReader oReader = oCmd.ExecuteReader())
-                    {
-                        while (oReader.Read())
-                        {
-                            bExist = true;
-                            break;
-                        }
-                    }
-                }
-
-                if (!bExist)
-                {
-                    new SQLiteCommand(@"CREATE TABLE CommitTags (
-	                                    TagID	INTEGER NOT NULL,
-	                                    CommitID	INTEGER NOT NULL,
-	                                    PRIMARY KEY('TagID','CommitID')
-                                    );", oSQLiteConnection).ExecuteNonQuery();
-                }
-
-                bExist = false;
-                using (SQLiteCommand oCmd = new SQLiteCommand("SELECT sql FROM sqlite_master WHERE type='table' AND name='DiffBlocks';",
-                                                              oSQLiteConnection))
-                {
-                    using (SQLiteDataReader oReader = oCmd.ExecuteReader())
-                    {
-                        while (oReader.Read())
-                        {
-                            bExist = true;
-                            break;
-                        }
-                    }
-                }
-
-                if (!bExist)
-                {
-                    new SQLiteCommand(@"CREATE TABLE DiffBlocks (
-                                    ID  INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE NOT NULL,
-                                    CommitID  INTEGER NOT NULL,
-                                    StartLine INTEGER NOT NULL,
-                                    EndLine   INTEGER NOT NULL
-                                );", oSQLiteConnection).ExecuteNonQuery();
-                }
-
-                bExist = false;
-                using (SQLiteCommand oCmd = new SQLiteCommand("SELECT sql FROM sqlite_master WHERE type='table' AND name='DiffLines';",
-                                                              oSQLiteConnection))
-                {
-                    using (SQLiteDataReader oReader = oCmd.ExecuteReader())
-                    {
-                        while (oReader.Read())
-                        {
-                            bExist = true;
-                            break;
-                        }
-                    }
-                }
-
-                if (!bExist)
-                {
-                    new SQLiteCommand(@"CREATE TABLE DiffLines (
-                                    ID INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE NOT NULL,
-                                    DiffBlockID INTEGER NOT NULL,
-                                    [Action]    TEXT    NOT NULL,
-                                    Line        TEXT    NOT NULL
-                                );", oSQLiteConnection).ExecuteNonQuery();
-                }
-
-                new SQLiteCommand(@"CREATE INDEX IF NOT EXISTS DiffLines_DiffBlockID ON DiffLines (DiffBlockID);"
-                                  , oSQLiteConnection).ExecuteNonQuery();
-                new SQLiteCommand(@"CREATE INDEX IF NOT EXISTS Commit_date_desc ON Commits (Date DESC, HASH ASC);"
-                                  , oSQLiteConnection).ExecuteNonQuery();
-                new SQLiteCommand(@"CREATE INDEX IF NOT EXISTS CommitTags_CommitID ON CommitTags (CommitID, TagID);"
-                                  , oSQLiteConnection).ExecuteNonQuery();
-
+                new DatabaseMigration(oSQLiteConnection).CreateOrMigrateAll();
                 oSQLiteConnection.Close();
-            }            
+            }
         }
 
         public List<CVSFile> GetFiles(string sRootDirectory)
         {
             List<CVSFile> cFiles = new List<CVSFile>();
 
-            using (SQLiteConnection oSQLiteConnection = SQLConnection())
+            using (SQLiteConnection oSQLiteConnection = NewSQLConnection())
             {
                 oSQLiteConnection.Open();
 
@@ -236,8 +53,8 @@ public List<CVSFile> GetFiles(string sRootDirectory)
                                 sPath = oReader["Path"].ToString(),
                                 sCVSPath = oReader["CVSPath"].ToString(),
                                 dLastUpdated = (DateTime)oReader["LastUpdated"],
-                                bDeleted = (int.Parse(oReader["Deleted"].ToString()) == 1) ? true : false,
-                                bIgnored = (int.Parse(oReader["Ignored"].ToString()) == 1) ? true : false
+                                bDeleted = int.Parse(oReader["Deleted"].ToString()) == 1,
+                                bIgnored = int.Parse(oReader["Ignored"].ToString()) == 1
                             };
 
                             cFiles.Add(oFile);
@@ -255,7 +72,7 @@ public List<Tag> GetTags()
         {
             List<Tag> cTags = new List<Tag>();
 
-            using (SQLiteConnection oSQLiteConnection = SQLConnection())
+            using (SQLiteConnection oSQLiteConnection = NewSQLConnection())
             {
                 oSQLiteConnection.Open();
 
@@ -287,7 +104,7 @@ public List<CommitTag> GetCommitTags(List<Tag> cTags)
         {
             List<CommitTag> cCommitTags = new List<CommitTag>();
 
-            using (SQLiteConnection oSQLiteConnection = SQLConnection())
+            using (SQLiteConnection oSQLiteConnection = NewSQLConnection())
             {
                 oSQLiteConnection.Open();
 
@@ -298,9 +115,10 @@ public List<CommitTag> GetCommitTags(List<Tag> cTags)
                     {
                         while (oReader.Read())
                         {
-                            oCommitTag = new CommitTag();
-
-                            oCommitTag.iCommitID = int.Parse(oReader["CommitID"].ToString());
+                            oCommitTag = new CommitTag
+                            {
+                                iCommitID = int.Parse(oReader["CommitID"].ToString())
+                            };
 
                             foreach (Tag oTag in cTags)
                             {
@@ -326,7 +144,7 @@ public List<Commit> GetCommits(string sRootDirectory, string sFilter, string sLi
         {
             List<Commit> cCommits = new List<Commit>();
 
-            using (SQLiteConnection oSQLiteConnection = SQLConnection())
+            using (SQLiteConnection oSQLiteConnection = NewSQLConnection())
             {
                 oSQLiteConnection.Open();
 
@@ -378,7 +196,7 @@ FROM Commits
                                 sLinesChanged = oReader["LinesChanged"].ToString(),
                                 sRevision = oReader["Revision"].ToString(),
                                 sState = oReader["State"].ToString(),
-                                bReAdded = (int.Parse(oReader["ReAdded"].ToString()) == 1) ? true : false,
+                                bReAdded = int.Parse(oReader["ReAdded"].ToString()) == 1,
                                 oFile = new CVSFile()
                                 {
                                     iID = int.Parse(oReader["FileID"].ToString()),
@@ -392,7 +210,7 @@ FROM Commits
 
                             string sSQL2 = $@"SELECT DiffBlocks.*, DiffLines.'Action', DiffLines.Line FROM DiffBlocks
                                           LEFT JOIN DiffLines ON DiffLines.DiffBlockID = DiffBlocks.ID
-                                          WHERE DiffBlocks.CommitID = {oReader["ID"].ToString()}
+                                          WHERE DiffBlocks.CommitID = {oReader["ID"]}
                                           ORDER BY DiffBlocks.ID, DiffLines.ID;";
 
                             using (SQLiteCommand oCmd2 = new SQLiteCommand(sSQL2, oSQLiteConnection))
@@ -475,7 +293,7 @@ private List<Tag> GetTagsForCommit(int iCommitID, List<CommitTag> cCommitTags)
         /// <param name="cCommits">List of Commits that need to be saved.</param>
         public void SaveCommits(List<Commit> cCommits, List<Tag> cTags)
         {
-            using (SQLiteConnection oSQLiteConnection = SQLConnection())
+            using (SQLiteConnection oSQLiteConnection = NewSQLConnection())
             {
                 oSQLiteConnection.Open();
 
@@ -491,7 +309,7 @@ public void SaveCommits(List<Commit> cCommits, List<Tag> cTags)
                               '{cCommits[0].cRevisions[0].oFile.sName.Replace("'", @"''")}', 
                               '{cCommits[0].cRevisions[0].oFile.sPath.Replace("'", @"''")}', 
                               '{sCVSPath}', 
-                              '{cCommits[0].cRevisions[0].oFile.dLastUpdated.ToString("yyyy-MM-dd HH:mm:ss")}',
+                              '{cCommits[0].cRevisions[0].oFile.dLastUpdated:yyyy-MM-dd HH:mm:ss}',
                                {(cCommits[0].cRevisions[0].oFile.bDeleted ? 1 : 0)},
                                {(cCommits[0].cRevisions[0].oFile.bIgnored ? 1 : 0)} );";
 
@@ -502,7 +320,7 @@ public void SaveCommits(List<Commit> cCommits, List<Tag> cTags)
                 else
                 {
                     sSQL = $@"UPDATE Files
-                              SET LastUpdated = '{cCommits[0].cRevisions[0].oFile.dLastUpdated.ToString("yyyy-MM-dd HH:mm:ss")}', 
+                              SET LastUpdated = '{cCommits[0].cRevisions[0].oFile.dLastUpdated:yyyy-MM-dd HH:mm:ss}', 
                                   Deleted = {(cCommits[0].cRevisions[0].oFile.bDeleted ? 1 : 0)},
                                   Ignored = {(cCommits[0].cRevisions[0].oFile.bIgnored ? 1 : 0)}
                               WHERE ID = {cCommits[0].cRevisions[0].oFile.iID};";
@@ -522,7 +340,7 @@ public void SaveCommits(List<Commit> cCommits, List<Tag> cTags)
                                 '{oRevision.sRevision}',
                                 {cCommits[0].cRevisions[0].oFile.iID},
                                 '{oCommit.sDescription.Replace("'", @"''")}',
-                                '{oCommit.dDate.ToString("yyyy-MM-dd HH:mm:ss")}',
+                                '{oCommit.dDate:yyyy-MM-dd HH:mm:ss}',
                                 '{oCommit.sAuthor}',
                                 '{oRevision.sState}',
                                 '{oRevision.sLinesChanged}',
@@ -554,7 +372,6 @@ public void SaveCommits(List<Commit> cCommits, List<Tag> cTags)
                                 new SQLiteCommand(sSQL, oSQLiteConnection).ExecuteNonQuery();
 
                                 oTag.iID = (int)oSQLiteConnection.LastInsertRowId;
-                                //cTags.Add(oTag);
                             }
 
                             sSQL = $@"INSERT OR IGNORE INTO CommitTags (TagID, CommitID) VALUES
@@ -571,7 +388,7 @@ public void SaveCommits(List<Commit> cCommits, List<Tag> cTags)
 
         public void SaveFile(CVSFile oFile)
         {
-            using (SQLiteConnection oSQLiteConnection = SQLConnection())
+            using (SQLiteConnection oSQLiteConnection = NewSQLConnection())
             {
                 oSQLiteConnection.Open();
 
@@ -583,7 +400,7 @@ public void SaveFile(CVSFile oFile)
                               '{oFile.sName.Replace("'", @"''")}', 
                               '{oFile.sPath.Replace("'", @"''")}', 
                               '{((oFile.sCVSPath != null) ? oFile.sCVSPath.Replace("'", @"''") : "")}',
-                              '{oFile.dLastUpdated.ToString("yyyy-MM-dd HH:mm:ss")}',
+                              '{oFile.dLastUpdated:yyyy-MM-dd HH:mm:ss}',
                                {(oFile.bDeleted ? 1 : 0)},
                                {(oFile.bIgnored ? 1 : 0)});";
 
@@ -594,7 +411,7 @@ public void SaveFile(CVSFile oFile)
                 else
                 {
                     string sSQL = $@"UPDATE Files
-                              SET LastUpdated = '{oFile.dLastUpdated.ToString("yyyy-MM-dd HH:mm:ss")}', Deleted = {(oFile.bDeleted ? 1 : 0)},
+                              SET LastUpdated = '{oFile.dLastUpdated:yyyy-MM-dd HH:mm:ss}', Deleted = {(oFile.bDeleted ? 1 : 0)},
                               Ignored = {(oFile.bIgnored ? 1 : 0)}
                               WHERE ID = {oFile.iID};";
 
@@ -607,7 +424,7 @@ public void SaveFile(CVSFile oFile)
 
         public void SaveDiff(Revision oRevision)
         {
-            using (SQLiteConnection oSQLiteConnection = SQLConnection())
+            using (SQLiteConnection oSQLiteConnection = NewSQLConnection())
             {
                 oSQLiteConnection.Open();
 
@@ -644,7 +461,7 @@ public void SaveDiff(Revision oRevision)
 
         public void DeleteDiffLines(Revision oRevision)
         {
-            using (SQLiteConnection oSQLiteConnection = SQLConnection())
+            using (SQLiteConnection oSQLiteConnection = NewSQLConnection())
             {
                 oSQLiteConnection.Open();
                 
@@ -671,7 +488,7 @@ public int GetRevisionCount(CVSFile oFile)
                 return iCount;
             }
 
-            using(SQLiteConnection oSQLiteConnection = SQLConnection())
+            using(SQLiteConnection oSQLiteConnection = NewSQLConnection())
             {
                 oSQLiteConnection.Open();
 
@@ -680,10 +497,9 @@ public int GetRevisionCount(CVSFile oFile)
                 {
                     using (SQLiteDataReader oReader = oCmd.ExecuteReader())
                     {
-                        while (oReader.Read())
+                        if (oReader.Read())
                         {
                             iCount = int.Parse(oReader["count"].ToString());
-                            break;
                         }
                     }
                 }
diff --git a/CVS History Viewer/Resources/Classes/DatabaseMigration.cs b/CVS History Viewer/Resources/Classes/DatabaseMigration.cs
new file mode 100644
index 0000000..f13da15
--- /dev/null
+++ b/CVS History Viewer/Resources/Classes/DatabaseMigration.cs	
@@ -0,0 +1,219 @@
+using System.Data.SQLite;
+
+namespace CVS_History_Viewer.Resources.Classes
+{
+    class DatabaseMigration
+    {
+        private readonly SQLiteConnection oSQLiteConnection;
+
+        public DatabaseMigration(SQLiteConnection oSQLiteConnection)
+        {
+            this.oSQLiteConnection = oSQLiteConnection;
+        }
+
+        public void CreateOrMigrateAll()
+        {
+            CreateOrMigrateFilesTable();
+            CreateOrMigrateTagsTable();
+            CreateOrMigrateCommitsTable();
+            CreateOrMigrateCommitTagsTable();
+            CreateOrMigrateDiffBlocksTable();
+            CreateOrMigrateDiffLinesTable();
+
+            new SQLiteCommand(@"CREATE INDEX IF NOT EXISTS DiffLines_DiffBlockID ON DiffLines (DiffBlockID);"
+                  , oSQLiteConnection).ExecuteNonQuery();
+            new SQLiteCommand(@"CREATE INDEX IF NOT EXISTS Commit_date_desc ON Commits (Date DESC, HASH ASC);"
+                              , oSQLiteConnection).ExecuteNonQuery();
+            new SQLiteCommand(@"CREATE INDEX IF NOT EXISTS CommitTags_CommitID ON CommitTags (CommitID, TagID);"
+                              , oSQLiteConnection).ExecuteNonQuery();
+        }
+
+        private void CreateOrMigrateFilesTable()
+        {
+            bool bExist = false;
+            string sSQL = "";
+            using (SQLiteCommand oCmd = new SQLiteCommand("SELECT sql FROM sqlite_master WHERE type='table' AND name='Files';",
+                                                          oSQLiteConnection))
+            {
+                using (SQLiteDataReader oReader = oCmd.ExecuteReader())
+                {
+                    if (oReader.Read())
+                    {
+                        bExist = true;
+                        sSQL = oReader["sql"].ToString();
+                    }
+                }
+            }
+
+            if (!bExist)
+            {
+                new SQLiteCommand(@"CREATE TABLE Files (
+	                                    ID	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	                                    Name	TEXT NOT NULL,
+	                                    Path	TEXT NOT NULL,
+                                        CVSPath TEXT NOT NULL,
+	                                    LastUpdated	DATETIME NOT NULL,
+                                        Deleted	INTEGER NOT NULL DEFAULT 0,
+                                        Ignored INTEGER NOT NULL DEFAULT 0,
+                                        UNIQUE(Name, Path)
+                                    );", oSQLiteConnection).ExecuteNonQuery();
+            }
+            else
+            {
+                if (!sSQL.ToLower().Contains("ignored integer"))
+                {
+                    new SQLiteCommand(@"ALTER TABLE Files
+                                            ADD Ignored INTEGER DEFAULT (0)
+                                            NOT NULL;", oSQLiteConnection).ExecuteNonQuery();
+                }
+            }
+        }
+
+        private void CreateOrMigrateTagsTable()
+        {
+            bool bExist = false;
+            using (SQLiteCommand oCmd = new SQLiteCommand("SELECT sql FROM sqlite_master WHERE type='table' AND name='Tags';",
+                                                          oSQLiteConnection))
+            {
+                using (SQLiteDataReader oReader = oCmd.ExecuteReader())
+                {
+                    if (oReader.Read())
+                    {
+                        bExist = true;
+                    }
+                }
+            }
+
+            if (!bExist)
+            {
+                new SQLiteCommand(@"CREATE TABLE Tags (
+	                                    ID	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	                                    Label	TEXT NOT NULL UNIQUE
+                                    );", oSQLiteConnection).ExecuteNonQuery();
+            }
+        }
+
+        private void CreateOrMigrateCommitsTable()
+        {
+            bool bExist = false;
+            string sSQL = "";
+            using (SQLiteCommand oCmd = new SQLiteCommand("SELECT sql FROM sqlite_master WHERE type='table' AND name='Commits';",
+                                                          oSQLiteConnection))
+            {
+                using (SQLiteDataReader oReader = oCmd.ExecuteReader())
+                {
+                    if (oReader.Read())
+                    {
+                        bExist = true;
+                        sSQL = oReader["sql"].ToString();
+                    }
+                }
+            }
+
+            if (!bExist)
+            {
+                new SQLiteCommand(@"CREATE TABLE Commits (
+	                                    ID	INTEGER NOT NULL,
+	                                    Revision	TEXT NOT NULL,
+	                                    FileID	INTEGER NOT NULL,
+	                                    Description	TEXT NOT NULL,
+	                                    Date	DATETIME NOT NULL,
+	                                    Author	TEXT NOT NULL,
+	                                    State	TEXT NOT NULL,
+	                                    LinesChanged	TEXT NOT NULL,
+	                                    HASH	TEXT NOT NULL,
+                                        ReAdded	INTEGER NOT NULL DEFAULT 0,
+                                        Whitespace INTEGER  DEFAULT (0) NOT NULL,
+	                                    PRIMARY KEY('FileID','Revision'),
+	                                    FOREIGN KEY('FileID') REFERENCES 'Files'('ID')
+                                    );", oSQLiteConnection).ExecuteNonQuery();
+            }
+            else
+            {
+                if (!sSQL.ToLower().Contains("whitespace integer"))
+                {
+                    new SQLiteCommand(@"ALTER TABLE Commits
+                                            ADD Whitespace INTEGER DEFAULT (0)
+                                            NOT NULL;", oSQLiteConnection).ExecuteNonQuery();
+                }
+            }
+        }
+
+        private void CreateOrMigrateCommitTagsTable()
+        {
+            bool bExist = false;
+            using (SQLiteCommand oCmd = new SQLiteCommand("SELECT sql FROM sqlite_master WHERE type='table' AND name='CommitTags';",
+                                                          oSQLiteConnection))
+            {
+                using (SQLiteDataReader oReader = oCmd.ExecuteReader())
+                {
+                    if (oReader.Read())
+                    {
+                        bExist = true;
+                    }
+                }
+            }
+
+            if (!bExist)
+            {
+                new SQLiteCommand(@"CREATE TABLE CommitTags (
+	                                    TagID	INTEGER NOT NULL,
+	                                    CommitID	INTEGER NOT NULL,
+	                                    PRIMARY KEY('TagID','CommitID')
+                                    );", oSQLiteConnection).ExecuteNonQuery();
+            }
+        }
+
+        private void CreateOrMigrateDiffBlocksTable()
+        {
+            bool bExist = false;
+            using (SQLiteCommand oCmd = new SQLiteCommand("SELECT sql FROM sqlite_master WHERE type='table' AND name='DiffBlocks';",
+                                                          oSQLiteConnection))
+            {
+                using (SQLiteDataReader oReader = oCmd.ExecuteReader())
+                {
+                    if (oReader.Read())
+                    {
+                        bExist = true;
+                    }
+                }
+            }
+
+            if (!bExist)
+            {
+                new SQLiteCommand(@"CREATE TABLE DiffBlocks (
+                                    ID  INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE NOT NULL,
+                                    CommitID  INTEGER NOT NULL,
+                                    StartLine INTEGER NOT NULL,
+                                    EndLine   INTEGER NOT NULL
+                                );", oSQLiteConnection).ExecuteNonQuery();
+            }
+        }
+
+        private void CreateOrMigrateDiffLinesTable()
+        {
+            bool bExist = false;
+            using (SQLiteCommand oCmd = new SQLiteCommand("SELECT sql FROM sqlite_master WHERE type='table' AND name='DiffLines';",
+                                                          oSQLiteConnection))
+            {
+                using (SQLiteDataReader oReader = oCmd.ExecuteReader())
+                {
+                    if (oReader.Read())
+                    {
+                        bExist = true;
+                    }
+                }
+            }
+
+            if (!bExist)
+            {
+                new SQLiteCommand(@"CREATE TABLE DiffLines (
+                                    ID INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE NOT NULL,
+                                    DiffBlockID INTEGER NOT NULL,
+                                    [Action]    TEXT    NOT NULL,
+                                    Line        TEXT    NOT NULL
+                                );", oSQLiteConnection).ExecuteNonQuery();
+            }
+        }
+    }
+}
diff --git a/CVS History Viewer/Resources/Classes/DiffBlock.cs b/CVS History Viewer/Resources/Classes/DiffBlock.cs
index e5ddc0f..21693c6 100644
--- a/CVS History Viewer/Resources/Classes/DiffBlock.cs	
+++ b/CVS History Viewer/Resources/Classes/DiffBlock.cs	
@@ -5,16 +5,16 @@ namespace CVS_History_Viewer.Resources.Classes
 {
     public class DiffBlock
     {
-        public int iStartLine = 0;
-        public int iEndLine = 0;
-        public string sBlockKind = "";
-        public List<LineChange> cLines = new List<LineChange>();
-        public List<TextBlock> cDiffLines = new List<TextBlock>();
+        public int iStartLine { get; set; } = 0;
+        public int iEndLine { get; set; } = 0;
+        public string sBlockKind { get; set; } = "";
+        public List<LineChange> cLines { get; set; } = new List<LineChange>();
+        public List<TextBlock> cDiffLines { get; set; } = new List<TextBlock>();
 
         public class LineChange
         {
-            public string sAction;
-            public string sLine;
+            public string sAction { get; set; }
+            public string sLine { get; set; }
         }        
     }
 }
diff --git a/CVS History Viewer/Resources/Classes/Revision.cs b/CVS History Viewer/Resources/Classes/Revision.cs
index 78309f4..709263b 100644
--- a/CVS History Viewer/Resources/Classes/Revision.cs	
+++ b/CVS History Viewer/Resources/Classes/Revision.cs	
@@ -4,14 +4,14 @@ namespace CVS_History_Viewer.Resources.Classes
 {
     public class Revision
     {
-        public int iCommitID;
-        public string sRevision;
-        public string sState;
-        public string sLinesChanged;
-        public List<Tag> cTags = new List<Tag>();
-        public CVSFile oFile;
-        public bool bReAdded = false;
-        public int iWhitespace = 3;
-        public List<DiffBlock> cDiffBlocks = new List<DiffBlock>();
+        public int iCommitID { get; set; }
+        public string sRevision { get; set; }
+        public string sState { get; set; }
+        public string sLinesChanged { get; set; }
+        public List<Tag> cTags { get; set; } = new List<Tag>();
+        public CVSFile oFile { get; set; }
+        public bool bReAdded { get; set; } = false;
+        public int iWhitespace { get; set; } = 3;
+        public List<DiffBlock> cDiffBlocks { get; set; } = new List<DiffBlock>();
     }
 }
diff --git a/CVS History Viewer/Resources/Classes/Settings.cs b/CVS History Viewer/Resources/Classes/Settings.cs
index 5d1c577..c363313 100644
--- a/CVS History Viewer/Resources/Classes/Settings.cs	
+++ b/CVS History Viewer/Resources/Classes/Settings.cs	
@@ -1,16 +1,33 @@
 
+using System.Text;
+
 namespace CVS_History_Viewer.Resources.Classes
 {
-    class Settings
+    public class Settings
     {
-        private JSONParser.JSONParser oJSONParser = new JSONParser.JSONParser();
-        private string sUserSettingsFilePath = "";
+        private readonly JSONParser.JSONParser oJSONParser = new JSONParser.JSONParser();
+        private readonly string sUserSettingsFilePath;
 
         //Setting Variables
-        public string sRootDirectory = null;
-        public int iWhitespace = 3;
-        public int iTabSpaces = 4;
-        public string sTab = null;
+        public string sRootDirectory { get; set; } = null;
+        public int iWhitespace { get; set; } = 3;
+        private int _iTabSpaces = 4;
+        public int iTabSpaces
+        {
+            get { return _iTabSpaces; }
+            set
+            {
+                _iTabSpaces = value;
+                StringBuilder tabBuilder = new StringBuilder(); 
+                for (int i = 1; i <= iTabSpaces; i++)
+                {
+                    tabBuilder.Append(" ");
+                }
+
+                sTab = tabBuilder.ToString();
+            }
+        }
+        public string sTab { get; set; } = null;
 
         public Settings(string sSettingsFilePath)
         {
@@ -28,11 +45,6 @@ private void LoadSettings()
             sRootDirectory = (string)oJSONParser.GetValue("RootDirectory", null);
             iWhitespace = (int)oJSONParser.GetValue("Whitespace", iWhitespace);
             iTabSpaces = (int)oJSONParser.GetValue("TabSpaces", iTabSpaces);
-
-            for(int i = 1; i <= iTabSpaces; i++)
-            {
-                sTab += " ";
-            }
         }
 
         public void SaveSettings()
diff --git a/CVS History Viewer/Resources/Classes/SyntaxHighlighting.cs b/CVS History Viewer/Resources/Classes/SyntaxHighlighting.cs
index 0702b90..ac24b0a 100644
--- a/CVS History Viewer/Resources/Classes/SyntaxHighlighting.cs	
+++ b/CVS History Viewer/Resources/Classes/SyntaxHighlighting.cs	
@@ -11,7 +11,7 @@ namespace CVS_History_Viewer.Resources.Classes
 {
     public class SyntaxHighlighting
     {
-        private List<Syntax> cSyntax = new List<Syntax>();
+        private readonly List<Syntax> cSyntax = new List<Syntax>();
 
         public SyntaxHighlighting(string sPath)
         {
@@ -118,15 +118,15 @@ public List<Inline> ParseSyntax(string sLine, string sFileExtension)
 
     public class Syntax
     {
-        public string lang;
-        public string[] extensions;
-        public Syntax.Scopes[] scopes;
+        public string lang { get; set; }
+        public string[] extensions { get; set; }
+        public Syntax.Scopes[] scopes { get; set; }
 
         public class Scopes
         {
-            public string name;
-            public string color;
-            public string[] patterns;
+            public string name { get; set; }
+            public string color { get; set; }
+            public string[] patterns { get; set; }
         }
     }
 }
diff --git a/CVS History Viewer/Resources/Styles/RedWhite.xaml b/CVS History Viewer/Resources/Styles/RedWhite.xaml
index 1c865ae..e82bcc3 100644
--- a/CVS History Viewer/Resources/Styles/RedWhite.xaml	
+++ b/CVS History Viewer/Resources/Styles/RedWhite.xaml	
@@ -9,6 +9,7 @@
     <SolidColorBrush x:Key="Red" Color="#c5013c"/>
     <SolidColorBrush x:Key="LightRed" Color="#FFBD627D"/>
     <Color x:Key="LightRedColor">#FFBD627D</Color>
+    <Color x:Key="DropShadowColor">#000000</Color>
 
     <Style x:Key="RevisionNewFile" TargetType="TextBlock">
         <Setter Property="FontFamily" Value="{StaticResource FontAwesomeRegular}"/>
@@ -68,6 +69,46 @@
         </Setter>
     </Style>
 
+    <!--
+    ####################################
+    Sub-Window
+    ####################################
+    -->
+
+    <Style x:Key="CustomChromeSub" TargetType="{x:Type Window}">
+        <Setter Property="shell:WindowChrome.WindowChrome">
+            <Setter.Value>
+                <shell:WindowChrome GlassFrameThickness="1" CornerRadius="0" CaptionHeight="20"/>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Window}">
+                    <Grid SnapsToDevicePixels="True">
+                        <Border Name="OuterBorder" Background="White" Margin="0" BorderThickness="1" BorderBrush="Black">
+                            <ContentPresenter Content="{TemplateBinding Content}" />
+                        </Border>
+                        <TextBlock Name="Title" Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Title}"   
+                               VerticalAlignment="Top" HorizontalAlignment="Left" Foreground="White"  
+                               Margin="5,2,0,0"/>
+                        <!--<Image Name="Icon" Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Icon}"  
+                           VerticalAlignment="Top" HorizontalAlignment="Left"  
+                           Margin="2,3,0,0"   
+                           Width="15"  
+                           shell:WindowChrome.IsHitTestVisibleInChrome="True"/>-->
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="WindowState" Value="Maximized">
+                            <Setter TargetName="OuterBorder" Property="BorderThickness" Value="6"/>
+                            <Setter TargetName="Title" Property="Margin" Value="66,8,0,0"/>
+                            <!--<Setter TargetName="Icon" Property="Margin" Value="9,10,0,0"/>-->
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <!--
     ####################################
     Button
@@ -565,4 +606,71 @@
         </Setter>
     </Style>
 
+    <!--
+    ####################################
+    Menu (all parts)
+    ####################################
+    -->
+
+    <Style TargetType="ContextMenu">
+        <Setter Property="Background" Value="{StaticResource Red}"/>
+        <Setter Property="BorderThickness" Value="1,1,2,1"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Red}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ContextMenu">
+                    <Border Background="{TemplateBinding Background}" 
+                            BorderBrush="{TemplateBinding BorderBrush}" 
+                            BorderThickness="{TemplateBinding BorderThickness}" Margin="3">
+                        <ItemsPresenter/>
+                        <Border.Effect>
+                            <DropShadowEffect Color="{StaticResource DropShadowColor}" Opacity="0.60" ShadowDepth="3"/>
+                        </Border.Effect>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="MenuItem">
+        <Setter Property="Background" Value="{StaticResource Red}"/>
+        <Setter Property="Foreground" Value="White"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="MenuItem">
+                    <Border Background="{TemplateBinding Background}" BorderThickness="0">
+                        <ContentPresenter Margin="6,3,6,3" ContentSource="Header" RecognizesAccessKey="True"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsHighlighted" Value="true">
+                            <Setter Property="Background" Value="{StaticResource LightRed}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="FontWeight" Value="Bold"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="Separator" x:Key="{x:Static MenuItem.SeparatorStyleKey}">
+        <Setter Property="Background" Value="White"/>
+        <Setter Property="BorderBrush" Value="White"/>
+        <Setter Property="BorderThickness" Value="0,1,0,0"/>
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Separator">
+                    <Border 
+                        BorderBrush="{TemplateBinding BorderBrush}" 
+                        BorderThickness="{TemplateBinding BorderThickness}" 
+                        Background="{TemplateBinding Background}" 
+                        Height="1" 
+                        SnapsToDevicePixels="true"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/CVS History Viewer/Resources/Windows/SettingsUI.xaml b/CVS History Viewer/Resources/Windows/SettingsUI.xaml
new file mode 100644
index 0000000..80a9f44
--- /dev/null
+++ b/CVS History Viewer/Resources/Windows/SettingsUI.xaml	
@@ -0,0 +1,38 @@
+<Window x:Class="CVS_History_Viewer.Resources.Windows.SettingsUI"
+        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:local="clr-namespace:CVS_History_Viewer.Resources.Windows"
+        mc:Ignorable="d"
+        Title="CVS History Viewer Settings" WindowStartupLocation="CenterScreen" Height="227" Width="240" Style="{StaticResource CustomChromeSub}" Icon="/CVS History Viewer;component/Resources/Images/Icon.ico" ResizeMode="NoResize">
+    <Grid SnapsToDevicePixels="True">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="20"/>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+
+        <Grid Grid.Row="0" Background="#c5013c">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
+                <Button Name="uiClose" Content="&#xf410;" FontFamily="{StaticResource FontAwesomeRegular}" Click="Close_Click" WindowChrome.IsHitTestVisibleInChrome="True" Height="20" Width="20" Style="{StaticResource Button}"/>
+            </StackPanel>
+        </Grid>
+
+        <Grid Grid.Row="1">
+            <DockPanel Margin="5">
+
+                <UniformGrid Columns="2" VerticalAlignment="Top">
+                    <Label Content="Whitespace" Margin="0,0,0,5"/>
+                    <TextBox Name="uiWhitespace" Margin="0,0,0,5" Height="20" Width="25" HorizontalAlignment="Left" TextAlignment="Center" TextChanged="uiWhitespace_TextChanged"/>
+
+                    <Label Content="Tab space*" Margin="0,0,0,5"/>
+                    <TextBox Name="uiTabspace" Margin="0,0,0,5" Height="20" Width="25" HorizontalAlignment="Left" TextAlignment="Center" TextChanged="uiTabspace_TextChanged"/>
+                </UniformGrid>
+                
+            </DockPanel>
+
+            <Label Content="*Applied after restart" VerticalAlignment="Bottom" FontSize="10"/>
+        </Grid>
+
+    </Grid>
+</Window>
diff --git a/CVS History Viewer/Resources/Windows/SettingsUI.xaml.cs b/CVS History Viewer/Resources/Windows/SettingsUI.xaml.cs
new file mode 100644
index 0000000..b2afdf1
--- /dev/null
+++ b/CVS History Viewer/Resources/Windows/SettingsUI.xaml.cs	
@@ -0,0 +1,49 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using CVS_History_Viewer.Resources.Classes;
+
+namespace CVS_History_Viewer.Resources.Windows
+{
+    /// <summary>
+    /// Interaktionslogik für SettingsUI.xaml
+    /// </summary>
+    public partial class SettingsUI : Window
+    {
+        private readonly Settings oSettings;
+
+        public SettingsUI(Settings settings)
+        {
+            InitializeComponent();
+            this.oSettings = settings;
+
+            this.uiTabspace.Text = oSettings.iTabSpaces.ToString();
+            this.uiWhitespace.Text = oSettings.iWhitespace.ToString();
+        }
+
+        private void Close_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+
+        private void uiWhitespace_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            string sInput = ((TextBox)sender).Text;
+            
+            if (int.TryParse(sInput, out int iResult))
+            {
+                this.oSettings.iWhitespace = iResult;
+            }
+        }
+
+        private void uiTabspace_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            string sInput = ((TextBox)sender).Text;
+
+            if (int.TryParse(sInput, out int iResult))
+            {
+                this.oSettings.iTabSpaces = iResult;
+            }
+        }
+    }
+}
diff --git a/CVS History Viewer/packages.config b/CVS History Viewer/packages.config
index acef5f6..5a811cc 100644
--- a/CVS History Viewer/packages.config	
+++ b/CVS History Viewer/packages.config	
@@ -2,6 +2,6 @@
 <packages>
   <package id="Microsoft.WindowsAPICodePack-Core" version="1.1.0.0" targetFramework="net461" />
   <package id="Microsoft.WindowsAPICodePack-Shell" version="1.1.0.0" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net461" />
   <package id="System.Data.SQLite.Core" version="1.0.110.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/changelog.md b/changelog.md
index 6c5a155..286de56 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,14 @@
 # CVS History Viewer Changelog
 
+# v1.2.0 (Released 2024/02/20)
+### New Features
+* (#9) Revision list entries now have a context menu that allows more ways of interacting with the revision.
+* (#48) Added Settings window.
+### Bugfix
+* (#42) Fixed issue that prevented correct scans when using a directory referenced by UNC-paths.
+* (#45) Commit time in revision head area now shows local time instead of UTC.
+* (#47) Changes in file path/name capitalization now no longer causes the file to be added as a new file.
+
 # v1.1.1 (Released 2019/10/21)
 ### Bugfix
 * (#43) Fixed a crash that would appear when the app tries to merge 2 or more diff blocks.