diff --git a/Jugenddienst Stunden/Resources/Styles/Colors.xaml b/Jugenddienst Stunden/Resources/Styles/Colors.xaml
index 4997e25..d69c36e 100644
--- a/Jugenddienst Stunden/Resources/Styles/Colors.xaml	
+++ b/Jugenddienst Stunden/Resources/Styles/Colors.xaml	
@@ -7,10 +7,10 @@
     <!-- Note: For Android please see also Platforms\Android\Resources\values\colors.xml -->
 
     <Color x:Key="Primary">#F7931D</Color>
-    <Color x:Key="PrimaryDark">#ac99ea</Color>
+    <Color x:Key="PrimaryDark">#EC8A16</Color>
     <Color x:Key="PrimaryDarkText">#242424</Color>
     <Color x:Key="Secondary">#DFD8F7</Color>
-    <Color x:Key="SecondaryDarkText">#9880e5</Color>
+    <Color x:Key="SecondaryDarkText">#EC8A16</Color>
     <Color x:Key="Tertiary">#2B0B98</Color>
 
     <Color x:Key="TransparentColor">Transparent</Color>
diff --git a/Jugenddienst Stunden/ViewModels/StundenViewModel.cs b/Jugenddienst Stunden/ViewModels/StundenViewModel.cs
index bebfa5e..bff97cf 100644
--- a/Jugenddienst Stunden/ViewModels/StundenViewModel.cs	
+++ b/Jugenddienst Stunden/ViewModels/StundenViewModel.cs	
@@ -261,7 +261,7 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
             DayTimes = new List<DayTime>();
             //TODO: hier könnte auch ein Fehler kommen, dann wäre InfoEvent falsch.
             
-            if (Settings.Version != AppInfo.Current.VersionString.Substring(0, 5)) {
+            if (Settings.Version!=null && Settings.Version != AppInfo.Current.VersionString.Substring(0, 5)) {
                 InfoEvent?.Invoke(this, "Version: " + AppInfo.Current.VersionString.Substring(0, 5) + " verfügbar (" + Settings.Version + " installiert)");
             } else { InfoEvent?.Invoke(this, e.Message); }
         } finally {
diff --git a/Jugenddienst Stunden/Views/LoginPage.xaml b/Jugenddienst Stunden/Views/LoginPage.xaml
index d2d508e..03510a2 100644
--- a/Jugenddienst Stunden/Views/LoginPage.xaml	
+++ b/Jugenddienst Stunden/Views/LoginPage.xaml	
@@ -62,7 +62,7 @@
                 <Entry x:Name="UsernameEntry" Placeholder="Benutzername (Mailadresse)" Keyboard="Email" />
                 <Entry x:Name="PasswordEntry" Placeholder="Passwort" IsPassword="True" />
                 <Entry x:Name="ServerEntry" Placeholder="Server (gleich wie im Browser)" Keyboard="Url" />
-                <Button Text="Login" Clicked="OnLoginButtonClicked" />
+                <Button Text="Login" Clicked="OnLoginButtonClicked" TextColor="{AppThemeBinding Dark={StaticResource White}, Light={StaticResource White}}" />
             </VerticalStackLayout>
         </VerticalStackLayout>
 
diff --git a/Jugenddienst Stunden/Views/StundePage.xaml b/Jugenddienst Stunden/Views/StundePage.xaml
index f926dd7..7fe0715 100644
--- a/Jugenddienst Stunden/Views/StundePage.xaml	
+++ b/Jugenddienst Stunden/Views/StundePage.xaml	
@@ -77,13 +77,15 @@
         <Editor  Placeholder="Beschreibung" Text="{Binding DayTime.Description}" MinimumHeightRequest="40" AutoSize="TextChanges" FontSize="18" />
 
         <Grid ColumnDefinitions="*,*" ColumnSpacing="4">
-            <Button Grid.Column="1" Text="Speichern" 
+            <Button Grid.Column="1" Text="Speichern"
+                    TextColor="{AppThemeBinding Dark={StaticResource White}, Light={StaticResource White}}"
                     Command="{Binding SaveCommand}" />
             <Button Grid.Column="0" Text="Löschen" 
                     Command="{Binding DeleteConfirmCommand}" 
                     IsEnabled="{Binding DayTime.Id, Converter={StaticResource IntBoolConverter}}" 
                     IsVisible="{Binding FreistellungEnabled}"
-                    BackgroundColor="{StaticResource Gray500}"/>
+                    BackgroundColor="{StaticResource Gray500}"
+                    TextColor="{AppThemeBinding Dark={StaticResource White}, Light={StaticResource White}}"/>
         </Grid>
 
 
diff --git a/Jugenddienst Stunden/Views/StundenPage.xaml b/Jugenddienst Stunden/Views/StundenPage.xaml
index 3ae8fcb..4257f4c 100644
--- a/Jugenddienst Stunden/Views/StundenPage.xaml	
+++ b/Jugenddienst Stunden/Views/StundenPage.xaml	
@@ -119,7 +119,10 @@
             </CollectionView>
             
             <!--<BoxView HeightRequest="1" Grid.Row="2" Margin="0,5,0,15" />-->
-            <Button Text="{Binding LoadOverview}" Command="{Binding LoadDataCommand}" Grid.Row="2" />
+            <Button Text="{Binding LoadOverview}" 
+                    Grid.Row="2" 
+                    Command="{Binding LoadDataCommand}" 
+                    TextColor="{AppThemeBinding Dark={StaticResource White}, Light={StaticResource White}}" />
             <Border Padding="2" Grid.Row="3" Margin="0,10,0,0">
                 <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,*" ColumnDefinitions="Auto,Auto,*,Auto" Margin="10,2">
                     <Label Grid.Row="0" Text="Soll:" />
diff --git a/Jugenddienst Stunden/Views/StundenPage.xaml.cs b/Jugenddienst Stunden/Views/StundenPage.xaml.cs
index f052358..dc85f7f 100644
--- a/Jugenddienst Stunden/Views/StundenPage.xaml.cs	
+++ b/Jugenddienst Stunden/Views/StundenPage.xaml.cs	
@@ -10,8 +10,6 @@ namespace Jugenddienst_Stunden.Views;
 /// </summary>
 public partial class StundenPage : ContentPage {
 
-    private int heightValue = 300;
-
     /// <summary>
     /// CTOR
     /// </summary>