diff --git a/src/BreCalClient/DateTimePickerExt.cs b/src/BreCalClient/DateTimePickerExt.cs
new file mode 100644
index 0000000..e448d34
--- /dev/null
+++ b/src/BreCalClient/DateTimePickerExt.cs
@@ -0,0 +1,44 @@
+using System.Text.RegularExpressions;
+using System.Windows.Input;
+using Xceed.Wpf.Toolkit;
+
+namespace BreCalClient
+{
+    public class DateTimePickerExt : DateTimePicker
+    {
+        protected override void OnPreviewTextInput(TextCompositionEventArgs e)
+        {
+            base.OnPreviewTextInput(e);
+                        
+            // Die vom Agenten "vorgeschlagene" Zeit könnte auch der Watermark sein?
+
+            string text = this.Text + e.Text;
+            if (this.Template.FindName("PART_TextBox", this) is not WatermarkTextBox tb) return;
+
+            if (Regex.IsMatch(text, @"^\d{3}"))
+            {
+                e.Handled = true;
+                tb.Text = Regex.Replace(text, @"(\d{2})(\d)", "$1.$2");
+                tb.CaretIndex = tb.Text.Length;
+            }
+            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{3})"))
+            {
+                e.Handled = true;
+                tb.Text = Regex.Replace(text, @"^(\d{2}\.\d{2})(\d)", "$1.$2");
+                tb.CaretIndex = tb.Text.Length;
+            }
+            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{2}\.\d{2} \d{3})"))
+            {
+                e.Handled = true;
+                tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\.\d{2} \d{2})(\d)", "$1:$2");
+                tb.CaretIndex = tb.Text.Length;
+            }
+            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{2}\.\d{4} \d{3})"))
+            {
+                e.Handled = true;
+                tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\.\d{4} \d{2})(\d)", "$1:$2");
+                tb.CaretIndex = tb.Text.Length;
+            }
+        }
+    }
+}
diff --git a/src/BreCalClient/EditShipcallControl.xaml b/src/BreCalClient/EditShipcallControl.xaml
index 6ebe2cf..71eac00 100644
--- a/src/BreCalClient/EditShipcallControl.xaml
+++ b/src/BreCalClient/EditShipcallControl.xaml
@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:BreCalClient"
-        xmlns:p = "clr-namespace:BreCalClient.Resources"        
+        xmlns:p = "clr-namespace:BreCalClient.Resources"
         xmlns:api="clr-namespace:BreCalClient.misc.Model"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d" Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
@@ -46,7 +46,7 @@
         <Button x:Name="buttonEditShips" Grid.Column="1" Grid.Row="6" Margin="2" Content="{x:Static p:Resources.textEditShips}" Click="buttonEditShips_Click" Visibility="Hidden" />
 
         <Label Content="{x:Static p:Resources.textType}" Grid.Column="2" Grid.Row="0" HorizontalContentAlignment="Right" />
-                
+
         <ComboBox ItemsSource="{local:Enumerate {x:Type api:ShipcallType}}" Grid.Column="3" Margin="2" Grid.Row="0" SelectionChanged="comboBoxCategories_SelectionChanged" x:Name="comboBoxCategories" />
 
         <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="2" Grid.Row="1"  HorizontalContentAlignment="Right"/>
@@ -66,10 +66,10 @@
 
         <Label Content="ETA" Grid.Column="2" Grid.Row="3"  HorizontalContentAlignment="Right" Margin="0,2,0,26" Grid.RowSpan="2"/>
         <Label Content="ETD" Grid.Column="2" Grid.Row="4"  HorizontalContentAlignment="Right"/>
-        
+
         <ComboBox x:Name="comboBoxTimeRef" Grid.Column="3" Margin="2" Grid.Row="2" />
-        <xctk:DateTimePicker x:Name="datePickerETA" Grid.Column="3" Grid.Row="3" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETA_ValueChanged"/>
-        <xctk:DateTimePicker x:Name="datePickerETD" Grid.Column="3" Grid.Row="4" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETD_ValueChanged"/>
+        <local:DateTimePickerExt x:Name="datePickerETA" Grid.Column="3" Grid.Row="3" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETA_ValueChanged"/>
+        <local:DateTimePickerExt x:Name="datePickerETD" Grid.Column="3" Grid.Row="4" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETD_ValueChanged"/>
 
         <Label Content="{x:Static p:Resources.textAgency}" Grid.Column="2" Grid.Row="5"  HorizontalContentAlignment="Right"/>
         <ComboBox Name="comboBoxAgency" Grid.Column="3" Grid.Row="5" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id" SelectionChanged="comboBoxAgency_SelectionChanged">
diff --git a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml
index 4c3ccac..84cfade 100644
--- a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml
@@ -5,7 +5,6 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:BreCalClient"
         xmlns:p = "clr-namespace:BreCalClient.Resources"
-        xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"  Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
         Title="{x:Static p:Resources.textEditShipcall}" Height="403" Width="900" Loaded="Window_Loaded" ResizeMode="CanResizeWithGrip" Icon="Resources/containership.ico">
@@ -42,19 +41,19 @@
             <Label Grid.Column="0" Grid.Row="0" Content="{x:Static p:Resources.textIncoming}" FontWeight="DemiBold"/>
             <Image Margin="2" Grid.Column="1" Source="Resources/arrow_down_red.png" />
         </Grid>
-        
+
         <Label Content="ETA" x:Name="labelETA" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <Grid Grid.Column="1" Grid.Row="1">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width=".5*" />
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
-            <xctk:DateTimePicker x:Name="datePickerETA" Grid.Column="0" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETA_ValueChanged"/>
-            <xctk:DateTimePicker x:Name="datePickerETA_End" Grid.Column="1" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETA_End_ValueChanged"/>
+            <local:DateTimePickerExt x:Name="datePickerETA" Grid.Column="0" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETA_ValueChanged"/>
+            <local:DateTimePickerExt x:Name="datePickerETA_End" Grid.Column="1" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETA_End_ValueChanged"/>
         </Grid>
         <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="2"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <ComboBox Name="comboBoxArrivalBerth" Grid.Column="1" Grid.Row="2" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id" SelectionChanged="comboBoxArrivalBerth_SelectionChanged">
-            
+
         </ComboBox>
         <Label Content="{x:Static p:Resources.textPierside}" Grid.Column="0" Grid.Row="3" HorizontalContentAlignment="Right" />
         <ComboBox x:Name="comboBoxPierside" Grid.Column="1" Grid.Row="3" Margin="2" >
diff --git a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
index 5cf1511..92c0ed8 100644
--- a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
@@ -5,7 +5,6 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:BreCalClient"
         xmlns:p = "clr-namespace:BreCalClient.Resources"
-        xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"  Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
         Title="{x:Static p:Resources.textEditShipcall}" Height="375" Width="900" Loaded="Window_Loaded" ResizeMode="CanResizeWithGrip" Icon="Resources/containership.ico">
@@ -39,15 +38,15 @@
             <Label Grid.Column="0" Grid.Row="0" Content="{x:Static p:Resources.textOutgoing}" FontWeight="DemiBold"/>
             <Image Margin="2" Grid.Column="1" Source="Resources/arrow_up_blue.png" />
         </Grid>
-        
+
         <Label Content="ETD" x:Name="labelETD" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <Grid Grid.Row="1" Grid.Column="1" >
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width=".5*" />
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
-            <xctk:DateTimePicker x:Name="datePickerETD" Grid.Column="0" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged" PreviewKeyUp="datePickerETD_PreviewKeyUp" PreviewTextInput="datePickerETD_PreviewTextInput"/>
-            <xctk:DateTimePicker x:Name="datePickerETD_End" Grid.Column="1" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged"/>
+            <local:DateTimePickerExt x:Name="datePickerETD" Grid.Column="0" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged" PreviewKeyUp="datePickerETD_PreviewKeyUp" PreviewTextInput="datePickerETD_PreviewTextInput"/>
+            <local:DateTimePickerExt x:Name="datePickerETD_End" Grid.Column="1" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged"/>
         </Grid>
         <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="2" HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <ComboBox Name="comboBoxDepartureBerth" Grid.Column="1" Grid.Row="2" Margin="2" DisplayMemberPath="Name"  SelectedValuePath="Id" SelectionChanged="comboBoxDepartureBerth_SelectionChanged" />
diff --git a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
index 7eaea66..fcc4d7d 100644
--- a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
@@ -355,26 +355,37 @@ namespace BreCalClient
 
         private void datePickerETD_PreviewTextInput(object sender, System.Windows.Input.TextCompositionEventArgs e)
         {
-            DateTimePicker dp = (sender as DateTimePicker);
+            DateTimePicker? dp = (sender as DateTimePicker);
+            if(dp == null) return;
             
             // Das ist der richtige Ansatz, funktioniert aber bei der Jahresangabe noch nicht ganz richtig.
             // Die vom Agenten "vorgeschlagene" Zeit könnte auch der Watermark sein?
 
             string text = dp.Text + e.Text;
-            dp.Template.LoadContent();
+            if (dp.Template.FindName("PART_TextBox", dp) is not WatermarkTextBox tb) return;
+
             if (Regex.IsMatch(text, @"^\d{3}"))
             {
-                e.Handled = true;
-                WatermarkTextBox tb = dp.Template.FindName("PART_TextBox", dp) as WatermarkTextBox;
-                
+                e.Handled = true;                                
                 tb.Text = Regex.Replace(text, @"(\d{2})(\d)", "$1.$2");
                 tb.CaretIndex = tb.Text.Length;
             }
             else if (Regex.IsMatch(text, @"^(\d{2}\.\d{3})"))
+            {
+                e.Handled = true;                
+                tb.Text = Regex.Replace(text, @"^(\d{2}\.\d{2})(\d)", "$1.$2");
+                tb.CaretIndex = tb.Text.Length;
+            }
+            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{2}\.\d{2} \d{3})"))
             {
                 e.Handled = true;
-                WatermarkTextBox tb = dp.Template.FindName("PART_TextBox", dp) as WatermarkTextBox;
-                tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2})(\d)", "$1.$2");
+                tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\.\d{2} \d{2})(\d)", "$1:$2");
+                tb.CaretIndex = tb.Text.Length;
+            }
+            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{2}\.\d{4} \d{3})"))
+            {
+                e.Handled = true;
+                tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\.\d{4} \d{2})(\d)", "$1:$2");
                 tb.CaretIndex = tb.Text.Length;
             }
         }
diff --git a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
index e742510..bd2d571 100644
--- a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
@@ -5,7 +5,6 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:BreCalClient"
         xmlns:p = "clr-namespace:BreCalClient.Resources"
-        xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"  Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
         Title="{x:Static p:Resources.textEditShipcall}" Height="490" Width="900" Loaded="Window_Loaded" ResizeMode="CanResizeWithGrip" Icon="Resources/containership.ico">
@@ -33,7 +32,7 @@
             <RowDefinition Height="*" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
-            
+
         </Grid.RowDefinitions>
 
         <Grid Grid.Row="0" Grid.Column="0">
@@ -50,8 +49,8 @@
                 <ColumnDefinition Width=".5*" />
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
-            <xctk:DateTimePicker x:Name="datePickerETD" Grid.Column="0" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged"/>
-            <xctk:DateTimePicker x:Name="datePickerETD_End" Grid.Column="1" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged"/>
+            <local:DateTimePickerExt x:Name="datePickerETD" Grid.Column="0" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged"/>
+            <local:DateTimePickerExt x:Name="datePickerETD_End" Grid.Column="1" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged"/>
         </Grid>
 
         <Label Content="{x:Static p:Resources.textTerminal}" Grid.Column="0" Grid.Row="2"  HorizontalContentAlignment="Right"/>
@@ -88,10 +87,10 @@
                 <ColumnDefinition Width=".5*" />
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
-            <xctk:DateTimePicker x:Name="datePickerETA" Grid.Column="0" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETA_ValueChanged"/>
-            <xctk:DateTimePicker x:Name="datePickerETA_End" Grid.Column="1" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETA_ValueChanged"/>
+            <local:DateTimePickerExt x:Name="datePickerETA" Grid.Column="0" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETA_ValueChanged"/>
+            <local:DateTimePickerExt x:Name="datePickerETA_End" Grid.Column="1" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETA_ValueChanged"/>
         </Grid>
-        
+
 
         <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="10"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <ComboBox Name="comboBoxArrivalBerth" Grid.Column="1" Grid.Row="10" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id" SelectionChanged="comboBoxArrivalBerth_SelectionChanged" />
@@ -143,7 +142,7 @@
         </ComboBox>
         <Label Content="{x:Static p:Resources.textMooredLock}" Grid.Column="2" Grid.Row="5" HorizontalContentAlignment="Right" />
         <CheckBox x:Name="checkBoxMooredLock" Grid.Column="3" Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,0,4,0" />
-        
+
         <Label Content="{x:Static p:Resources.textRainSensitiveCargo}" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="6" HorizontalAlignment="Right" />
         <CheckBox x:Name="checkBoxRainsensitiveCargo" Grid.Column="3" Grid.Row="6" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,0,4,0" />
         <Label Content="{x:Static p:Resources.textRemarks}" Grid.Column="2" Grid.Row="7" HorizontalContentAlignment="Right" />
diff --git a/src/BreCalClient/EditTimesControl.xaml b/src/BreCalClient/EditTimesControl.xaml
index 465f90b..e1aee6f 100644
--- a/src/BreCalClient/EditTimesControl.xaml
+++ b/src/BreCalClient/EditTimesControl.xaml
@@ -5,7 +5,6 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:BreCalClient"
         xmlns:p = "clr-namespace:BreCalClient.Resources"
-        xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"  Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
         Title="{x:Static p:Resources.textEditTimes}" Height="331" Width="500" Loaded="Window_Loaded" ResizeMode="CanResizeWithGrip" Icon="Resources/containership.ico">
@@ -36,7 +35,7 @@
         <Label Grid.Row="4" Grid.Column="0" Content="ATD" HorizontalContentAlignment="Right" x:Name="labelATD" />
         <Label Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textLockTime}" HorizontalContentAlignment="Right" />
         <Label Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textZoneEntryTime}" HorizontalContentAlignment="Right" />
-        
+
         <Label Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textRemarks}" HorizontalContentAlignment="Right" />
 
         <Grid Grid.Row="1" Grid.Column="1">
@@ -45,7 +44,7 @@
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
 
-            <xctk:DateTimePicker IsEnabled="False" Grid.Row="0" Grid.Column="0" Margin="2" Name="datePickerETABerth" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETABerth_ValueChanged">
+            <local:DateTimePickerExt IsEnabled="False" Grid.Row="0" Grid.Column="0" Margin="4,2,0,2" x:Name="datePickerETABerth" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETABerth_ValueChanged">
                 <xctk:DateTimePicker.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearETA" Click="contextMenuItemClearETA_Click" >
@@ -55,9 +54,9 @@
                         </MenuItem>
                     </ContextMenu>
                 </xctk:DateTimePicker.ContextMenu>
-            </xctk:DateTimePicker>
+            </local:DateTimePickerExt>
 
-            <xctk:DateTimePicker IsEnabled="False" Grid.Row="0" Grid.Column="1" Margin="2" Name="datePickerETABerth_End" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+            <local:DateTimePickerExt IsEnabled="False" Grid.Row="0" Grid.Column="1" Margin="2" x:Name="datePickerETABerth_End" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
                 <xctk:DateTimePicker.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearETA_End" Click="contextMenuItemClearETA_End_Click" >
@@ -67,7 +66,7 @@
                         </MenuItem>
                     </ContextMenu>
                 </xctk:DateTimePicker.ContextMenu>
-            </xctk:DateTimePicker>
+            </local:DateTimePickerExt>
 
         </Grid>
 
@@ -77,7 +76,7 @@
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
 
-            <xctk:DateTimePicker IsEnabled="False" Grid.Row="0" Grid.Column="0" Margin="2" Name="datePickerETDBerth" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETDBerth_ValueChanged">
+            <local:DateTimePickerExt IsEnabled="False" Grid.Row="0" Grid.Column="0" Margin="2" x:Name="datePickerETDBerth" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETDBerth_ValueChanged">
                 <xctk:DateTimePicker.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearETD" Click="contextMenuItemClearETD_Click" >
@@ -87,9 +86,9 @@
                         </MenuItem>
                     </ContextMenu>
                 </xctk:DateTimePicker.ContextMenu>
-            </xctk:DateTimePicker>
+            </local:DateTimePickerExt>
 
-            <xctk:DateTimePicker IsEnabled="False" Grid.Row="0" Grid.Column="1" Margin="2" Name="datePickerETDBerth_End" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+            <local:DateTimePickerExt IsEnabled="False" Grid.Row="0" Grid.Column="1" Margin="2" x:Name="datePickerETDBerth_End" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
                 <xctk:DateTimePicker.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearETD_End" Click="contextMenuItemClearETD_End_Click" >
@@ -99,11 +98,11 @@
                         </MenuItem>
                     </ContextMenu>
                 </xctk:DateTimePicker.ContextMenu>
-            </xctk:DateTimePicker>
+            </local:DateTimePickerExt>
 
         </Grid>
 
-        <xctk:DateTimePicker IsEnabled="False"  Grid.Row="3" Grid.Column="1" Margin="2" Name="datePickerATA" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+        <local:DateTimePickerExt IsEnabled="False"  Grid.Row="3" Grid.Column="1" Margin="2" x:Name="datePickerATA" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
             <xctk:DateTimePicker.ContextMenu>
                 <ContextMenu>
                     <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearATA" Click="contextMenuItemClearATA_Click" >
@@ -113,9 +112,9 @@
                     </MenuItem>
                 </ContextMenu>
             </xctk:DateTimePicker.ContextMenu>
-        </xctk:DateTimePicker>
+        </local:DateTimePickerExt>
 
-        <xctk:DateTimePicker IsEnabled="False" Grid.Row="4" Grid.Column="1" Margin="2" Name="datePickerATD" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+        <local:DateTimePickerExt IsEnabled="False" Grid.Row="4" Grid.Column="1" Margin="2" x:Name="datePickerATD" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
             <xctk:DateTimePicker.ContextMenu>
                 <ContextMenu>
                     <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearATD" Click="contextMenuItemClearATD_Click" >
@@ -125,9 +124,9 @@
                     </MenuItem>
                 </ContextMenu>
             </xctk:DateTimePicker.ContextMenu>
-        </xctk:DateTimePicker>
+        </local:DateTimePickerExt>
 
-        <xctk:DateTimePicker IsEnabled="False" Grid.Row="5" Grid.Column="1" Margin="2" Name="datePickerLockTime" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+        <local:DateTimePickerExt IsEnabled="False" Grid.Row="5" Grid.Column="1" Margin="2" x:Name="datePickerLockTime" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
             <xctk:DateTimePicker.ContextMenu>
                 <ContextMenu>
                     <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearLockTime" Click="contextMenuItemClearLockTime_Click" >
@@ -137,9 +136,9 @@
                     </MenuItem>
                 </ContextMenu>
             </xctk:DateTimePicker.ContextMenu>
-        </xctk:DateTimePicker>
+        </local:DateTimePickerExt>
         <!--CheckBox IsEnabled="False" Grid.Row="3" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxLockTimeFixed" VerticalAlignment="Center" /-->
-        <xctk:DateTimePicker IsEnabled="False" Grid.Row="6" Grid.Column="1" Margin="2" Name="datePickerZoneEntry" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+        <local:DateTimePickerExt IsEnabled="False" Grid.Row="6" Grid.Column="1" Margin="2" x:Name="datePickerZoneEntry" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
             <xctk:DateTimePicker.ContextMenu>
                 <ContextMenu>
                     <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearZoneEntry" Click="contextMenuItemClearZoneEntry_Click" >
@@ -149,7 +148,7 @@
                     </MenuItem>
                 </ContextMenu>
             </xctk:DateTimePicker.ContextMenu>
-        </xctk:DateTimePicker>
+        </local:DateTimePickerExt>
         <!--CheckBox IsEnabled="False" Grid.Row="4" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxZoneEntryFixed" VerticalAlignment="Center" /-->
 
         <TextBox Grid.Row="7" Grid.Column="1" Margin="2" Name="textBoxRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="False" IsReadOnly="True" MaxLength="512"/>
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml b/src/BreCalClient/EditTimesTerminalControl.xaml
index 0854263..f07a031 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml
@@ -12,7 +12,7 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width=".3*" />
             <ColumnDefinition Width=".7*" />
-            
+
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
@@ -37,8 +37,8 @@
                 <ColumnDefinition Width=".5*" />
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
-            
-            <xctk:DateTimePicker Grid.Row="0" Grid.Column="0" Margin="2" Name="datePickerOperationStart" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerOperationStart_ValueChanged">
+
+            <local:DateTimePickerExt Grid.Row="0" Grid.Column="0" Margin="2" x:Name="datePickerOperationStart" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerOperationStart_ValueChanged">
                 <xctk:DateTimePicker.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearOperationStart" Click="contextMenuItemClearOperationStart_Click" >
@@ -48,8 +48,8 @@
                         </MenuItem>
                     </ContextMenu>
                 </xctk:DateTimePicker.ContextMenu>
-            </xctk:DateTimePicker>
-            <xctk:DateTimePicker Grid.Row="0" Grid.Column="1" Margin="2" Name="datePickerOperationStart_End" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False">
+            </local:DateTimePickerExt>
+            <local:DateTimePickerExt Grid.Row="0" Grid.Column="1" Margin="2" x:Name="datePickerOperationStart_End" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False">
                 <xctk:DateTimePicker.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearOperationStart_End" Click="contextMenuItemClearOperationStart_End_Click">
@@ -59,8 +59,8 @@
                         </MenuItem>
                     </ContextMenu>
                 </xctk:DateTimePicker.ContextMenu>
-            </xctk:DateTimePicker>
-            
+            </local:DateTimePickerExt>
+
         </Grid>
 
         <Grid Grid.Row="1" Grid.Column="1" >
@@ -68,8 +68,8 @@
                 <ColumnDefinition Width=".5*" />
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
-            
-            <xctk:DateTimePicker Grid.Row="0" Grid.Column="0" Margin="2" Name="datePickerOperationEnd" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerOperationEnd_ValueChanged">
+
+            <local:DateTimePickerExt Grid.Row="0" Grid.Column="0" Margin="2" x:Name="datePickerOperationEnd" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerOperationEnd_ValueChanged">
                 <xctk:DateTimePicker.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearOperationEnd" Click="contextMenuItemClearOperationEnd_Click" >
@@ -79,9 +79,9 @@
                         </MenuItem>
                     </ContextMenu>
                 </xctk:DateTimePicker.ContextMenu>
-            </xctk:DateTimePicker>
+            </local:DateTimePickerExt>
 
-            <xctk:DateTimePicker Grid.Row="0" Grid.Column="1" Margin="2" Name="datePickerOperationEnd_End" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False">
+            <local:DateTimePickerExt Grid.Row="0" Grid.Column="1" Margin="2" x:Name="datePickerOperationEnd_End" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False">
                 <xctk:DateTimePicker.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearOperationEnd_End" Click="contextMenuItemClearOperationEnd_End_Click">
@@ -91,11 +91,11 @@
                         </MenuItem>
                     </ContextMenu>
                 </xctk:DateTimePicker.ContextMenu>
-            </xctk:DateTimePicker>
+            </local:DateTimePickerExt>
 
         </Grid>
-        
-        
+
+
         <ComboBox Name="comboBoxBerth" Grid.Column="1" Grid.Row="2" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id" IsEnabled="False">
             <ComboBox.ContextMenu>
                 <ContextMenu>