From d0b6a6a4bc1362f082cf3ebddbb7baeccc356e24 Mon Sep 17 00:00:00 2001
From: Dreamcooled <dreamcooled@gmail.com>
Date: Sun, 10 Aug 2014 00:27:32 +0200
Subject: [PATCH] Added more Settings (Default Filter, Update Interval). Other
 minor changes.

---
 README.md                                     |   9 +-
 SjUpdater/MainWindow.xaml                     | 283 ++++++++++++------
 SjUpdater/MainWindow.xaml.cs                  | 172 ++++++-----
 SjUpdater/Model/FavShowData.cs                | 126 ++++++--
 SjUpdater/Model/UploadData.cs                 |  12 +-
 SjUpdater/Settings.cs                         |  29 ++
 SjUpdater/ViewModel/EpisodeTileViewModel.cs   |   2 +-
 .../ViewModel/OverviewPanormaViewModel.cs     |  32 +-
 .../ViewModel/SeasonPanoramaViewModel.cs      |  38 +--
 SjUpdater/ViewModel/ShowViewModel.cs          |  10 +-
 10 files changed, 473 insertions(+), 240 deletions(-)

diff --git a/README.md b/README.md
index 9406fea..ca79261 100644
--- a/README.md
+++ b/README.md
@@ -6,16 +6,17 @@ Any contribution would be highly appreciated.
 
 
 #### Download
-Binaries of current version v0.13 (needs .NET 4.5): 
-#####http://www.share-online.biz/dl/MO1DIW9NCW 
+Binaries of current version v0.14 (needs .NET 4.5): 
+#####http://www.share-online.biz/dl/32GS82ANO6
 
 
 
 #### Screenshots
 
-![Main Screen](http://s1.directupload.net/images/140125/husa5e9a.png)
+![Main Screen](http://s1.directupload.net/images/140810/q8j684y5.png)
 ![Show Screen](http://s7.directupload.net/images/140115/xas33ut6.png)
 ![Episode Screen](http://s7.directupload.net/images/140115/cpffb9uf.png)
-![Notification](http://s7.directupload.net/images/140806/ocdcio5f.png)
+![Settings Screen](http://s1.directupload.net/images/140810/vcntsad3.png)
+![Notification](http://s7.directupload.net/images/140810/wf7jemqk.png)
 
 
diff --git a/SjUpdater/MainWindow.xaml b/SjUpdater/MainWindow.xaml
index 8a64ed7..3cad682 100644
--- a/SjUpdater/MainWindow.xaml
+++ b/SjUpdater/MainWindow.xaml
@@ -1,4 +1,4 @@
-<controls:MetroWindow x:Class="SjUpdater.MainWindow"
+<controls:MetroWindow
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:local="clr-namespace:SjUpdater"
@@ -7,9 +7,11 @@
                       xmlns:utils="clr-namespace:SjUpdater.Utils"
                       xmlns:metro="clr-namespace:MahApps.Metro;assembly=MahApps.Metro"
                       xmlns:tb="http://www.hardcodet.net/taskbar"
+                      xmlns:model="clr-namespace:SjUpdater.Model"
+                      x:Class="SjUpdater.MainWindow"
                       Title="Serienjunkies Updater" Height="784.65" Width="1096" x:Name="Window"
                       Closing="MainWindow_OnClosing" AllowsTransparency="True" WindowStyle="None" Icon="icon3.ico" >
-    <Window.Resources>
+    <controls:MetroWindow.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
@@ -18,10 +20,10 @@
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
-    </Window.Resources>
+    </controls:MetroWindow.Resources>
     <controls:MetroWindow.WindowCommands>
         <controls:WindowCommands>
-            <Button Content="Settings" Command="{Binding ElementName=Window, Path=SettingsCommand}" />
+            <Button Content="Settings" Command="{Binding SettingsCommand, ElementName=Window}" />
         </controls:WindowCommands>
     </controls:MetroWindow.WindowCommands>
 
@@ -48,93 +50,78 @@
                 <StackPanel Orientation="Vertical">
                     <CheckBox Content="Show Non-Season Stuff" IsChecked="{Binding FilterNonSeason}" />
                     <CheckBox Content="Show Non-Episodes" IsChecked="{Binding FilterNonEpisode}" />
-                    <Label>Regex Name:</Label>
+                    <Label Content="Regex Name:"/>
                     <TextBox controls:TextboxHelper.Watermark="e.g. .*-TVS$"
                              controls:TextboxHelper.ClearTextButton="True">
-                        <TextBox.Text>
-                            <Binding Path="FilterName" UpdateSourceTrigger="PropertyChanged">
-                                <Binding.ValidationRules>
-                                    <utils:RegexValidationRule />
-                                </Binding.ValidationRules>
-                            </Binding>
-                        </TextBox.Text>
+                        <Binding Path="FilterName" UpdateSourceTrigger="PropertyChanged">
+                            <Binding.ValidationRules>
+                                <utils:RegexValidationRule />
+                            </Binding.ValidationRules>
+                        </Binding>
                     </TextBox>
-                    <Label>Regex Format:</Label>
+                    <Label Content="Regex Format:"/>
                     <TextBox controls:TextboxHelper.Watermark="e.g. (1080|720)(p|i)"
                              controls:TextboxHelper.ClearTextButton="True">
-                        <TextBox.Text>
-                            <Binding Path="FilterFormat" UpdateSourceTrigger="PropertyChanged">
-                                <Binding.ValidationRules>
-                                    <utils:RegexValidationRule />
-                                </Binding.ValidationRules>
-                            </Binding>
-                        </TextBox.Text>
+                        <Binding Path="FilterFormat" UpdateSourceTrigger="PropertyChanged">
+                            <Binding.ValidationRules>
+                                <utils:RegexValidationRule />
+                            </Binding.ValidationRules>
+                        </Binding>
                     </TextBox>
-                    <Label>Regex Uploader:</Label>
+                    <Label Content="Regex Uploader:"/>
                     <TextBox controls:TextboxHelper.Watermark="Regex or leave Empty"
                              controls:TextboxHelper.ClearTextButton="True">
-                        <TextBox.Text>
-                            <Binding Path="FilterUploader" UpdateSourceTrigger="PropertyChanged">
-                                <Binding.ValidationRules>
-                                    <utils:RegexValidationRule />
-                                </Binding.ValidationRules>
-                            </Binding>
-                        </TextBox.Text>
+                        <Binding Path="FilterUploader" UpdateSourceTrigger="PropertyChanged">
+                            <Binding.ValidationRules>
+                                <utils:RegexValidationRule />
+                            </Binding.ValidationRules>
+                        </Binding>
                     </TextBox>
-                    <Label>Regex Size:</Label>
+                    <Label Content="Regex Size:"/>
                     <TextBox controls:TextboxHelper.Watermark="Regex or leave Empty"
                              controls:TextboxHelper.ClearTextButton="True">
-                        <TextBox.Text>
-                            <Binding Path="FilterSize" UpdateSourceTrigger="PropertyChanged">
-                                <Binding.ValidationRules>
-                                    <utils:RegexValidationRule />
-                                </Binding.ValidationRules>
-                            </Binding>
-                        </TextBox.Text>
+                        <Binding Path="FilterSize" UpdateSourceTrigger="PropertyChanged">
+                            <Binding.ValidationRules>
+                                <utils:RegexValidationRule />
+                            </Binding.ValidationRules>
+                        </Binding>
                     </TextBox>
-                    <Label>Regex Runtime:</Label>
+                    <Label Content="Regex Runtime:"/>
                     <TextBox controls:TextboxHelper.Watermark="Regex or leave Empty"
                              controls:TextboxHelper.ClearTextButton="True">
-                        <TextBox.Text>
-                            <Binding Path="FilterRuntime" UpdateSourceTrigger="PropertyChanged">
-                                <Binding.ValidationRules>
-                                    <utils:RegexValidationRule />
-                                </Binding.ValidationRules>
-                            </Binding>
-                        </TextBox.Text>
+                        <Binding Path="FilterRuntime" UpdateSourceTrigger="PropertyChanged">
+                            <Binding.ValidationRules>
+                                <utils:RegexValidationRule />
+                            </Binding.ValidationRules>
+                        </Binding>
                     </TextBox>
-                    <Label>Regex Hoster:</Label>
+                    <Label Content="Regex Hoster:"/>
                     <TextBox controls:TextboxHelper.Watermark="e.g. share-online|uploaded"
                              controls:TextboxHelper.ClearTextButton="True">
-                        <TextBox.Text>
-                            <Binding Path="FilterHoster" UpdateSourceTrigger="PropertyChanged">
-                                <Binding.ValidationRules>
-                                    <utils:RegexValidationRule />
-                                </Binding.ValidationRules>
-                            </Binding>
-                        </TextBox.Text>
+                        <Binding Path="FilterHoster" UpdateSourceTrigger="PropertyChanged">
+                            <Binding.ValidationRules>
+                                <utils:RegexValidationRule />
+                            </Binding.ValidationRules>
+                        </Binding>
                     </TextBox>
-                    <Label>Language:</Label>
-                    <ComboBox SelectedIndex="{Binding FilterLanguage}">
-                        <ComboBoxItem>German</ComboBoxItem>
-                        <ComboBoxItem>English</ComboBoxItem>
-                        <ComboBoxItem>Any</ComboBoxItem>
-                    </ComboBox>
+                    <Label Content="Language:"/>
+                    <ComboBox ItemsSource="{Binding Source={x:Static model:UploadData.LanguagesValues}}" 
+                              SelectedItem="{Binding FilterLanguage}" />
                 </StackPanel>
             </Grid>
         </controls:Flyout>
-
     </controls:MetroWindow.Flyouts>
     <controls:MetroWindow.CommandBindings>
-        <CommandBinding Command="BrowseBack" Executed="NavBack"></CommandBinding>
+        <CommandBinding Command="BrowseBack" Executed="NavBack"/>
     </controls:MetroWindow.CommandBindings>
     <Grid x:Name="MainGrid" Background="#FF1D1D1D">
         <Grid x:Name="OverviewGrid">
 
-            <tb:TaskbarIcon x:Name="NotifyIcon" DataContext="{Binding ElementName=Window}" IconSource="icon3.ico" ToolTipText="SjUpdater" DoubleClickCommand="{Binding ElementName=Window, Path=IconClickedCommand}" > 
+            <tb:TaskbarIcon x:Name="NotifyIcon" DataContext="{Binding ElementName=Window}" IconSource="icon3.ico" ToolTipText="SjUpdater" DoubleClickCommand="{Binding IconClickedCommand, ElementName=Window}" >
                 <tb:TaskbarIcon.ContextMenu>
                     <ContextMenu>
-                        <MenuItem Header="Exit" Command="{Binding Path=TerminateCommand }"/>
+                        <MenuItem Header="Open" Command="{Binding IconClickedCommand}" FontWeight="Bold"/>
+                        <MenuItem Header="Exit" Command="{Binding TerminateCommand}"/>
                     </ContextMenu>
                 </tb:TaskbarIcon.ContextMenu>
             </tb:TaskbarIcon>
@@ -142,9 +129,9 @@
                                VerticalAlignment="Stretch" ItemBox="200">
 
                 <controls:Panorama.Resources>
-                    <DataTemplate DataType="{x:Type viewModel:ShowTileViewModel }">
+                    <DataTemplate DataType="{x:Type viewModel:ShowTileViewModel}">
                         <controls:Tile Width="240" Height="120" x:Name="tile" Title="{Binding Title}"
-                                       Command="{Binding ElementName=Window, Path=ShowClickedCommand }"
+                                       Command="{Binding ShowClickedCommand, ElementName=Window}"
                                        CommandParameter="{Binding ShowViewModel}" Background="#00000000">
                             <Grid>
                                 <Image Source="{Binding Background.ImageSource}" Stretch="UniformToFill" Opacity="0.5" />
@@ -187,7 +174,7 @@
 
                         </controls:Tile>
                     </DataTemplate>
-                    <Style TargetType="controls:Tile">
+                    <Style TargetType="{x:Type controls:Tile}">
                         <Setter Property="Foreground" Value="White" />
                         <Setter Property="Background" Value="{DynamicResource AccentColorBrush}" />
                         <Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -195,12 +182,12 @@
                         <Setter Property="RenderTransformOrigin" Value="0.5,0.5" />
                         <Setter Property="Template">
                             <Setter.Value>
-                                <ControlTemplate TargetType="controls:Tile">
+                                <ControlTemplate TargetType="{x:Type controls:Tile}">
                                     <Grid Background="{TemplateBinding Background}">
                                         <ContentPresenter RecognizesAccessKey="True" />
                                     </Grid>
                                     <ControlTemplate.Triggers>
-                                        <Trigger Property="Button.IsPressed" Value="True">
+                                        <Trigger Property="IsPressed" Value="True">
                                             <Setter Property="RenderTransform">
                                                 <Setter.Value>
                                                     <ScaleTransform ScaleX="0.98"
@@ -217,6 +204,22 @@
                     </Style>
                 </controls:Panorama.Resources>
             </controls:Panorama>
+            <Button Width="40" Click="AddShow"  ToolTip="Add Show" HorizontalAlignment="Right" VerticalAlignment="Top"
+                        Height="40" Margin="0,10,90,0"
+                        Style="{DynamicResource MetroCircleButtonStyle}">
+                <Label Foreground="White" FontSize="20" Margin="0,-5,0,0" Content="+"/>
+            </Button>
+            <Button Width="40" Click="OpenHomepage"  ToolTip="Open serienjunkies.org" HorizontalAlignment="Right" VerticalAlignment="Top"
+                        Height="40" Margin="0,10,50,0"
+                        Style="{DynamicResource MetroCircleButtonStyle}">
+                <Label Foreground="White" FontSize="20" Content="H"/>
+            </Button>
+            <Button Width="40" Click="ReloadAll"  ToolTip="Recheck all" HorizontalAlignment="Right" VerticalAlignment="Top"
+                        Height="40" Margin="0,10,10,0"
+                        Style="{DynamicResource MetroCircleButtonStyle}">
+                <Label Foreground="White" FontSize="20" Content="R"/>
+            </Button>
+
         </Grid>
         <Grid x:Name="ShowGrid">
             <StackPanel Orientation="Horizontal" Margin="10,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top">
@@ -251,15 +254,20 @@
                 </Button>
                 <Label FontFamily="Segoe UI Symbol" FontSize="24" Foreground="White" Content="{Binding Title}"
                        VerticalAlignment="Center" x:Name="SeasonLabel" />
-                <Button Width="40" VerticalAlignment="Center" Click="ShowFilter"
+                <Button Width="40" VerticalAlignment="Center" Click="ShowFilter" ToolTip="Open Filter"
+                        Height="40"
+                        Style="{DynamicResource MetroCircleButtonStyle}">
+                    <Label Foreground="White" FontSize="20" Content="F"/>
+                </Button>
+                <Button Width="40" VerticalAlignment="Center" Click="ShowGotoPage" ToolTip="Open on serienjunkies.org"
                         Height="40"
                         Style="{DynamicResource MetroCircleButtonStyle}">
-                    <Label Foreground="White" FontSize="20">F</Label>
+                    <Label Foreground="White" FontSize="20" Content="H"/>
                 </Button>
-                <Button Width="40" VerticalAlignment="Center" Click="ShowDelete"
+                <Button Width="40" VerticalAlignment="Center" Click="ShowDelete" ToolTip="Remove this Show"
                         Height="40"
                         Style="{DynamicResource MetroCircleButtonStyle}">
-                    <Label Foreground="White" FontSize="20">X</Label>
+                    <Label Foreground="White" FontSize="20" Content="X"/>
                 </Button>
             </StackPanel>
             <controls:Panorama x:Name="Panorama" UseSnapBackScrolling="False" Margin="10,55,10,10"
@@ -268,7 +276,7 @@
                     <DataTemplate DataType="{x:Type viewModel:EpisodeTileViewModel}">
                         <controls:Tile Padding="0" Width="120" Height="120" x:Name="tile"
                                        Background="{Binding Background}"
-                                       Command="{Binding ElementName=Window,Path=EpisodeClickedCommand}"
+                                       Command="{Binding EpisodeClickedCommand, ElementName=Window}"
                                        CommandParameter="{Binding EpisodeViewModel}">
 
                             <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
@@ -303,7 +311,7 @@
                             </DataTrigger>
                         </DataTemplate.Triggers>
                     </DataTemplate>
-                    <Style TargetType="controls:Tile">
+                    <Style TargetType="{x:Type controls:Tile}">
                         <Setter Property="Width" Value="140" />
                         <Setter Property="Height" Value="140" />
                         <Setter Property="Margin" Value="3" />
@@ -314,12 +322,12 @@
                         <Setter Property="RenderTransformOrigin" Value="0.5,0.5" />
                         <Setter Property="Template">
                             <Setter.Value>
-                                <ControlTemplate TargetType="controls:Tile">
+                                <ControlTemplate TargetType="{x:Type controls:Tile}">
                                     <Grid Background="{TemplateBinding Background}">
                                         <ContentPresenter RecognizesAccessKey="True" Margin="5" />
                                     </Grid>
                                     <ControlTemplate.Triggers>
-                                        <Trigger Property="Button.IsPressed" Value="True">
+                                        <Trigger Property="IsPressed" Value="True">
                                             <Setter Property="RenderTransform">
                                                 <Setter.Value>
                                                     <ScaleTransform ScaleX="0.98"
@@ -406,7 +414,7 @@
                                         <ItemsControl.ItemTemplate>
                                             <DataTemplate>
                                                 <Button Margin="4" Content="{Binding Key}"
-                                                        Command="{Binding ElementName=Window, Path=DownloadCommand}"
+                                                        Command="{Binding DownloadCommand, ElementName=Window}"
                                                         CommandParameter="{Binding Value}" />
                                             </DataTemplate>
                                         </ItemsControl.ItemTemplate>
@@ -424,11 +432,12 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
             <StackPanel Orientation="Horizontal" Margin="10,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top">
                 <Button Width="40" VerticalAlignment="Center"
-                        Command="{Binding ElementName=Window, Path=SettingsCommand}"
+                        Command="{Binding SettingsCommand, ElementName=Window}"
                         Height="40"
                         Style="{DynamicResource MetroCircleButtonStyle}">
                     <Rectangle Width="20"
@@ -459,6 +468,7 @@
                 <Label FontFamily="Segoe UI Symbol" FontSize="24" Foreground="White" Content="Settings"
                        VerticalAlignment="Center" />
             </StackPanel>
+            <Label Grid.Row="0" HorizontalAlignment="Right" Margin="0,15,10,0" VerticalAlignment="Center" Content="You might have to restart the program for the changes to take effect."/>
 
             <GroupBox Header="Apperance" Grid.Row="1" Margin="10,10,10,10">
                 <StackPanel>
@@ -467,39 +477,134 @@
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
-                        <Label>Theme Accent:</Label>
+                        <Label Content="Theme Accent:"/>
                         <ComboBox Grid.Column="1"
                                   ItemsSource="{Binding Source={x:Static metro:ThemeManager.DefaultAccents}}"
                                   DisplayMemberPath="Name" SelectedValuePath="Name"
-                                  SelectedValue="{Binding ElementName=Window,Path=CurrentAccent}" />
+                                  SelectedValue="{Binding CurrentAccent, ElementName=Window}" />
 
                     </Grid>
 
+                    <CheckBox Content="Sort Tv Shows Alphabetically"
+                              IsChecked="{Binding SortShowsAlphabetically, Source={x:Static local:Settings.Instance}}" />
                     <CheckBox Content="Sort Seasons Descending"
-                              IsChecked="{Binding Source={x:Static local:Settings.Instance},Path=SortSeasonsDesc}" />
+                              IsChecked="{Binding SortSeasonsDesc, Source={x:Static local:Settings.Instance}}" />
                     <CheckBox Content="Sort Episodes Descending"
-                              IsChecked="{Binding Source={x:Static local:Settings.Instance},Path=SortEpisodesDesc}" />
-                    <Label>You might have to restart the Programm after changeing values in this section.</Label>
+                              IsChecked="{Binding SortEpisodesDesc, Source={x:Static local:Settings.Instance}}" />
                 </StackPanel>
             </GroupBox>
-            <GroupBox Header="Other" Grid.Row="2" Margin="10,10,10,10">
+            <GroupBox Header="Other" Grid.Row="3" Margin="10,10,10,10">
                 <StackPanel>
+                    <CheckBox Content="Only Minimize to Tray when closing"
+        				IsChecked="{Binding MinimizeToTray, Source={x:Static local:Settings.Instance}}" />
                     <Grid Width="500" HorizontalAlignment="Left">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
-                        <Label>Number of Fetching Threads:</Label>
+                        <Label Content="Number of Fetching Threads:"/>
                         <Slider Minimum="1" Maximum="8" x:Name="threadSlider" Grid.Column="1" SmallChange="1"
-                                IsSnapToTickEnabled="True"
-                                Value="{Binding Source={x:Static local:Settings.Instance},Path=NumFetchThreads}" />
-                        <Label Content="{Binding ElementName=threadSlider,Path=Value}" Grid.Column="2" />
+        					IsSnapToTickEnabled="True"
+        					Value="{Binding NumFetchThreads, Source={x:Static local:Settings.Instance}}" />
+                        <Label Content="{Binding Value, ElementName=threadSlider}" Grid.Column="2" />
                     </Grid>
-                    <CheckBox Content="Only Minimize to Tray when closing"
-                              IsChecked="{Binding Source={x:Static local:Settings.Instance},Path=MinimizeToTray}" />
+                    <Grid Width="500" HorizontalAlignment="Left">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Label Content="Update Shows Automatically:"/>
+                        <ComboBox Grid.Column="1" ItemsSource="{Binding Source={x:Static local:MainWindow.DictUpdateTimes}}"
+                                  DisplayMemberPath="Key" SelectedValuePath="Value"
+                                  SelectedValue="{Binding UpdateTime, Source={x:Static local:Settings.Instance}}"/>
+
+                    </Grid>
+   
                 </StackPanel>
             </GroupBox>
+            <GroupBox Grid.Row="2" Margin="10,10,10,10" Header="Default Filter">
+                <Grid DataContext="{Binding Source={x:Static local:Settings.Instance}}">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="50*" />
+                        <ColumnDefinition Width="50" />
+                        <ColumnDefinition Width="50*" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+
+                    <CheckBox Grid.Row="0" Grid.Column="0" Content="Show Non-Season Stuff" IsChecked="{Binding FilterShowNonSeason}"  Margin="0,5,0,0"/>
+                        <CheckBox Grid.Row="1" Grid.Column="0" Content="Show Non-Episodes" IsChecked="{Binding FilterShowNonEpisode}"  Margin="0,5,0,0"/>
+                        <Label Grid.Row="2" Grid.Column="0" Content="Regex Name:"/>
+                        <TextBox Grid.Row="3" Grid.Column="0" controls:TextboxHelper.Watermark="e.g. .*-TVS$"
+                             controls:TextboxHelper.ClearTextButton="True">
+                            <Binding Path="FilterName" UpdateSourceTrigger="PropertyChanged">
+                                <Binding.ValidationRules>
+                                    <utils:RegexValidationRule />
+                                </Binding.ValidationRules>
+                            </Binding>
+                        </TextBox>
+                        <Label Grid.Row="4" Grid.Column="0" Content="Regex Format:"/>
+                        <TextBox Grid.Row="5" Grid.Column="0" controls:TextboxHelper.Watermark="e.g. (1080|720)(p|i)"
+                             controls:TextboxHelper.ClearTextButton="True">
+                            <Binding Path="FilterFormat" UpdateSourceTrigger="PropertyChanged">
+                                <Binding.ValidationRules>
+                                    <utils:RegexValidationRule />
+                                </Binding.ValidationRules>
+                            </Binding>
+                        </TextBox>
+                        <Label Grid.Row="6" Grid.Column="0" Content="Regex Uploader:"/>
+                        <TextBox Grid.Row="7" Grid.Column="0" controls:TextboxHelper.Watermark="Regex or leave Empty"
+                             controls:TextboxHelper.ClearTextButton="True">
+                            <Binding Path="FilterUploader" UpdateSourceTrigger="PropertyChanged">
+                                <Binding.ValidationRules>
+                                    <utils:RegexValidationRule />
+                                </Binding.ValidationRules>
+                            </Binding>
+                        </TextBox>
+
+                        <Label  Grid.Row="0" Grid.Column="2" Content="Regex Size:"/>
+                        <TextBox Grid.Row="1" Grid.Column="2" controls:TextboxHelper.Watermark="Regex or leave Empty"
+                             controls:TextboxHelper.ClearTextButton="True">
+                            <Binding Path="FilterSize" UpdateSourceTrigger="PropertyChanged">
+                                <Binding.ValidationRules>
+                                    <utils:RegexValidationRule />
+                                </Binding.ValidationRules>
+                            </Binding>
+                        </TextBox>
+                        <Label Grid.Row="2" Grid.Column="2" Content="Regex Runtime:"/>
+                        <TextBox Grid.Row="3" Grid.Column="2" controls:TextboxHelper.Watermark="Regex or leave Empty"
+                             controls:TextboxHelper.ClearTextButton="True">
+                            <Binding Path="FilterRuntime" UpdateSourceTrigger="PropertyChanged">
+                                <Binding.ValidationRules>
+                                    <utils:RegexValidationRule />
+                                </Binding.ValidationRules>
+                            </Binding>
+                        </TextBox>
+                        <Label Grid.Row="4" Grid.Column="2" Content="Regex Hoster:"/>
+                        <TextBox Grid.Row="5" Grid.Column="2" controls:TextboxHelper.Watermark="e.g. share-online|uploaded"
+                             controls:TextboxHelper.ClearTextButton="True">
+                            <Binding Path="FilterHoster" UpdateSourceTrigger="PropertyChanged">
+                                <Binding.ValidationRules>
+                                    <utils:RegexValidationRule />
+                                </Binding.ValidationRules>
+                            </Binding>
+                        </TextBox>
+                        <Label Grid.Row="6" Grid.Column="2" Content="Language:"/>
+                        <ComboBox Grid.Row="7" Grid.Column="2" 
+                                  ItemsSource="{Binding Source={x:Static model:UploadData.LanguagesValues}}"  
+                                  SelectedItem="{Binding FilterLanguage}"/>
+                </Grid>
+            </GroupBox>
         </Grid>
     </Grid>
 </controls:MetroWindow>
\ No newline at end of file
diff --git a/SjUpdater/MainWindow.xaml.cs b/SjUpdater/MainWindow.xaml.cs
index 6cac579..4c7f08d 100644
--- a/SjUpdater/MainWindow.xaml.cs
+++ b/SjUpdater/MainWindow.xaml.cs
@@ -7,6 +7,7 @@
 using System.IO;
 using System.Linq;
 using System.Security.Principal;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Timers;
 using System.Windows;
@@ -21,6 +22,7 @@
 using SjUpdater.Model;
 using SjUpdater.Utils;
 using SjUpdater.ViewModel;
+using Timer = System.Timers.Timer;
 
 namespace SjUpdater
 {
@@ -29,15 +31,12 @@ namespace SjUpdater
     /// </summary>
     public partial class MainWindow
     {
-        private Settings setti;
+        private readonly Settings _setti;
         private readonly MainWindowViewModel _viewModel;
-        private bool user_read_updates = true;
         public MainWindow()
         {
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
 
-
-            AddShowCommand = new SimpleCommand<object, object>(AddShowClicked);
             DownloadCommand = new SimpleCommand<object, String>(DownloadCommandExecute);
             EpisodeClickedCommand = new SimpleCommand<object, EpisodeViewModel>(OnEpisodeViewClicked);
             ShowClickedCommand = new SimpleCommand<object, ShowViewModel>(OnShowViewClicked);
@@ -45,21 +44,24 @@ public MainWindow()
             IconClickedCommand = new SimpleCommand<object, object>(IconClicked);
             TerminateCommand = new SimpleCommand<object, object>(Terminate);
 
-            setti = Settings.Instance;
-            currentAccent = ThemeManager.DefaultAccents.First(x => x.Name ==  setti.ThemeAccent);
+            _setti = Settings.Instance;
+            _currentAccent = ThemeManager.DefaultAccents.First(x => x.Name ==  _setti.ThemeAccent);
 
 
             InitializeComponent();
 
-            CurrentAccent = setti.ThemeAccent;
+            CurrentAccent = _setti.ThemeAccent;
+
+            if (_setti.UpdateTime > 0) //Autoupdate enabled
+            {
+                var t = new Timer(_setti.UpdateTime);
+                t.Elapsed += t_Elapsed;
+                t.Start();
+            }
 
-            Timer t = new Timer(15*60*1000); //15min
-            t.Elapsed += t_Elapsed;
-            t.Start();
-            
-            update();
+            Update();
 
-            _viewModel = new MainWindowViewModel(setti.TvShows);
+            _viewModel = new MainWindowViewModel(_setti.TvShows);
             ShowsPanorama.ItemsSource = _viewModel.PanoramaItems;
             SwitchPage(0);
 
@@ -71,17 +73,24 @@ public MainWindow()
 
         void t_Elapsed(object sender, ElapsedEventArgs e)
         {
-            update();
+            Update();
         }
 
+        private void ReloadAll(object sender, RoutedEventArgs e)
+        {
+            Update();
+        }
 
-        private void update()
+        private readonly Semaphore _sema = new Semaphore(1,1);
+
+        private void Update()
         {
+            if (!_sema.WaitOne(10)) return;
 
-            SmartThreadPool stp = new SmartThreadPool();
-            stp.MaxThreads = (int) setti.NumFetchThreads;
+            var stp = new SmartThreadPool();
+            stp.MaxThreads = (int) _setti.NumFetchThreads;
             var results = new List<IWaitableResult>();
-            foreach (FavShowData t in setti.TvShows)
+            foreach (FavShowData t in _setti.TvShows)
             {
                 results.Add(stp.QueueWorkItem(data => data.Fetch(), t)); //schedule update of show (executed paralell)
             }
@@ -89,23 +98,21 @@ private void update()
             stp.QueueWorkItem(() =>
             {
                 SmartThreadPool.WaitAll(results.ToArray());
-                var updates = setti.TvShows.Where(show => show.NewEpisodes).ToList();
-                if (updates.Count > 0 && user_read_updates)
+                _sema.Release();
+
+                var updates = _setti.TvShows.Where(show => show.NewEpisodes && !show.Notified).ToList();
+                if (updates.Count > 0)
                 {
+                    updates.ForEach(show => show.Notified=true);
                     Dispatcher.Invoke(() =>
                     {
                         var n = new NotificationBalloon(updates);
                         n.ShowViewClicked += on_ShowViewClicked;
                         NotifyIcon.ShowCustomBalloon(n, PopupAnimation.Slide, 4000);
-                    }
-                        );
-                    user_read_updates = false;
+                    });
                 }
             });
 
-
-
-
         }
 
 
@@ -118,36 +125,33 @@ void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs
             MessageBox.Show("Unhandled Exception. Please report the following details:\n" + e.ExceptionObject);
         }
 
-        void AddShowClicked(object o)
+
+        private void AddShow(object sender, RoutedEventArgs e)
         {
-            AddShowFlyout.IsOpen = !AddShowFlyout.IsOpen;
-        }
+            AddShowFlyout.IsOpen = true;
+        }   
 
-        private int lastpage = 0;
+        private int _lastpage = 0;
         private void SettingsClicked(object o)
         {
             if (CurrentPage() == 3)
             {
-                SwitchPage(lastpage);
+                SwitchPage(_lastpage);
                 return;
             }
 
             AddShowFlyout.IsOpen = false;
             FilterFlyout.IsOpen = false;
-            lastpage = CurrentPage();
+            _lastpage = CurrentPage();
             SwitchPage(3);
         }
 
         private void IconClicked(object obj)
         {
             if (!IsVisible)
-            {
                 Show();
-            }
             else
-            {
-                Activate();
-            }
+                Activate(); //"Bring to front"
         }
 
 
@@ -162,21 +166,24 @@ private void DownloadCommandExecute(string s)
                     Clipboard.Flush();
                     return;
                 }
-                catch { }
-                System.Threading.Thread.Sleep(10);
+                catch
+                {
+                    //nah
+                }
+                Thread.Sleep(10);
             }
             MessageBox.Show("Couldn't Copy link to clipboard.\n" + s);
         }
 
-        private Accent currentAccent;
+        private Accent _currentAccent;
         public String CurrentAccent
         {
-            get { return currentAccent.Name; }
+            get { return _currentAccent.Name; }
             set
             {
-                currentAccent = ThemeManager.DefaultAccents.First(x => x.Name == value);
-                ThemeManager.ChangeTheme(this, currentAccent, Theme.Dark);
-                setti.ThemeAccent = currentAccent.Name;
+                _currentAccent = ThemeManager.DefaultAccents.First(x => x.Name == value);
+                ThemeManager.ChangeTheme(this, _currentAccent, Theme.Dark);
+                _setti.ThemeAccent = _currentAccent.Name;
             }
         }
 
@@ -222,20 +229,20 @@ void SwitchPage(int page)
 
         }
 
-        private IWorkItemResult currentWorkItem;
-        private string nextSearchString;
+        private IWorkItemResult _currentWorkItem;
+        private string _nextSearchString;
 
         private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
             string searchString = TextBoxAutoComl.Text;
 
-            if (currentWorkItem == null || currentWorkItem.IsCompleted)
+            if (_currentWorkItem == null || _currentWorkItem.IsCompleted)
             {
-                currentWorkItem = StaticInstance.SmartThreadPool.QueueWorkItem(UpdateShowSearch, searchString);
+                _currentWorkItem = StaticInstance.SmartThreadPool.QueueWorkItem(UpdateShowSearch, searchString);
             }
             else
             {
-                nextSearchString = searchString;
+                _nextSearchString = searchString;
             }
         }
 
@@ -249,19 +256,16 @@ private void UpdateShowSearch(string query)
                     result;
             });
 
-            if (!string.IsNullOrEmpty(nextSearchString) && nextSearchString != query)
+            if (!string.IsNullOrEmpty(_nextSearchString) && _nextSearchString != query)
             {
-                currentWorkItem = StaticInstance.SmartThreadPool.QueueWorkItem(UpdateShowSearch, nextSearchString);
+                _currentWorkItem = StaticInstance.SmartThreadPool.QueueWorkItem(UpdateShowSearch, _nextSearchString);
             }
         }
 
         private void OnEpisodeViewClicked(EpisodeViewModel episodeView)
         {
-         
             EpisodeGrid.DataContext = episodeView;
             SwitchPage(2);
-            //EpisodeDataList.ItemsSource = episodeView.EpisodeDescriptors;
-            //EpisodeDataLabel.Content = episodeView.DetailTitle;
         }
 
 
@@ -269,23 +273,41 @@ void on_ShowViewClicked(object sender, ShowViewModel showView)
         {
             if(!IsVisible)
                 Show();
-            user_read_updates = true;
             AddShowFlyout.IsOpen = false;
             FilterFlyout.IsOpen = false;
             OnShowViewClicked(showView);
         }
         private void OnShowViewClicked(ShowViewModel showView)
         {
+            showView.Show.Notified = false;
+            showView.Show.NewEpisodes = false;
             ShowGrid.DataContext = showView;
             FilterFlyout.DataContext = showView;
-            //Panorama.ItemsSource = showView.EpisodeGroups;
-           // SeasonLabel.Content = showView.Title;
             SwitchPage(1);
         }
 
+       
+
+         private void ShowGotoPage(object sender, RoutedEventArgs e)
+         {
+             var vm = ((ShowViewModel) ShowGrid.DataContext).Show;
+             var url = vm.Show.Url;
+             var p = new Process();
+             p.StartInfo = new ProcessStartInfo(url);
+             p.Start();
+         }
+
+         private void OpenHomepage(object sender, RoutedEventArgs e)
+         {
+             var p = new Process();
+             p.StartInfo = new ProcessStartInfo("http://serienjunkies.org");
+             p.Start();
+         }
+
+
         private void ShowDelete(object sender, RoutedEventArgs e)
         {
-            setti.TvShows.Remove((ShowGrid.DataContext as ShowViewModel).Show);
+            _setti.TvShows.Remove(((ShowViewModel) ShowGrid.DataContext).Show);
             SwitchPage(0);
         }
 
@@ -296,7 +318,6 @@ private void EpisodeDataBack(object sender, RoutedEventArgs e)
         private void EpisodesBack(object sender, RoutedEventArgs e)
         {
             SwitchPage(0);
-            ((ShowViewModel) ShowGrid.DataContext).Show.NewEpisodes = false;
         }
 
 
@@ -313,7 +334,7 @@ private void NavBack(object sender, ExecutedRoutedEventArgs e)
                     EpisodeDataBack(this, new RoutedEventArgs());
                     break;
                 case 3:
-                    SwitchPage(lastpage);
+                    SwitchPage(_lastpage);
                     break;
 
             }
@@ -325,26 +346,21 @@ private void ListViewAutoCompl_MouseDoubleClick(object sender, MouseButtonEventA
             {
                 var selectedShow = (KeyValuePair<string,string>)ListViewAutoCompl.SelectedItem;
 
-                for (int i = 0; i < setti.TvShows.Count; i++)
+                if (_setti.TvShows.Any(t => t.Show.Url == selectedShow.Value))
                 {
-                    if (setti.TvShows[i].Show.Url == selectedShow.Value)
-                    {
-                        return;
-                    }
+                    return;
                 }
 
                 TextBoxAutoComl.Text = "";
                 AddShowFlyout.IsOpen = false;
-                //ShowView sv = new ShowView(selectedShow.Key, selectedShow.Value, true, Dispatcher);
-                //showsCollection.Insert(showsCollection.Count() - 1,sv);
-                setti.TvShows.Add(new FavShowData(new ShowData{Name=selectedShow.Key, Url=selectedShow.Value},true));
+                _setti.TvShows.Add(new FavShowData(new ShowData{Name=selectedShow.Key, Url=selectedShow.Value},true));
             }
         }
 
         private void MainWindow_OnClosing(object sender, CancelEventArgs e)
 
         {
-            if (setti.MinimizeToTray)
+            if (_setti.MinimizeToTray)
             {
                 e.Cancel = true;
                 Hide();
@@ -377,13 +393,9 @@ private void Terminate(object obj)
         {
             Settings.Save();
             if (Debugger.IsAttached)
-            {
                 Environment.Exit(0);
-            }
             else
-            {
                 Application.Current.Shutdown(0);
-            }
         }
 
 
@@ -404,5 +416,19 @@ private void FilterFlyout_OnIsOpenChanged(object sender, EventArgs e)
    
         }
 
+        public static readonly Dictionary<String, int> DictUpdateTimes = new Dictionary<string, int>()
+        {
+            {"Never", -1},
+            {"5 min", 1000*60*5},
+            {"15 min",  1000*60*15},
+            {"30 min",  1000*60*30},
+            {"1 h",  1000*3600*1},
+            {"2 h",  1000*3600*2},
+            {"3 h",  1000*3600*3},
+            {"6 h",  1000*3600*6},
+            {"12 h", 1000*3600*12},
+            {"24 h", 1000*3600*24}
+        };
+
     }
 }
diff --git a/SjUpdater/Model/FavShowData.cs b/SjUpdater/Model/FavShowData.cs
index 9f8a58e..d195b7e 100644
--- a/SjUpdater/Model/FavShowData.cs
+++ b/SjUpdater/Model/FavShowData.cs
@@ -23,17 +23,18 @@ public class FavShowData : PropertyChangedImpl
         private int _nrEpisodes;
         private int _cachedNrEpisodes;
         private bool _newEpisodes;
+        private bool _notified;
         private bool _isLoading;
 
-        private UploadLanguage _filterLanguage;
+        private UploadLanguage? _filterLanguage;
         private string _filterHoster;
-        private bool _filterShowNonSeason;
+        private bool? _filterShowNonSeason;
         private string _filterName;
         private string _filterFormat;
         private string _filterUploader;
         private string _filterSize;
         private string _filterRuntime;
-        private bool _filterShowNonEpisode;
+        private bool? _filterShowNonEpisode;
         private string _infoUrl;
         private List<DownloadData> _allDownloads;
 
@@ -55,15 +56,16 @@ public FavShowData()
             _seasons = new ObservableCollection<FavSeasonData>();
             _allDownloads = new List<DownloadData>();
 
-            _filterName = "";
-            _filterHoster = "";
-            _filterLanguage = UploadLanguage.Both;
-            _filterFormat = "";
-            _filterUploader = "";
-            _filterSize = "";
-            _filterRuntime = "";
-            _filterShowNonSeason = true;
-            _filterShowNonEpisode = true;
+            //the getters will return the default filter if the value is a null string
+            _filterName = null;
+            _filterHoster = null;
+            _filterLanguage = null;
+            _filterFormat = null;
+            _filterUploader = null;
+            _filterSize = null;
+            _filterRuntime = null;
+            _filterShowNonSeason = null;
+            _filterShowNonEpisode = null;
 
         }
 
@@ -139,18 +141,15 @@ public void ApplyFilter(bool reset=true)
                     }
                 }
 
-                if (seasonNr == -1 && !FilterShowNonSeason) //Filter: NonSeason Stuff
+                if (seasonNr == -1 && !FilterShowNonSeason.GetValueOrDefault()) //Filter: NonSeason Stuff
                 {
                     continue;
                 }
 
                 if (currentFavSeason == null || currentFavSeason.Number != seasonNr)
                 {
-                    currentFavSeason = Seasons.FirstOrDefault(favSeasonData => favSeasonData.Number == seasonNr);
-                    if (currentFavSeason == null)
-                    {
-                        currentFavSeason = new FavSeasonData() {Number = seasonNr,Show=this};
-                    }
+                    currentFavSeason = Seasons.FirstOrDefault(favSeasonData => favSeasonData.Number == seasonNr) ??
+                                       new FavSeasonData() {Number = seasonNr,Show=this};
                 }
 
 
@@ -227,7 +226,7 @@ public void ApplyFilter(bool reset=true)
                         int.TryParse(m1.Groups[1].Value, out episodeNr);
                     }
 
-                    if (episodeNr == -1 && !FilterShowNonEpisode) //Filter: NonEpisode Stuff
+                    if (episodeNr == -1 && !FilterShowNonEpisode.GetValueOrDefault()) //Filter: NonEpisode Stuff
                     {
                         continue;
                     }
@@ -388,6 +387,11 @@ internal set
                 OnPropertyChanged();
             }
         }
+
+
+        /// <summary>
+        /// Is set to true when we have new episodes (count > cached number). Reset this to false, yourself
+        /// </summary>
         [XmlIgnore]
         public bool NewEpisodes
         {
@@ -400,6 +404,21 @@ internal set
             }
         }
 
+        /// <summary>
+        /// Not touched by class at all. It's intended to be set to true when you have notified the user about updates.
+        /// </summary>
+        [XmlIgnore]
+        public bool Notified
+        {
+            get { return _notified; }
+            internal set
+            {
+                if (value == _notified) return;
+                _notified = value;
+                OnPropertyChanged();
+            }
+        }
+
         [XmlIgnore]
         public int NumberOfSeasons
         {
@@ -441,9 +460,14 @@ public List<DownloadData> AllDownloads
             }
         }
 
-        public UploadLanguage FilterLanguage
+        public UploadLanguage? FilterLanguage
         {
-            get { return _filterLanguage; }
+            get
+            {
+                if (!_filterLanguage.HasValue)
+                    return Settings.Instance.FilterLanguage;
+                return _filterLanguage;
+            }
             set
             {
                 if (value == _filterLanguage)
@@ -455,7 +479,12 @@ public UploadLanguage FilterLanguage
 
         public String FilterName
         {
-            get { return _filterName; }
+            get
+            {
+                if(_filterName==null)
+                    return Settings.Instance.FilterName;
+                return _filterName;
+            }
             set
             {
                 if (value == _filterName) return;
@@ -466,7 +495,12 @@ public String FilterName
 
         public String FilterHoster
         {
-            get { return _filterHoster; }
+            get
+            {
+                if (_filterHoster == null)
+                    return Settings.Instance.FilterHoster;
+                return _filterHoster;
+            }
             set
             {
                 if (value == _filterHoster) return;
@@ -475,9 +509,14 @@ public String FilterHoster
             }
         }
 
-        public bool FilterShowNonSeason
+        public bool? FilterShowNonSeason
         {
-            get { return _filterShowNonSeason; }
+            get
+            {
+                if (!_filterShowNonSeason.HasValue)
+                    return Settings.Instance.FilterShowNonSeason;
+                return _filterShowNonSeason;
+            }
             set
             {
                 if (value == _filterShowNonSeason) return;
@@ -486,9 +525,14 @@ public bool FilterShowNonSeason
             }
         }
 
-        public bool FilterShowNonEpisode
+        public bool? FilterShowNonEpisode
         {
-            get { return _filterShowNonEpisode; }
+            get
+            {
+                if (!_filterShowNonEpisode.HasValue)
+                    return Settings.Instance.FilterShowNonEpisode;
+                return _filterShowNonEpisode;
+            }
             set
             {
                 if (value == _filterShowNonEpisode) return;
@@ -499,7 +543,12 @@ public bool FilterShowNonEpisode
 
         public String FilterFormat
         {
-            get { return _filterFormat; }
+            get
+            {
+                if (_filterFormat == null)
+                    return Settings.Instance.FilterFormat; 
+                return _filterFormat;
+            }
             set
             {
                 if (value == _filterFormat) return;
@@ -510,7 +559,12 @@ public String FilterFormat
 
         public String FilterUploader
         {
-            get { return _filterUploader; }
+            get
+            {
+                if (_filterUploader == null)
+                    return Settings.Instance.FilterUploader; 
+                return _filterUploader;
+            }
             set
             {
                 if (value == _filterUploader) return;
@@ -521,7 +575,12 @@ public String FilterUploader
 
         public String FilterSize
         {
-            get { return _filterSize; }
+            get
+            {
+                if (_filterSize == null)
+                    return Settings.Instance.FilterSize; 
+                return _filterSize;
+            }
             set
             {
                 if (value == _filterSize) return;
@@ -532,7 +591,12 @@ public String FilterSize
 
         public String FilterRuntime
         {
-            get { return _filterRuntime; }
+            get
+            {
+                if (_filterRuntime == null)
+                    return Settings.Instance.FilterRuntime; 
+                return _filterRuntime;
+            }
             set
             {
                 if (value == _filterRuntime) return;
diff --git a/SjUpdater/Model/UploadData.cs b/SjUpdater/Model/UploadData.cs
index db288dc..172c97b 100644
--- a/SjUpdater/Model/UploadData.cs
+++ b/SjUpdater/Model/UploadData.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace SjUpdater.Model
 {
@@ -7,7 +9,7 @@ public enum UploadLanguage
     {
         German = 1,
         English = 2,
-        Both = German + English
+        Any = German + English
     }
     public class UploadData
     {
@@ -27,6 +29,14 @@ public UploadData()
         public String Runtime { get; set; }
         public UploadLanguage Language { get; set; }
         public SeasonData Season { get; set; }
+        public static IEnumerable<UploadLanguage> LanguagesValues
+        {
+            get
+            {
+                return Enum.GetValues(typeof(UploadLanguage))
+                    .Cast<UploadLanguage>();
+            }
+        }
 
     }
 }
diff --git a/SjUpdater/Settings.cs b/SjUpdater/Settings.cs
index c404182..5bff81a 100644
--- a/SjUpdater/Settings.cs
+++ b/SjUpdater/Settings.cs
@@ -58,6 +58,11 @@ public static Settings Instance
         /// </summary>
         public bool SortEpisodesDesc { get; set; }
 
+        /// <summary>
+        /// Wheather to sort the Shows alphabetically or by new/old
+        /// </summary>
+        public bool SortShowsAlphabetically { get; set; }
+
         /// <summary>
         /// The Numer of Threads used to fetch updates on programm start
         /// </summary>
@@ -68,9 +73,29 @@ public static Settings Instance
         /// </summary>
         public bool MinimizeToTray { get; set; }
 
+        /// <summary>
+        /// How often to update the TV Shows (in miliseconds)
+        /// </summary>
+        public int UpdateTime { get; set; }
+
+        /// <summary>
+        /// Theme Color
+        /// </summary>
         public String ThemeAccent { get; set; }
 
 
+        //Default Filters: See FavShowData.cs
+
+        public UploadLanguage FilterLanguage { get; set; }
+        public String FilterName{ get; set; }
+        public String FilterHoster { get; set; }
+        public bool FilterShowNonSeason { get; set; }
+        public bool FilterShowNonEpisode { get; set; }
+        public String FilterFormat { get; set; }
+        public String FilterUploader { get; set; }
+        public String FilterSize { get; set; }
+        public String FilterRuntime { get; set; }
+
         public Settings()
         {
             TvShows = new ObservableCollection<FavShowData>();
@@ -78,6 +103,10 @@ public Settings()
             SortEpisodesDesc = false;
             NumFetchThreads = 3;
             ThemeAccent = "Green";
+            UpdateTime = 1000*60*15; //15min
+            FilterLanguage = UploadLanguage.Any;
+            FilterShowNonEpisode = true;
+            FilterShowNonSeason = true;
         }
         
         public static Settings Load(string filename)
diff --git a/SjUpdater/ViewModel/EpisodeTileViewModel.cs b/SjUpdater/ViewModel/EpisodeTileViewModel.cs
index 4b351b8..0d8b034 100644
--- a/SjUpdater/ViewModel/EpisodeTileViewModel.cs
+++ b/SjUpdater/ViewModel/EpisodeTileViewModel.cs
@@ -104,7 +104,7 @@ public string Languages
                         return "English";
                     case UploadLanguage.German:
                         return "German";
-                    case UploadLanguage.Both:
+                    case UploadLanguage.Any:
                         return "German,English";
                 }
                 return "";
diff --git a/SjUpdater/ViewModel/OverviewPanormaViewModel.cs b/SjUpdater/ViewModel/OverviewPanormaViewModel.cs
index 2a86d7f..4af3230 100644
--- a/SjUpdater/ViewModel/OverviewPanormaViewModel.cs
+++ b/SjUpdater/ViewModel/OverviewPanormaViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Windows;
@@ -8,38 +9,38 @@
 using System.Windows.Media;
 using MahApps.Metro.Controls;
 using SjUpdater.Model;
+using SjUpdater.Utils;
 
 namespace SjUpdater.ViewModel
 {
     public class OverviewPanormaViewModel:PanoramaGroup
     {
         private readonly ObservableCollection<FavShowData> _shows;
-        //private readonly SimpleCommand<object, ShowViewModel> _openShowCommand;
-        private readonly ObservableCollection<object> _lisTiles; 
+        private readonly ObservableCollection<ShowTileViewModel> _lisTiles;
+
+        private static readonly Comparer<ShowTileViewModel> ShowComparer =
+          Comparer<ShowTileViewModel>.Create((m1, m2) => String.CompareOrdinal(m1.Title, m2.Title));
+
         public OverviewPanormaViewModel(ObservableCollection<FavShowData>  shows) : base("My TV Shows")
         {
             _shows = shows;
-            /*_openShowCommand = new SimpleCommand<object, ShowViewModel>(delegate(ShowViewModel model)
-            {
-                if (OpenShow != null)
-                {
-                    OpenShow(this, model);
-                }
-            });*/
+
 
             shows.CollectionChanged += update_source;
 
-            _lisTiles = new ObservableCollection<object>();
+            _lisTiles = new ObservableCollection<ShowTileViewModel>();
             SetSource(_lisTiles);
             foreach (FavShowData favShowData in _shows)
             {
                 var x = new ShowTileViewModel(favShowData);//, _openShowCommand);
                 _lisTiles.Add(x);
             }
+            if (Settings.Instance.SortShowsAlphabetically)
+                _lisTiles.Sort(ShowComparer);
 
 
          
-             var t =  new Tile();
+           /*  var t =  new Tile();
             t.Content = new TextBlock()
             {
                 Text = "+",
@@ -56,7 +57,7 @@ public OverviewPanormaViewModel(ObservableCollection<FavShowData>  shows) : base
             b.ElementName = "Window";
             t.SetBinding(ButtonBase.CommandProperty, b);
 
-            _lisTiles.Add(t);
+            _lisTiles.Add(t);*/
             //{Binding ElementName=Window, Path=ShowClickedCommand }
             /* Command = new SimpleCommand<object, object>(o =>
              {
@@ -86,7 +87,7 @@ private void update_source(object sender, NotifyCollectionChangedEventArgs e)
                         var o = oldItem as FavShowData;
                         for (int i=_lisTiles.Count-2; i>=0; i--)
                         {
-                            if (((ShowTileViewModel) _lisTiles[i]).Show == oldItem)
+                            if (_lisTiles[i].Show == oldItem)
                             {
                                 _lisTiles.RemoveAt(i);
                             }
@@ -99,10 +100,5 @@ private void update_source(object sender, NotifyCollectionChangedEventArgs e)
 
             }
         }
-
-
-
-       /* public event EventHandler AddNew;
-        public event EventHandler<ShowViewModel> OpenShow;*/
     }
 }
diff --git a/SjUpdater/ViewModel/SeasonPanoramaViewModel.cs b/SjUpdater/ViewModel/SeasonPanoramaViewModel.cs
index 37b110e..3af37f6 100644
--- a/SjUpdater/ViewModel/SeasonPanoramaViewModel.cs
+++ b/SjUpdater/ViewModel/SeasonPanoramaViewModel.cs
@@ -58,24 +58,26 @@ public SeasonPanoramaViewModel(FavSeasonData season) :base((season.Number==-1)?"
 
 
 
-            var t = new Tile();
-            t.Content = new TextBlock()
-            {
-                Text = "*",
-                FontSize = 180,
-                Foreground = Brushes.White,
-                HorizontalAlignment = HorizontalAlignment.Center,
-                VerticalAlignment = VerticalAlignment.Center,
-                Padding = new Thickness(0),
-                Margin = new Thickness(0, -40, 0, 0)
-            };
-            t.Width = 120;
-            t.Height = 120;
-           /* Binding b = new Binding("AddShowCommand");
-            b.ElementName = "Window";
-            t.SetBinding(ButtonBase.CommandProperty, b);*/
-
-            _lisTiles.Add(t);
+            /* var t = new Tile();
+             t.Content = new TextBlock()
+             {
+                 Text = "*",
+                 FontSize = 180,
+                 Foreground = Brushes.White,
+                 HorizontalAlignment = HorizontalAlignment.Center,
+                 VerticalAlignment = VerticalAlignment.Center,
+                 Padding = new Thickness(0),
+                 Margin = new Thickness(0, -40, 0, 0)
+             };
+             t.Width = 120;
+             t.Height = 120;
+             * _lisTiles.Add(t);
+              */
+            /* Binding b = new Binding("AddShowCommand");
+             b.ElementName = "Window";
+             t.SetBinding(ButtonBase.CommandProperty, b);*/
+
+            
             _lisTiles.Sort(EpisodeComparer);
 
 
diff --git a/SjUpdater/ViewModel/ShowViewModel.cs b/SjUpdater/ViewModel/ShowViewModel.cs
index 3e44f23..1ec1fc1 100644
--- a/SjUpdater/ViewModel/ShowViewModel.cs
+++ b/SjUpdater/ViewModel/ShowViewModel.cs
@@ -139,7 +139,7 @@ public String FilterUploader
 
         public bool FilterNonSeason
         {
-            get { return _show.FilterShowNonSeason; }
+            get { return _show.FilterShowNonSeason.GetValueOrDefault(); }
             set
             {
                 _show.FilterShowNonSeason = value;
@@ -149,7 +149,7 @@ public bool FilterNonSeason
 
         public bool FilterNonEpisode
         {
-            get { return _show.FilterShowNonEpisode; }
+            get { return _show.FilterShowNonEpisode.GetValueOrDefault(); }
             set
             {
                 _show.FilterShowNonEpisode = value;
@@ -177,12 +177,12 @@ public String FilterRuntime
             }
         }
 
-        public int FilterLanguage
+        public UploadLanguage FilterLanguage
         {
-            get { return (int)_show.FilterLanguage-1; }
+            get { return _show.FilterLanguage.GetValueOrDefault(); }
             set
             {
-                _show.FilterLanguage = (UploadLanguage) (value + 1);
+                _show.FilterLanguage = value;
                 OnPropertyChanged();
             }
         }