diff --git a/Jugenddienst Stunden/App.xaml.cs b/Jugenddienst Stunden/App.xaml.cs
index 7a10127..533f09a 100644
--- a/Jugenddienst Stunden/App.xaml.cs	
+++ b/Jugenddienst Stunden/App.xaml.cs	
@@ -5,13 +5,11 @@
 /// </summary>
 public partial class App : Application {
 
-	/// <summary>
-	/// Initialisiert eine neue Instanz der <see cref="App"/>-Klasse.
-	/// </summary>
-	public App() {
-		InitializeComponent();
-
-		MainPage = new AppShell();
-	}
-
+    /// <summary>
+    /// Initialisiert eine neue Instanz der <see cref="App"/>-Klasse.
+    /// </summary>
+    public App() {
+        InitializeComponent();
+        MainPage = new AppShell();
+    }
 }
diff --git a/Jugenddienst Stunden/MauiProgram.cs b/Jugenddienst Stunden/MauiProgram.cs
index 98e83e0..b8f0b55 100644
--- a/Jugenddienst Stunden/MauiProgram.cs	
+++ b/Jugenddienst Stunden/MauiProgram.cs	
@@ -9,13 +9,15 @@ namespace Jugenddienst_Stunden;
 /// Das Hauptprogramm.
 /// </summary>
 public static class MauiProgram {
-    
+
     public static MauiApp CreateMauiApp() {
         var builder = MauiApp.CreateBuilder();
         builder
             .UseMauiApp<App>()
             // Initialize the .NET MAUI Community Toolkit by adding the below line of code
-            .UseMauiCommunityToolkit()
+            .UseMauiCommunityToolkit(options => {
+                options.SetShouldEnableSnackbarOnWindows(true);
+            })
             .ConfigureFonts(fonts => {
                 fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
                 fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
diff --git a/Jugenddienst Stunden/Platforms/Android/Resources/values/colors.xml b/Jugenddienst Stunden/Platforms/Android/Resources/values/colors.xml
index afca004..c04d749 100644
--- a/Jugenddienst Stunden/Platforms/Android/Resources/values/colors.xml	
+++ b/Jugenddienst Stunden/Platforms/Android/Resources/values/colors.xml	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="colorPrimary">#512BD4</color>
-    <color name="colorPrimaryDark">#F7931D</color>
+    <color name="colorPrimaryDark">#2B0B98</color>
     <color name="colorAccent">#2B0B98</color>
 </resources>
\ No newline at end of file
diff --git a/Jugenddienst Stunden/Platforms/Windows/Package.appxmanifest b/Jugenddienst Stunden/Platforms/Windows/Package.appxmanifest
index 6e8e704..e3df2fc 100644
--- a/Jugenddienst Stunden/Platforms/Windows/Package.appxmanifest	
+++ b/Jugenddienst Stunden/Platforms/Windows/Package.appxmanifest	
@@ -4,7 +4,9 @@
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
   xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  IgnorableNamespaces="uap rescap">
+  xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
+  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
+  IgnorableNamespaces="uap rescap com desktop">
 
   <Identity Name="JugenddienstStunden" Publisher="CN=User Name" Version="0.0.0.0" />
 
@@ -36,6 +38,26 @@
         <uap:DefaultTile Square71x71Logo="Resources\Windows\Small\$placeholder$.png" Wide310x150Logo="Resources\Windows\Wide\$placeholder$.png" Square310x310Logo="Resources\Windows\$placeholder$.png"  ShortName="Stunden"/>
         <uap:SplashScreen Image="Resources\Windows\Splash\$placeholder$.png"  BackgroundColor="#F7931D"/>
       </uap:VisualElements>
+
+        <Extensions>
+
+            <!-- Specify which CLSID to activate when notification is clicked -->
+            <desktop:Extension Category="windows.toastNotificationActivation">
+                <desktop:ToastNotificationActivation ToastActivatorCLSID="6e919706-2634-4d97-a93c-2213b2acc334" />
+            </desktop:Extension>
+
+            <!-- Register COM CLSID -->
+            <com:Extension Category="windows.comServer">
+                <com:ComServer>
+                    <com:ExeServer Executable="Jugenddienst Stunden.exe" DisplayName="$targetnametoken$" Arguments="----AppNotificationActivated:">
+                        <!-- Example path to executable: CommunityToolkit.Maui.Sample\CommunityToolkit.Maui.Sample.exe -->
+                        <com:Class Id="6e919706-2634-4d97-a93c-2213b2acc334" />
+                    </com:ExeServer>
+                </com:ComServer>
+            </com:Extension>
+
+        </Extensions>
+
     </Application>
   </Applications>
 
diff --git a/Jugenddienst Stunden/ViewModels/StundenViewModel.cs b/Jugenddienst Stunden/ViewModels/StundenViewModel.cs
index 179246f..e9933da 100644
--- a/Jugenddienst Stunden/ViewModels/StundenViewModel.cs	
+++ b/Jugenddienst Stunden/ViewModels/StundenViewModel.cs	
@@ -203,9 +203,10 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
         try {
             BaseResponse dat = await HoursBase.LoadBase("hours&year="+ DateToday.ToString("yyyy") + "&month=" + DateToday.ToString("MM"));
             _hour = dat.hour;
+            Settings = dat.settings;
 
-            if (dat.settings.Version != AppInfo.Current.VersionString) {
-                InfoEvent?.Invoke(this, "Du solltest deine Programmversion: " + AppInfo.Current.VersionString + " auf Version: " + dat.settings.Version + " updaten");
+            if (Settings.Version != AppInfo.Current.VersionString.Substring(0,5)) {
+                InfoEvent?.Invoke(this, "Update verfügbar: " + AppInfo.Current.VersionString.Substring(0, 5) + " < " + dat.settings.Version + " updaten");
             }
             //_hour = await HoursBase.LoadData();
             RefreshProperties();
@@ -260,8 +261,8 @@ 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) {
-                InfoEvent?.Invoke(this, "Du solltest deine Programmversion: " + AppInfo.Current.VersionString + " auf Version: " + Settings.Version + " updaten");
+            if (Settings.Version != AppInfo.Current.VersionString.Substring(0, 5)) {
+                InfoEvent?.Invoke(this, "Update verfügbar: " + AppInfo.Current.VersionString.Substring(0, 5) + " < " + Settings.Version + " updaten");
             } else { InfoEvent?.Invoke(this, e.Message); }
         } finally {
             OnPropertyChanged(nameof(DayTotal));
@@ -270,7 +271,6 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
             OnPropertyChanged(nameof(LoadOverview));
             //OnPropertyChanged(nameof(DayTimes));
         }
-
     }
 
     async void IQueryAttributable.ApplyQueryAttributes(IDictionary<string, object> query) {
diff --git a/Jugenddienst Stunden/Views/AllNotesPage.xaml b/Jugenddienst Stunden/Views/AllNotesPage.xaml
index bca5dee..3bad812 100644
--- a/Jugenddienst Stunden/Views/AllNotesPage.xaml	
+++ b/Jugenddienst Stunden/Views/AllNotesPage.xaml	
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              xmlns:viewModels="clr-namespace:Jugenddienst_Stunden.ViewModels"
              x:Class="Jugenddienst_Stunden.Views.AllNotesPage"
              Title="Deine Notizen"
@@ -15,6 +16,12 @@
         <ToolbarItem Text="Neue Notiz" Command="{Binding NewCommand}" IconImageSource="{FontImage Glyph='+', Color=Black, Size=22}" />
     </ContentPage.ToolbarItems>
 
+    <ContentPage.Behaviors>
+        <toolkit:StatusBarBehavior 
+            StatusBarColor="{AppThemeBinding Dark={StaticResource OffBlack}, Light={StaticResource Primary}}" 
+            StatusBarStyle="LightContent" />
+    </ContentPage.Behaviors>
+
     <VerticalStackLayout Margin="20,0,0,0">
         <Label Text="Werden nur lokal gespeichert"/>
 
diff --git a/Jugenddienst Stunden/Views/LoginPage.xaml b/Jugenddienst Stunden/Views/LoginPage.xaml
index a628daf..d2d508e 100644
--- a/Jugenddienst Stunden/Views/LoginPage.xaml	
+++ b/Jugenddienst Stunden/Views/LoginPage.xaml	
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              xmlns:models="clr-namespace:Jugenddienst_Stunden.ViewModels"
              xmlns:zxing="clr-namespace:ZXing.Net.Maui.Controls;assembly=ZXing.Net.MAUI.Controls"
              xmlns:conv="clr-namespace:Jugenddienst_Stunden.Converter"
@@ -18,35 +19,41 @@
         </ResourceDictionary>
     </ContentPage.Resources>
 
+    <ContentPage.Behaviors>
+        <toolkit:StatusBarBehavior 
+            StatusBarColor="{AppThemeBinding Dark={StaticResource OffBlack}, Light={StaticResource Primary}}" 
+            StatusBarStyle="LightContent" />
+    </ContentPage.Behaviors>
+
     <ScrollView>
         <VerticalStackLayout Spacing="10" Margin="15,0">
-
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
-                <HorizontalStackLayout Spacing="10" HorizontalOptions="Start" Grid.Column="0">
-                    <Label FontSize="22" FontAttributes="Bold" Text="{Binding AppTitle}" Margin="0,4,0,0" />
-                    <Label FontSize="22" Text="{Binding Version}" Margin="0,4,0,0" />
-                </HorizontalStackLayout>
-                <HorizontalStackLayout HorizontalOptions="End" Spacing="10" Grid.Column="1">
-                    <Label Text="Login QR/manuell" Margin="0,12,0,0"/>
-                    <Switch x:Name="LoginSwitch" IsToggled="False" Toggled="Switch_Toggled"/>
+                <HorizontalStackLayout Spacing="5" HorizontalOptions="Start" Grid.Column="0">
+                    <Label FontSize="20" FontAttributes="Bold" Text="{Binding AppTitle}" Margin="0,7,0,0" />
+                    <Label FontSize="16" Text="{Binding Version}" Margin="0,11,0,0" />
                 </HorizontalStackLayout>
+                <Grid Grid.Column="1" ColumnDefinitions="*,50" ColumnSpacing="10">
+                    <Label Text="Login QR/manuell" VerticalOptions="Center" Grid.Column="0"/>
+                    <Switch x:Name="LoginSwitch" IsToggled="False" Toggled="Switch_Toggled" VerticalOptions="Center" Grid.Column="1"/>
+                </Grid>
             </Grid>
 
             <Label x:Name="ServerLabel" Text="{Binding Server}" IsVisible="{Binding Server, Converter={StaticResource StringVisibilityConverter}}" />
 
-            <VerticalStackLayout x:Name="LoginQR">
+            <VerticalStackLayout x:Name="LoginQR" Margin="0,20,0,0">
                 <Label Text="Login mit QR-Code" FontSize="32" HorizontalOptions="Start" />
                 <Label x:Name="Message" Text="{Binding Message}" Margin="0,15" />
 
                 <Border HeightRequest="300" Padding="0">
-                    <zxing:CameraBarcodeReaderView x:Name="barcodeScannerView"
-                                BarcodesDetected="BarcodesDetected"
-                                HorizontalOptions="FillAndExpand"
-                                VerticalOptions="FillAndExpand"/>
+                    <zxing:CameraBarcodeReaderView 
+                                    x:Name="barcodeScannerView"
+                                    BarcodesDetected="BarcodesDetected"
+                                    HorizontalOptions="FillAndExpand"
+                                    VerticalOptions="FillAndExpand"/>
                 </Border>
             </VerticalStackLayout>
 
diff --git a/Jugenddienst Stunden/Views/NotePage.xaml b/Jugenddienst Stunden/Views/NotePage.xaml
index e2212b2..e0ec155 100644
--- a/Jugenddienst Stunden/Views/NotePage.xaml	
+++ b/Jugenddienst Stunden/Views/NotePage.xaml	
@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              xmlns:viewModels="clr-namespace:Jugenddienst_Stunden.ViewModels"
              x:Class="Jugenddienst_Stunden.Views.NotePage"
              Title="Notiz">
+
     <ContentPage.BindingContext>
         <viewModels:NoteViewModel />
     </ContentPage.BindingContext>
+
+    <ContentPage.Behaviors>
+        <toolkit:StatusBarBehavior 
+            StatusBarColor="{AppThemeBinding Dark={StaticResource OffBlack}, Light={StaticResource Primary}}" 
+            StatusBarStyle="LightContent" />
+    </ContentPage.Behaviors>
+
     <VerticalStackLayout Spacing="10" Margin="5">
         <Editor x:Name="TextEditor"
                 Placeholder="Gib deine Notiz ein"
diff --git a/Jugenddienst Stunden/Views/StundePage.xaml b/Jugenddienst Stunden/Views/StundePage.xaml
index 8e0c8e4..dd2a21b 100644
--- a/Jugenddienst Stunden/Views/StundePage.xaml	
+++ b/Jugenddienst Stunden/Views/StundePage.xaml	
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              xmlns:models="clr-namespace:Jugenddienst_Stunden.ViewModels"
              xmlns:conv="clr-namespace:Jugenddienst_Stunden.Converter"
              x:Class="Jugenddienst_Stunden.Views.StundePage"
@@ -17,6 +18,12 @@
         </ResourceDictionary>
     </ContentPage.Resources>
 
+    <ContentPage.Behaviors>
+        <toolkit:StatusBarBehavior 
+            StatusBarColor="{AppThemeBinding Dark={StaticResource OffBlack}, Light={StaticResource Primary}}" 
+            StatusBarStyle="LightContent" />
+    </ContentPage.Behaviors>
+
     <VerticalStackLayout Spacing="10" Margin="10">
 
         <Label Text="{Binding SubTitle}" FontSize="Medium" FontAttributes="Bold" Margin="4,0,0,0" />
diff --git a/Jugenddienst Stunden/Views/StundenPage.xaml b/Jugenddienst Stunden/Views/StundenPage.xaml
index 8b363ff..3ae8fcb 100644
--- a/Jugenddienst Stunden/Views/StundenPage.xaml	
+++ b/Jugenddienst Stunden/Views/StundenPage.xaml	
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              xmlns:mmodels="clr-namespace:Jugenddienst_Stunden.Models"
              xmlns:models="clr-namespace:Jugenddienst_Stunden.ViewModels"
              xmlns:conv="clr-namespace:Jugenddienst_Stunden.Converter"
@@ -21,11 +22,15 @@
         </ResourceDictionary>
     </ContentPage.Resources>
 
+    <ContentPage.Behaviors>
+        <toolkit:StatusBarBehavior 
+            StatusBarColor="{AppThemeBinding Dark={StaticResource OffBlack}, Light={StaticResource Primary}}" 
+            StatusBarStyle="LightContent" />
+    </ContentPage.Behaviors>
 
     <ContentPage.ToolbarItems>
         <!--<ToolbarItem Text="Lade Liste" Command="{Binding RefreshListCommand}"/>-->
         <ToolbarItem Text="Neuer Eintrag" IconImageSource="{StaticResource ToolbarIcon}" Command="{Binding NewEntryCommand}" />
-
     </ContentPage.ToolbarItems>
 
     <RefreshView x:Name="MyRefreshView" Command="{Binding RefreshCommand}" IsRefreshing="{Binding IsRefreshing}" Margin="10" Padding="10">