diff --git a/ModernKeePass/Common/ToastNotificationHelper.cs b/ModernKeePass/Common/ToastNotificationHelper.cs
index ab8127f..eeee286 100644
--- a/ModernKeePass/Common/ToastNotificationHelper.cs
+++ b/ModernKeePass/Common/ToastNotificationHelper.cs
@@ -66,7 +66,7 @@ namespace ModernKeePass.Common
             */
             var notificationXml = ToastNotificationManager.GetTemplateContent(ToastTemplateType.ToastText02);
             var toastElements = notificationXml.GetElementsByTagName("text");
-            toastElements[0].AppendChild(notificationXml.CreateTextNode($"{entityType} deleted"));
+            toastElements[0].AppendChild(notificationXml.CreateTextNode($"{entityType} {entity.Name} deleted"));
             toastElements[1].AppendChild(notificationXml.CreateTextNode("Click me to undo"));
             var toastNode = notificationXml.SelectSingleNode("/toast");
             ((XmlElement)toastNode)?.SetAttribute("launch", new QueryString
diff --git a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml b/ModernKeePass/Controls/OpenDatabaseUserControl.xaml
index c8b0cf5..bbcd47b 100644
--- a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml
+++ b/ModernKeePass/Controls/OpenDatabaseUserControl.xaml
@@ -36,26 +36,18 @@
                                                             <VisualState x:Name="Normal" />
                                                             <VisualState x:Name="PointerOver">
                                                                 <Storyboard>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundElement"
-                                                                                               Storyboard.TargetProperty="Background">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverBackgroundThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
                                                                     <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
                                                                                                Storyboard.TargetProperty="BorderBrush">
                                                                         <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverBorderThemeBrush}" />
                                                                     </ObjectAnimationUsingKeyFrames>
                                                                     <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GlyphElement"
                                                                                                Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverForegroundThemeBrush}" />
+                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverBackgroundThemeBrush}" />
                                                                     </ObjectAnimationUsingKeyFrames>
                                                                 </Storyboard>
                                                             </VisualState>
                                                             <VisualState x:Name="Pressed">
                                                                 <Storyboard>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundElement"
-                                                                                               Storyboard.TargetProperty="Background">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedBackgroundThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
                                                                     <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
                                                                                                Storyboard.TargetProperty="BorderBrush">
                                                                         <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedBorderThemeBrush}" />
diff --git a/ModernKeePass/Converters/DoubleToForegroungBrushComplexityConverter.cs b/ModernKeePass/Converters/DoubleToForegroungBrushComplexityConverter.cs
new file mode 100644
index 0000000..785bc59
--- /dev/null
+++ b/ModernKeePass/Converters/DoubleToForegroungBrushComplexityConverter.cs
@@ -0,0 +1,32 @@
+using System;
+using Windows.UI;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Media;
+
+namespace ModernKeePass.Converters
+{
+    public class DoubleToForegroungBrushComplexityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            try
+            {
+                var currentValue = (double) value;
+                var maxValue = double.Parse(parameter as string);
+                var green = System.Convert.ToByte(currentValue / maxValue * byte.MaxValue);
+                var red = (byte) (byte.MaxValue - green);
+                return new SolidColorBrush(Color.FromArgb(255, red, green, 0));
+            }
+            catch (OverflowException)
+            {
+                return new SolidColorBrush(Color.FromArgb(255, 0, byte.MaxValue, 0));
+            }
+            
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/ModernKeePass/ModernKeePass.csproj b/ModernKeePass/ModernKeePass.csproj
index bde2dd1..b74dca4 100644
--- a/ModernKeePass/ModernKeePass.csproj
+++ b/ModernKeePass/ModernKeePass.csproj
@@ -126,6 +126,7 @@
     <Compile Include="Controls\TextBoxWithButton.cs" />
     <Compile Include="Converters\BooleanToVisibilityConverter.cs" />
     <Compile Include="Converters\ColorToBrushConverter.cs" />
+    <Compile Include="Converters\DoubleToForegroungBrushComplexityConverter.cs" />
     <Compile Include="Converters\InverseBooleanToVisibilityConverter.cs" />
     <Compile Include="Converters\PluralizationConverter.cs" />
     <Compile Include="Converters\ProgressBarLegalValuesConverter.cs" />
diff --git a/ModernKeePass/Pages/EntryDetailPage.xaml b/ModernKeePass/Pages/EntryDetailPage.xaml
index ff44f20..c309abb 100644
--- a/ModernKeePass/Pages/EntryDetailPage.xaml
+++ b/ModernKeePass/Pages/EntryDetailPage.xaml
@@ -41,10 +41,6 @@
                                                             <VisualState x:Name="Normal" />
                                                             <VisualState x:Name="PointerOver">
                                                                 <Storyboard>
-                                                                    <!--<ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundElement"
-                                                                                               Storyboard.TargetProperty="Background">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverBackgroundThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>-->
                                                                     <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
                                                                                                Storyboard.TargetProperty="BorderBrush">
                                                                         <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverBorderThemeBrush}" />
@@ -57,10 +53,6 @@
                                                             </VisualState>
                                                             <VisualState x:Name="Pressed">
                                                                 <Storyboard>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundElement"
-                                                                                               Storyboard.TargetProperty="Background">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedBackgroundThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
                                                                     <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
                                                                                                Storyboard.TargetProperty="BorderBrush">
                                                                         <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedBorderThemeBrush}" />
@@ -343,8 +335,6 @@
                                             <CheckBox IsChecked="{Binding SpacePatternSelected, Mode=TwoWay}">Space ( )</CheckBox>
                                             <CheckBox IsChecked="{Binding SpecialPatternSelected, Mode=TwoWay}">Special (!, $, %, ...)</CheckBox>
                                             <CheckBox IsChecked="{Binding BracketsPatternSelected, Mode=TwoWay}">Brackets ([], {}, (), ...)</CheckBox>
-                                            <TextBlock>Additional characters:</TextBlock>
-                                            <TextBox Text="{Binding CustomChars}" />
                                             <Button Click="PasswordGenerationButton_Click">Generate</Button>
                                         </StackPanel>
                                     </Flyout>
@@ -377,6 +367,9 @@
                 <Style TargetType="TextBlock">
                     <Setter Property="Margin" Value="0,20,0,0"/>
                 </Style>
+                <Style TargetType="CheckBox">
+                    <Setter Property="Margin" Value="0,20,0,0"/>
+                </Style>
             </StackPanel.Resources>
             <TextBlock TextWrapping="Wrap" Text="User name or login" FontSize="18"/>
             <TextBox HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding UserName, Mode=TwoWay}" Width="350"  Height="32" />
@@ -388,6 +381,11 @@
             <local:TextBoxWithButton x:Name="UrlTextBox" HorizontalAlignment="Left" Text="{Binding Url, Mode=TwoWay}" Height="32" Width="350" MaxLength="256" Style="{StaticResource TextBoxWithButtonStyle}" GotoClick="UrlButton_Click" />
             <TextBlock TextWrapping="Wrap" Text="Notes" FontSize="18"/>
             <TextBox HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Notes, Mode=TwoWay}" Width="350" Height="200" AcceptsReturn="True" IsSpellCheckEnabled="True" />
+            <CheckBox FontSize="18" IsChecked="{Binding HasExpirationDate, Mode=TwoWay}">Expiration date</CheckBox>
+            <StackPanel Orientation="Horizontal" IsHitTestVisible="{Binding HasExpirationDate}">
+                <DatePicker Margin="0,0,20,0" ></DatePicker>
+                <TimePicker ></TimePicker>
+            </StackPanel>
         </StackPanel>
 
         <!-- Bouton Précédent et titre de la page -->
diff --git a/ModernKeePass/Pages/NewDatabasePage.xaml b/ModernKeePass/Pages/NewDatabasePage.xaml
index 175f1ed..a75b2db 100644
--- a/ModernKeePass/Pages/NewDatabasePage.xaml
+++ b/ModernKeePass/Pages/NewDatabasePage.xaml
@@ -11,6 +11,7 @@
     <Page.Resources>
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
         <converters:ProgressBarLegalValuesConverter x:Key="ProgressBarLegalValuesConverter"/>
+        <converters:DoubleToForegroungBrushComplexityConverter x:Key="DoubleToForegroungBrushComplexityConverter"/>
     </Page.Resources>
     <Page.DataContext>
         <viewModels:NewVm />
@@ -25,14 +26,7 @@
                 <TextBlock Margin="25,10,0,10" Text="{Binding Name}" />
                 <local:OpenDatabaseUserControl Password="{Binding Password, Mode=TwoWay}" CreateNew="True"  ValidationChecked="PasswordUserControl_PasswordChecked" />
                 <TextBlock Margin="25,0,0,10">Password complexity</TextBlock>
-                <ProgressBar Margin="25,0,0,10" Value="{Binding PasswordComplexityIndicator, ConverterParameter=0\,128, Converter={StaticResource ProgressBarLegalValuesConverter}, Mode=OneWay}" Maximum="128" Width="300" HorizontalAlignment="Left" >
-                    <ProgressBar.Background>
-                        <LinearGradientBrush EndPoint="1,1" StartPoint="0,0">
-                            <GradientStop Color="#FFFD0000"/>
-                            <GradientStop Color="#FF2EFF00" Offset="1"/>
-                        </LinearGradientBrush>
-                    </ProgressBar.Background>
-                </ProgressBar>
+                <ProgressBar Margin="25,0,0,10" Value="{Binding PasswordComplexityIndicator, ConverterParameter=0\,128, Converter={StaticResource ProgressBarLegalValuesConverter}}" Maximum="128" Width="300" HorizontalAlignment="Left" Foreground="{Binding PasswordComplexityIndicator, ConverterParameter=128, Converter={StaticResource DoubleToForegroungBrushComplexityConverter}}" />
             </StackPanel>
         </Border>
     </StackPanel>
diff --git a/ModernKeePass/ViewModels/EntryVm.cs b/ModernKeePass/ViewModels/EntryVm.cs
index e133710..2cbd6d5 100644
--- a/ModernKeePass/ViewModels/EntryVm.cs
+++ b/ModernKeePass/ViewModels/EntryVm.cs
@@ -19,6 +19,7 @@ namespace ModernKeePass.ViewModels
         public System.Drawing.Color? ForegroundColor => Entry?.ForegroundColor;
         public bool IsRevealPasswordEnabled => !string.IsNullOrEmpty(Password);
 
+
         public double PasswordLength { get; set; } = 25;
         public bool UpperCasePatternSelected { get; set; } = true;
         public bool LowerCasePatternSelected { get; set; } = true;
@@ -72,11 +73,23 @@ namespace ModernKeePass.ViewModels
             get
             {
                 if (Entry == null) return Symbol.Add;
+                //if ()
                 var result = PwIconToSegoeMapping.GetSymbolFromIcon(Entry.IconId);
                 return result == Symbol.More ? Symbol.Permissions : result;
             }
         }
 
+        public DateTimeOffset ExpiryDate
+        {
+            get { return new DateTimeOffset(Entry.ExpiryTime.Date); }
+            set { Entry.ExpiryTime = value.DateTime; }
+        }
+        public TimeSpan ExpiryTime
+        {
+            get { return Entry.ExpiryTime.TimeOfDay; }
+            set { Entry.ExpiryTime = Entry.ExpiryTime.Date.Add(value); }
+        }
+
         public bool IsEditMode
         {
             get { return _isEditMode; }
@@ -96,11 +109,21 @@ namespace ModernKeePass.ViewModels
                 NotifyPropertyChanged("IsRevealPassword");
             }
         }
+        public bool HasExpirationDate
+        {
+            get { return Entry.Expires; }
+            set
+            {
+                Entry.Expires = value;
+                NotifyPropertyChanged("HasExpirationDate");
+            }
+        }
         
         public event PropertyChangedEventHandler PropertyChanged;
 
         private bool _isEditMode;
         private bool _isRevealPassword;
+
         private void NotifyPropertyChanged(string propertyName)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
diff --git a/ModernKeePass/ViewModels/NewVm.cs b/ModernKeePass/ViewModels/NewVm.cs
index da2cd89..d599ede 100644
--- a/ModernKeePass/ViewModels/NewVm.cs
+++ b/ModernKeePass/ViewModels/NewVm.cs
@@ -6,6 +6,7 @@ namespace ModernKeePass.ViewModels
     {
         private string _password = string.Empty;
 
+        public double PasswordComplexityIndicator => QualityEstimation.EstimatePasswordBits(Password.ToCharArray());
         public string Password
         {
             get { return _password; }
@@ -16,6 +17,5 @@ namespace ModernKeePass.ViewModels
             }
         }
 
-        public double PasswordComplexityIndicator => QualityEstimation.EstimatePasswordBits(Password.ToCharArray());
     }
 }