diff --git a/Jugenddienst Stunden/Resources/Styles/Styles.xaml b/Jugenddienst Stunden/Resources/Styles/Styles.xaml
index 6641e3a..13f626b 100644
--- a/Jugenddienst Stunden/Resources/Styles/Styles.xaml	
+++ b/Jugenddienst Stunden/Resources/Styles/Styles.xaml	
@@ -4,6 +4,13 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
+    <Style TargetType="ToolbarItem">
+        <Style.Triggers>
+            <Trigger TargetType="ToolbarItem" Property="VisualElement.BackgroundColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}">
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    
     <Style TargetType="ActivityIndicator">
         <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
     </Style>
@@ -21,6 +28,7 @@
 
     <Style TargetType="BoxView">
         <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
+        <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource PrimaryDark}}" />
     </Style>
 
     <Style TargetType="Button">
diff --git a/Jugenddienst Stunden/ViewModels/StundeViewModel.cs b/Jugenddienst Stunden/ViewModels/StundeViewModel.cs
index 0c42213..a9d578e 100644
--- a/Jugenddienst Stunden/ViewModels/StundeViewModel.cs	
+++ b/Jugenddienst Stunden/ViewModels/StundeViewModel.cs	
@@ -10,7 +10,7 @@ internal class StundeViewModel : ObservableObject, IQueryAttributable {
 
 	public int id { get; set; }
 
-	public string SubTitle { get; set; } = DateTime.Today.ToString("dddd, d. MMM. yyyy");
+	public string SubTitle { get; set; } = DateTime.Today.ToString("dddd, d. MMMM yyyy");
 
 
 	private DayTime _stunde;
@@ -150,7 +150,7 @@ internal class StundeViewModel : ObservableObject, IQueryAttributable {
 			if (System.String.IsNullOrEmpty(_stunde.description)) {
 				AlertEvent?.Invoke(this, "Eintrag hat keine Daten zurückgegeben");
 			}
-			SubTitle = _stunde.day.ToString("dddd, d. MMM. yyyy");
+			SubTitle = _stunde.day.ToString("dddd, d. MMMM yyyy");
 
 			OptionsProjekt = new ObservableCollection<Projekt>(_stunde.Projekte);
 			OptionsGemeinde = new ObservableCollection<Gemeinde>(_stunde.Gemeinden);
@@ -188,7 +188,7 @@ internal class StundeViewModel : ObservableObject, IQueryAttributable {
 			}
 
 			_stunde.day = _date;
-			SubTitle = _date.ToString("dddd, d. MMM. yyyy");
+			SubTitle = _date.ToString("dddd, d. MMMM yyyy");
 
 			_ = LoadData();
 			OnPropertyChanged(nameof(Title));
diff --git a/Jugenddienst Stunden/Views/StundePage.xaml b/Jugenddienst Stunden/Views/StundePage.xaml
index e7588d7..28b9563 100644
--- a/Jugenddienst Stunden/Views/StundePage.xaml	
+++ b/Jugenddienst Stunden/Views/StundePage.xaml	
@@ -17,33 +17,35 @@
     </ContentPage.Resources>
 
     <VerticalStackLayout Spacing="10" Margin="10">
-        
+
         <Label Text="{Binding SubTitle}" />
 
-        <FlexLayout Direction="Row" AlignItems="Start" Wrap="Wrap" JustifyContent="SpaceBetween">
-            <Border>
+        <Frame Padding="5,2,5,10">
+            <FlexLayout Direction="Row" AlignItems="Start" Wrap="Wrap" JustifyContent="SpaceBetween">
+
                 <HorizontalStackLayout>
                     <Label Text="Beginn" VerticalTextAlignment="Center" HorizontalTextAlignment="End" Padding="0,0,10,0" Margin="5,0,0,0" MinimumWidthRequest="60"></Label>
                     <TimePicker x:Name="TimeBegin" HorizontalOptions="Center" Format="HH:mm" MinimumWidthRequest="80" Time="{Binding Stunde.TimeSpanVon}" Margin="0,0,0,-5" />
                 </HorizontalStackLayout>
-            </Border>
-            <Border>
+
                 <HorizontalStackLayout>
                     <Label Text="Ende" VerticalTextAlignment="Center" HorizontalTextAlignment="End" Padding="0,0,10,0" Margin="5,0,0,0" MinimumWidthRequest="60"></Label>
                     <TimePicker x:Name="TimeEnd" Format="HH:mm" MinimumWidthRequest="80" Time="{Binding Stunde.TimeSpanBis}" Margin="0,0,0,-5" />
                 </HorizontalStackLayout>
-            </Border>
-        </FlexLayout>
 
-        <Grid ColumnDefinitions="*,*,*">
-            <Picker x:Name="pick_gemeinde" Title="Gemeinde" ItemsSource="{Binding OptionsGemeinde}" SelectedItem="{Binding SelectedOptionGemeinde, Mode=TwoWay}" ItemDisplayBinding="{Binding Name}" Grid.Column="0" >
-            </Picker>
-            <Picker x:Name="pick_projekt" Title="Projekt" ItemsSource="{Binding OptionsProjekt}" SelectedItem="{Binding SelectedOptionProjekt, Mode=TwoWay}" ItemDisplayBinding="{Binding Name}" Grid.Column="1" >
-            </Picker>
-            <Picker x:Name="pick_freistellung" Title="Freistellung" ItemsSource="{Binding OptionsFreistellung}" SelectedItem="{Binding SelectedOptionFreistellung, Mode=TwoWay}" ItemDisplayBinding="{Binding Name}" Grid.Column="2" >
-            </Picker>
-        </Grid>
+            </FlexLayout>
+        </Frame>
 
+        <Frame Padding="5,2,5,10">
+            <Grid ColumnDefinitions="*,*,*">
+                <Picker x:Name="pick_gemeinde" Title="Gemeinde" ItemsSource="{Binding OptionsGemeinde}" SelectedItem="{Binding SelectedOptionGemeinde, Mode=TwoWay}" ItemDisplayBinding="{Binding Name}" Grid.Column="0" >
+                </Picker>
+                <Picker x:Name="pick_projekt" Title="Projekt" ItemsSource="{Binding OptionsProjekt}" SelectedItem="{Binding SelectedOptionProjekt, Mode=TwoWay}" ItemDisplayBinding="{Binding Name}" Grid.Column="1" >
+                </Picker>
+                <Picker x:Name="pick_freistellung" Title="Freistellung" ItemsSource="{Binding OptionsFreistellung}" SelectedItem="{Binding SelectedOptionFreistellung, Mode=TwoWay}" ItemDisplayBinding="{Binding Name}" Grid.Column="2" >
+                </Picker>
+            </Grid>
+        </Frame>
 
         <Editor  Placeholder="Beschreibung" Text="{Binding Stunde.description}" MinimumHeightRequest="40" AutoSize="TextChanges" FontSize="18" />
 
@@ -52,9 +54,9 @@
             <Button Text="Speichern" Command="{Binding SaveCommand}" />
             <Button Grid.Column="1" Text="Löschen" Command="{Binding DeleteConfirmCommand}" IsEnabled="{Binding Stunde.id, Converter={StaticResource IntBoolConverter}}" />
         </Grid>
-        
-        <BoxView HeightRequest="1" Color="Red" Margin="5,10"/>
-        
+
+        <BoxView HeightRequest="1" Margin="5,10"/>
+
         <CollectionView 
         ItemsSource="{Binding DayTimes}" 
         x:Name="stundeItems" Margin="0"
diff --git a/Jugenddienst Stunden/Views/StundenPage.xaml b/Jugenddienst Stunden/Views/StundenPage.xaml
index 3e7e55d..bf8254a 100644
--- a/Jugenddienst Stunden/Views/StundenPage.xaml	
+++ b/Jugenddienst Stunden/Views/StundenPage.xaml	
@@ -9,8 +9,15 @@
         <models:StundenViewModel />
     </ContentPage.BindingContext>
 
+    <ContentPage.Resources>
+        <FontImageSource x:Key="ToolbarIcon"
+                         Glyph="+"
+                         Size="22"
+                         Color="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"/>
+    </ContentPage.Resources>
+
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="Add" Command="{Binding NewEntryCommand}" IconImageSource="{FontImage Glyph='+', Size=22}" />
+        <ToolbarItem Text="Add" IconImageSource="{StaticResource ToolbarIcon}" Command="{Binding NewEntryCommand}" />
     </ContentPage.ToolbarItems>
 
 
@@ -19,7 +26,7 @@
         <Grid RowDefinitions="Auto" ColumnDefinitions="Auto,*">
             <DatePicker Grid.Column="0" MinimumDate="{Binding MinimumDate}"
             MaximumDate="{Binding MaximumDate}"
-            Date="{Binding DateToday}" Format="dddd, d. MMM yyyy" />
+            Date="{Binding DateToday}" Format="dddd, d. MMMM yyyy" />
             <Border Grid.Column="1" Margin="15,0,0,0" Padding="15,0,0,0" ToolTipProperties.Text="Tagessumme">
                 <Label Text="{Binding DayTotal,StringFormat='{}{0:HH:mm}'}" VerticalOptions="Center"></Label>
             </Border>
@@ -39,7 +46,26 @@
 
             <CollectionView.ItemTemplate>
                 <DataTemplate>
+
+
                     <Grid Padding="5,10,5,0">
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup Name="CommonStates">
+                                <VisualState Name="Normal">
+                                    <VisualState.Setters>
+                                        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Transparent}}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState Name="Selected">
+                                    <VisualState.Setters>
+                                        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource PrimaryDark}}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+
+
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
@@ -58,16 +84,17 @@
                         </HorizontalStackLayout>
 
                         <Label Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding description}" Padding="0,0,0,15"/>
+
                     </Grid>
                 </DataTemplate>
             </CollectionView.ItemTemplate>
 
         </CollectionView>
 
-        <BoxView HeightRequest="1" Color="Red"/>
+        <BoxView HeightRequest="1" />
 
         <Button Text="{Binding LoadOverview}" Command="{Binding LoadDataCommand}" />
-        <Border>
+        <Frame Padding="2">
             <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,*" ColumnDefinitions="Auto,*" Margin="10,2">
                 <Label Grid.Row="0" Text="Soll:" />
                 <Label Grid.Row="1" Text="Summe:" />
@@ -83,7 +110,7 @@
                 <Label Grid.Row="4" Grid.Column="1" HorizontalTextAlignment="End" Padding="0,0,5,0" Text="{Binding Overtime}" />
                 <Label Grid.Row="5" Grid.Column="1" HorizontalTextAlignment="End" Padding="0,0,5,0" Text="{Binding Holiday}" />
             </Grid>
-        </Border>
+        </Frame>
 
 
     </VerticalStackLayout>