diff --git a/src/TramlineFive/TramlineFive.Maui/App.xaml.cs b/src/TramlineFive/TramlineFive.Maui/App.xaml.cs
index 5582ce0..b1a3235 100644
--- a/src/TramlineFive/TramlineFive.Maui/App.xaml.cs
+++ b/src/TramlineFive/TramlineFive.Maui/App.xaml.cs
@@ -37,7 +37,8 @@ public App(PathService dbPathService)
             WeakReferenceMessenger.Default.Send(new ChangeThemeMessage(theme));
             Current.RequestedThemeChanged += (s, a) =>
             {
-                WeakReferenceMessenger.Default.Send(new ChangeThemeMessage(a.RequestedTheme == AppTheme.Light ? Names.LightTheme : Names.DarkTheme));
+                if (Preferences.Get(Settings.Theme, Names.SystemDefault) == Names.SystemDefault)
+                    WeakReferenceMessenger.Default.Send(new ChangeThemeMessage(a.RequestedTheme == AppTheme.Light ? Names.LightTheme : Names.DarkTheme));
             };
 
             System.Diagnostics.Debug.WriteLine("creating task");
diff --git a/src/TramlineFive/TramlineFive.Maui/AppShell.xaml b/src/TramlineFive/TramlineFive.Maui/AppShell.xaml
index 89871ff..4e7c515 100644
--- a/src/TramlineFive/TramlineFive.Maui/AppShell.xaml
+++ b/src/TramlineFive/TramlineFive.Maui/AppShell.xaml
@@ -13,11 +13,11 @@
             <Setter Property="Shell.TitleColor"
                         Value="White" />
             <Setter Property="Shell.TabBarTitleColor"
-              Value="DodgerBlue" />
+              Value="{DynamicResource IconsColor}" />
             <Setter Property="Shell.BackgroundColor"
               Value="{DynamicResource BarBackgroundColor}" />
             <Setter Property="Shell.TabBarForegroundColor" 
-              Value="DodgerBlue" />
+              Value="{DynamicResource IconsColor}" />
         </Style>
 
         <Style Class="FlyoutItemLabelStyle" TargetType="Label">
@@ -37,7 +37,7 @@
 
     <FlyoutItem Route="Main" Title="Начало" FlyoutDisplayOptions="AsSingleItem">
         <FlyoutItem.Icon>
-            <FontImageSource FontFamily="MaterialIconsOutlinedRegular.otf" Glyph="home" Color="DodgerBlue" />
+            <FontImageSource FontFamily="MaterialIconsOutlinedRegular.otf" Glyph="home" Color="{DynamicResource IconsColor}" />
         </FlyoutItem.Icon>
         <ShellContent Style="{StaticResource TabStyle}" Route="Map" Title="Карта" ContentTemplate="{DataTemplate pages:MapPage}">
             <ShellContent.Icon>
@@ -54,7 +54,7 @@
                 <FontImageSource FontFamily="MaterialIconsOutlinedRegular.otf" Glyph="history" />
             </ShellContent.Icon>
         </ShellContent>
-        <Tab Route="Lines" Shell.TabBarTitleColor="DodgerBlue" Shell.TabBarForegroundColor="DodgerBlue" Title="Линии" Shell.BackgroundColor="{DynamicResource BarBackgroundColor}" Shell.FlyoutBehavior="Disabled" Shell.NavBarIsVisible="True">
+        <Tab Route="Lines" Shell.TabBarTitleColor="{DynamicResource IconsColor}" Shell.TabBarForegroundColor="{DynamicResource IconsColor}"  Title="Линии" Shell.BackgroundColor="{DynamicResource BarBackgroundColor}" Shell.FlyoutBehavior="Disabled" Shell.NavBarIsVisible="True">
             <Tab.Icon>
                 <FontImageSource FontFamily="MaterialIconsOutlinedRegular.otf" Glyph="departure_board" />
             </Tab.Icon>
@@ -71,7 +71,7 @@
         </Tab>
     </FlyoutItem>
 
-    <Tab Route="LineDetails" Shell.BackgroundColor="DodgerBlue" Shell.FlyoutBehavior="Disabled" Shell.NavBarIsVisible="True" Shell.TabBarIsVisible="False">
+    <Tab Route="LineDetails" Shell.BackgroundColor="{DynamicResource BarBackgroundColor}" Shell.FlyoutBehavior="Disabled" Shell.NavBarIsVisible="True" Shell.TabBarIsVisible="False">
         <ShellContent Route="Forward" BindingContext="{Binding LineDetailsViewModel, Source={StaticResource Locator}}" Title="{Binding TargetStop, Mode=OneWay}">
             <pages:LineDetails BindingContext="{Binding}"  />
         </ShellContent>
@@ -83,19 +83,19 @@
 
     <ShellContent Style="{StaticResource TabStyle}" Route="Settings" Title="Настройки" Shell.FlyoutBehavior="Disabled" ContentTemplate="{DataTemplate pages:SettingsPage}">
         <ShellContent.Icon>
-            <FontImageSource FontFamily="MaterialIconsOutlinedRegular.otf" Color="DodgerBlue" Glyph="settings" />
+            <FontImageSource FontFamily="MaterialIconsOutlinedRegular.otf" Color="{DynamicResource IconsColor}" Glyph="settings" />
         </ShellContent.Icon>
     </ShellContent>
 
     <ShellContent Style="{StaticResource TabStyle}" Route="Directions" Title="Пътуване (Експериментално)" ContentTemplate="{DataTemplate pages:Directions}">
         <ShellContent.Icon>
-            <FontImageSource FontFamily="MaterialIconsOutlinedRegular.otf" Glyph="route" Color="DodgerBlue" />
+            <FontImageSource FontFamily="MaterialIconsOutlinedRegular.otf" Glyph="route" Color="{DynamicResource IconsColor}" />
         </ShellContent.Icon>
     </ShellContent>
     
     <ShellContent Route="About" Title="Информация">
         <ShellContent.Icon>
-            <FontImageSource FontFamily="MaterialIconsOutlinedRegular.otf" Color="DodgerBlue" Glyph="info" />
+            <FontImageSource FontFamily="MaterialIconsOutlinedRegular.otf" Color="{DynamicResource IconsColor}" Glyph="info" />
         </ShellContent.Icon>
 
         <pages:AboutPage />
diff --git a/src/TramlineFive/TramlineFive.Maui/Pages/LineDetails.xaml b/src/TramlineFive/TramlineFive.Maui/Pages/LineDetails.xaml
index 22c940b..490aa60 100644
--- a/src/TramlineFive/TramlineFive.Maui/Pages/LineDetails.xaml
+++ b/src/TramlineFive/TramlineFive.Maui/Pages/LineDetails.xaml
@@ -56,7 +56,7 @@
                                         <ColumnDefinition Width="100" />
                                     </Grid.ColumnDefinitions>
 
-                                    <Label FontFamily="MaterialIconsOutlinedRegular.otf" TextColor="DodgerBlue" Text="share_location" FontSize="32" VerticalOptions="Center" HorizontalOptions="Center" />
+                                    <Label FontFamily="MaterialIconsOutlinedRegular.otf" TextColor="{DynamicResource IconsColor}" Text="share_location" FontSize="32" VerticalOptions="Center" HorizontalOptions="Center" />
 
                                     <VerticalStackLayout  Grid.Column="1" VerticalOptions="Center">
                                         <Label Text="{Binding Code, Converter={StaticResource CodeToText}}" FontSize="14" VerticalOptions="Center" />
diff --git a/src/TramlineFive/TramlineFive.Maui/Pages/VirtualTablesPage.xaml b/src/TramlineFive/TramlineFive.Maui/Pages/VirtualTablesPage.xaml
index 80ca5e1..afd282c 100644
--- a/src/TramlineFive/TramlineFive.Maui/Pages/VirtualTablesPage.xaml
+++ b/src/TramlineFive/TramlineFive.Maui/Pages/VirtualTablesPage.xaml
@@ -41,11 +41,11 @@
                             <Label Text="{Binding StopInfo.Code, StringFormat=' ({0})'}" TextColor="{DynamicResource IconsColor}" FontSize="Small" />
                         </StackLayout>
 
-                        <Grid BackgroundColor="{DynamicResource BackgroundColor}">
-                            <Label Background="{DynamicResource BackgroundColor}"   FontFamily="MaterialIconsOutlinedRegular.otf" Text="&#xe570;" FontSize="40" TextColor="{DynamicResource IconsColor}" HorizontalOptions="Center" VerticalOptions="Center" />
+                        <Grid BackgroundColor="{DynamicResource VirtualTablesTopBarColor}">
+                            <Label Background="{DynamicResource VirtualTablesTopBarColor}"   FontFamily="MaterialIconsOutlinedRegular.otf" Text="&#xe570;" FontSize="40" TextColor="{DynamicResource IconsColor}" HorizontalOptions="Center" VerticalOptions="Center" />
                         </Grid>
 
-                        <Grid Grid.Column="1" HorizontalOptions="End" VerticalOptions="Center" Background="{DynamicResource BackgroundColor}">
+                        <Grid Grid.Column="1" HorizontalOptions="End" VerticalOptions="Center" Background="{DynamicResource VirtualTablesTopBarColor}">
                             <Grid.Behaviors>
                                 <mct:TouchBehavior DefaultAnimationDuration="350"
                                             PressedOpacity="0.6"