From d4ca2bd5192fbe021d00347ac853c4c0663f171d Mon Sep 17 00:00:00 2001
From: Alkalinee <vincent.griebel@yahoo.de>
Date: Sun, 22 Mar 2015 00:55:54 +0100
Subject: [PATCH] Code cleanup

---
 .../WindowSkins/WindowAdvancedView.xaml       | 13 ++--
 .../WindowSkins/WindowSmartView.xaml          |  2 +-
 .../WindowSkins/WindowSmartView.xaml.cs       |  6 +-
 .../Extensions/ContentControlExtensions.cs    | 64 +++++++++++++++++++
 .../TextWithHyperlinkParametersConverter.cs   | 42 ------------
 Hurricane/Hurricane.csproj                    |  4 +-
 Hurricane/Views/EqualizerWindow.xaml          |  4 +-
 Hurricane/Views/EqualizerWindow.xaml.cs       | 32 ++++------
 Hurricane/Views/FolderImportWindow.xaml       |  8 +--
 Hurricane/Views/InputDialog.xaml              |  8 +--
 Hurricane/Views/InputDialog.xaml.cs           | 22 +++----
 Hurricane/Views/ProgressWindow.xaml           |  4 +-
 Hurricane/Views/ProgressWindow.xaml.cs        | 16 ++---
 Hurricane/Views/ReportExceptionWindow.xaml    |  8 +--
 Hurricane/Views/ReportExceptionWindow.xaml.cs | 11 ++--
 Hurricane/Views/TagEditorWindow.xaml          |  6 +-
 Hurricane/Views/TagEditorWindow.xaml.cs       | 19 +++---
 Hurricane/Views/TrackImportWindow.xaml        | 10 +--
 Hurricane/Views/TrackImportWindow.xaml.cs     |  9 ++-
 Hurricane/Views/TrackInformationWindow.xaml   | 19 +++---
 Hurricane/Views/UpdateWindow.xaml             | 18 +++---
 Hurricane/Views/UpdateWindow.xaml.cs          | 13 ++--
 Hurricane/Views/UserControls/AboutView.xaml   | 42 ++++++------
 .../Views/UserControls/SettingsView.xaml      | 15 ++---
 Setup/HurricaneSetup.iss                      |  2 +-
 release-notes/0.3.6.md                        |  3 +-
 26 files changed, 204 insertions(+), 196 deletions(-)
 create mode 100644 Hurricane/Extensions/ContentControlExtensions.cs
 delete mode 100644 Hurricane/Extensions/Converter/TextWithHyperlinkParametersConverter.cs

diff --git a/Hurricane/AppMainWindow/WindowSkins/WindowAdvancedView.xaml b/Hurricane/AppMainWindow/WindowSkins/WindowAdvancedView.xaml
index 3bf2e61..3a300fd 100644
--- a/Hurricane/AppMainWindow/WindowSkins/WindowAdvancedView.xaml
+++ b/Hurricane/AppMainWindow/WindowSkins/WindowAdvancedView.xaml
@@ -113,14 +113,14 @@
                             </MenuItem.Style>
                         </MenuItem>
                     </Menu>
-                    <TextBox Grid.ColumnSpan="4" Margin="0,0,10,0" x:Name="txtSearch" VerticalAlignment="Center" controls:TextBoxHelper.ClearTextButton="True" HorizontalAlignment="Right" Width="200" controls:TextBoxHelper.Watermark="{StaticResource Search}" Text="{Binding MusicManager.SelectedPlaylist.SearchText,UpdateSourceTrigger=PropertyChanged}"/>
+                    <TextBox Grid.ColumnSpan="4" Margin="0,0,10,0" VerticalAlignment="Center" controls:TextBoxHelper.ClearTextButton="True" HorizontalAlignment="Right" Width="200" controls:TextBoxHelper.Watermark="{StaticResource Search}" Text="{Binding MusicManager.SelectedPlaylist.SearchText,UpdateSourceTrigger=PropertyChanged}"/>
                     <ListBox Grid.Row="1" DisplayMemberPath="Name" SelectedItem="{Binding MusicManager.SelectedPlaylist}" Margin="5" ItemsSource="{Binding MusicManager.Playlists}" Background="Transparent"
                              dd:DragDrop.IsDragSource="True" dd:DragDrop.IsDropTarget="True" dd:DragDrop.DropHandler="{Binding PlaylistListDropHandler}" dd:DragDrop.DragAdornerTemplate="{StaticResource DragAdornerPlaylist}" dd:DragDrop.DefaultDragAdornerOpacity=".8" ScrollViewer.HorizontalScrollBarVisibility="Hidden">
                         <ListBox.InputBindings>
                             <KeyBinding Key="Delete" Command="{Binding RemovePlaylist}"/>
                         </ListBox.InputBindings>
                         <ListBox.Resources>
-                            <ContextMenu x:Key="contexmenu">
+                            <ContextMenu x:Key="PlaylistContextMenu">
                                 <MenuItem IsEnabled="False" Foreground="{StaticResource BlackBrush}">
                                     <MenuItem.Resources>
                                         <converter:PlaylistInfoConverter x:Key="PlaylistInfoConverter"/>
@@ -155,12 +155,12 @@
                         </ListBox.Resources>
                         <ListBox.ItemContainerStyle>
                             <Style TargetType="ListBoxItem" BasedOn="{StaticResource MetroListBoxItem}">
-                                <Setter Property="ContextMenu" Value="{StaticResource contexmenu}"/>
+                                <Setter Property="ContextMenu" Value="{StaticResource PlaylistContextMenu}"/>
                             </Style>
                         </ListBox.ItemContainerStyle>
                     </ListBox>
                     <Rectangle Grid.Column="1" Width="1" Fill="Gray" Grid.Row="1"/>
-                    <Grid Grid.Column="2" Margin="5" x:Name="gridplaylist" Grid.Row="1">
+                    <Grid Grid.Column="2" Margin="5" Grid.Row="1">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="*"/>
                             <RowDefinition Height="auto"/>
@@ -195,6 +195,7 @@
                                             <Separator />
                                             <MenuItem Header="{DynamicResource Remove}" Command="{Binding RemoveSelectedTracks}" CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type hurricaneControls:AnimatedListView}}, Path=SelectedItems}" InputGestureText="{DynamicResource Del}"/>
                                         </ContextMenu>
+                                        
                                         <ContextMenu x:Key="StreamContextMenu">
                                             <MenuItem Header="{DynamicResource Play}" Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListView}}, Path=DataContext.MusicManager.Commands.PlaySelectedTrack}" InputGestureText="Enter"/>
                                             <Separator />
@@ -670,7 +671,7 @@
                         </Grid.RowDefinitions>
                         <Grid Height="69" Margin="0,3,0,3">
                             <Grid.Resources>
-                                <ContextMenu x:Key="contextMenu">
+                                <ContextMenu x:Key="NotAddedStreamContextMenu">
                                     <MenuItem Header="{DynamicResource AddToExistingPlaylist}" ItemsSource="{Binding MusicManager.Playlists}">
                                         <MenuItem.ItemContainerStyle>
                                             <Style TargetType="MenuItem" BasedOn="{StaticResource MetroMenuItem}">
@@ -690,7 +691,7 @@
                             <Grid.Style>
                                 <Style TargetType="Grid">
                                     <Setter Property="Visibility" Value="Visible"/>
-                                    <Setter Property="ContextMenu" Value="{StaticResource contextMenu}"/>
+                                    <Setter Property="ContextMenu" Value="{StaticResource NotAddedStreamContextMenu}"/>
                                     <Setter Property="Background" Value="{StaticResource WhiteBrush}"/>
                                     <Style.Triggers>
                                         <DataTrigger Binding="{Binding TrackSearcher.PlaylistResult}" Value="{x:Null}">
diff --git a/Hurricane/AppMainWindow/WindowSkins/WindowSmartView.xaml b/Hurricane/AppMainWindow/WindowSkins/WindowSmartView.xaml
index 1c455fa..e8d64b2 100644
--- a/Hurricane/AppMainWindow/WindowSkins/WindowSmartView.xaml
+++ b/Hurricane/AppMainWindow/WindowSkins/WindowSmartView.xaml
@@ -69,7 +69,7 @@
                 </Button>
             </Grid>
             <DockPanel Grid.Row="1" Margin="5,5,0,0" Visibility="{Binding MusicManager.CSCoreEngine.CurrentTrack,Converter={StaticResource CollapsedOnNullValue}}">
-                <Polygon Points="0,0 8,5, 0,10" Stroke="{StaticResource AccentColorBrush}" StrokeThickness="2" VerticalAlignment="Center" Margin="0,2,0,0" x:Name="polyplay"/>
+                <Polygon Points="0,0 8,5, 0,10" Stroke="{StaticResource AccentColorBrush}" StrokeThickness="2" VerticalAlignment="Center" Margin="0,2,0,0" x:Name="PlayPolygon"/>
                 <Grid Margin="5,0,5,0" VerticalAlignment="Center" MouseEnter="Grid_MouseEnter" MouseLeave="Grid_MouseLeave" Background="{StaticResource WhiteBrush}">
                     <controls:TransitioningContentControl Transition="Down" x:Name="TitleTransitioningControl" mahAppsExtensions:TransitioningExtensions.DisplayText="{Binding MusicManager.CSCoreEngine.CurrentTrack}">
                         <controls:TransitioningContentControl.InputBindings>
diff --git a/Hurricane/AppMainWindow/WindowSkins/WindowSmartView.xaml.cs b/Hurricane/AppMainWindow/WindowSkins/WindowSmartView.xaml.cs
index 7ac8903..2775088 100644
--- a/Hurricane/AppMainWindow/WindowSkins/WindowSmartView.xaml.cs
+++ b/Hurricane/AppMainWindow/WindowSkins/WindowSmartView.xaml.cs
@@ -6,10 +6,8 @@
 using System.Windows.Media.Animation;
 using System.Windows.Shapes;
 using AudioVisualisation;
-using Hurricane.Music;
 using Hurricane.Utilities;
 using Hurricane.ViewModels;
-using WPFSoundVisualizationLib;
 
 namespace Hurricane.AppMainWindow.WindowSkins
 {
@@ -43,14 +41,14 @@ private void Grid_MouseEnter(object sender, MouseEventArgs e)
         {
             var textBlock = TitleTransitioningControl.Content as TextBlock;
             if (textBlock == null) return;
-            CurrentTrackAnimation(textBlock, polyplay, true);
+            CurrentTrackAnimation(textBlock, PlayPolygon, true);
         }
 
         private void Grid_MouseLeave(object sender, MouseEventArgs e)
         {
             var textBlock = TitleTransitioningControl.Content as TextBlock;
             if (textBlock == null) return;
-            CurrentTrackAnimation(textBlock, polyplay, false);
+            CurrentTrackAnimation(textBlock, PlayPolygon, false);
         }
 
         private void CurrentTrackAnimation(TextBlock txt, Polygon poly, bool inAnimate)
diff --git a/Hurricane/Extensions/ContentControlExtensions.cs b/Hurricane/Extensions/ContentControlExtensions.cs
new file mode 100644
index 0000000..9e3fe6e
--- /dev/null
+++ b/Hurricane/Extensions/ContentControlExtensions.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Diagnostics;
+using System.Text.RegularExpressions;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace Hurricane.Extensions
+{
+    class ContentControlExtensions
+    {
+        public static readonly DependencyProperty FormattedContentProperty = DependencyProperty.RegisterAttached(
+            "FormattedContent", typeof (string), typeof (ContentControlExtensions), new PropertyMetadata(default(string), PropertyChangedCallback));
+
+        private static void PropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
+        {
+            var contentControl = dependencyObject as ContentControl;
+            if (contentControl == null) return;
+
+            var textBlock = new TextBlock();
+            var values = GetFormatValues(contentControl);
+
+            int counter = 0;
+            foreach (var item in Regex.Split(dependencyPropertyChangedEventArgs.NewValue.ToString(), @"\{.\}"))
+            {
+                textBlock.Inlines.Add(new Run(item));
+
+                if (values.Length - 1 < counter) continue;
+                string[] sSplit = values[counter].Split('$');
+                string text = sSplit[0];
+                string url = sSplit[1];
+
+                var hyperlink = new Hyperlink(new Run(text)) { NavigateUri = new Uri(url) };
+                hyperlink.RequestNavigate += (s, e) => { Process.Start(e.Uri.AbsoluteUri); };
+                textBlock.Inlines.Add(hyperlink);
+                counter++;
+            }
+            contentControl.Content = textBlock;
+        }
+
+        public static void SetFormattedContent(DependencyObject element, string value)
+        {
+            element.SetValue(FormattedContentProperty, value);
+        }
+
+        public static string GetFormattedContent(DependencyObject element)
+        {
+            return (string) element.GetValue(FormattedContentProperty);
+        }
+
+        public static readonly DependencyProperty FormatValuesProperty = DependencyProperty.RegisterAttached(
+            "FormatValues", typeof (string[]), typeof (ContentControlExtensions), new PropertyMetadata(default(string[])));
+
+        public static void SetFormatValues(DependencyObject element, string[] value)
+        {
+            element.SetValue(FormatValuesProperty, value);
+        }
+
+        public static string[] GetFormatValues(DependencyObject element)
+        {
+            return (string[]) element.GetValue(FormatValuesProperty);
+        }
+    }
+}
diff --git a/Hurricane/Extensions/Converter/TextWithHyperlinkParametersConverter.cs b/Hurricane/Extensions/Converter/TextWithHyperlinkParametersConverter.cs
deleted file mode 100644
index 9f2d1fc..0000000
--- a/Hurricane/Extensions/Converter/TextWithHyperlinkParametersConverter.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.Text.RegularExpressions;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-
-namespace Hurricane.Extensions.Converter
-{
-    class TextWithHyperlinkParametersConverter : IMultiValueConverter
-    {
-
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            TextBlock textblock = new TextBlock();
-            string stringtoformat = values[0].ToString();
-
-            int counter = 0;
-            foreach (var item in Regex.Split(stringtoformat, @"\{.\}"))
-            {
-                counter++;
-                textblock.Inlines.Add(new Run(item));
-
-                if (values.Length - 1 < counter) continue;
-                string[] sSplit = values[counter].ToString().Split('$');
-                string text = sSplit[0];
-                string url = sSplit[1];
-
-                Hyperlink hyperlink = new Hyperlink(new Run(text)) { NavigateUri = new Uri(url) };
-                hyperlink.RequestNavigate += (s, e) => { Process.Start(e.Uri.AbsoluteUri); };
-                textblock.Inlines.Add(hyperlink);
-            }
-            return textblock;
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Hurricane/Hurricane.csproj b/Hurricane/Hurricane.csproj
index 967effb..a4cb5d1 100644
--- a/Hurricane/Hurricane.csproj
+++ b/Hurricane/Hurricane.csproj
@@ -197,6 +197,7 @@
     <Compile Include="Extensions\Converter\InvertBooleanConverter.cs" />
     <Compile Include="Extensions\Converter\MillisecondsToStringConverter.cs" />
     <Compile Include="Extensions\Converter\PlaylistInfoConverter.cs" />
+    <Compile Include="Extensions\ContentControlExtensions.cs" />
     <Compile Include="Extensions\MahApps\TransitioningExtensions.cs" />
     <Compile Include="Extensions\Controls\SliderWhichMakesMoves.cs" />
     <Compile Include="Extensions\TextBlockTextFormat.cs" />
@@ -228,9 +229,6 @@
     <Compile Include="Extensions\Converter\PlaceholderConverter.cs" />
     <Compile Include="Extensions\Converter\TimeSpanProgressConverter.cs" />
     <Compile Include="Extensions\Converter\StringArrayToStringConverter.cs" />
-    <Compile Include="Extensions\Converter\TextWithHyperlinkParametersConverter.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Extensions\Converter\TimespanToMinutesSeconds.cs" />
     <Compile Include="Extensions\GridViewSort.cs" />
     <Compile Include="Extensions\Controls\VectorMenuItem.cs" />
diff --git a/Hurricane/Views/EqualizerWindow.xaml b/Hurricane/Views/EqualizerWindow.xaml
index d8e930c..2d6cbce 100644
--- a/Hurricane/Views/EqualizerWindow.xaml
+++ b/Hurricane/Views/EqualizerWindow.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
-        xmlns:UserControls="clr-namespace:Hurricane.Views.UserControls"
+        xmlns:userControls="clr-namespace:Hurricane.Views.UserControls"
         Title="Equalizer" Height="200" SizeToContent="Width" Width="300" Top="20" IsWindowDraggable="False" ShowInTaskbar="False" ShowTitleBar="False" ShowCloseButton="False" ShowMinButton="False" ShowMaxRestoreButton="False" ShowIconOnTitleBar="False" GlowBrush="{StaticResource AccentColorBrush}" ResizeMode="NoResize">
-    <UserControls:EqualizerView WantClose="EqualizerView_OnWantClose" ItemSpace="5"/>
+    <userControls:EqualizerView WantClose="EqualizerView_OnWantClose" ItemSpace="5"/>
 </controls:MetroWindow>
diff --git a/Hurricane/Views/EqualizerWindow.xaml.cs b/Hurricane/Views/EqualizerWindow.xaml.cs
index c214bbe..6d0a168 100644
--- a/Hurricane/Views/EqualizerWindow.xaml.cs
+++ b/Hurricane/Views/EqualizerWindow.xaml.cs
@@ -2,30 +2,27 @@
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Media.Animation;
-using Hurricane.Music;
 using Hurricane.Utilities;
 using Hurricane.Utilities.Native;
-using Hurricane.Views.UserControls;
-using MahApps.Metro.Controls;
 
 namespace Hurricane.Views
 {
     /// <summary>
     /// Interaction logic for EqualizerWindow.xaml
     /// </summary>
-    public partial class EqualizerWindow : MetroWindow
+    public partial class EqualizerWindow
     {
         public event EventHandler BeginCloseAnimation;
 
         public EqualizerWindow(RECT rect, double width)
         {
             InitializeComponent();
-            this.SetPosition(rect, width);
-            this.Closing += EqualizerWindow_Closing;
+            SetPosition(rect, width);
+            Closing += EqualizerWindow_Closing;
         }
 
-        bool _isClosing = false;
-        bool _canClose = false;
+        bool _isClosing;
+        bool _canClose;
         void EqualizerWindow_Closing(object sender, CancelEventArgs e)
         {
             if (!_canClose)
@@ -35,12 +32,12 @@ void EqualizerWindow_Closing(object sender, CancelEventArgs e)
                 {
                     _isClosing = true;
                     Storyboard story = new Storyboard();
-                    DoubleAnimation doubleanimation = new DoubleAnimation(IsLeft ? this.Left - 25 : this.Left + 25, TimeSpan.FromMilliseconds(100));
+                    DoubleAnimation doubleanimation = new DoubleAnimation(_isLeft ? Left - 25 : Left + 25, TimeSpan.FromMilliseconds(100));
                     Storyboard.SetTargetProperty(doubleanimation, new PropertyPath(LeftProperty));
                     Storyboard.SetTarget(doubleanimation, this);
                     story.Children.Add(doubleanimation);
 
-                    story.Completed += (s, es) => { _canClose = true; this.Close(); };
+                    story.Completed += (s, es) => { _canClose = true; Close(); };
                     story.Begin(this);
 
                     if (BeginCloseAnimation != null) BeginCloseAnimation(this, EventArgs.Empty);
@@ -48,26 +45,25 @@ void EqualizerWindow_Closing(object sender, CancelEventArgs e)
             }
         }
 
-        protected const double width = 300; //the widht of this window. we can't use this.ActualWidth because the window isn't always initialized
-        protected bool IsLeft;
+        private bool _isLeft;
         public void SetPosition(RECT parentRecantgle, double windowWidth)
         {
-            this.Top = parentRecantgle.top + 25;
+            Top = parentRecantgle.top + 25;
             if (parentRecantgle.left + windowWidth + windowWidth - WpfScreen.MostRightX > 0) //If left from the parent isn't 300 space
             {
-                this.Left = parentRecantgle.left - windowWidth;
-                IsLeft = false;
+                Left = parentRecantgle.left - windowWidth;
+                _isLeft = false;
             }
             else
             {
-                this.Left = parentRecantgle.left + windowWidth;
-                IsLeft = true;
+                Left = parentRecantgle.left + windowWidth;
+                _isLeft = true;
             }
         }
 
         private void EqualizerView_OnWantClose(object sender, EventArgs e)
         {
-            this.Close();
+            Close();
         }
     }
 }
\ No newline at end of file
diff --git a/Hurricane/Views/FolderImportWindow.xaml b/Hurricane/Views/FolderImportWindow.xaml
index a53a67a..8d1b314 100644
--- a/Hurricane/Views/FolderImportWindow.xaml
+++ b/Hurricane/Views/FolderImportWindow.xaml
@@ -4,7 +4,7 @@
         xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls" 
         xmlns:converter="clr-namespace:Hurricane.Extensions.Converter"
         xmlns:extensions="clr-namespace:Hurricane.Extensions"
-        Title="{StaticResource AddDirectories}" SizeToContent="Height" Width="400" ResizeMode="NoResize" ShowInTaskbar="False" x:Name="window" WindowStartupLocation="CenterOwner" GlowBrush="{DynamicResource AccentColorBrush}">
+        Title="{StaticResource AddDirectories}" SizeToContent="Height" Width="400" ResizeMode="NoResize" ShowInTaskbar="False" x:Name="BaseWindow" WindowStartupLocation="CenterOwner" GlowBrush="{DynamicResource AccentColorBrush}">
     <Window.Resources>
         <converter:FalseOnEmptyString x:Key="FalseOnEmptyString"/>
     </Window.Resources>
@@ -14,10 +14,10 @@
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
-            <TextBox Margin="0,0,10,0" IsReadOnly="True" Text="{Binding ElementName=window,Path=SelectedPath}" x:Name="txt"/>
+            <TextBox Margin="0,0,10,0" IsReadOnly="True" Text="{Binding ElementName=BaseWindow,Path=SelectedPath}" x:Name="PathTextBox"/>
             <Button Grid.Column="1" Content="..." Width="30" Click="Button_Click"/>
         </Grid>
-        <CheckBox Margin="0,10,0,0" Content="{StaticResource IncludeSubfolder}" IsChecked="{Binding ElementName=window,Path=IncludeSubfolder}"/>
+        <CheckBox Margin="0,10,0,0" Content="{StaticResource IncludeSubfolder}" IsChecked="{Binding ElementName=BaseWindow,Path=IncludeSubfolder}"/>
         <Grid Grid.IsSharedSizeScope="True" Margin="0,10,0,0" HorizontalAlignment="Right">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition SharedSizeGroup="Buttons"/>
@@ -25,7 +25,7 @@
                 <ColumnDefinition SharedSizeGroup="Buttons"/>
             </Grid.ColumnDefinitions>
             <Button Grid.Column="0" Content="{StaticResource Cancel}" extensions:ButtonHelper.DialogResult="False"/>
-            <Button Grid.Column="2" Content="{StaticResource Add}" IsEnabled="{Binding ElementName=txt,Path=Text,Converter={StaticResource FalseOnEmptyString}}" extensions:ButtonHelper.DialogResult="True"/>
+            <Button Grid.Column="2" Content="{StaticResource Add}" IsEnabled="{Binding ElementName=PathTextBox,Path=Text,Converter={StaticResource FalseOnEmptyString}}" extensions:ButtonHelper.DialogResult="True"/>
         </Grid>
     </StackPanel>
 </controls:MetroWindow>
diff --git a/Hurricane/Views/InputDialog.xaml b/Hurricane/Views/InputDialog.xaml
index ece8c07..265b9b9 100644
--- a/Hurricane/Views/InputDialog.xaml
+++ b/Hurricane/Views/InputDialog.xaml
@@ -4,15 +4,15 @@
         xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
         xmlns:converter="clr-namespace:Hurricane.Extensions.Converter"
         xmlns:ex="clr-namespace:Hurricane.Extensions"
-        Title="" SizeToContent="Height" Width="300" GlowBrush="{StaticResource AccentColorBrush}" ResizeMode="NoResize" x:Name="window" WindowStartupLocation="CenterOwner" FocusManager.FocusedElement="{Binding ElementName=txt}" ShowIconOnTitleBar="False">
+        Title="" SizeToContent="Height" Width="300" GlowBrush="{StaticResource AccentColorBrush}" ResizeMode="NoResize" x:Name="BaseWindow" WindowStartupLocation="CenterOwner" FocusManager.FocusedElement="{Binding ElementName=txt}" ShowIconOnTitleBar="False">
     <Window.Resources>
         <converter:FalseOnEmptyString x:Key="FalseOnEmptyString"/>
     </Window.Resources>
     <StackPanel Margin="10">
-        <TextBlock Text="" x:Name="txtMessage"/>
-        <TextBox Margin="0,5,0,0" Text="{Binding ElementName=window,Path=ResultText}" x:Name="txt"/>
+        <TextBlock Text="" x:Name="MessageTextBlock"/>
+        <TextBox Margin="0,5,0,0" Text="{Binding ElementName=BaseWindow,Path=ResultText}" x:Name="ResultTextBox"/>
         <StackPanel Orientation="Horizontal" Margin="0,10,0,0" HorizontalAlignment="Center">
-            <Button ex:ButtonHelper.DialogResult="true" IsEnabled="{Binding ElementName=txt,Path=Text,Converter={StaticResource FalseOnEmptyString}}" IsDefault="True" x:Name="btnOK"/>
+            <Button ex:ButtonHelper.DialogResult="true" IsEnabled="{Binding ElementName=ResultTextBox,Path=Text,Converter={StaticResource FalseOnEmptyString}}" IsDefault="True" x:Name="OkButton"/>
             <Button Content="{StaticResource Cancel}" ex:ButtonHelper.DialogResult="false" Margin="10,0,0,0" IsCancel="True"/>
         </StackPanel>
     </StackPanel>
diff --git a/Hurricane/Views/InputDialog.xaml.cs b/Hurricane/Views/InputDialog.xaml.cs
index ba94da5..0699236 100644
--- a/Hurricane/Views/InputDialog.xaml.cs
+++ b/Hurricane/Views/InputDialog.xaml.cs
@@ -1,13 +1,11 @@
-using System;
-using System.ComponentModel;
-using MahApps.Metro.Controls;
+using System.ComponentModel;
 
 namespace Hurricane.Views
 {
     /// <summary>
     /// Interaction logic for CreateNewPlaylistWindow.xaml
     /// </summary>
-    public partial class InputDialog : MetroWindow, INotifyPropertyChanged
+    public partial class InputDialog : INotifyPropertyChanged
     {
         public InputDialog()
         {
@@ -17,15 +15,15 @@ public InputDialog()
         public InputDialog(string title, string message, string buttonoktext, string defaulttext)
             : this()
         {
-            this.ResultText = defaulttext;
-            this.Title = title;
-            this.txtMessage.Text = message;
-            this.btnOK.Content = buttonoktext;
-            this.txt.SelectAll();
+            ResultText = defaulttext;
+            Title = title;
+            MessageTextBlock.Text = message;
+            OkButton.Content = buttonoktext;
+            ResultTextBox.SelectAll();
         }
 
-        private String _resulttext;
-        public String ResultText
+        private string _resulttext;
+        public string ResultText
         {
             get { return _resulttext; }
             set
@@ -34,9 +32,7 @@ public String ResultText
                 {
                     _resulttext = value;
                     if (PropertyChanged != null)
-                    {
                         PropertyChanged(this, new PropertyChangedEventArgs("ResultText"));
-                    }
                 }
             }
         }
diff --git a/Hurricane/Views/ProgressWindow.xaml b/Hurricane/Views/ProgressWindow.xaml
index 64e41fa..0a3d161 100644
--- a/Hurricane/Views/ProgressWindow.xaml
+++ b/Hurricane/Views/ProgressWindow.xaml
@@ -4,7 +4,7 @@
         xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
         Title="ProgressWindow" SizeToContent="Height" Width="300" WindowStartupLocation="CenterOwner" ResizeMode="NoResize" GlowBrush="{DynamicResource AccentColorBrush}" ShowCloseButton="False" ShowInTaskbar="False">
     <StackPanel Orientation="Vertical">
-        <TextBlock Text="Ihre Anfrage wird bearbeitet...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawwwwwwwwwwwwwwwwwwwwwwwwwww" Margin="10,15,15,15" x:Name="txtinfo"/>
-        <controls:MetroProgressBar Margin="0,0,0,10" x:Name="prg" Maximum="1"/>
+        <TextBlock Text="Something will be done..." Margin="10,15,15,15" x:Name="InfoTextBlock"/>
+        <controls:MetroProgressBar Margin="0,0,0,10" x:Name="StatusProgressBar" Maximum="1"/>
     </StackPanel>
 </controls:MetroWindow>
diff --git a/Hurricane/Views/ProgressWindow.xaml.cs b/Hurricane/Views/ProgressWindow.xaml.cs
index 052b195..82eb0db 100644
--- a/Hurricane/Views/ProgressWindow.xaml.cs
+++ b/Hurricane/Views/ProgressWindow.xaml.cs
@@ -1,32 +1,30 @@
-using MahApps.Metro.Controls;
-
-namespace Hurricane.Views
+namespace Hurricane.Views
 {
     /// <summary>
     /// Interaction logic for ProgressWindow.xaml
     /// </summary>
-    public partial class ProgressWindow : MetroWindow
+    public partial class ProgressWindow
     {
         public ProgressWindow(string title, bool indeterminate)
         {
             InitializeComponent();
-            this.Title = title;
-            this.prg.IsIndeterminate = indeterminate;
+            Title = title;
+            StatusProgressBar.IsIndeterminate = indeterminate;
         }
 
         public void SetText(string text)
         {
-          this.txtinfo.Text = text;
+            InfoTextBlock.Text = text;
         }
 
         public void SetProgress(double progress)
         {
-            prg.Value = progress;
+            StatusProgressBar.Value = progress;
         }
 
         public void SetTitle(string title)
         {
-            this.Title = title;
+            Title = title;
         }
     }
 }
diff --git a/Hurricane/Views/ReportExceptionWindow.xaml b/Hurricane/Views/ReportExceptionWindow.xaml
index d22ce0b..c26b524 100644
--- a/Hurricane/Views/ReportExceptionWindow.xaml
+++ b/Hurricane/Views/ReportExceptionWindow.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
-        Title="{StaticResource ExceptionTitle}" SizeToContent="Height" Width="450" GlowBrush="{StaticResource AccentColorBrush}" ResizeMode="NoResize" x:Name="window">
+        Title="{StaticResource ExceptionTitle}" SizeToContent="Height" Width="450" GlowBrush="{StaticResource AccentColorBrush}" ResizeMode="NoResize" x:Name="BaseWindow">
     <StackPanel Orientation="Vertical" Margin="10">
         <Grid>
             <Grid.ColumnDefinitions>
@@ -19,14 +19,14 @@
         <DockPanel Margin="10">
             <TextBlock Text="{StaticResource Exception}" FontWeight="Bold" VerticalAlignment="Center"/>
             <TextBlock Text=":" Margin="0,0,5,0" FontWeight="Bold" VerticalAlignment="Center"/>
-            <TextBox Text="{Binding ElementName=window,Path=Error.Message,Mode=OneWay}" IsReadOnly="True" />
+            <TextBox Text="{Binding ElementName=BaseWindow,Path=Error.Message,Mode=OneWay}" IsReadOnly="True" />
         </DockPanel>
         <TextBlock Margin="10" Text="{StaticResource ExceptionNote}" TextWrapping="Wrap"/>
-        <TextBox Height="100" AcceptsReturn="True" AcceptsTab="True" x:Name="txtNote"/>
+        <TextBox Height="100" AcceptsReturn="True" AcceptsTab="True" x:Name="NoteTextBox"/>
         <DockPanel LastChildFill="False" Margin="10,10,10,5">
             <Button Content="{StaticResource SendExceptionAndClose}" DockPanel.Dock="Right" Click="ButtonSendErrorReport_Click"/>
             <Button Content="{StaticResource Close}" DockPanel.Dock="Left" Click="ButtonClose_Click"/>
         </DockPanel>
-        <controls:MetroProgressBar x:Name="prg"/>
+        <controls:MetroProgressBar x:Name="StatusProgressBar"/>
     </StackPanel>
 </controls:MetroWindow>
diff --git a/Hurricane/Views/ReportExceptionWindow.xaml.cs b/Hurricane/Views/ReportExceptionWindow.xaml.cs
index b7ddf66..938038f 100644
--- a/Hurricane/Views/ReportExceptionWindow.xaml.cs
+++ b/Hurricane/Views/ReportExceptionWindow.xaml.cs
@@ -5,19 +5,18 @@
 using System.Windows.Controls;
 using Exceptionless;
 using Hurricane.Settings;
-using MahApps.Metro.Controls;
 
 namespace Hurricane.Views
 {
     /// <summary>
     /// Interaction logic for ReportExceptionWindow.xaml
     /// </summary>
-    public partial class ReportExceptionWindow : MetroWindow, INotifyPropertyChanged
+    public partial class ReportExceptionWindow : INotifyPropertyChanged
     {
         public ReportExceptionWindow(Exception error)
         {
             InitializeComponent();
-            this.Error = error;
+            Error = error;
             if (HurricaneSettings.Instance.IsLoaded) HurricaneSettings.Instance.Save();
         }
 
@@ -31,12 +30,12 @@ public Exception Error
         private async void ButtonSendErrorReport_Click(object sender, RoutedEventArgs e)
         {
             var ex = Error.ToExceptionless();
-            ex.SetUserDescription(null, txtNote.Text);
+            ex.SetUserDescription(null, NoteTextBox.Text);
             ex.Submit();
             ((Button)sender).IsEnabled = false;
-            prg.IsIndeterminate = true;
+            StatusProgressBar.IsIndeterminate = true;
             await Task.Run(() => ExceptionlessClient.Default.ProcessQueue());
-            prg.IsIndeterminate = false;
+            StatusProgressBar.IsIndeterminate = false;
             Application.Current.Shutdown();
         }
 
diff --git a/Hurricane/Views/TagEditorWindow.xaml b/Hurricane/Views/TagEditorWindow.xaml
index f93033d..dc171d4 100644
--- a/Hurricane/Views/TagEditorWindow.xaml
+++ b/Hurricane/Views/TagEditorWindow.xaml
@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
         xmlns:converter="clr-namespace:Hurricane.Extensions.Converter"
-        Title="{StaticResource TagEditor}" GlowBrush="{StaticResource AccentColorBrush}" x:Name="window" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" Width="600" Height="500" DataContext="{Binding ElementName=window}" ShowInTaskbar="False">
+        Title="{StaticResource TagEditor}" GlowBrush="{StaticResource AccentColorBrush}" x:Name="BaseWindow" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" Width="600" Height="500" DataContext="{Binding ElementName=BaseWindow}" ShowInTaskbar="False">
     <Window.Resources>
         <converter:StringArrayToStringConverter x:Key="StringArrayToStringConverter"/>
     </Window.Resources>
@@ -49,7 +49,7 @@
                             <TextBox Text="{Binding TagFile.Tag.Year,ValidatesOnDataErrors=True,UpdateSourceTrigger=PropertyChanged,NotifyOnValidationError=True}" Grid.Column="1" VerticalAlignment="Center"/>
                         </Grid>
                         <Expander Header="{StaticResource Genre}" Margin="30,0,0,0">
-                            <ListBox x:Name="lstGenre" Height="200">
+                            <ListBox x:Name="GenreListBox" Height="200">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
                                         <CheckBox Content="{Binding Text}" IsChecked="{Binding IsChecked}"/>
@@ -126,7 +126,7 @@
                         </MenuItem>
                         <MenuItem Header="{StaticResource Remove}" Click="MenuItemRemoveAllText_Click"/>
                     </Menu>
-                    <TextBox x:Name="txtLyrics"  Grid.Row="1" AcceptsReturn="True" AcceptsTab="True" Text="{Binding TagFile.Tag.Lyrics}"/>
+                    <TextBox x:Name="LyrcisTextBox"  Grid.Row="1" AcceptsReturn="True" AcceptsTab="True" Text="{Binding TagFile.Tag.Lyrics}"/>
                 </Grid>
             </TabItem>
         </TabControl>
diff --git a/Hurricane/Views/TagEditorWindow.xaml.cs b/Hurricane/Views/TagEditorWindow.xaml.cs
index fbd1ebf..e66a76c 100644
--- a/Hurricane/Views/TagEditorWindow.xaml.cs
+++ b/Hurricane/Views/TagEditorWindow.xaml.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Windows;
 using Hurricane.Music.Track;
-using MahApps.Metro.Controls;
 using Microsoft.Win32;
 using TagLib;
 
@@ -13,16 +12,16 @@ namespace Hurricane.Views
     /// <summary>
     /// Interaction logic for TagEditorWindow.xaml
     /// </summary>
-    public partial class TagEditorWindow : MetroWindow, INotifyPropertyChanged
+    public partial class TagEditorWindow : INotifyPropertyChanged
     {
         public TagEditorWindow(LocalTrack track)
         {
-            this.TagFile = File.Create(track.Path);
-            this.CurrentTrack = track;
+            TagFile = File.Create(track.Path);
+            CurrentTrack = track;
             InitializeComponent();
 
             List<Genre> genres = Genres.Audio.Select(item => new Genre(item, TagFile.Tag.Genres.Contains(item))).ToList();
-            lstGenre.ItemsSource = genres;
+            GenreListBox.ItemsSource = genres;
         }
 
         public LocalTrack CurrentTrack { get; set; }
@@ -56,13 +55,13 @@ private void MenuItemSaveAs_Click(object sender, RoutedEventArgs e)
 
         private void MenuItemRemoveAllText_Click(object sender, RoutedEventArgs e)
         {
-            txtLyrics.Clear();
+            LyrcisTextBox.Clear();
         }
         #endregion
 
         private async void ButtonSave_Click(object sender, RoutedEventArgs e)
         {
-            TagFile.Tag.Genres = (from item in (List<Genre>)lstGenre.ItemsSource where item.IsChecked select item.Text).ToArray();
+            TagFile.Tag.Genres = (from item in (List<Genre>)GenreListBox.ItemsSource where item.IsChecked select item.Text).ToArray();
             try
             {
                 TagFile.Save();
@@ -96,7 +95,7 @@ protected void OnPropertyChanged(string propertyName)
 
         private void ButtonClose_Click(object sender, RoutedEventArgs e)
         {
-            this.Close();
+            Close();
         }
 
         public class Genre
@@ -106,8 +105,8 @@ public class Genre
 
             public Genre(string genre, bool ischecked)
             {
-                this.Text = genre;
-                this.IsChecked = ischecked;
+                Text = genre;
+                IsChecked = ischecked;
             }
         }
     }
diff --git a/Hurricane/Views/TrackImportWindow.xaml b/Hurricane/Views/TrackImportWindow.xaml
index 24c0b55..a9d4ebb 100644
--- a/Hurricane/Views/TrackImportWindow.xaml
+++ b/Hurricane/Views/TrackImportWindow.xaml
@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
         xmlns:extensions="clr-namespace:Hurricane.Extensions"
-        Title="{StaticResource ImportTrack}" SizeToContent="Height" Width="400" GlowBrush="{StaticResource AccentColorBrush}" ShowInTaskbar="False" ResizeMode="NoResize" x:Name="window" WindowStartupLocation="CenterOwner">
+        Title="{StaticResource ImportTrack}" SizeToContent="Height" Width="400" GlowBrush="{StaticResource AccentColorBrush}" ShowInTaskbar="False" ResizeMode="NoResize" x:Name="BaseWindow" WindowStartupLocation="CenterOwner">
     <StackPanel Orientation="Vertical" Margin="10">
         <Grid>
             <Grid.ColumnDefinitions>
@@ -14,7 +14,7 @@
                 <TextBlock Text="{StaticResource TrackName}"/>
                 <TextBlock Text=":"/>
             </StackPanel>
-            <TextBlock Text="{Binding ElementName=window,Path=Trackname}" Grid.Column="1"/>
+            <TextBlock Text="{Binding ElementName=BaseWindow,Path=Trackname}" Grid.Column="1"/>
         </Grid>
         <Grid Margin="0,10,0,0">
             <Grid.ColumnDefinitions>
@@ -25,11 +25,11 @@
                 <TextBlock Text="{StaticResource Playlist}"/>
                 <TextBlock Text=":"/>
             </StackPanel>
-            <ComboBox Grid.Column="1" ItemsSource="{Binding ElementName=window,Path=Playlists}" SelectedItem="{Binding ElementName=window,Path=SelectedPlaylist}" DisplayMemberPath="Name"/>
+            <ComboBox Grid.Column="1" ItemsSource="{Binding ElementName=BaseWindow,Path=Playlists}" SelectedItem="{Binding ElementName=BaseWindow,Path=SelectedPlaylist}" DisplayMemberPath="Name"/>
         </Grid>
         <DockPanel Margin="0,15,0,0">
-            <CheckBox Content="{StaticResource Remember}" IsChecked="{Binding ElementName=window,Path=RememberChoice}" x:Name="chkremember"/>
-            <CheckBox Content="{StaticResource AlsoAfterRestart}" Margin="5,0,0,0" IsChecked="{Binding ElementName=window,Path=RememberAlsoAfterRestart}" IsEnabled="{Binding ElementName=chkremember,Path=IsChecked}" ToolTip="{StaticResource CanBeResetedInSettings}"/>
+            <CheckBox Content="{StaticResource Remember}" IsChecked="{Binding ElementName=BaseWindow,Path=RememberChoice}" x:Name="RememberCheckBox"/>
+            <CheckBox Content="{StaticResource AlsoAfterRestart}" Margin="5,0,0,0" IsChecked="{Binding ElementName=BaseWindow,Path=RememberAlsoAfterRestart}" IsEnabled="{Binding ElementName=RememberCheckBox,Path=IsChecked}" ToolTip="{StaticResource CanBeResetedInSettings}"/>
             <Grid Grid.IsSharedSizeScope="True" HorizontalAlignment="Right">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition SharedSizeGroup="Buttons"/>
diff --git a/Hurricane/Views/TrackImportWindow.xaml.cs b/Hurricane/Views/TrackImportWindow.xaml.cs
index fedb7ca..ad91d34 100644
--- a/Hurricane/Views/TrackImportWindow.xaml.cs
+++ b/Hurricane/Views/TrackImportWindow.xaml.cs
@@ -1,19 +1,18 @@
 using System.Collections.ObjectModel;
 using Hurricane.Music.Playlist;
-using MahApps.Metro.Controls;
 
 namespace Hurricane.Views
 {
     /// <summary>
     /// Interaction logic for TrackImportWindow.xaml
     /// </summary>
-    public partial class TrackImportWindow : MetroWindow
+    public partial class TrackImportWindow
     {
         public TrackImportWindow(ObservableCollection<NormalPlaylist> playlists, NormalPlaylist selectedplaylist, string trackname)
         {
-            this.Playlists = playlists;
-            this.SelectedPlaylist = selectedplaylist;
-            this.Trackname = trackname;
+            Playlists = playlists;
+            SelectedPlaylist = selectedplaylist;
+            Trackname = trackname;
             InitializeComponent();
         }
 
diff --git a/Hurricane/Views/TrackInformationWindow.xaml b/Hurricane/Views/TrackInformationWindow.xaml
index df41ce8..5cca00d 100644
--- a/Hurricane/Views/TrackInformationWindow.xaml
+++ b/Hurricane/Views/TrackInformationWindow.xaml
@@ -5,13 +5,12 @@
         xmlns:converter="clr-namespace:Hurricane.Extensions.Converter"
         xmlns:track="clr-namespace:Hurricane.Music.Track"
         xmlns:hurricaneControls="clr-namespace:Hurricane.Extensions.Controls"
-        Title="{StaticResource TrackInformation}" SizeToContent="Height" GlowBrush="{StaticResource AccentColorBrush}" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" Width="800" x:Name="window" ShowInTaskbar="False" DataContext="{Binding ElementName=window}">
+        Title="{StaticResource TrackInformation}" SizeToContent="Height" GlowBrush="{StaticResource AccentColorBrush}" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" Width="800" x:Name="BaseWindow" ShowInTaskbar="False" DataContext="{Binding ElementName=BaseWindow}">
     <Window.Resources>
         <converter:RoundSizeConverter x:Key="RoundSizeConverter"/>
         <converter:NeverIfDateIsNull x:Key="NeverIfDateIsNull"/>
         <converter:PlaceholderConverter x:Key="PlaceholderConverter"/>
         <converter:MillisecondsToStringConverter x:Key="MillisecondsToStringConverter"/>
-
         <Style TargetType="Button" x:Key="TextButton">
             <Setter Property="Template">
                 <Setter.Value>
@@ -235,7 +234,7 @@
                     </ContentControl.Resources>
                 </ContentControl>
             </StackPanel>
-            <hurricaneControls:TrackImagePreseter Track="{Binding ElementName=window,Path=CurrentTrack}" Height="136" Width="136" HorizontalAlignment="Left" Grid.Column="1">
+            <hurricaneControls:TrackImagePreseter Track="{Binding ElementName=BaseWindow,Path=CurrentTrack}" Height="136" Width="136" HorizontalAlignment="Left" Grid.Column="1">
                 <hurricaneControls:TrackImagePreseter.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="{StaticResource Save}" Command="{Binding SaveImage}">
@@ -264,7 +263,7 @@
                     <TextBlock Text="{StaticResource Title}"/>
                     <TextBlock Text=":"/>
                 </StackPanel>
-                <TextBox Text="{Binding ElementName=window,Path=CurrentTrack.Title}" Grid.Column="1"/>
+                <TextBox Text="{Binding ElementName=BaseWindow,Path=CurrentTrack.Title}" Grid.Column="1"/>
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -275,7 +274,7 @@
                     <TextBlock Text="{StaticResource Artist}"/>
                     <TextBlock Text=":"/>
                 </StackPanel>
-                <TextBox Text="{Binding ElementName=window,Path=CurrentTrack.Artist}" Grid.Column="1"/>
+                <TextBox Text="{Binding ElementName=BaseWindow,Path=CurrentTrack.Artist}" Grid.Column="1"/>
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -286,7 +285,7 @@
                     <TextBlock Text="{StaticResource Album}"/>
                     <TextBlock Text=":"/>
                 </StackPanel>
-                <TextBox Grid.Column="1" Text="{Binding ElementName=window,Path=CurrentTrack.Album}"/>
+                <TextBox Grid.Column="1" Text="{Binding ElementName=BaseWindow,Path=CurrentTrack.Album}"/>
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -297,7 +296,7 @@
                     <TextBlock Text="{StaticResource Genre}"/>
                     <TextBlock Text=":"/>
                 </StackPanel>
-                <TextBox Text="{Binding ElementName=window,Path=CurrentTrack.Genres}" Grid.Column="1"/>
+                <TextBox Text="{Binding ElementName=BaseWindow,Path=CurrentTrack.Genres}" Grid.Column="1"/>
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -308,7 +307,7 @@
                     <TextBlock Text="{StaticResource Year}"/>
                     <TextBlock Text=":"/>
                 </StackPanel>
-                <TextBox Text="{Binding ElementName=window,Path=CurrentTrack.Year,ValidatesOnDataErrors=True,UpdateSourceTrigger=PropertyChanged,NotifyOnValidationError=True}" Grid.Column="1"/>
+                <TextBox Text="{Binding ElementName=BaseWindow,Path=CurrentTrack.Year,ValidatesOnDataErrors=True,UpdateSourceTrigger=PropertyChanged,NotifyOnValidationError=True}" Grid.Column="1"/>
             </Grid>
             <Separator Margin="0,10"/>
             <Grid>
@@ -338,7 +337,7 @@
                     <TextBlock Text="{StaticResource Added}"/>
                     <TextBlock Text=":"/>
                 </StackPanel>
-                <TextBlock Text="{Binding ElementName=window,Path=CurrentTrack.TimeAdded,StringFormat={StaticResource DateFormat}}" Grid.Column="1"/>
+                <TextBlock Text="{Binding ElementName=BaseWindow,Path=CurrentTrack.TimeAdded,StringFormat={StaticResource DateFormat}}" Grid.Column="1"/>
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -349,7 +348,7 @@
                     <TextBlock Text="{StaticResource Played}"/>
                     <TextBlock Text=":"/>
                 </StackPanel>
-                <TextBlock Text="{Binding ElementName=window,Path=CurrentTrack.LastTimePlayed,Converter={StaticResource NeverIfDateIsNull}}" Grid.Column="1"/>
+                <TextBlock Text="{Binding ElementName=BaseWindow,Path=CurrentTrack.LastTimePlayed,Converter={StaticResource NeverIfDateIsNull}}" Grid.Column="1"/>
             </Grid>
         </StackPanel>
     </Grid>
diff --git a/Hurricane/Views/UpdateWindow.xaml b/Hurricane/Views/UpdateWindow.xaml
index 14f722d..35e23da 100644
--- a/Hurricane/Views/UpdateWindow.xaml
+++ b/Hurricane/Views/UpdateWindow.xaml
@@ -4,7 +4,7 @@
         xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
         xmlns:converter="clr-namespace:Hurricane.Extensions.Converter"
         xmlns:ex="clr-namespace:Hurricane.Extensions"
-        Title="{StaticResource UpdatesAvailable}" Width="670" GlowBrush="{StaticResource AccentColorBrush}" ResizeMode="NoResize" x:Name="window" WindowStartupLocation="CenterScreen" Icon="/Resources/GUI/updater.ico" ShowIconOnTitleBar="False" Height="405">
+        Title="{StaticResource UpdatesAvailable}" Width="670" GlowBrush="{StaticResource AccentColorBrush}" ResizeMode="NoResize" x:Name="BaseWindow" WindowStartupLocation="CenterScreen" Icon="/Resources/GUI/updater.ico" ShowIconOnTitleBar="False" Height="405">
     <Window.Resources>
         <converter:RoundSizeConverter x:Key="RoundSizeConverter"/>
     </Window.Resources>
@@ -21,7 +21,7 @@
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <TextBlock Text="{StaticResource CurrentVersion}"/>
-                <TextBlock Grid.Column="1" Text="{Binding ElementName=window,Path=UpdateService.CurrentVersion}"/>
+                <TextBlock Grid.Column="1" Text="{Binding ElementName=BaseWindow,Path=UpdateService.CurrentVersion}"/>
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -29,12 +29,12 @@
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <TextBlock Text="{StaticResource NewVersion}"/>
-                <TextBlock Grid.Column="1" Text="{Binding ElementName=window,Path=UpdateService.NewVersion}"/>
+                <TextBlock Grid.Column="1" Text="{Binding ElementName=BaseWindow,Path=UpdateService.NewVersion}"/>
             </Grid>
             <Separator Margin="0,5,0,0"/>
         </StackPanel>
         <ScrollViewer Grid.Row="1" Margin="0,10,0,0">
-            <TextBlock ex:TextBlockTextFormat.FormattedText="{Binding ElementName=window,Path=UpdateService.Changelog}"/>
+            <TextBlock ex:TextBlockTextFormat.FormattedText="{Binding ElementName=BaseWindow,Path=UpdateService.Changelog}"/>
         </ScrollViewer>
         <StackPanel Orientation="Vertical" Grid.Row="2">
             <Grid Margin="0,5,0,0">
@@ -43,21 +43,21 @@
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <TextBlock Text="{StaticResource Size}"/>
-                <TextBlock Grid.Column="1" Text="{Binding ElementName=window,Path=UpdateService.UpdateSize,Converter={StaticResource RoundSizeConverter}}"/>
+                <TextBlock Grid.Column="1" Text="{Binding ElementName=BaseWindow,Path=UpdateService.UpdateSize,Converter={StaticResource RoundSizeConverter}}"/>
             </Grid>
-            <Grid Margin="0,10,0,0" x:Name="gridState" Visibility="Collapsed" ex:VisibilityAnimation.AnimationType="Fade">
+            <Grid Margin="0,10,0,0" x:Name="StateGrid" Visibility="Collapsed" ex:VisibilityAnimation.AnimationType="Fade">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="auto"/>
                 </Grid.ColumnDefinitions>
-                <controls:MetroProgressBar VerticalAlignment="Center" Value="{Binding ElementName=window,Path=UpdateService.ProgressState}" Foreground="{StaticResource NormalColorBrush}"/>
-                <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="24" Height="24" Grid.Column="1" x:Name="btncancel" Click="btncancel_Click">
+                <controls:MetroProgressBar VerticalAlignment="Center" Value="{Binding ElementName=BaseWindow,Path=UpdateService.ProgressState}" Foreground="{StaticResource NormalColorBrush}"/>
+                <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="24" Height="24" Grid.Column="1" Click="CancelButton_Click">
                     <Viewbox Width="6" Height="6" Stretch="UniformToFill">
                         <Path Data="{StaticResource VectorX}" Fill="{StaticResource GrayBrush1}"/>
                     </Viewbox>
                 </Button>
             </Grid>
-            <Button Content="{StaticResource Update}" Margin="10" Click="Button_Click"/>
+            <Button Content="{StaticResource Update}" Margin="10" Click="UpdateButton_Click"/>
         </StackPanel>
     </Grid>
 </controls:MetroWindow>
diff --git a/Hurricane/Views/UpdateWindow.xaml.cs b/Hurricane/Views/UpdateWindow.xaml.cs
index 607a118..cd8cbb8 100644
--- a/Hurricane/Views/UpdateWindow.xaml.cs
+++ b/Hurricane/Views/UpdateWindow.xaml.cs
@@ -1,34 +1,33 @@
 using System.Windows;
 using System.Windows.Controls;
 using Hurricane.Settings;
-using MahApps.Metro.Controls;
 
 namespace Hurricane.Views
 {
     /// <summary>
     /// Interaction logic for UpdateWindow.xaml
     /// </summary>
-    public partial class UpdateWindow : MetroWindow
+    public partial class UpdateWindow
     {
         public UpdateService UpdateService { get; set; }
 
         public UpdateWindow(UpdateService updateservice)
         {
-            this.UpdateService = updateservice;
+            UpdateService = updateservice;
             InitializeComponent();
         }
 
-        private void Button_Click(object sender, RoutedEventArgs e)
+        private void UpdateButton_Click(object sender, RoutedEventArgs e)
         {
             ((Button)sender).IsEnabled = false;
-            gridState.Visibility = Visibility.Visible;
+            StateGrid.Visibility = Visibility.Visible;
             UpdateService.Update();
         }
 
-        private void btncancel_Click(object sender, RoutedEventArgs e)
+        private void CancelButton_Click(object sender, RoutedEventArgs e)
         {
             UpdateService.CancelUpdate();
-            this.Close();
+            Close();
         }
     }
 }
diff --git a/Hurricane/Views/UserControls/AboutView.xaml b/Hurricane/Views/UserControls/AboutView.xaml
index aee96a3..5d50e39 100644
--- a/Hurricane/Views/UserControls/AboutView.xaml
+++ b/Hurricane/Views/UserControls/AboutView.xaml
@@ -5,8 +5,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:converter="clr-namespace:Hurricane.Extensions.Converter"
              xmlns:ex="clr-namespace:Hurricane.Extensions"
+             xmlns:system="clr-namespace:System;assembly=mscorlib"
              mc:Ignorable="d" 
-             d:DesignHeight="600" d:DesignWidth="800" Background="Transparent" x:Name="aboutcontrol">
+             d:DesignHeight="600" d:DesignWidth="800" Background="Transparent" x:Name="AboutControl">
     <UserControl.Resources>
         <ResourceDictionary>
             <Style TargetType="TextBlock" x:Key="TextBlockHeader">
@@ -14,7 +15,6 @@
                 <Setter Property="FontSize" Value="14"/>
                 <Setter Property="Foreground" Value="{StaticResource AccentColorBrush}"/>
             </Style>
-            <converter:TextWithHyperlinkParametersConverter x:Key="TextWithHyperlinkParametersConverter"/>
             <Style TargetType="Hyperlink" x:Key="HyperlinkStyle">
                 <Setter Property="TextBlock.TextDecorations" Value="{x:Null}"/>
                 <Setter Property="Foreground" Value="{StaticResource NormalColorBrush}"/>
@@ -49,7 +49,7 @@
                 <TextBlock Text="Hurricane" FontSize="24" FontFamily="Segoe UI Light"/>
                 <StackPanel Orientation="Horizontal"  Margin="0,5,0,0">
                     <TextBlock Text="Version: "/>
-                    <TextBlock Text="{Binding ElementName=aboutcontrol,Path=CurrentVersion}" FontWeight="Bold"/>
+                    <TextBlock Text="{Binding ElementName=AboutControl,Path=CurrentVersion}" FontWeight="Bold"/>
                     <TextBlock Text="Beta" Foreground="{DynamicResource AccentColorBrush}" FontWeight="Bold" Margin="5,0,0,0"/>
                 </StackPanel>
                 <TextBlock Text="{DynamicResource AboutCopyright}" Margin="0,10,0,0"/>
@@ -141,7 +141,7 @@
                 </StackPanel>
             </StackPanel>
             <TextBlock ex:TextBlockHelper.UpperText="{DynamicResource Libraries}" Style="{StaticResource TextBlockHeader}" Margin="0,40,0,0"/>
-            <ItemsControl ItemsSource="{Binding ElementName=aboutcontrol,Path=Components}" Margin="0,10,0,0">
+            <ItemsControl ItemsSource="{Binding ElementName=AboutControl,Path=Components}" Margin="0,10,0,0">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
                         <Grid Margin="0,5,0,0">
@@ -160,7 +160,7 @@
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
             <TextBlock ex:TextBlockHelper.UpperText="{DynamicResource Images}" Style="{StaticResource TextBlockHeader}" Margin="0,30,0,0"/>
-            <ItemsControl ItemsSource="{Binding ElementName=aboutcontrol,Path=ImageCreators}" Margin="0,10,0,0">
+            <ItemsControl ItemsSource="{Binding ElementName=AboutControl,Path=ImageCreators}" Margin="0,10,0,0">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
                         <Grid>
@@ -196,22 +196,26 @@
                     <TextBlock TextWrapping="Wrap" Text="{DynamicResource AboutThanks2}"/>
                 </Label>
                 <Label>
-                    <Label.Content>
-                        <MultiBinding Converter="{StaticResource TextWithHyperlinkParametersConverter}">
-                            <Binding Source="{StaticResource AboutThanks3}" />
-                            <Binding Source="ConnyKarras$https://www.vb-paradise.de/index.php/User/16654/"/>
-                            <Binding Source="GimpTutWorks$https://www.vb-paradise.de/index.php/User/10535/"/>
-                            <Binding Source="filoe$https://www.vb-paradise.de/index.php/User/8712/"/>
-                        </MultiBinding>
-                    </Label.Content>
+                    <ex:ContentControlExtensions.FormatValues>
+                        <x:Array Type="system:String">
+                            <system:String>ConnyKarras$https://www.vb-paradise.de/index.php/User/16654/</system:String>
+                            <system:String>GimpTutWorks$https://www.vb-paradise.de/index.php/User/10535/</system:String>
+                            <system:String>filoe$https://www.vb-paradise.de/index.php/User/8712/</system:String>
+                        </x:Array>
+                    </ex:ContentControlExtensions.FormatValues>
+                    <ex:ContentControlExtensions.FormattedContent>
+                        <DynamicResource ResourceKey="AboutThanks3"/>
+                    </ex:ContentControlExtensions.FormattedContent>
                 </Label>
                 <Label>
-                    <Label.Content>
-                        <MultiBinding Converter="{StaticResource TextWithHyperlinkParametersConverter}">
-                            <Binding Source="{StaticResource AboutThanks4}" />
-                            <Binding Source="VB-Paradise$https://www.vb-paradise.de/"/>
-                        </MultiBinding>
-                    </Label.Content>
+                    <ex:ContentControlExtensions.FormatValues>
+                        <x:Array Type="system:String">
+                            <system:String>VB-Paradise$https://www.vb-paradise.de/</system:String>
+                        </x:Array>
+                    </ex:ContentControlExtensions.FormatValues>
+                    <ex:ContentControlExtensions.FormattedContent>
+                        <DynamicResource ResourceKey="AboutThanks4"/>
+                    </ex:ContentControlExtensions.FormattedContent>
                 </Label>
             </StackPanel>
         </StackPanel>
diff --git a/Hurricane/Views/UserControls/SettingsView.xaml b/Hurricane/Views/UserControls/SettingsView.xaml
index 9e34682..7c22a5c 100644
--- a/Hurricane/Views/UserControls/SettingsView.xaml
+++ b/Hurricane/Views/UserControls/SettingsView.xaml
@@ -7,7 +7,6 @@
              xmlns:extensions="clr-namespace:Hurricane.Extensions"
              xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:converter="clr-namespace:Hurricane.Settings.Converter"
-             xmlns:userControls="clr-namespace:Hurricane.Views.UserControls"
              xmlns:appCommunication="clr-namespace:Hurricane.AppCommunication"
              xmlns:lvm="clr-namespace:Hurricane.Extensions.ListViewLayoutManager"
              xmlns:qrCodeNet="clr-namespace:Gma.QrCodeNet.Encoding.Windows.WPF;assembly=Gma.QrCodeNet.Encoding"
@@ -66,27 +65,27 @@
                                         <ComboBox ItemsSource="{Binding SelectedSoundOut.AudioDevices}" Margin="10,0,0,0" SelectedItem="{Binding SelectedAudioDevice}" Width="300" HorizontalAlignment="Left" ItemTemplateSelector="{StaticResource ComboBoxItemTemplateChooser}" SelectedIndex="{Binding SelectedAudioDeviceIndex}">
                                             <extensions:ComboBoxItemTemplateChooser.DropDownTemplate>
                                                 <DataTemplate>
-                                                    <Grid x:Name="grid">
-                                                        <TextBlock Text="{Binding}" x:Name="txt"/>
+                                                    <Grid>
+                                                        <TextBlock Text="{Binding}" x:Name="TextBlock"/>
                                                     </Grid>
                                                     <DataTemplate.Triggers>
                                                         <DataTrigger Binding="{Binding IsDefault}" Value="True">
-                                                            <Setter TargetName="txt" Property="Foreground" Value="#FFC15757"/>
+                                                            <Setter TargetName="TextBlock" Property="Foreground" Value="#FFC15757"/>
                                                         </DataTrigger>
                                                         <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ComboBoxItem},Path=IsSelected}" Value="True">
-                                                            <Setter TargetName="txt" Property="Foreground" Value="White"/>
+                                                            <Setter TargetName="TextBlock" Property="Foreground" Value="White"/>
                                                         </DataTrigger>
                                                     </DataTemplate.Triggers>
                                                 </DataTemplate>
                                             </extensions:ComboBoxItemTemplateChooser.DropDownTemplate>
                                             <extensions:ComboBoxItemTemplateChooser.SelectedTemplate>
                                                 <DataTemplate>
-                                                    <Grid x:Name="grid">
-                                                        <TextBlock Text="{Binding}" x:Name="txt"/>
+                                                    <Grid>
+                                                        <TextBlock Text="{Binding}" x:Name="TextBlock"/>
                                                     </Grid>
                                                     <DataTemplate.Triggers>
                                                         <DataTrigger Binding="{Binding IsDefault}" Value="True">
-                                                            <Setter TargetName="txt" Property="Foreground" Value="#FFC15757"/>
+                                                            <Setter TargetName="TextBlock" Property="Foreground" Value="#FFC15757"/>
                                                         </DataTrigger>
                                                     </DataTemplate.Triggers>
                                                 </DataTemplate>
diff --git a/Setup/HurricaneSetup.iss b/Setup/HurricaneSetup.iss
index 145750b..bcaf554 100644
--- a/Setup/HurricaneSetup.iss
+++ b/Setup/HurricaneSetup.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Hurricane"
-#define MyAppVersion "0.3.5"
+#define MyAppVersion "0.3.6"
 #define MyAppPublisher "Alkaline"
 #define MyAppURL "hurricaneproject.org"
 #define MyAppExeName "Hurricane.exe"
diff --git a/release-notes/0.3.6.md b/release-notes/0.3.6.md
index 65d8011..3e7faaf 100644
--- a/release-notes/0.3.6.md
+++ b/release-notes/0.3.6.md
@@ -20,4 +20,5 @@
 - Fixed a crash if there aren't any sound devices at start
 - Fixed a flac bug (updated CSCore)
 - Fixed that tracks are disabled after a refresh (reload track information)
-- Fixed a bug if you try to remove the selected files from the queue, nothing happens
\ No newline at end of file
+- Fixed a bug if you try to remove the selected files from the queue, nothing happens
+- The last two entries in the about view become updated now if the language is changed
\ No newline at end of file