diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj
index d72adfb..c68bfbc 100644
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -108,7 +108,7 @@
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>Aviso_TemporaryKey.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>LME.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />
diff --git a/Aviso/frmGesamtsicherheitenNEU.Designer.vb b/Aviso/frmGesamtsicherheitenNEU.Designer.vb
index e3d097d..dc4886b 100644
--- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb
@@ -33,12 +33,12 @@ Partial Class frmGesamtsicherheitenNEU
         Me.ATBNraendernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.Panel2 = New System.Windows.Forms.Panel()
         Me.pnlChangeATCNr = New System.Windows.Forms.Panel()
+        Me.txtDatumaendern = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtSicherheitsbetragContext = New System.Windows.Forms.TextBox()
         Me.Label30 = New System.Windows.Forms.Label()
         Me.txtWarenwertContext = New System.Windows.Forms.TextBox()
         Me.lblWarenwertContext = New System.Windows.Forms.Label()
         Me.txtUhrzeitaendern = New System.Windows.Forms.TextBox()
-        Me.txtDatumaendern = New System.Windows.Forms.TextBox()
         Me.Label26 = New System.Windows.Forms.Label()
         Me.lblATCwarning = New System.Windows.Forms.Label()
         Me.FlatButton3 = New VERAG_PROG_ALLGEMEIN.FlatButton()
@@ -110,6 +110,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.Label20 = New System.Windows.Forms.Label()
         Me.txtPosNr = New System.Windows.Forms.TextBox()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.cbxRundPosanzeigen = New System.Windows.Forms.CheckBox()
         Me.btnRundungsdifAusgl = New System.Windows.Forms.Button()
         Me.btnNew = New System.Windows.Forms.Button()
         Me.cbx_offene = New System.Windows.Forms.CheckBox()
@@ -145,7 +146,6 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtSicherheitFreitext = New System.Windows.Forms.TextBox()
         Me.btnAddPos = New VERAG_PROG_ALLGEMEIN.FlatButton()
         Me.btnAddSicherheit = New VERAG_PROG_ALLGEMEIN.FlatButton()
-        Me.cbxRundPosanzeigen = New System.Windows.Forms.CheckBox()
         Me.ContextMenuStripGesSicherh.SuspendLayout()
         Me.Panel2.SuspendLayout()
         Me.pnlChangeATCNr.SuspendLayout()
@@ -189,12 +189,12 @@ Partial Class frmGesamtsicherheitenNEU
         'pnlChangeATCNr
         '
         Me.pnlChangeATCNr.BackColor = System.Drawing.SystemColors.ButtonHighlight
+        Me.pnlChangeATCNr.Controls.Add(Me.txtDatumaendern)
         Me.pnlChangeATCNr.Controls.Add(Me.txtSicherheitsbetragContext)
         Me.pnlChangeATCNr.Controls.Add(Me.Label30)
         Me.pnlChangeATCNr.Controls.Add(Me.txtWarenwertContext)
         Me.pnlChangeATCNr.Controls.Add(Me.lblWarenwertContext)
         Me.pnlChangeATCNr.Controls.Add(Me.txtUhrzeitaendern)
-        Me.pnlChangeATCNr.Controls.Add(Me.txtDatumaendern)
         Me.pnlChangeATCNr.Controls.Add(Me.Label26)
         Me.pnlChangeATCNr.Controls.Add(Me.lblATCwarning)
         Me.pnlChangeATCNr.Controls.Add(Me.FlatButton3)
@@ -207,6 +207,32 @@ Partial Class frmGesamtsicherheitenNEU
         Me.pnlChangeATCNr.TabIndex = 13
         Me.pnlChangeATCNr.Visible = False
         '
+        'txtDatumaendern
+        '
+        Me.txtDatumaendern._DateTimeOnly = False
+        Me.txtDatumaendern._numbersOnly = False
+        Me.txtDatumaendern._numbersOnlyKommastellen = ""
+        Me.txtDatumaendern._numbersOnlyTrennzeichen = True
+        Me.txtDatumaendern._Prozent = False
+        Me.txtDatumaendern._ShortDateNew = False
+        Me.txtDatumaendern._ShortDateOnly = True
+        Me.txtDatumaendern._TimeOnly = False
+        Me.txtDatumaendern._TimeOnly_Seconds = False
+        Me.txtDatumaendern._value = ""
+        Me.txtDatumaendern._Waehrung = False
+        Me.txtDatumaendern._WaehrungZeichen = True
+        Me.txtDatumaendern.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtDatumaendern.ForeColor = System.Drawing.Color.Black
+        Me.txtDatumaendern.Location = New System.Drawing.Point(95, 72)
+        Me.txtDatumaendern.MaxLength = 10
+        Me.txtDatumaendern.MaxLineLength = -1
+        Me.txtDatumaendern.MaxLines_Warning = ""
+        Me.txtDatumaendern.MaxLines_Warning_Label = Nothing
+        Me.txtDatumaendern.Multiline = True
+        Me.txtDatumaendern.Name = "txtDatumaendern"
+        Me.txtDatumaendern.Size = New System.Drawing.Size(112, 24)
+        Me.txtDatumaendern.TabIndex = 55
+        '
         'txtSicherheitsbetragContext
         '
         Me.txtSicherheitsbetragContext.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -256,15 +282,6 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtUhrzeitaendern.Size = New System.Drawing.Size(71, 24)
         Me.txtUhrzeitaendern.TabIndex = 8
         '
-        'txtDatumaendern
-        '
-        Me.txtDatumaendern.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtDatumaendern.Location = New System.Drawing.Point(95, 72)
-        Me.txtDatumaendern.Margin = New System.Windows.Forms.Padding(0)
-        Me.txtDatumaendern.Name = "txtDatumaendern"
-        Me.txtDatumaendern.Size = New System.Drawing.Size(112, 24)
-        Me.txtDatumaendern.TabIndex = 7
-        '
         'Label26
         '
         Me.Label26.AutoSize = True
@@ -1277,6 +1294,16 @@ Partial Class frmGesamtsicherheitenNEU
         Me.Panel1.Size = New System.Drawing.Size(1384, 61)
         Me.Panel1.TabIndex = 2
         '
+        'cbxRundPosanzeigen
+        '
+        Me.cbxRundPosanzeigen.AutoSize = True
+        Me.cbxRundPosanzeigen.Location = New System.Drawing.Point(12, 38)
+        Me.cbxRundPosanzeigen.Name = "cbxRundPosanzeigen"
+        Me.cbxRundPosanzeigen.Size = New System.Drawing.Size(169, 17)
+        Me.cbxRundPosanzeigen.TabIndex = 52
+        Me.cbxRundPosanzeigen.Text = "Rundungspositionen anzeigen"
+        Me.cbxRundPosanzeigen.UseVisualStyleBackColor = True
+        '
         'btnRundungsdifAusgl
         '
         Me.btnRundungsdifAusgl.Location = New System.Drawing.Point(1133, 7)
@@ -1668,16 +1695,6 @@ Partial Class frmGesamtsicherheitenNEU
         Me.btnAddSicherheit.TabIndex = 36
         Me.btnAddSicherheit.UseVisualStyleBackColor = False
         '
-        'cbxRundPosanzeigen
-        '
-        Me.cbxRundPosanzeigen.AutoSize = True
-        Me.cbxRundPosanzeigen.Location = New System.Drawing.Point(12, 38)
-        Me.cbxRundPosanzeigen.Name = "cbxRundPosanzeigen"
-        Me.cbxRundPosanzeigen.Size = New System.Drawing.Size(169, 17)
-        Me.cbxRundPosanzeigen.TabIndex = 52
-        Me.cbxRundPosanzeigen.Text = "Rundungspositionen anzeigen"
-        Me.cbxRundPosanzeigen.UseVisualStyleBackColor = True
-        '
         'frmGesamtsicherheitenNEU
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1815,7 +1832,6 @@ Partial Class frmGesamtsicherheitenNEU
     Friend WithEvents FlatButton4 As VERAG_PROG_ALLGEMEIN.FlatButton
     Friend WithEvents btnNew As Button
     Friend WithEvents txtGestellInfo As TextBox
-    Friend WithEvents txtDatumaendern As TextBox
     Friend WithEvents Label26 As Label
     Friend WithEvents txtUhrzeitaendern As TextBox
     Friend WithEvents lbloffenerWarenwert As Label
@@ -1829,4 +1845,5 @@ Partial Class frmGesamtsicherheitenNEU
     Friend WithEvents Label30 As Label
     Friend WithEvents btnRundungsdifAusgl As Button
     Friend WithEvents cbxRundPosanzeigen As CheckBox
+    Friend WithEvents txtDatumaendern As VERAG_PROG_ALLGEMEIN.MyTextBox
 End Class
diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb
index fdc13ab..5b859ed 100644
--- a/Aviso/frmGesamtsicherheitenNEU.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.vb
@@ -468,7 +468,7 @@ Public Class frmGesamtsicherheitenNEU
 
     Private Sub Date_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtPosDat.KeyPress, txtSicherheitDat.KeyPress, txtDatumaendern.KeyPress
         Select Case Asc(e.KeyChar)
-            Case 48 To 57, 8, 46, 58
+            Case 48 To 57, 8, 44, 46, 58, 47
                 ' Zahlen, Backspace, . und : zulassen
 
             Case Else
@@ -479,7 +479,8 @@ Public Class frmGesamtsicherheitenNEU
 
     Private Sub DateTime_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtPosTime.KeyPress, txtSicherheitTime.KeyPress, txtUhrzeitaendern.KeyPress
         Select Case Asc(e.KeyChar)
-            Case 48 To 57, 8, 46, 58
+            Case 48 To 57, 8, 44, 46, 58
+                'Case 48 To 57, 8, 44, 46, 58, 160, 188, 110, 111, 190, 226
                 ' Zahlen, Backspace, . und : zulassen
 
             Case Else
@@ -1083,7 +1084,7 @@ Public Class frmGesamtsicherheitenNEU
             Dim calcSicherheitenPos As Double = calcSicherheitsbetragPos()
             Dim newCalcSaldo As Double
 
-            newCalcSaldo = SaldoNew - currentSBetrag 
+            newCalcSaldo = SaldoNew - currentSBetrag
 
             'Dim referenzbetrag As Double = currentGesSichRef.brgakto_betrag
 
@@ -1646,19 +1647,39 @@ Public Class frmGesamtsicherheitenNEU
 
         If txtPosTime.Text <> "" Then
             txtPosTime.Text = Replace(txtPosTime.Text, ".", ":")
+            txtPosTime.Text = Replace(txtPosTime.Text, ",", ":")
         End If
 
         If txtSicherheitTime.Text <> "" Then
             txtSicherheitTime.Text = Replace(txtSicherheitTime.Text, ".", ":")
+            txtSicherheitTime.Text = Replace(txtSicherheitTime.Text, ",", ":")
         End If
 
         If txtUhrzeitaendern.Text <> "" Then
             txtUhrzeitaendern.Text = Replace(txtUhrzeitaendern.Text, ".", ":")
+            txtUhrzeitaendern.Text = Replace(txtUhrzeitaendern.Text, ",", ":")
         End If
 
 
     End Sub
 
+    Private Sub txtPosDat_Leave(sender As Object, e As EventArgs) Handles txtPosDat.Leave, txtSicherheitDat.Leave, txtDatumaendern.Leave, txtUhrzeitaendern.Leave
+        If txtPosDat.Text <> "" Then
+            txtPosDat.Text = Replace(txtPosDat.Text, "/", ".")
+            txtPosDat.Text = Replace(txtPosDat.Text, ",", ".")
+        End If
+
+        If txtSicherheitDat.Text <> "" Then
+            txtSicherheitDat.Text = Replace(txtSicherheitDat.Text, "/", ".")
+            txtSicherheitDat.Text = Replace(txtSicherheitDat.Text, ",", ".")
+        End If
+
+        If txtDatumaendern.Text <> "" Then
+            txtDatumaendern.Text = Replace(txtDatumaendern.Text, "/", ".")
+            txtDatumaendern.Text = Replace(txtDatumaendern.Text, ",", ".")
+        End If
+    End Sub
+
     Private Sub changeLabel(Optional isATR As Boolean = True)
 
         If Standort = "Verag GmbH" Then
@@ -1757,4 +1778,5 @@ Public Class frmGesamtsicherheitenNEU
     Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles cbxRundPosanzeigen.CheckedChanged
         LoadDGVSicherheiten(True)
     End Sub
+
 End Class