diff --git a/.vs/LotteryApplication/DesignTimeBuild/.dtbcache.v2 b/.vs/LotteryApplication/DesignTimeBuild/.dtbcache.v2
index 3a0e49b..399238f 100644
Binary files a/.vs/LotteryApplication/DesignTimeBuild/.dtbcache.v2 and b/.vs/LotteryApplication/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/.vs/LotteryApplication/v17/.suo b/.vs/LotteryApplication/v17/.suo
index e6aac06..2c96811 100644
Binary files a/.vs/LotteryApplication/v17/.suo and b/.vs/LotteryApplication/v17/.suo differ
diff --git a/LotteryApplication/MainWindow.xaml b/LotteryApplication/MainWindow.xaml
index 509dcb5..9ab0923 100644
--- a/LotteryApplication/MainWindow.xaml
+++ b/LotteryApplication/MainWindow.xaml
@@ -80,7 +80,7 @@
 >
                 <Grid Margin="15">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="135"/>
+                        <ColumnDefinition Width="116"/>
                         <ColumnDefinition/>
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
@@ -100,11 +100,11 @@
                         FontSize="14"
                         FontWeight="Bold"
                         HorizontalAlignment="Left"
-                         Width="150"
-                         BorderBrush="#FF157315"
-                         BorderThickness="3"
-                         Background="Transparent"
-                         Style="{StaticResource ModernTextbox}" />
+                        BorderBrush="#FF157315"
+                        BorderThickness="3"
+                        Background="Transparent"
+                        Style="{StaticResource ModernTextbox}" 
+                         />
 
                     <TextBlock Grid.Row="1"
                                Margin="0,20"
@@ -113,6 +113,7 @@
                            FontWeight="Bold"
                            FontFamily="MV Boli"
                            Foreground="#FF157315"/>
+                    
                     <TextBox x:Name="LastTicket"
                         HorizontalAlignment="Left"
                         Margin="0,20" Grid.Row="1"
@@ -120,13 +121,11 @@
                         Foreground="#FF157315"
                         FontSize="14"
                         FontWeight="Bold"
-                         Width="150"
-                         BorderBrush="#FF157315"
-                         BorderThickness="3"
-                         Background="Transparent"
-                         Style="{StaticResource ModernTextbox}" />
-                </Grid>
-                
+                        BorderBrush="#FF157315"
+                        BorderThickness="3"
+                        Background="Transparent"
+                        Style="{StaticResource ModernTextbox}" />
+                </Grid>                
                
                 <Button Style="{StaticResource ModernButton}"
                         Height="45"
diff --git a/LotteryApplication/MainWindow.xaml.cs b/LotteryApplication/MainWindow.xaml.cs
index b75a0f5..289230b 100644
--- a/LotteryApplication/MainWindow.xaml.cs
+++ b/LotteryApplication/MainWindow.xaml.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -28,17 +29,24 @@ namespace LotteryApplication
                         
         private void BtnRaffleClick(object sender, RoutedEventArgs e)
         {
+            if (FirstTicket.Text != "" && LastTicket.Text != "")
+            {
+                int num1 = int.Parse(FirstTicket.Text);
+                int num2 = int.Parse(LastTicket.Text);
+
+                TicketList.Items.Clear();
+
+                Random rnd = new Random();
+                for (int i = 0; i <= 99; i++)
+
+
+                    TicketList.Items.Add(rnd.Next(num1, num2));
+            }
+            else
+            {
+                MessageBox.Show("no valid Ticketnumber!");
+            }                           
                         
-            int num1 = int.Parse(FirstTicket.Text);
-            int num2 = int.Parse(LastTicket.Text);                          
-                                    
-            TicketList.Items.Clear();
-
-            Random rnd = new Random();
-            for (int i = 0; i <= 99; i++)
-
-                TicketList.Items.Add(rnd.Next(num1, num2));
-            
         }
 
         private void BtnExit(object sender, RoutedEventArgs e)
@@ -56,5 +64,15 @@ namespace LotteryApplication
         {
             this.WindowState = WindowState.Minimized;
         }
+
+        //private void FirstTicket_previewtextinput(object sender, TextCompositionEventArgs e)
+        //{
+        //    e.Handled = new Regex("[^0-9]+").IsMatch(e.Text);
+        //}
+
+        //private void LastTicket_previewtextinput(object sender, TextCompositionEventArgs e)
+        //{
+        //    //e.Handled = new Regex("[^0-9]+").IsMatch(e.Text);
+        //}
     }
 }
diff --git a/LotteryApplication/Theme/ModernButtonTheme.xaml b/LotteryApplication/Theme/ModernButtonTheme.xaml
index 3eb807c..53ad52f 100644
--- a/LotteryApplication/Theme/ModernButtonTheme.xaml
+++ b/LotteryApplication/Theme/ModernButtonTheme.xaml
@@ -24,7 +24,7 @@
 
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="White"/>
+                <Setter Property="Background" Value="#FF489448"/>
                 <Setter Property="Opacity" Value="0.8"/>
                 <Setter Property="Foreground" Value="#FFAF9BB7"/>
             </Trigger>
diff --git a/LotteryApplication/Theme/ModernTextBoxTheme.xaml b/LotteryApplication/Theme/ModernTextBoxTheme.xaml
index 9c15a2f..e16db3c 100644
--- a/LotteryApplication/Theme/ModernTextBoxTheme.xaml
+++ b/LotteryApplication/Theme/ModernTextBoxTheme.xaml
@@ -12,7 +12,8 @@
                         <Grid>
                             <Rectangle StrokeThickness="1"/>
                             <TextBox Margin="1"
-                                     Text="{TemplateBinding Text}"
+                                     Text="{Binding Path=Text, RelativeSource={RelativeSource TemplatedParent},
+                                             Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                      BorderThickness="0"
                                      Background="Transparent"
                                      VerticalContentAlignment="Center"
@@ -27,7 +28,7 @@
                                        VerticalAlignment="Center"
                                        HorizontalAlignment="Left"
                                        Padding="5"
-                                       Margin="10,0,0,0"                                       
+                                       Margin="5,0,0,0"                                       
                                        Foreground="#FF73C373">
                                 <TextBlock.Style>
                                     <Style TargetType="{x:Type TextBlock}">
diff --git a/LotteryApplication/bin/Debug/net5.0-windows/LotteryApplication.dll b/LotteryApplication/bin/Debug/net5.0-windows/LotteryApplication.dll
index 1f7663b..94ee58f 100644
Binary files a/LotteryApplication/bin/Debug/net5.0-windows/LotteryApplication.dll and b/LotteryApplication/bin/Debug/net5.0-windows/LotteryApplication.dll differ
diff --git a/LotteryApplication/bin/Debug/net5.0-windows/LotteryApplication.pdb b/LotteryApplication/bin/Debug/net5.0-windows/LotteryApplication.pdb
index a559334..140b038 100644
Binary files a/LotteryApplication/bin/Debug/net5.0-windows/LotteryApplication.pdb and b/LotteryApplication/bin/Debug/net5.0-windows/LotteryApplication.pdb differ
diff --git a/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication.csproj.AssemblyReference.cache b/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication.csproj.AssemblyReference.cache
index 04fcb1c..204fdef 100644
Binary files a/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication.csproj.AssemblyReference.cache and b/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication.csproj.AssemblyReference.cache differ
diff --git a/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication.dll b/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication.dll
index 1f7663b..94ee58f 100644
Binary files a/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication.dll and b/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication.dll differ
diff --git a/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication.g.resources b/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication.g.resources
index d85cd17..a19ec7a 100644
Binary files a/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication.g.resources and b/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication.g.resources differ
diff --git a/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication.pdb b/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication.pdb
index a559334..140b038 100644
Binary files a/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication.pdb and b/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication.pdb differ
diff --git a/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication_MarkupCompile.i.cache b/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication_MarkupCompile.i.cache
index fcc3c93..990188a 100644
--- a/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication_MarkupCompile.i.cache
+++ b/LotteryApplication/obj/Debug/net5.0-windows/LotteryApplication_MarkupCompile.i.cache
@@ -16,5 +16,5 @@ C:\Nathalie\Programmieren\Projekte\LotteryApplication\LotteryApplication\App.xam
 193-1891726104
 MainWindow.xaml;Theme\ModernButtonTheme.xaml;Theme\ModernTextBoxTheme.xaml;
 
-False
+True
 
diff --git a/LotteryApplication/obj/Debug/net5.0-windows/MainWindow.baml b/LotteryApplication/obj/Debug/net5.0-windows/MainWindow.baml
index d3a7df3..12254fc 100644
Binary files a/LotteryApplication/obj/Debug/net5.0-windows/MainWindow.baml and b/LotteryApplication/obj/Debug/net5.0-windows/MainWindow.baml differ
diff --git a/LotteryApplication/obj/Debug/net5.0-windows/MainWindow.g.cs b/LotteryApplication/obj/Debug/net5.0-windows/MainWindow.g.cs
index 81fbffc..e8a4b0a 100644
--- a/LotteryApplication/obj/Debug/net5.0-windows/MainWindow.g.cs
+++ b/LotteryApplication/obj/Debug/net5.0-windows/MainWindow.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "78002E44A7F27DECE1537F2570F60833B1B8DA6A"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "DC00031C45A17A4CF23733A38F48550DA65D1C39"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Dieser Code wurde von einem Tool generiert.
@@ -50,7 +50,7 @@ namespace LotteryApplication {
         #line hidden
         
         
-        #line 116 "..\..\..\MainWindow.xaml"
+        #line 117 "..\..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox LastTicket;
         
@@ -58,7 +58,7 @@ namespace LotteryApplication {
         #line hidden
         
         
-        #line 154 "..\..\..\MainWindow.xaml"
+        #line 153 "..\..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox TicketList;
         
@@ -127,7 +127,7 @@ namespace LotteryApplication {
             return;
             case 6:
             
-            #line 136 "..\..\..\MainWindow.xaml"
+            #line 135 "..\..\..\MainWindow.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.BtnRaffleClick);
             
             #line default
diff --git a/LotteryApplication/obj/Debug/net5.0-windows/MainWindow.g.i.cs b/LotteryApplication/obj/Debug/net5.0-windows/MainWindow.g.i.cs
index 81fbffc..e8a4b0a 100644
--- a/LotteryApplication/obj/Debug/net5.0-windows/MainWindow.g.i.cs
+++ b/LotteryApplication/obj/Debug/net5.0-windows/MainWindow.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "78002E44A7F27DECE1537F2570F60833B1B8DA6A"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "DC00031C45A17A4CF23733A38F48550DA65D1C39"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Dieser Code wurde von einem Tool generiert.
@@ -50,7 +50,7 @@ namespace LotteryApplication {
         #line hidden
         
         
-        #line 116 "..\..\..\MainWindow.xaml"
+        #line 117 "..\..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox LastTicket;
         
@@ -58,7 +58,7 @@ namespace LotteryApplication {
         #line hidden
         
         
-        #line 154 "..\..\..\MainWindow.xaml"
+        #line 153 "..\..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox TicketList;
         
@@ -127,7 +127,7 @@ namespace LotteryApplication {
             return;
             case 6:
             
-            #line 136 "..\..\..\MainWindow.xaml"
+            #line 135 "..\..\..\MainWindow.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.BtnRaffleClick);
             
             #line default
diff --git a/LotteryApplication/obj/Debug/net5.0-windows/Theme/ModernButtonTheme.baml b/LotteryApplication/obj/Debug/net5.0-windows/Theme/ModernButtonTheme.baml
index ff2497f..bc80861 100644
Binary files a/LotteryApplication/obj/Debug/net5.0-windows/Theme/ModernButtonTheme.baml and b/LotteryApplication/obj/Debug/net5.0-windows/Theme/ModernButtonTheme.baml differ
diff --git a/LotteryApplication/obj/Debug/net5.0-windows/Theme/ModernTextBoxTheme.baml b/LotteryApplication/obj/Debug/net5.0-windows/Theme/ModernTextBoxTheme.baml
index b6537bd..2731966 100644
Binary files a/LotteryApplication/obj/Debug/net5.0-windows/Theme/ModernTextBoxTheme.baml and b/LotteryApplication/obj/Debug/net5.0-windows/Theme/ModernTextBoxTheme.baml differ