diff --git a/.gitignore b/.gitignore
index 9dae5ec..09b8d0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -331,3 +331,4 @@ ASALocalRun/
 # MFractors (Xamarin productivity tool) working folder 
 .mfractor/
 Image Converter/Code/Github.cs
+Image Converter/gif2webp.exe
diff --git a/Image Converter/Code/Converter.cs b/Image Converter/Code/Converter.cs
index d53782c..bca6ecc 100644
--- a/Image Converter/Code/Converter.cs	
+++ b/Image Converter/Code/Converter.cs	
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -45,12 +46,27 @@ private static void WebPConvert() {
                         magickImage.Settings.SetDefine(WEBP, "-quality", $"{Properties.Settings.Default.WebP_Quality}");
                         magickImage.Format = WEBP;
                         magickImage.Write($"{image}.webp");
-
-                        RemoveImage($"{info.FileName}{info.FileType}", info.FileLocation);
                     }
                     else if (info.FileType != ".webp") {
-                        //Todo: add gif conversion
+                        Process gifProcess = new Process() {
+                            StartInfo = {
+                                FileName = "cmd.exe",
+                                RedirectStandardInput = true,
+                                RedirectStandardOutput = true,
+                                CreateNoWindow = true,
+                                UseShellExecute = false
+                            }
+                        };
+
+                        gifProcess.Start();
+                        gifProcess.StandardInput.WriteLine($"cd {Environment.CurrentDirectory}");
+                        //process.StandardInput.WriteLine($"gif2webp.exe {Options.GetWebPQuality()} \"{Image}\" -o \"{infos.FileDirectory()}\\{infos.FileNameWithoutExtension()}.webp\"");
+                        gifProcess.StandardInput.WriteLine($"gif2webp.exe {Properties.Settings.Default.WebP_Quality} \"{imageExt}\" -o \"{image}.webp\"");
+                        gifProcess.StandardInput.Flush();
+                        gifProcess.StandardInput.Close();
+                        gifProcess.WaitForExit();
                     }
+                    RemoveImage($"{info.FileName}{info.FileType}", info.FileLocation);
                 }
                 catch (Exception ex) {
                     Logger.Instance.LogError(ex);
@@ -63,7 +79,7 @@ private static void JpegConvert() {
                 string imageExt = $"{info.FileLocation}\\{info.FileName}{info.FileType}";
                 string image = $"{info.FileLocation}\\{info.FileName}";
 
-                try{
+                try {
                     if (info.FileType != ".jpg" && info.FileType != ".jpeg" && info.FileType != ".gif") {
                         MagickImage magickImage = new MagickImage(imageExt);
                         magickImage.Settings.SetDefine(JPEG, "-quality", $"{Properties.Settings.Default.Jpeg_Quality}");
diff --git a/Image Converter/Code/Utilities.cs b/Image Converter/Code/Utilities.cs
index 75670dd..873845c 100644
--- a/Image Converter/Code/Utilities.cs	
+++ b/Image Converter/Code/Utilities.cs	
@@ -1,4 +1,5 @@
-using MaterialDesignThemes.Wpf;
+using MahApps.Metro.Controls;
+using MaterialDesignThemes.Wpf;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -17,6 +18,7 @@ public class Utilities {
         static readonly string[] SizeSuffixes = { "bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB" };
 
         public static SnackbarMessageQueue messageQueue { get; set; }
+        public static Flyout flyout { get; set; }
 
         public static string SizeSuffix(long value, int decimalPlaces = 1) {
             if (value < 0) {
@@ -64,7 +66,7 @@ public static void PopulateList(string[] droppedFiles) {
             "“Begin with the end in mind.” – Steven Covey",
             "“Much of the stress that people feel doesn’t come from having too much to do. It comes from not finishing what they started.” – David Allen",
             "“It’s not enough to be busy, so are the ants. The question is, what are we busy about?” – Henry David Thoreau",
-            "“You’ve got to think about big things while you’re doing small things, so that all the small things go in the right direction.” – Alvin Toffler"
+            "“You’ve got to think about big things while you’re doing small things, so that all the small things go in the right direction.” – Alvin Toffler",
             "“In the long run, we shape our lives, and we shape ourselves. The process never ends until we die. And the choices we make are ultimately our own responsibility.” ― Eleanor Roosevelt"
             };
 
diff --git a/Image Converter/Image Converter.csproj b/Image Converter/Image Converter.csproj
index 3ed51b0..8d63229 100644
--- a/Image Converter/Image Converter.csproj	
+++ b/Image Converter/Image Converter.csproj	
@@ -52,6 +52,9 @@
     <WarningLevel>4</WarningLevel>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>icon.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net462\ControlzEx.dll</HintPath>
@@ -62,9 +65,6 @@
     <Reference Include="MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MahApps.Metro.1.6.5\lib\net47\MahApps.Metro.dll</HintPath>
     </Reference>
-    <Reference Include="Markdig, Version=0.16.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Markdig.0.16.0\lib\net40\Markdig.dll</HintPath>
-    </Reference>
     <Reference Include="MaterialDesignColors, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll</HintPath>
     </Reference>
@@ -80,9 +80,6 @@
     <Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.3.3, Culture=neutral, PublicKeyToken=8985beaab7ea3f04, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft-WindowsAPICodePack-Shell.1.1.3.3\lib\net452\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
     </Reference>
-    <Reference Include="Neo.Markdig.Xaml, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Neo.Markdig.Xaml.1.0.5\lib\net47\Neo.Markdig.Xaml.dll</HintPath>
-    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.6.2\lib\net45\NLog.dll</HintPath>
     </Reference>
@@ -179,20 +176,15 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <EmbeddedResource Include="Properties\Resources.de.resx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="MarkdigXaml.licenseheader" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Include="README.md">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
@@ -208,6 +200,12 @@
     <Content Include="finished.wav">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="gif2webp.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Resource Include="icon.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Image Converter/MainWindow.xaml b/Image Converter/MainWindow.xaml
index 3563709..1e29d01 100644
--- a/Image Converter/MainWindow.xaml	
+++ b/Image Converter/MainWindow.xaml	
@@ -25,14 +25,14 @@
 
     <metro:MetroWindow.RightWindowCommands>
         <metro:WindowCommands>
-            <Button Name="BugButton" Content="{materialDesign:PackIcon Kind=BugReport}" Click="BugButton_Click"/>
-            <Button Name="SettingsButton" Click="SettingsButton_Click" ToolTip="Opens settings menu">
+            <Button Name="BugButton" Content="{materialDesign:PackIcon Kind=BugReport}" Click="BugButton_Click" ToolTip="{x:Static loc:Resources.BugsTooltip}"/>
+            <Button Name="SettingsButton" Click="SettingsButton_Click" ToolTip="{x:Static loc:Resources.SettingsTooltip}">
                 <StackPanel Orientation="Horizontal">
                     <materialDesign:PackIcon Width="24" Height="24" Kind="Cog"/>
                     <TextBlock Margin="4 0 0 0" VerticalAlignment="Center" Text="{x:Static loc:Resources.Settings}" />
                 </StackPanel>
             </Button>
-            <Button Name="AboutButton" Content="{materialDesign:PackIcon Kind=Help}" Click="AboutButton_Click"/>
+            <Button Name="AboutButton" Content="{materialDesign:PackIcon Kind=Help}" Click="AboutButton_Click" ToolTip="{x:Static loc:Resources.AboutTooltip}"/>
         </metro:WindowCommands>
     </metro:MetroWindow.RightWindowCommands>
 
@@ -41,9 +41,9 @@
             <Button Name="FileButton" Click="FileButton_Click" ToolTip="File" Content="{x:Static loc:Resources.File}">
                 <Button.ContextMenu>
                     <ContextMenu>
-                        <MenuItem Name="OpenFolderMenu" Header="{x:Static loc:Resources.OpenFolderMenu}" Click="OpenFolderMenu_Click"/>
-                        <MenuItem Name="OpenFileMenu" Header="{x:Static loc:Resources.OpenFileMenu}" Click="OpenFileMenu_Click"/>
-                        <MenuItem Name="ExitMenu" Header="{x:Static loc:Resources.ExitMenu}" Click="ExitMenu_Click"/>
+                        <MenuItem Name="OpenFolderMenu" Header="{x:Static loc:Resources.OpenFolderMenu}" ToolTip="{x:Static loc:Resources.OpenFolderTooltip}" Click="OpenFolderMenu_Click"/>
+                        <MenuItem Name="OpenFileMenu" Header="{x:Static loc:Resources.OpenFileMenu}" ToolTip="{x:Static loc:Resources.OpenFileTooltip}" Click="OpenFileMenu_Click"/>
+                        <MenuItem Name="ExitMenu" Header="{x:Static loc:Resources.ExitMenu}" ToolTip="{x:Static loc:Resources.ExitTooltip}" Click="ExitMenu_Click"/>
                     </ContextMenu>
                 </Button.ContextMenu>
             </Button>
@@ -79,7 +79,7 @@
             <ComboBoxItem Content="PNG"/>
             <ComboBoxItem Content="JPEG"/>
         </ComboBox>
-        <Button Name="ConvertButton" Content="{x:Static loc:Resources.Convert}" Height="Auto" Margin="0,0,10,10" Click="ConvertButton_Click"  HorizontalAlignment="Right" VerticalAlignment="Bottom"/>
+        <Button Name="ConvertButton" Content="{x:Static loc:Resources.Convert}" ToolTip="{x:Static loc:Resources.ConvertTooltip}" Height="Auto" Margin="0,0,10,10" Click="ConvertButton_Click"  HorizontalAlignment="Right" VerticalAlignment="Bottom"/>
         <materialDesign:Snackbar MessageQueue="{materialDesign:MessageQueue}" x:Name="SnackbarToaster" />
     </Grid>
 </metro:MetroWindow>
diff --git a/Image Converter/MainWindow.xaml.cs b/Image Converter/MainWindow.xaml.cs
index 11d446b..243b344 100644
--- a/Image Converter/MainWindow.xaml.cs	
+++ b/Image Converter/MainWindow.xaml.cs	
@@ -30,11 +30,12 @@ public MainWindow() {
             InitializeComponent();
             Utilities.ImageListView = ImageList;
             Utilities.messageQueue = SnackbarToaster.MessageQueue;
+            Utilities.flyout = FlyoutControl;
         }
 
         private void SettingsButton_Click(object sender, RoutedEventArgs e) => OpenFlyout(new SettingsContent(), Properties.Resources.Settings);
         private void AboutButton_Click(object sender, RoutedEventArgs e) => OpenFlyout(new AboutContent(), Properties.Resources.About);
-        private void BugButton_Click(object sender, RoutedEventArgs e) => OpenFlyout(new BugContent(), "Bugs or Features");
+        private void BugButton_Click(object sender, RoutedEventArgs e) => OpenFlyout(new BugContent(), Properties.Resources.BugsOrFeatures);
 
         private void OpenFlyout(UserControl content, string header) {
             content.Width = FlyoutWidth;
diff --git a/Image Converter/Properties/AssemblyInfo.cs b/Image Converter/Properties/AssemblyInfo.cs
index 07802d8..c18863e 100644
--- a/Image Converter/Properties/AssemblyInfo.cs	
+++ b/Image Converter/Properties/AssemblyInfo.cs	
@@ -8,11 +8,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Image Converter")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("A simple and easy to use image converter")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("HP Inc.")]
+[assembly: AssemblyCompany("MrSquirrely.net")]
 [assembly: AssemblyProduct("Image Converter")]
-[assembly: AssemblyCopyright("Copyright © HP Inc. 2019")]
+[assembly: AssemblyCopyright("Copyright © James<MrSquirrely.net> 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/Image Converter/Properties/Resources.Designer.cs b/Image Converter/Properties/Resources.Designer.cs
index 00eadd8..f34a8db 100644
--- a/Image Converter/Properties/Resources.Designer.cs	
+++ b/Image Converter/Properties/Resources.Designer.cs	
@@ -69,6 +69,78 @@ public static string About {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to About the program.
+        /// </summary>
+        public static string AboutTooltip {
+            get {
+                return ResourceManager.GetString("AboutTooltip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Backup.
+        /// </summary>
+        public static string Backup {
+            get {
+                return ResourceManager.GetString("Backup", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Browse.
+        /// </summary>
+        public static string Browse {
+            get {
+                return ResourceManager.GetString("Browse", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Bug.
+        /// </summary>
+        public static string Bug {
+            get {
+                return ResourceManager.GetString("Bug", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Bug or Feature.
+        /// </summary>
+        public static string BugContent {
+            get {
+                return ResourceManager.GetString("BugContent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Bugs or Features.
+        /// </summary>
+        public static string BugsOrFeatures {
+            get {
+                return ResourceManager.GetString("BugsOrFeatures", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Report a Bug or request a feature.
+        /// </summary>
+        public static string BugsTooltip {
+            get {
+                return ResourceManager.GetString("BugsTooltip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Title:.
+        /// </summary>
+        public static string BugTitle {
+            get {
+                return ResourceManager.GetString("BugTitle", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Convert.
         /// </summary>
@@ -78,6 +150,24 @@ public static string Convert {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Start the conversion.
+        /// </summary>
+        public static string ConvertTooltip {
+            get {
+                return ResourceManager.GetString("ConvertTooltip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Emulate Size Of Jpeg.
+        /// </summary>
+        public static string EmulateJpeg {
+            get {
+                return ResourceManager.GetString("EmulateJpeg", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Exit.
         /// </summary>
@@ -87,6 +177,24 @@ public static string ExitMenu {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Exit the application.
+        /// </summary>
+        public static string ExitTooltip {
+            get {
+                return ResourceManager.GetString("ExitTooltip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Feature.
+        /// </summary>
+        public static string Feature {
+            get {
+                return ResourceManager.GetString("Feature", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to File.
         /// </summary>
@@ -141,6 +249,15 @@ public static string FileType {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Finished with conversion.
+        /// </summary>
+        public static string FinishedConversion {
+            get {
+                return ResourceManager.GetString("FinishedConversion", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Image Converter.
         /// </summary>
@@ -150,6 +267,15 @@ public static string ImageConverter {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Lossless.
+        /// </summary>
+        public static string Lossless {
+            get {
+                return ResourceManager.GetString("Lossless", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Open File.
         /// </summary>
@@ -159,6 +285,15 @@ public static string OpenFileMenu {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Select and image or images to use.
+        /// </summary>
+        public static string OpenFileTooltip {
+            get {
+                return ResourceManager.GetString("OpenFileTooltip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Open Folder.
         /// </summary>
@@ -168,6 +303,78 @@ public static string OpenFolderMenu {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Open a folder.
+        /// </summary>
+        public static string OpenFolderTooltip {
+            get {
+                return ResourceManager.GetString("OpenFolderTooltip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Play Sound When Finished.
+        /// </summary>
+        public static string PlaySound {
+            get {
+                return ResourceManager.GetString("PlaySound", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Quality:.
+        /// </summary>
+        public static string Quality {
+            get {
+                return ResourceManager.GetString("Quality", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Remove Alpha.
+        /// </summary>
+        public static string RemoveAlpha {
+            get {
+                return ResourceManager.GetString("RemoveAlpha", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Reset.
+        /// </summary>
+        public static string Reset {
+            get {
+                return ResourceManager.GetString("Reset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Reset the settings to default settings.
+        /// </summary>
+        public static string ResetTooltip {
+            get {
+                return ResourceManager.GetString("ResetTooltip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Save.
+        /// </summary>
+        public static string Save {
+            get {
+                return ResourceManager.GetString("Save", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Save the settings.
+        /// </summary>
+        public static string SaveTooltip {
+            get {
+                return ResourceManager.GetString("SaveTooltip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Settings.
         /// </summary>
@@ -176,5 +383,41 @@ public static string Settings {
                 return ResourceManager.GetString("Settings", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Opens the settings.
+        /// </summary>
+        public static string SettingsTooltip {
+            get {
+                return ResourceManager.GetString("SettingsTooltip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Submit.
+        /// </summary>
+        public static string SubmitBug {
+            get {
+                return ResourceManager.GetString("SubmitBug", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Submit the bug or feature request.
+        /// </summary>
+        public static string SubmitTooltip {
+            get {
+                return ResourceManager.GetString("SubmitTooltip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Use A Custom Folder.
+        /// </summary>
+        public static string UseCustomFolder {
+            get {
+                return ResourceManager.GetString("UseCustomFolder", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Image Converter/Properties/Resources.resx b/Image Converter/Properties/Resources.resx
index 4f2d02f..90e06a7 100644
--- a/Image Converter/Properties/Resources.resx	
+++ b/Image Converter/Properties/Resources.resx	
@@ -116,11 +116,9 @@
   </resheader>
   <data name="File" xml:space="preserve">
     <value>File</value>
-    <comment>menu file name</comment>
   </data>
   <data name="ImageConverter" xml:space="preserve">
     <value>Image Converter</value>
-    <comment>Title name</comment>
   </data>
   <data name="FileName" xml:space="preserve">
     <value>File Name</value>
@@ -143,9 +141,6 @@
   <data name="Settings" xml:space="preserve">
     <value>Settings</value>
   </data>
-  <data name="OpenFolderMenu" xml:space="preserve">
-    <value>Open Folder</value>
-  </data>
   <data name="OpenFileMenu" xml:space="preserve">
     <value>Open File</value>
   </data>
@@ -155,4 +150,88 @@
   <data name="About" xml:space="preserve">
     <value>About</value>
   </data>
+  <data name="OpenFolderMenu" xml:space="preserve">
+    <value>Open Folder</value>
+  </data>
+  <data name="BugsOrFeatures" xml:space="preserve">
+    <value>Bugs or Features</value>
+  </data>
+  <data name="SubmitBug" xml:space="preserve">
+    <value>Submit</value>
+  </data>
+  <data name="BugTitle" xml:space="preserve">
+    <value>Title:</value>
+  </data>
+  <data name="Bug" xml:space="preserve">
+    <value>Bug</value>
+  </data>
+  <data name="BugContent" xml:space="preserve">
+    <value>Bug or Feature</value>
+  </data>
+  <data name="Feature" xml:space="preserve">
+    <value>Feature</value>
+  </data>
+  <data name="Backup" xml:space="preserve">
+    <value>Backup</value>
+  </data>
+  <data name="UseCustomFolder" xml:space="preserve">
+    <value>Use A Custom Folder</value>
+  </data>
+  <data name="PlaySound" xml:space="preserve">
+    <value>Play Sound When Finished</value>
+  </data>
+  <data name="Browse" xml:space="preserve">
+    <value>Browse</value>
+  </data>
+  <data name="EmulateJpeg" xml:space="preserve">
+    <value>Emulate Size Of Jpeg</value>
+  </data>
+  <data name="Lossless" xml:space="preserve">
+    <value>Lossless</value>
+  </data>
+  <data name="RemoveAlpha" xml:space="preserve">
+    <value>Remove Alpha</value>
+  </data>
+  <data name="Quality" xml:space="preserve">
+    <value>Quality:</value>
+  </data>
+  <data name="Reset" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="Save" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="FinishedConversion" xml:space="preserve">
+    <value>Finished with conversion</value>
+  </data>
+  <data name="OpenFolderTooltip" xml:space="preserve">
+    <value>Open a folder</value>
+  </data>
+  <data name="OpenFileTooltip" xml:space="preserve">
+    <value>Select and image or images to use</value>
+  </data>
+  <data name="ExitTooltip" xml:space="preserve">
+    <value>Exit the application</value>
+  </data>
+  <data name="BugsTooltip" xml:space="preserve">
+    <value>Report a Bug or request a feature</value>
+  </data>
+  <data name="SettingsTooltip" xml:space="preserve">
+    <value>Opens the settings</value>
+  </data>
+  <data name="AboutTooltip" xml:space="preserve">
+    <value>About the program</value>
+  </data>
+  <data name="ConvertTooltip" xml:space="preserve">
+    <value>Start the conversion</value>
+  </data>
+  <data name="SubmitTooltip" xml:space="preserve">
+    <value>Submit the bug or feature request</value>
+  </data>
+  <data name="ResetTooltip" xml:space="preserve">
+    <value>Reset the settings to default settings</value>
+  </data>
+  <data name="SaveTooltip" xml:space="preserve">
+    <value>Save the settings</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Image Converter/Todo.cs b/Image Converter/Todo.cs
index b1afc04..e9dec3b 100644
--- a/Image Converter/Todo.cs	
+++ b/Image Converter/Todo.cs	
@@ -2,7 +2,6 @@
 
 namespace Image_Converter {
     public class Todo {
-        //Todo: Add all localization including tool-tips
         //Todo: Add WebP GIF Conversion
 
         //! In the DotNet 4.8 update you can use Windows UWP controls, so I want to see if you can use the file dialog control from there instead of using Windows API Code Pack
diff --git a/Image Converter/Views/AboutContent.xaml b/Image Converter/Views/AboutContent.xaml
index dd246ea..d0b9b5d 100644
--- a/Image Converter/Views/AboutContent.xaml	
+++ b/Image Converter/Views/AboutContent.xaml	
@@ -8,6 +8,10 @@
              mc:Ignorable="d" 
              Width="390" Height="580">
     <Grid>
-        <FlowDocumentScrollViewer Name="AboutViewer"/>
+        <Label Content="Image Convert is an easy to use image conversion utility" Margin="10,10,10,0" VerticalAlignment="Top"/>
+        <Button Name="FinishedSoundButton" Content="Finished sound is CC0 by Kenny" Style="{DynamicResource MaterialDesignToolButton}" Margin="10,41,10,0" VerticalAlignment="Top" Click="FinishedSoundButton_Click"/>
+        <Image Height="220" Margin="10,78,10,0" VerticalAlignment="Top" Source="/Image Converter;component/icon.ico"/>
+        <Label Content="Icon is CC0 by Kenny" Margin="10,303,10,0" VerticalAlignment="Top"/>
+        <Button Name="KennyLinkButton" Content="Link to Kenny" HorizontalAlignment="Left" Margin="10,334,0,0" VerticalAlignment="Top" Width="140" Click="KennyLinkButton_Click"/>
     </Grid>
 </UserControl>
diff --git a/Image Converter/Views/AboutContent.xaml.cs b/Image Converter/Views/AboutContent.xaml.cs
index ff785c8..679266d 100644
--- a/Image Converter/Views/AboutContent.xaml.cs	
+++ b/Image Converter/Views/AboutContent.xaml.cs	
@@ -1,6 +1,6 @@
-using Markdig;
-using Neo.Markdig.Xaml;
+using System.Diagnostics;
 using System.IO;
+using System.Media;
 using System.Windows.Controls;
 using System.Windows.Documents;
 
@@ -11,10 +11,13 @@ namespace Image_Converter.Views {
     public partial class AboutContent : UserControl {
         public AboutContent() {
             InitializeComponent();
+        }
 
-            string content = File.ReadAllText("README.md");
-            FlowDocument doc = MarkdownXaml.ToFlowDocument(content, new MarkdownPipelineBuilder().UseXamlSupportedExtensions().Build());
-            AboutViewer.Document = doc;
+        private void FinishedSoundButton_Click(object sender, System.Windows.RoutedEventArgs e) {
+            SoundPlayer player = new SoundPlayer("finished.wav");
+            player.Play();
         }
+
+        private void KennyLinkButton_Click(object sender, System.Windows.RoutedEventArgs e) => Process.Start("https://www.kenney.nl/");
     }
 }
diff --git a/Image Converter/Views/BugContent.xaml b/Image Converter/Views/BugContent.xaml
index ed8e27e..4db05ae 100644
--- a/Image Converter/Views/BugContent.xaml	
+++ b/Image Converter/Views/BugContent.xaml	
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Image_Converter.Views"
+             xmlns:loc="clr-namespace:Image_Converter.Properties"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
              Width="390" Height="580">
@@ -11,37 +12,29 @@
         <materialDesign:DialogHost Name="DialogHost" CloseOnClickAway="True" IsOpen="False">
             <materialDesign:DialogHost.DialogContent>
                 <Grid>
-                    <!--<Border x:Name="Custom" Padding="20">
-                        <Frame x:Name="Frame" />
-                    </Border>-->
                     <Border x:Name="Default" Padding="20">
                         <StackPanel>
                             <TextBlock x:Name="DialogTitle" Margin="10,10,10,0" MinWidth="300" MaxWidth="300"
-                                       FontSize="30" TextWrapping="Wrap" FontWeight="Bold">
-                                Why no possible timetable?
-                            </TextBlock>
+                                       FontSize="30" TextWrapping="Wrap" FontWeight="Bold"/>
                             <TextBlock x:Name="DialogMessage" Margin="10" FontSize="20" MinWidth="300"
                                        MaxWidth="300"
-                                       TextWrapping="Wrap">
-                                Please make sure you copied the correct content and is using Google Chrome
-                            </TextBlock>
+                                       TextWrapping="Wrap"/>
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
                                 <Button x:Name="DialogButton" materialDesign:ShadowAssist.ShadowDepth="Depth0"
                                         Style="{StaticResource MaterialDesignFlatButton}"
                                         Margin="10,10,0,0" HorizontalAlignment="Center" FontSize="20" Height="40"
-                                        Click="DialogButton_Click">
-                                    Right
-                                </Button>
+                                        Click="DialogButton_Click"/>
                             </StackPanel>
                         </StackPanel>
                     </Border>
                 </Grid>
             </materialDesign:DialogHost.DialogContent>
         </materialDesign:DialogHost>
-        <Label Content="Submit bug or Feature request" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top"/>
-        <Label Content="Title:" HorizontalAlignment="Left" Margin="10,41,0,0" VerticalAlignment="Top"/>
+
+        <Label Content="{x:Static loc:Resources.SubmitBug}" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top"/>
+        <Label Content="{x:Static loc:Resources.BugTitle}" HorizontalAlignment="Left" Margin="10,41,0,0" VerticalAlignment="Top"/>
         <TextBox Name="TitleContent" Height="23" Margin="10,67,10,0" TextWrapping="Wrap" Text="Example Bug Title" VerticalAlignment="Top"/>
-        <Label Content="Bug or Feature:" HorizontalAlignment="Left" Margin="10,95,0,0" VerticalAlignment="Top"/>
+        <Label Content="{x:Static loc:Resources.BugsOrFeatures}" HorizontalAlignment="Left" Margin="10,95,0,0" VerticalAlignment="Top"/>
         <RichTextBox  Margin="10,121,10,47" Background="Transparent">
             <FlowDocument>
                 <Paragraph >
@@ -49,10 +42,10 @@
                 </Paragraph>
             </FlowDocument>
         </RichTextBox>
-        <Button Name="SubmitButton" Content="Submit" HorizontalAlignment="Right" Margin="0,0,10,10" VerticalAlignment="Bottom" Width="84" Click="SubmitButton_Click"/>
+        <Button Name="SubmitButton" Content="{x:Static loc:Resources.SubmitBug}" ToolTip="{x:Static loc:Resources.SubmitTooltip}" HorizontalAlignment="Right" Margin="0,0,10,10" VerticalAlignment="Bottom" Width="84" Click="SubmitButton_Click"/>
         <ComboBox Name="IssueTypeBox" Margin="10,0,99,10" VerticalAlignment="Bottom" Height="32" SelectedIndex="0">
-            <ComboBoxItem Content="Bug"/>
-            <ComboBoxItem Content="Feature"/>
+            <ComboBoxItem Content="{x:Static loc:Resources.Bug}"/>
+            <ComboBoxItem Content="{x:Static loc:Resources.Feature}"/>
         </ComboBox>
     </Grid>
 </UserControl>
diff --git a/Image Converter/Views/BugContent.xaml.cs b/Image Converter/Views/BugContent.xaml.cs
index 9abdbd9..5f40ce4 100644
--- a/Image Converter/Views/BugContent.xaml.cs	
+++ b/Image Converter/Views/BugContent.xaml.cs	
@@ -24,7 +24,7 @@ private async void SubmitButton_Click(object sender, RoutedEventArgs e) {
                 Credentials credentials = new Credentials(Github.token);
                 client.Credentials = credentials;
 
-                NewIssue createIssue = new NewIssue(TitleContent.Text) { Body = BodyContent.Text };
+                NewIssue createIssue = new NewIssue(TitleContent.Text) { Body = $"{BodyContent.Text}\n\n-Submitted in the Image Converter application" };
                 ComboBoxItem selectedItem = (ComboBoxItem)IssueTypeBox.SelectedItem;
                 switch (selectedItem.Content) {
                     case "Bug":
@@ -40,6 +40,7 @@ private async void SubmitButton_Click(object sender, RoutedEventArgs e) {
             }else if (TitleContent.Text == "Example Bug Title") {
                 ShowError("You must change the body content.");
             }
+            Utilities.flyout.IsOpen = false;
         }
 
         private void ShowError(string message) {
diff --git a/Image Converter/Views/SettingsContent.xaml b/Image Converter/Views/SettingsContent.xaml
index 6ec9770..fccd0a1 100644
--- a/Image Converter/Views/SettingsContent.xaml	
+++ b/Image Converter/Views/SettingsContent.xaml	
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Image_Converter.Views"
+    xmlns:loc="clr-namespace:Image_Converter.Properties"
     xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
     x:Class="Image_Converter.Views.SettingsContent"
              mc:Ignorable="d" Width="390" Height="580">
@@ -11,38 +12,38 @@
         <TabControl>
             <TabItem Header="General">
                 <Grid Background="#FFE5E5E5">
-                    <CheckBox Name="GeneralBackup" Content="Backup" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top"/>
-                    <CheckBox Name="GeneralUseCustomFolder" Content="Use Custom Folder" Margin="94,10,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
-                    <TextBox Name="GeneralCustomFolder" HorizontalAlignment="Left" Height="23" Margin="10,33,0,0" TextWrapping="Wrap" Text="BACKUP" VerticalAlignment="Top" Width="276"/>
-                    <Button Name="GernalBrowseButton" Content="Browse" Style="{DynamicResource MaterialDesignToolButton}" HorizontalAlignment="Left" Margin="291,33,0,0" VerticalAlignment="Top" Width="83" Height="23" Click="GernalBrowseButton_Click"/>
-                    <CheckBox Name="GeneralPlaySound" Content="Play Sound When Finished" HorizontalAlignment="Left" Margin="10,61,0,0" VerticalAlignment="Top"/>
+                    <CheckBox Name="GeneralBackup" Content="{x:Static loc:Resources.Backup}" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top"/>
+                    <CheckBox Name="GeneralUseCustomFolder" Content="{x:Static loc:Resources.UseCustomFolder}" Margin="10,33,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                    <TextBox Name="GeneralCustomFolder" Height="23" Margin="10,79,10,0" TextWrapping="Wrap" Text="BACKUP" VerticalAlignment="Top"/>
+                    <Button Name="GernalBrowseButton" Content="{x:Static loc:Resources.Browse}" Style="{DynamicResource MaterialDesignToolButton}" HorizontalAlignment="Right" Margin="0,107,10,0" VerticalAlignment="Top" Width="83" Height="23" Click="GernalBrowseButton_Click"/>
+                    <CheckBox Name="GeneralPlaySound" Content="{x:Static loc:Resources.PlaySound}" HorizontalAlignment="Left" Margin="10,56,0,0" VerticalAlignment="Top"/>
                 </Grid>
             </TabItem>
             <TabItem Header="WebP">
                 <Grid Background="#FFE5E5E5">
-                    <CheckBox Name="WebPLosses" Content="Lossless" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" IsChecked="True"/>
-                    <CheckBox Name="WebPEmulateJpeg" Content="Emulate Size Of Jpeg" HorizontalAlignment="Left" Margin="105,10,0,0" VerticalAlignment="Top"/>
-                    <CheckBox Name="WebPRemoveAlpha" Content="Remove Alpha" HorizontalAlignment="Left" Margin="261,10,0,0" VerticalAlignment="Top"/>
-                    <Label Content="Quality:" HorizontalAlignment="Left" Margin="10,33,0,0" VerticalAlignment="Top"/>
-                    <mah:NumericUpDown Name="WebPQuality" HorizontalAlignment="Left" Height="23" Margin="65,34,0,0" Minimum="1" Maximum="100" Value="80" VerticalAlignment="Top" Width="70"  />
+                    <CheckBox Name="WebPLosses" Content="{x:Static loc:Resources.Lossless}" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" IsChecked="True"/>
+                    <CheckBox Name="WebPEmulateJpeg" Content="{x:Static loc:Resources.EmulateJpeg}" HorizontalAlignment="Left" Margin="10,33,0,0" VerticalAlignment="Top"/>
+                    <CheckBox Name="WebPRemoveAlpha" Content="{x:Static loc:Resources.RemoveAlpha}" HorizontalAlignment="Left" Margin="10,56,0,0" VerticalAlignment="Top"/>
+                    <Label Content="{x:Static loc:Resources.Quality}" HorizontalAlignment="Left" Margin="10,79,0,0" VerticalAlignment="Top"/>
+                    <mah:NumericUpDown Name="WebPQuality" HorizontalAlignment="Left" Height="23" Margin="65,79,0,0" Minimum="1" Maximum="100" Value="80" VerticalAlignment="Top" Width="70"  />
                 </Grid>
             </TabItem>
             <TabItem Header="Jpeg">
                 <Grid Background="#FFE5E5E5">
-                    <Label Content="Quality:" HorizontalAlignment="Left" Margin="10,9,0,0" VerticalAlignment="Top"/>
+                    <Label Content="{x:Static loc:Resources.Quality}" HorizontalAlignment="Left" Margin="10,9,0,0" VerticalAlignment="Top"/>
                     <mah:NumericUpDown Name="JpegQuality" HorizontalAlignment="Left" Height="23" Margin="65,10,0,0" Minimum="1" Maximum="100" Value="80" VerticalAlignment="Top" Width="70" />
                 </Grid>
             </TabItem>
             <TabItem Header="Png">
                 <Grid Background="#FFE5E5E5">
-                    <CheckBox Name="PngLossess" Content="Lossless" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" IsChecked="True"/>
-                    <CheckBox Name="PngRemoveAlpha" Content="Remove Alpha" HorizontalAlignment="Left" Margin="109,10,0,0" VerticalAlignment="Top"/>
-                    <Label Content="Quality:" HorizontalAlignment="Left" Margin="10,33,0,0" VerticalAlignment="Top"/>
-                    <mah:NumericUpDown Name="PngQuality" HorizontalAlignment="Left" Height="23" Margin="65,34,0,0" Minimum="1" Maximum="100" Value="80" VerticalAlignment="Top" Width="70" />
+                    <CheckBox Name="PngLossess" Content="{x:Static loc:Resources.Lossless}" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" IsChecked="True"/>
+                    <CheckBox Name="PngRemoveAlpha" Content="{x:Static loc:Resources.RemoveAlpha}" HorizontalAlignment="Left" Margin="10,33,0,0" VerticalAlignment="Top"/>
+                    <Label Content="{x:Static loc:Resources.Quality}" HorizontalAlignment="Left" Margin="10,56,0,0" VerticalAlignment="Top"/>
+                    <mah:NumericUpDown Name="PngQuality" HorizontalAlignment="Left" Height="23" Margin="65,56,0,0" Minimum="1" Maximum="100" Value="80" VerticalAlignment="Top" Width="70" />
                 </Grid>
             </TabItem>
         </TabControl>
-        <Button Name="SaveButton" Content="Save" HorizontalAlignment="Right" Margin="0,0,10,10" VerticalAlignment="Bottom" Width="75" Click="SaveButton_Click"/>
-        <Button Name="ResetButton" Content="Reset" HorizontalAlignment="Left" Margin="10,0,0,10" VerticalAlignment="Bottom" Width="75" Click="ResetButton_Click"/>
+        <Button Name="SaveButton" Content="{x:Static loc:Resources.Save}" ToolTip="{x:Static loc:Resources.SaveTooltip}" HorizontalAlignment="Right" Margin="0,0,10,10" VerticalAlignment="Bottom" Width="75" Click="SaveButton_Click"/>
+        <Button Name="ResetButton" Content="{x:Static loc:Resources.Reset}" ToolTip="{x:Static loc:Resources.ResetTooltip}" HorizontalAlignment="Left" Margin="10,0,0,10" VerticalAlignment="Bottom" Width="75" Click="ResetButton_Click"/>
     </Grid>
 </UserControl>
diff --git a/Image Converter/Views/SettingsContent.xaml.cs b/Image Converter/Views/SettingsContent.xaml.cs
index bdaeb91..05861d5 100644
--- a/Image Converter/Views/SettingsContent.xaml.cs	
+++ b/Image Converter/Views/SettingsContent.xaml.cs	
@@ -1,4 +1,5 @@
-using Microsoft.WindowsAPICodePack.Dialogs;
+using Image_Converter.Code;
+using Microsoft.WindowsAPICodePack.Dialogs;
 using System;
 using System.Windows;
 using System.Windows.Controls;
@@ -57,6 +58,8 @@ private void SaveButton_Click(object sender, RoutedEventArgs e) {
             Properties.Settings.Default.Png_Quality = (int)PngQuality.Value;
             //! Save the settings
             Properties.Settings.Default.Save();
+
+            Utilities.flyout.IsOpen = false;
         }
 
         private void ResetButton_Click(object sender, RoutedEventArgs e) {
diff --git a/Image Converter/icon.ico b/Image Converter/icon.ico
new file mode 100644
index 0000000..1dec31b
Binary files /dev/null and b/Image Converter/icon.ico differ
diff --git a/Image Converter/packages.config b/Image Converter/packages.config
index e1ee7ab..b05ea4c 100644
--- a/Image Converter/packages.config	
+++ b/Image Converter/packages.config	
@@ -3,13 +3,11 @@
   <package id="ControlzEx" version="3.0.2.4" targetFramework="net48" />
   <package id="Magick.NET-Q16-AnyCPU" version="7.12.0" targetFramework="net472" />
   <package id="MahApps.Metro" version="1.6.5" targetFramework="net48" />
-  <package id="Markdig" version="0.16.0" targetFramework="net472" />
   <package id="MaterialDesignColors" version="1.1.3" targetFramework="net48" />
   <package id="MaterialDesignThemes" version="2.5.1" targetFramework="net48" />
   <package id="MaterialDesignThemes.MahApps" version="0.0.12" targetFramework="net48" />
   <package id="Microsoft-WindowsAPICodePack-Core" version="1.1.3.3" targetFramework="net472" />
   <package id="Microsoft-WindowsAPICodePack-Shell" version="1.1.3.3" targetFramework="net472" />
-  <package id="Neo.Markdig.Xaml" version="1.0.5" targetFramework="net472" />
   <package id="NLog" version="4.6.2" targetFramework="net472" />
   <package id="Octokit" version="0.32.0" targetFramework="net472" />
 </packages>
\ No newline at end of file