diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 0000000..077063f
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,7 @@
+# AGENTS Instructions
+
+## Pflichtregeln
+
+1. Bei jeder Dateiänderung oder Neuerstellung sind immer Windows Line Endings (CRLF) zu verwenden.
+2. Vor jeder Änderung muss `git status` geprüft werden und der Working Tree muss sauber sein.
+3. Nach Abschluss der Änderungen sind immer ein passender Git Commit und ein Git Push auszuführen.
diff --git a/App.xaml b/App.xaml
index fb9f320..4830049 100644
--- a/App.xaml
+++ b/App.xaml
@@ -12,7 +12,7 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary  Source="/themes/ThemeDarkMain.xaml"/>
-                <ResourceDictionary  Source="/themes/ThemeDarkNav.xaml"/>
+                <ResourceDictionary  Source="/themes/ThemeLightNav.xaml"/>
                 <ResourceDictionary Source="/F4SD-ResourceDictionaries/LightModeResources.xaml"/>
                 <ResourceDictionary Source="/F4SD-ResourceDictionaries/CheckBoxResources.xaml"/>
                 <ResourceDictionary Source="/F4SD-ResourceDictionaries/RadioButtonResources.xaml"/>
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 4c7b6a9..f6280d4 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -31,13 +31,13 @@
                                        Height="Auto"
                                        Fill="Transparent" />
                             <Border x:Name="CornerScrollBarRectangle"
-                                    CornerRadius="0"
+                                    CornerRadius="6"
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Stretch"
                                     Width="Auto"
                                     Height="Auto"
-                                    Margin="0,1,0,1"
-                                    Background="#FF7C7777" />
+                                    Margin="1"
+                                    Background="{DynamicResource subtleTextColor}" />
                         </Grid>
                         <ControlTemplate.Triggers>
                             <Trigger Property="Tag"
@@ -58,16 +58,16 @@
             <Setter Property="Stylus.IsFlicksEnabled"
                     Value="false" />
             <Setter Property="Foreground"
-                    Value="#ADABAB" />
+                    Value="{DynamicResource subtleTextColor}" />
             <Setter Property="Background"
                     Value="Transparent" />
             <Setter Property="Width"
-                    Value="7" />
+                    Value="10" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ScrollBar}">
                         <Grid x:Name="GridRoot"
-                              Width="10"
+                              Width="12"
                               Background="{TemplateBinding Background}">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="0.00001*" />
@@ -127,7 +127,7 @@
                                 <Setter Property="Width"
                                         Value="Auto" />
                                 <Setter Property="Height"
-                                        Value="8" />
+                                        Value="10" />
                                 <Setter TargetName="Thumb"
                                         Property="Tag"
                                         Value="Horizontal" />
@@ -148,15 +148,29 @@
         <Style TargetType="Button"
                x:Key="ButtonStyle">
             <Setter Property="Foreground"
-                    Value="{DynamicResource navForeground}" />
+                    Value="{DynamicResource buttonTextColor}" />
             <Setter Property="Background"
                     Value="{DynamicResource inactiveButtonColor}" />
+            <Setter Property="BorderBrush"
+                    Value="{DynamicResource panelBorderColor}" />
+            <Setter Property="BorderThickness"
+                    Value="1" />
+            <Setter Property="Cursor"
+                    Value="Hand" />
+            <Setter Property="Padding"
+                    Value="12,6" />
+            <Setter Property="SnapsToDevicePixels"
+                    Value="True" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type Button}">
-                        <Border Background="{TemplateBinding Background}">
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="10">
                             <ContentPresenter HorizontalAlignment="Center"
-                                              VerticalAlignment="Center" />
+                                              VerticalAlignment="Center"
+                                              Margin="{TemplateBinding Padding}" />
                         </Border>
                     </ControlTemplate>
                 </Setter.Value>
@@ -166,15 +180,26 @@
                          Value="True">
                     <Setter Property="Background"
                             Value="{DynamicResource activeButtonColor}" />
+                    <Setter Property="Foreground"
+                            Value="White" />
+                </Trigger>
+                <Trigger Property="IsPressed"
+                         Value="True">
+                    <Setter Property="Opacity"
+                            Value="0.92" />
                 </Trigger>
             </Style.Triggers>
         </Style>
         <Style TargetType="Button"
                x:Key="FlatButtonStyle2">
             <Setter Property="FontSize"
-                    Value="18" />
+                    Value="17" />
             <Setter Property="Height"
-                    Value="60" />
+                    Value="62" />
+            <Setter Property="Width"
+                    Value="62" />
+            <Setter Property="Margin"
+                    Value="0,5,0,3" />
             <Setter Property="Panel.ZIndex"
                     Value="50"></Setter>
             <EventSetter Event="PreviewMouseDown"
@@ -187,6 +212,12 @@
                          Handler="Button_Loaded" />
             <Setter Property="Background"
                     Value="{DynamicResource inactiveButtonColor}" />
+            <Setter Property="Foreground"
+                    Value="{DynamicResource navForeground}" />
+            <Setter Property="BorderBrush"
+                    Value="{DynamicResource navigationRailBorderColor}" />
+            <Setter Property="BorderThickness"
+                    Value="1" />
         </Style>
         <Style TargetType="ProgressBar"
                x:Key="FlatProgressBar">
@@ -214,7 +245,8 @@
         <TaskbarItemInfo />
     </Window.TaskbarItemInfo>
 
-    <Grid x:Name="MainGrid">
+    <Grid x:Name="MainGrid"
+          Background="{DynamicResource backgroundColor}">
         <DockPanel Width="{Binding ActualWidth, ElementName=Window, Mode=OneWay}"
                    x:Name="MainDock">
             <Grid DockPanel.Dock="Top"
@@ -223,44 +255,62 @@
                   HorizontalAlignment="Left"
                   Margin="0"
                   Background="{DynamicResource headerColor}"
-                  Height="60"
+                  Height="72"
                   MouseDown="GridTop_MouseDown"
                   MouseUp="GridTop_MouseUp">
                 <Image Source="Resources/consulting4it-header1.png"
                        Panel.ZIndex="55"
-                       Height="50"
-                       Width="175"
+                       Height="44"
+                       Width="160"
                        VerticalAlignment="Top"
                        HorizontalAlignment="Left"
-                       Margin="5,5,0,0"
+                       Margin="14,14,0,0"
                        x:Name="Logo" />
                 <TextBlock x:Name="Close_Text"
                            MouseDown="OnMinimizeClicked"
                            HorizontalAlignment="Right"
-                           FontSize="20"
+                           VerticalAlignment="Top"
+                           Width="28"
+                           Height="28"
+                           FontSize="16"
+                           TextAlignment="Center"
+                           Padding="0,2,0,0"
+                           Background="{DynamicResource headerControlBackgroundColor}"
+                           Foreground="{DynamicResource navForeground}"
                            FontWeight="Bold"
-                           Margin="0,-5,5,0"
+                           Margin="0,12,12,0"
                            Cursor="Hand"
+                           ToolTip="{x:Static resx:Resources.close}"
                            Panel.ZIndex="500"><Run Text="X" /></TextBlock>
                 <Image x:Name="RefreshIcon"
                        Source="{DynamicResource nav_appbar_refresh}"
                        Tag="ICO"
                        Panel.ZIndex="500"
                        HorizontalAlignment="Right"
-                       Width="32"
-                       Height="32"
+                       Width="20"
+                       Height="20"
                        VerticalAlignment="Top"
-                       Margin="0,-5,25,0"
+                       Margin="0,16,88,0"
                        MouseDown="OnRefreshClicked"
                        Cursor="Hand" />
                 <!--<TextBlock MouseDown="OnCloseClicked" HorizontalAlignment="Right" FontSize="20" FontWeight="Bold" Margin="0,-5,5,0" Cursor="Hand" Panel.ZIndex="500"  >X</TextBlock>-->
-                <Image Source="Resources/icons/light/appbar.network.server.disconnect.png"
+                <Image Source="{DynamicResource nav_appbar_network_server_disconnect}"
                        Tag="ICO"
                        x:Name="ConnProblem"
+                       Width="20"
+                       Height="20"
+                       Margin="0,16,54,0"
+                       HorizontalAlignment="Right"
+                       VerticalAlignment="Top"
                        Visibility="Visible" />
-                <Image Source="Resources/icons/light/appbar.network.server.connecting.png"
+                <Image Source="{DynamicResource nav_appbar_network_server_connecting}"
                        Tag="ICO"
                        x:Name="Connecting"
+                       Width="20"
+                       Height="20"
+                       Margin="0,16,54,0"
+                       HorizontalAlignment="Right"
+                       VerticalAlignment="Top"
                        Visibility="Visible">
                     <Image.Style>
                         <Style>
@@ -287,7 +337,7 @@
                         x:Name="TopAbstract"
                         BorderThickness="0"
                         BorderBrush="Gray"
-                        CornerRadius="0,0,0,0"
+                        CornerRadius="0,0,14,14"
                         Width="{Binding ActualWidth, ElementName=Window, Mode=OneWay}">
                     <Border.Background>
                         <ImageBrush ImageSource="Resources/top_cp.png"
@@ -308,23 +358,33 @@
                         HorizontalAlignment="Left"
                         Height="620"
                         Width="75">
+                    <Border Canvas.Left="5"
+                            Canvas.Top="10"
+                            Width="64"
+                            Height="560"
+                            CornerRadius="20"
+                            BorderThickness="1"
+                            BorderBrush="{DynamicResource navigationRailBorderColor}"
+                            Background="{DynamicResource navigationRailColor}" />
                     <Button  Visibility="Hidden"
                              x:Name="BtnBack"
                              Tag="100"
-                             Canvas.Top="0"
-                             Canvas.Left="-1"
-                             Width="70"
-                             Height="50"
-                             BorderThickness="0"
+                             Canvas.Top="6"
+                             Canvas.Left="4"
+                             Width="62"
+                             Height="62"
+                             BorderThickness="1"
                              Style="{StaticResource FlatButtonStyle2}"
                              Panel.ZIndex="1000">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
-                                <Canvas ClipToBounds="False"
-                                        Background="{Binding Background, ElementName=BtnBack}">
+                                <Border Background="{Binding Background, ElementName=BtnBack}"
+                                        BorderBrush="{DynamicResource navigationRailBorderColor}"
+                                        BorderThickness="1"
+                                        CornerRadius="14">
                                     <ContentPresenter HorizontalAlignment="Center"
                                                       VerticalAlignment="Center" />
-                                </Canvas>
+                                </Border>
                             </ControlTemplate>
                         </Button.Template>
                         <StackPanel Orientation="Horizontal"
@@ -332,17 +392,17 @@
                                     ClipToBounds="false"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Width="70">
-                            <Image Source="Resources/icons/dark/appbar.home.gps.png"
+                                    Width="62">
+                            <Image Source="{DynamicResource nav_appbar_home_gps}"
                                    Panel.ZIndex="18"
                                    Style="{StaticResource ImageStyle}"
                                    Tag="ICO"
                                    Stretch="Fill"
-                                   Width="60"
-                                   Height="50"
-                                   HorizontalAlignment="Left"
-                                   VerticalAlignment="top"
-                                   Margin="5,0,0,0" />
+                                   Width="32"
+                                   Height="32"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center"
+                                   Margin="15,14,0,0" />
                         </StackPanel>
                     </Button>
                     <Button  Tag="0"
@@ -351,29 +411,32 @@
                              Visibility="Visible"
                              Style="{StaticResource FlatButtonStyle2}"
                              ToolTip="{x:Static resx:Resources.mo_announcement}"
-                             BorderThickness="0"
+                             BorderThickness="1"
                              Panel.ZIndex="1000"
-                             Width="70"
-                             Height="70"
-                             Canvas.Left="0"
+                             Width="62"
+                             Height="62"
+                             Canvas.Left="4"
                              Canvas.Top="0">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
-                                <Canvas ClipToBounds="False"
-                                        Background="{Binding Background, ElementName=BtnAnnouncements}">
+                                <Grid ClipToBounds="False">
+                                    <Border Background="{Binding Background, ElementName=BtnAnnouncements}"
+                                            BorderBrush="{DynamicResource navigationRailBorderColor}"
+                                            BorderThickness="1"
+                                            CornerRadius="14" />
                                     <Canvas Panel.ZIndex="1000"
-                                            Height="70"
-                                            Width="80"
-                                            Margin="70,0,0,0">
+                                            Height="62"
+                                            Width="72"
+                                            Margin="62,0,0,0">
                                         <Polygon Visibility="Hidden"
                                                  x:Name="poly_main1"
                                                  Panel.ZIndex="900"
-                                                 Points="0,0 10,0 10,70 0,70"
+                                                 Points="0,0 8,0 8,62 0,62"
                                                  Fill="{Binding Background, ElementName=BtnAnnouncements}" />
                                     </Canvas>
                                     <ContentPresenter HorizontalAlignment="Center"
                                                       VerticalAlignment="Center" />
-                                </Canvas>
+                                </Grid>
                             </ControlTemplate>
                         </Button.Template>
                         <StackPanel Orientation="Horizontal"
@@ -387,11 +450,11 @@
                                    Style="{StaticResource ImageStyle}"
                                    x:Name="icoAnn"
                                    Stretch="Fill"
-                                   Width="60"
-                                   Height="60"
+                                   Width="34"
+                                   Height="34"
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
-                                   Margin="5" />
+                                   Margin="14" />
                             <Image Source="Resources/StateOverlays/OverlayNewContentButton.png"
                                    Visibility="Collapsed"
                                    Panel.ZIndex="18"
@@ -400,7 +463,7 @@
                                    Stretch="None"
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
-                                   Margin="-29,-29,0,0" />
+                                   Margin="-20,-20,0,0" />
                         </StackPanel>
                     </Button>
                     <Button x:Uid="2"
@@ -409,28 +472,31 @@
                             Visibility="Hidden"
                             Style="{StaticResource FlatButtonStyle2}"
                             ToolTip="{x:Static resx:Resources.mo_incidents }"
-                            BorderThickness="0"
+                            BorderThickness="1"
                             Canvas.Top="0"
-                            Width="70"
-                            Height="70"
-                            Canvas.Left="0">
+                            Width="62"
+                            Height="62"
+                            Canvas.Left="4">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
-                                <Canvas ClipToBounds="False"
-                                        Background="{Binding Background, ElementName=BtnIncident}">
+                                <Grid ClipToBounds="False">
+                                    <Border Background="{Binding Background, ElementName=BtnIncident}"
+                                            BorderBrush="{DynamicResource navigationRailBorderColor}"
+                                            BorderThickness="1"
+                                            CornerRadius="14" />
                                     <Canvas Panel.ZIndex="1000"
-                                            Height="70"
-                                            Width="80"
-                                            Margin="70,0,0,0">
+                                            Height="62"
+                                            Width="72"
+                                            Margin="62,0,0,0">
                                         <Polygon Visibility="Hidden"
                                                  x:Name="poly_main2"
                                                  Panel.ZIndex="1000"
-                                                 Points="0,0 10,0 10,70 0,70"
+                                                 Points="0,0 8,0 8,62 0,62"
                                                  Fill="{Binding Background, ElementName=BtnIncident}" />
                                     </Canvas>
                                     <ContentPresenter HorizontalAlignment="Center"
                                                       VerticalAlignment="Center" />
-                                </Canvas>
+                                </Grid>
                             </ControlTemplate>
                         </Button.Template>
                         <StackPanel x:Name="StackPanel"
@@ -442,9 +508,9 @@
                                    Stretch="fill"
                                    Panel.ZIndex="18"
                                    Style="{StaticResource ImageStyle}"
-                                   Width="60"
-                                   Height="60"
-                                   Margin="5" />
+                                   Width="34"
+                                   Height="34"
+                                   Margin="14" />
                             <Image Source="Resources/StateOverlays/OverlayNewContentButton.png"
                                    Visibility="Collapsed"
                                    Panel.ZIndex="18"
@@ -453,7 +519,7 @@
                                    Stretch="None"
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
-                                   Margin="-29,-29,0,0" />
+                                   Margin="-20,-20,0,0" />
                         </StackPanel>
                     </Button>
                     <Button Panel.ZIndex="1000"
@@ -462,28 +528,31 @@
                             Visibility="Hidden"
                             Style="{StaticResource FlatButtonStyle2}"
                             ToolTip="{x:Static resx:Resources.mo_ssp}"
-                            BorderThickness="0"
+                            BorderThickness="1"
                             Canvas.Top="0"
-                            Width="70"
-                            Height="70"
-                            Canvas.Left="0">
+                            Width="62"
+                            Height="62"
+                            Canvas.Left="4">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
-                                <Canvas ClipToBounds="false"
-                                        Background="{Binding Background, ElementName=BtnSsp}">
+                                <Grid ClipToBounds="false">
+                                    <Border Background="{Binding Background, ElementName=BtnSsp}"
+                                            BorderBrush="{DynamicResource navigationRailBorderColor}"
+                                            BorderThickness="1"
+                                            CornerRadius="14" />
                                     <Canvas Panel.ZIndex="1000"
-                                            Height="70"
-                                            Width="80"
-                                            Margin="70,0,0,0">
+                                            Height="62"
+                                            Width="72"
+                                            Margin="62,0,0,0">
                                         <Polygon Visibility="Hidden"
                                                  x:Name="poly_main3"
                                                  Panel.ZIndex="1000"
-                                                 Points="0,0 10,0 10,70 0,70"
+                                                 Points="0,0 8,0 8,62 0,62"
                                                  Fill="{Binding Background, ElementName=BtnSsp}" />
                                     </Canvas>
                                     <ContentPresenter HorizontalAlignment="Center"
                                                       VerticalAlignment="Center" />
-                                </Canvas>
+                                </Grid>
                             </ControlTemplate>
                         </Button.Template>
                         <StackPanel Orientation="Horizontal"
@@ -493,9 +562,9 @@
                                    Stretch="fill"
                                    Panel.ZIndex="18"
                                    Style="{StaticResource ImageStyle}"
-                                   Width="60"
-                                   Height="60"
-                                   Margin="5"
+                                   Width="34"
+                                   Height="34"
+                                   Margin="14"
                                    Tag="ICO" />
                             <Image Source="Resources/StateOverlays/OverlayNewContentButton.png"
                                    Visibility="Collapsed"
@@ -505,7 +574,7 @@
                                    Stretch="None"
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
-                                   Margin="-29,-29,0,0" />
+                                   Margin="-20,-20,0,0" />
                         </StackPanel>
                     </Button>
                     <Button x:Name="BtnCustomLink"
@@ -514,29 +583,32 @@
                             Visibility="Hidden"
                             Style="{StaticResource FlatButtonStyle2}"
                             ToolTip="{x:Static resx:Resources.CustomLink}"
-                            BorderThickness="0"
+                            BorderThickness="1"
                             Canvas.Top="0"
-                            Width="70"
-                            Height="70"
-                            Canvas.Left="0"
+                            Width="62"
+                            Height="62"
+                            Canvas.Left="4"
                             Panel.ZIndex="1000">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
-                                <Canvas ClipToBounds="False"
-                                        Background="{Binding Background, ElementName=BtnCustomLink}">
+                                <Grid ClipToBounds="False">
+                                    <Border Background="{Binding Background, ElementName=BtnCustomLink}"
+                                            BorderBrush="{DynamicResource navigationRailBorderColor}"
+                                            BorderThickness="1"
+                                            CornerRadius="14" />
                                     <Canvas Panel.ZIndex="1000"
-                                            Height="70"
-                                            Width="80"
-                                            Margin="70,0,0,0">
+                                            Height="62"
+                                            Width="72"
+                                            Margin="62,0,0,0">
                                         <Polygon Visibility="Hidden"
                                                  x:Name="poly_main4"
                                                  Panel.ZIndex="90"
-                                                 Points="0,0 10,0 10,70 0,70"
+                                                 Points="0,0 8,0 8,62 0,62"
                                                  Fill="{Binding Background, ElementName=BtnCustomLink}" />
                                     </Canvas>
                                     <ContentPresenter HorizontalAlignment="Center"
                                                       VerticalAlignment="Center" />
-                                </Canvas>
+                                </Grid>
                             </ControlTemplate>
                         </Button.Template>
                         <StackPanel Orientation="Horizontal"
@@ -547,9 +619,9 @@
                                    Stretch="fill"
                                    Panel.ZIndex="18"
                                    Style="{StaticResource ImageStyle}"
-                                   Width="60"
-                                   Height="60"
-                                   Margin="5" />
+                                   Width="34"
+                                   Height="34"
+                                   Margin="14" />
                             <Image Source="Resources/StateOverlays/OverlayNewContentButton.png"
                                    Visibility="Collapsed"
                                    Panel.ZIndex="18"
@@ -558,7 +630,7 @@
                                    Stretch="None"
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
-                                   Margin="-29,-29,0,0" />
+                                   Margin="-20,-20,0,0" />
                         </StackPanel>
                     </Button>
                     <Button x:Name="BtnInfo"
@@ -567,29 +639,32 @@
                             Visibility="Hidden"
                             Style="{StaticResource FlatButtonStyle2}"
                             ToolTip="{x:Static resx:Resources.mo_information}"
-                            BorderThickness="0"
+                            BorderThickness="1"
                             Canvas.Top="0"
-                            Width="70"
-                            Height="70"
-                            Canvas.Left="0"
+                            Width="62"
+                            Height="62"
+                            Canvas.Left="4"
                             Panel.ZIndex="1000">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
-                                <Canvas ClipToBounds="False"
-                                        Background="{Binding Background, ElementName=BtnInfo}">
+                                <Grid ClipToBounds="False">
+                                    <Border Background="{Binding Background, ElementName=BtnInfo}"
+                                            BorderBrush="{DynamicResource navigationRailBorderColor}"
+                                            BorderThickness="1"
+                                            CornerRadius="14" />
                                     <Canvas Panel.ZIndex="1000"
-                                            Height="70"
-                                            Width="80"
-                                            Margin="70,0,0,0">
+                                            Height="62"
+                                            Width="72"
+                                            Margin="62,0,0,0">
                                         <Polygon Visibility="Hidden"
                                                  x:Name="poly_main4"
                                                  Panel.ZIndex="90"
-                                                 Points="0,0 10,0 10,70 0,70"
+                                                 Points="0,0 8,0 8,62 0,62"
                                                  Fill="{Binding Background, ElementName=BtnInfo}" />
                                     </Canvas>
                                     <ContentPresenter HorizontalAlignment="Center"
                                                       VerticalAlignment="Center" />
-                                </Canvas>
+                                </Grid>
                             </ControlTemplate>
                         </Button.Template>
                         <StackPanel Orientation="Horizontal"
@@ -600,9 +675,9 @@
                                    Stretch="fill"
                                    Panel.ZIndex="18"
                                    Style="{StaticResource ImageStyle}"
-                                   Width="60"
-                                   Height="60"
-                                   Margin="5" />
+                                   Width="34"
+                                   Height="34"
+                                   Margin="14" />
                             <Image Source="Resources/StateOverlays/OverlayNewContentButton.png"
                                    Visibility="Collapsed"
                                    Panel.ZIndex="18"
@@ -611,7 +686,7 @@
                                    Stretch="None"
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
-                                   Margin="-29,-29,0,0" />
+                                   Margin="-20,-20,0,0" />
                         </StackPanel>
                     </Button>
                 </Canvas>
@@ -620,11 +695,19 @@
                         Panel.ZIndex="1"
                         ClipToBounds="False"
                         >
+                    <Border Canvas.Left="-75"
+                            Canvas.Top="8"
+                            Width="500"
+                            Height="580"
+                            CornerRadius="20"
+                            BorderThickness="1"
+                            BorderBrush="{DynamicResource panelBorderColor}"
+                            Background="{DynamicResource panelBackgroundColor}" />
                     <Canvas x:Name="StPaMain"
                             Panel.ZIndex="1000"
                             Height="590"
                             Width="500"
-                            Background="{DynamicResource backgroundColor}"
+                            Background="Transparent"
                             Canvas.Left="-75">
 
 
@@ -665,4 +748,4 @@
                Margin="80,0,0,140" />
     </Grid>
 </Window>
-   
\ No newline at end of file
+   
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index d40b2c3..d8f26ea 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -541,7 +541,10 @@ namespace C4IT_CustomerPanel
 
             ComputerInfoCtrl.SetAppearence();
 
-            Close_Text.Foreground = ConfigSettings.GetConfig()._iconColor == 10 ? new SolidColorBrush(Colors.Black) : new SolidColorBrush(Colors.White);
+            if (TryFindResource("navForeground") is SolidColorBrush navForeground)
+            {
+                Close_Text.Foreground = navForeground;
+            }
 
             if (firstStart)
             {
diff --git a/UserControls/AnnouncementListItem.xaml b/UserControls/AnnouncementListItem.xaml
index 1fc2bca..b0f470f 100644
--- a/UserControls/AnnouncementListItem.xaml
+++ b/UserControls/AnnouncementListItem.xaml
@@ -8,7 +8,7 @@
              mc:Ignorable="d" 
              d:DesignWidth="320"
              FontSize="12"
-             FontFamily="Arial"
+             FontFamily="Segoe UI"
              Cursor="Hand"
              MouseLeftButtonDown="OnMouseLeftButtonDownClicked"
              >
@@ -16,8 +16,15 @@
         <BooleanToVisibilityConverter x:Key="BoolToVis" />
     </UserControl.Resources>
 
-    <Border BorderThickness="1.5" x:Name="HighlightAnnouncementBorder" CornerRadius="1" MouseEnter="OnAnnMouseEnter" MouseLeave="OnAnnMouseLeave">
-        <Grid Background="White" Height="auto">
+    <Border BorderThickness="1"
+            x:Name="HighlightAnnouncementBorder"
+            BorderBrush="{DynamicResource cardBorderColor}"
+            Background="{DynamicResource cardBackgroundColor}"
+            CornerRadius="12"
+            MouseEnter="OnAnnMouseEnter"
+            MouseLeave="OnAnnMouseLeave">
+        <Grid Background="Transparent"
+              Height="auto">
 
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="5"/>
@@ -33,10 +40,10 @@
             <Grid Background="{Binding Path=PrioColor}" Grid.RowSpan="3" x:Name="annColor"></Grid>
             <DockPanel Grid.Column="1" >
                 <Image Source="pack://application:,,,/Resources/StateOverlays/OverlayNewContentButton.png" Panel.ZIndex="18" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}" x:Name="signal" Width="15px" Cursor="Hand" ToolTip="{x:Static resx:Resources.removeMarkup}" Margin="5,0,0,0"  />
-                <TextBlock x:Name="txtDate" Grid.Row="0" Margin="10,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" FontStyle="Italic" Text="{Binding Path=CreatedDate,StringFormat={}{0:dd.MM.yyyy},FallbackValue='01.01.2021'}"></TextBlock>
+                <TextBlock x:Name="txtDate" Grid.Row="0" Margin="10,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" FontStyle="Italic" Foreground="{DynamicResource subtleTextColor}" Text="{Binding Path=CreatedDate,StringFormat={}{0:dd.MM.yyyy},FallbackValue='01.01.2021'}"></TextBlock>
             </DockPanel>
 
-            <Image x:Name="imgOpen" Grid.Row="0"  Grid.Column="2" Source="{DynamicResource appbar_new_window}" Width="30" ToolTip="{x:Static resx:Resources.CallAnnonceDetails}" Cursor="Hand"/>
+            <Image x:Name="imgOpen" Grid.Row="0"  Grid.Column="2" Source="{DynamicResource appbar_new_window}" Width="20" Margin="0,2,8,0" ToolTip="{x:Static resx:Resources.CallAnnonceDetails}" Cursor="Hand"/>
             <TextBlock x:Name="txtSubject" 
                        Grid.Row="1" 
                        Grid.ColumnSpan="2" 
@@ -45,6 +52,7 @@
                        Text="{Binding Path=Subject,FallbackValue='test Announcement'}" 
                        VerticalAlignment="Center" 
                        FontWeight="Bold" 
+                       Foreground="{DynamicResource sectionTitleColor}"
                        ClipToBounds="True"/>
             <TextBlock x:Name="txtContent" 
                        Grid.Row="2" 
@@ -52,6 +60,7 @@
                        Margin="15,10,10,0" 
                        VerticalAlignment="Center" 
                        Text="{Binding Path=Text,FallbackValue='test text'}" 
+                       Foreground="{DynamicResource subtleTextColor}"
                        TextWrapping="Wrap" 
                        TextTrimming="CharacterEllipsis" 
                        LineStackingStrategy="BlockLineHeight" 
@@ -66,6 +75,7 @@
                        Margin="15,5,10,0" 
                        VerticalAlignment="Center"
                        FontStyle="Italic" 
+                       Foreground="{DynamicResource subtleTextColor}"
                        TextWrapping="Wrap" 
                        TextTrimming="CharacterEllipsis" 
                        LineStackingStrategy="BlockLineHeight" 
diff --git a/UserControls/AnnouncementListItem.xaml.cs b/UserControls/AnnouncementListItem.xaml.cs
index 3670fc4..851ab86 100644
--- a/UserControls/AnnouncementListItem.xaml.cs
+++ b/UserControls/AnnouncementListItem.xaml.cs
@@ -172,12 +172,18 @@ namespace C4IT_CustomerPanel.UserControls
 
         private void OnAnnMouseEnter(object sender, MouseEventArgs e)
         {
-            HighlightAnnouncementBorder.BorderBrush = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#2d45fb"));
+            if (Application.Current.TryFindResource("itemHoverBorderColor") is SolidColorBrush hoverBrush)
+            {
+                HighlightAnnouncementBorder.BorderBrush = hoverBrush;
+            }
         }
 
         private void OnAnnMouseLeave(object sender, MouseEventArgs e)
         {
-            HighlightAnnouncementBorder.BorderBrush = new SolidColorBrush(Colors.White);
+            if (Application.Current.TryFindResource("cardBorderColor") is SolidColorBrush defaultBrush)
+            {
+                HighlightAnnouncementBorder.BorderBrush = defaultBrush;
+            }
         }
 
         private void OnMouseLeftButtonDownClicked(object sender, MouseButtonEventArgs e)
diff --git a/UserControls/Announcements.xaml b/UserControls/Announcements.xaml
index 4730331..d838a77 100644
--- a/UserControls/Announcements.xaml
+++ b/UserControls/Announcements.xaml
@@ -7,9 +7,9 @@
              xmlns:resx="clr-namespace:C4IT_CustomerPanel.Properties"
              mc:Ignorable="d" 
              d:DesignHeight="500" d:DesignWidth="800">
-    <Grid x:Name="GridMain" x:FieldModifier="private"
-        Width="500"
-        >
+    <Grid x:Name="GridMain"
+          x:FieldModifier="private"
+          Width="500">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="100*" />
             <ColumnDefinition Width="185*" />
@@ -20,51 +20,62 @@
             <RowDefinition Height="6*" />
             <RowDefinition Height="7*" />
         </Grid.RowDefinitions>
-        <Canvas x:Name="Canvas" x:FieldModifier="private"
-                                    Grid.Column="1"
-                                    Grid.ColumnSpan="2"
-                                    Grid.Row="0">
-
+        <Canvas x:Name="Canvas"
+                x:FieldModifier="private"
+                Grid.Column="1"
+                Grid.ColumnSpan="2"
+                Grid.Row="0">
             <Image Source="{DynamicResource appbar_newspaper}"
-                                       Width="48"
-                                       x:Name="icoNewspaper_Inline" x:FieldModifier="private" />
-
+                   Width="36"
+                   Height="36"
+                   Margin="0,6,0,0"
+                   x:Name="icoNewspaper_Inline"
+                   x:FieldModifier="private" />
             <Label Content="{x:Static resx:Resources.announcement}"
-                                       FontSize="16"
-                                       Canvas.Top="10"
-                                       Canvas.Left="40"
-                                       Foreground="{DynamicResource mainForeground}" />
-
-            <ScrollViewer x:Name="CanvasAnnouncements" x:FieldModifier="private"
-                                              Canvas.Top="50"
-                                              Canvas.Left="10"
-                                              Visibility="Visible"
-                                              MinHeight="60"
-                                              MaxHeight="480"
-                                              Width="{Binding ActualWidth, ElementName=Canvas, Mode=OneWay}"
-                                              HorizontalScrollBarVisibility="Disabled"
-                                              VerticalScrollBarVisibility="Auto" />
+                   FontSize="19"
+                   FontWeight="SemiBold"
+                   Canvas.Top="8"
+                   Canvas.Left="40"
+                   Foreground="{DynamicResource sectionTitleColor}" />
+            <ScrollViewer x:Name="CanvasAnnouncements"
+                          x:FieldModifier="private"
+                          Canvas.Top="56"
+                          Canvas.Left="0"
+                          Visibility="Visible"
+                          MinHeight="60"
+                          MaxHeight="470"
+                          Width="{Binding ActualWidth, ElementName=Canvas, Mode=OneWay}"
+                          HorizontalScrollBarVisibility="Disabled"
+                          VerticalScrollBarVisibility="Auto" />
             <StackPanel Canvas.Top="50"
-                                            Canvas.Left="10"
-                                            x:Name="NoAnnouncement" x:FieldModifier="private"
-                                            Background="White"
-                                            Width="{Binding ActualWidth, ElementName=Canvas, Mode=OneWay}"
-                                            Height="50">
-                <TextBlock Text="{x:Static resx:Resources.noannouncement}"
-                                               Margin="25,5,10,0"
-                                               Foreground="Black" />
+                        Canvas.Left="0"
+                        x:Name="NoAnnouncement"
+                        x:FieldModifier="private"
+                        Background="Transparent"
+                        Width="{Binding ActualWidth, ElementName=Canvas, Mode=OneWay}"
+                        Height="58">
+                <Border Margin="2,6,2,0"
+                        BorderThickness="1"
+                        CornerRadius="10"
+                        BorderBrush="{DynamicResource cardBorderColor}"
+                        Background="{DynamicResource cardBackgroundColor}">
+                    <TextBlock Text="{x:Static resx:Resources.noannouncement}"
+                               Margin="18,12,10,0"
+                               Foreground="{DynamicResource subtleTextColor}" />
+                </Border>
             </StackPanel>
             <Image Source="{DynamicResource appbar_list_check}"
-                                       x:Name="buttonReadAllAnnouncements" x:FieldModifier="private"
-                                       Tag="readAllAnnouncements"
-                                       Cursor="Hand"
-                                       PreviewMouseDown="ReadAll_PreviewMouseDown"
-                                       Grid.Column="2"
-                                       RenderTransformOrigin="1.536,1.429"
-                                       Height="32"
-                                       Width="32"
-                                       Canvas.Left="338"
-                                       Canvas.Top="10" />
+                   x:Name="buttonReadAllAnnouncements"
+                   x:FieldModifier="private"
+                   Tag="readAllAnnouncements"
+                   Cursor="Hand"
+                   PreviewMouseDown="ReadAll_PreviewMouseDown"
+                   Grid.Column="2"
+                   RenderTransformOrigin="1.536,1.429"
+                   Height="24"
+                   Width="24"
+                   Canvas.Left="338"
+                   Canvas.Top="14" />
         </Canvas>
 
     </Grid>
diff --git a/UserControls/ComputerInformation.xaml b/UserControls/ComputerInformation.xaml
index 9148ddb..39ed421 100644
--- a/UserControls/ComputerInformation.xaml
+++ b/UserControls/ComputerInformation.xaml
@@ -14,15 +14,25 @@
         <Style TargetType="Button"
                x:Key="ButtonStyle">
             <Setter Property="Foreground"
-                    Value="{DynamicResource navForeground}" />
+                    Value="{DynamicResource buttonTextColor}" />
             <Setter Property="Background"
                     Value="{DynamicResource inactiveButtonColor}" />
+            <Setter Property="BorderBrush"
+                    Value="{DynamicResource panelBorderColor}" />
+            <Setter Property="BorderThickness"
+                    Value="1" />
+            <Setter Property="Padding"
+                    Value="12,6" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type Button}">
-                        <Border Background="{TemplateBinding Background}">
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="10">
                             <ContentPresenter HorizontalAlignment="Center"
-                                              VerticalAlignment="Center" />
+                                              VerticalAlignment="Center"
+                                              Margin="{TemplateBinding Padding}" />
                         </Border>
                     </ControlTemplate>
                 </Setter.Value>
@@ -32,9 +42,36 @@
                          Value="True">
                     <Setter Property="Background"
                             Value="{DynamicResource activeButtonColor}" />
+                    <Setter Property="Foreground"
+                            Value="White" />
                 </Trigger>
             </Style.Triggers>
         </Style>
+        <Style x:Key="InfoTextBoxStyle"
+               TargetType="{x:Type TextBox}">
+            <Setter Property="Foreground"
+                    Value="{DynamicResource sectionTitleColor}" />
+            <Setter Property="Background"
+                    Value="{DynamicResource inputBackgroundColor}" />
+            <Setter Property="BorderBrush"
+                    Value="{DynamicResource inputBorderColor}" />
+            <Setter Property="BorderThickness"
+                    Value="1" />
+            <Setter Property="Padding"
+                    Value="8,3" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type TextBox}">
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="8">
+                            <ScrollViewer x:Name="PART_ContentHost" />
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
     </UserControl.Resources>
 
     <!--ComputerInformation-->
@@ -64,9 +101,9 @@
                 Grid.Row="1"
                 Height="70">
             <Image Source="{DynamicResource appbar_monitor}"
-                   Height="48"
+                   Height="34"
                    x:Name="icoComputer_Inline" x:FieldModifier="private" />
-            <Label Foreground="{DynamicResource mainForeground}"
+            <Label Foreground="{DynamicResource sectionTitleColor}"
                    x:Name="LblComputername" x:FieldModifier="private"
                    Content="{x:Static resx:Resources.computername}"
                    FontSize="16"
@@ -76,12 +113,12 @@
                      Width="300"
                      FontSize="16"
                      VerticalAlignment="Center"
+                     Style="{StaticResource InfoTextBoxStyle}"
                      x:Name="TxtComputername" x:FieldModifier="private"
                      IsReadOnly="true"
                      Canvas.Top="45"
                      Height="25"
-                     PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick"
-                     Background="White" />
+                     PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
             <Image Cursor="Hand"
                    Source="{DynamicResource appbar_page_copy}"
                    Height="25"
@@ -98,9 +135,9 @@
                 Grid.Row="2"
                 Height="70">
             <Image Source="{DynamicResource appbar_network}"
-                   Height="48"
+                   Height="34"
                    x:Name="icoNetwork_Inline" x:FieldModifier="private" />
-            <Label Foreground="{DynamicResource mainForeground}"
+            <Label Foreground="{DynamicResource sectionTitleColor}"
                    FontSize="16"
                    x:Name="LblIpaddress" x:FieldModifier="private"
                    Content="{x:Static resx:Resources.ipaddress}"
@@ -111,11 +148,11 @@
                      Height="25"
                      VerticalAlignment="Center"
                      FontSize="16"
+                     Style="{StaticResource InfoTextBoxStyle}"
                      x:Name="TxtIpaddress" x:FieldModifier="private"
                      IsReadOnly="true"
                      Canvas.Top="45"
-                     PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick"
-                     Background="White" />
+                     PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
             <Image Cursor="Hand"
                    Source="{DynamicResource appbar_page_copy}"
                    Height="25"
@@ -133,9 +170,9 @@
                 Height="70"
                 x:Name="CanvasHostname" x:FieldModifier="private">
             <Image Source="{DynamicResource appbar_remotehost}"
-                   Height="48"
+                   Height="34"
                    x:Name="icoHost_Inline" x:FieldModifier="private"/>
-            <Label Foreground="{DynamicResource mainForeground}"
+            <Label Foreground="{DynamicResource sectionTitleColor}"
                    x:Name="LblHostname" x:FieldModifier="private"
                    Content="{x:Static resx:Resources.Hostname}"
                    FontSize="16"
@@ -145,12 +182,12 @@
                      Width="300"
                      FontSize="16"
                      VerticalAlignment="Center"
+                     Style="{StaticResource InfoTextBoxStyle}"
                      x:Name="TxtHostname" x:FieldModifier="private"
                      IsReadOnly="true"
                      Canvas.Top="45"
                      Height="25"
-                     PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick"
-                     Background="White" />
+                     PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
             <Image Cursor="Hand"
                    Source="{DynamicResource appbar_page_copy}"
                    Height="25"
@@ -167,9 +204,9 @@
                 Grid.Row="4"
                 Height="70">
             <Image Source="{DynamicResource appbar_people}"
-                   Height="48"
+                   Height="34"
                    x:Name="icoUser_Inline" x:FieldModifier="private" />
-            <Label Foreground="{DynamicResource mainForeground}"
+            <Label Foreground="{DynamicResource sectionTitleColor}"
                    FontSize="16"
                    x:Name="LblUsername" x:FieldModifier="private"
                    Content="{x:Static resx:Resources.username}"
@@ -180,12 +217,12 @@
                      Height="25"
                      VerticalAlignment="Center"
                      FontSize="16"
+                     Style="{StaticResource InfoTextBoxStyle}"
                      x:Name="TxtUsername" x:FieldModifier="private"
                      IsEnabled="true"
                      IsReadOnly="true"
                      Canvas.Top="45"
-                     PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick"
-                     Background="White" />
+                     PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
             <Image Cursor="Hand"
                    Source="{DynamicResource appbar_page_copy}"
                    Height="25"
@@ -202,10 +239,10 @@
                 Grid.Row="5"
                 Height="70">
             <Image Source="{DynamicResource appbar_reset}"
-                   Height="48"
+                   Height="34"
                    x:Name="icoRestart_Inline" x:FieldModifier="private"
                    Tag="MAINICO" />
-            <Label  Foreground="{DynamicResource mainForeground}"
+            <Label  Foreground="{DynamicResource sectionTitleColor}"
                     FontSize="16"
                     x:Name="LblLastreboot" x:FieldModifier="private"
                     Content="{x:Static resx:Resources.lastreboot}"
@@ -216,11 +253,11 @@
                      Height="25"
                      VerticalAlignment="Center"
                      FontSize="16"
+                     Style="{StaticResource InfoTextBoxStyle}"
                      x:Name="TxtLastreboot" x:FieldModifier="private"
                      IsReadOnly="true"
                      Canvas.Top="45"
-                     MouseDoubleClick="Info_TXT_OnMouseDoubleClick"
-                     Background="White" />
+                     MouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
             <Image Cursor="Hand"
                    Source="{DynamicResource appbar_page_copy}"
                    Height="25"
@@ -237,10 +274,10 @@
                 Grid.Row="6"
                 Height="70">
             <Image Source="{DynamicResource appbar_folder_ellipsis}"
-                   Height="48"
+                   Height="34"
                    x:Name="icoDrive_Inline" x:FieldModifier="private"
                    Tag="MAINICO" />
-            <Label Foreground="{DynamicResource mainForeground}"
+            <Label Foreground="{DynamicResource sectionTitleColor}"
                    x:Name="LblDrives" x:FieldModifier="private"
                    Content="{x:Static resx:Resources.drives}"
                    FontSize="16"
@@ -273,7 +310,7 @@
                 Grid.Row="7"
                 Height="70">
             <Label Content="{x:Static resx:Resources.genReportHeader}"
-                   Foreground="{DynamicResource mainForeground}"
+                   Foreground="{DynamicResource sectionTitleColor}"
                    Canvas.Left="53"
                    Canvas.Top="15"
                    FontSize="16"
@@ -286,7 +323,7 @@
                     <ColumnDefinition Width="43*" />
                     <ColumnDefinition Width="57*" />
                 </Grid.ColumnDefinitions>
-                <Button Foreground="{DynamicResource navForeground}"
+                <Button Foreground="{DynamicResource buttonTextColor}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource ButtonStyle}"
                         Width="250"
@@ -301,7 +338,7 @@
             <Grid Width="300"
                   Canvas.Left="15"
                   Canvas.Top="110">
-                <Button Foreground="{DynamicResource navForeground}"
+                <Button Foreground="{DynamicResource buttonTextColor}"
                         HorizontalAlignment="Center"
                         Style="{StaticResource ButtonStyle}"
                         Width="250"
@@ -340,16 +377,16 @@
                 Opacity="0"
                 Visibility="Collapsed">
             <Border  BorderThickness="1"
-                     BorderBrush="Black"
-                     CornerRadius="3"
-                     Background="{DynamicResource inactiveButtonColor}"
+                     BorderBrush="{DynamicResource panelBorderColor}"
+                     CornerRadius="10"
+                     Background="{DynamicResource cardBackgroundColor}"
                      Width="250"
                      VerticalAlignment="Center"
                      HorizontalAlignment="Center"
                      Panel.ZIndex="100">
                 <TextBlock Text="{x:Static resx:Resources.copied}"
-                           Foreground="White"
-                           FontSize="16"
+                           Foreground="{DynamicResource sectionTitleColor}"
+                           FontSize="15"
                            Height="25"
                            VerticalAlignment="Center"
                            HorizontalAlignment="Center" />
diff --git a/UserControls/CustomLinks.xaml b/UserControls/CustomLinks.xaml
index e4452e0..98e08d0 100644
--- a/UserControls/CustomLinks.xaml
+++ b/UserControls/CustomLinks.xaml
@@ -23,11 +23,14 @@
                 Grid.ColumnSpan="2"
                 Grid.Row="0">
             <Image Source="{DynamicResource appbar_star}"
-                   Width="48"
+                   Width="36"
+                   Height="36"
+                   Margin="0,6,0,0"
                    Tag="MAINICO" />
-            <Label Foreground="{DynamicResource mainForeground}"
-                   FontSize="16"
-                   Canvas.Top="10"
+            <Label Foreground="{DynamicResource sectionTitleColor}"
+                   FontSize="19"
+                   FontWeight="SemiBold"
+                   Canvas.Top="8"
                    Canvas.Left="40"
                    Content="{x:Static resx:Resources.CustomLink}" />
         </Canvas>
@@ -37,7 +40,7 @@
             <StackPanel x:Name="CustomLinkPanel"
                         x:FieldModifier="private"
                         Orientation="Vertical"
-                        Canvas.Top="50" />
+                        Canvas.Top="56" />
         </Canvas>
     </Grid>
 </UserControl>
diff --git a/UserControls/CustomProgressBar.xaml b/UserControls/CustomProgressBar.xaml
index 1017875..ef80ccf 100644
--- a/UserControls/CustomProgressBar.xaml
+++ b/UserControls/CustomProgressBar.xaml
@@ -6,7 +6,15 @@
              xmlns:local="clr-namespace:C4IT_CustomerPanel.UserControls"
              mc:Ignorable="d" 
              d:DesignHeight="50" d:DesignWidth="400" Loaded="UserControl_Loaded" SizeChanged="UserControl_SizeChanged">
-    <Grid Background="White">
-        <Border x:Name="ProgressRect" Background="#FFBEE6FD" Width="100" HorizontalAlignment="Left"/>
+    <Grid Background="Transparent">
+        <Border Background="{DynamicResource inputBackgroundColor}"
+                BorderBrush="{DynamicResource inputBorderColor}"
+                BorderThickness="1"
+                CornerRadius="8" />
+        <Border x:Name="ProgressRect"
+                Width="100"
+                HorizontalAlignment="Left"
+                CornerRadius="8"
+                Background="{DynamicResource accentColor}" />
     </Grid>
 </UserControl>
diff --git a/UserControls/IncidentListItem.xaml b/UserControls/IncidentListItem.xaml
index 5a1857d..f5d2c87 100644
--- a/UserControls/IncidentListItem.xaml
+++ b/UserControls/IncidentListItem.xaml
@@ -9,14 +9,21 @@
              mc:Ignorable="d" 
              d:DesignWidth="320"
              FontSize="12"
-             FontFamily="Arial"
+             FontFamily="Segoe UI"
              Cursor="Hand"
              >
     <UserControl.Resources>
         <BooleanToVisibilityConverter x:Key="BoolToVis" />
     </UserControl.Resources>
-    <Border BorderThickness="1.5" x:Name="HighlightIncidentBorder" CornerRadius="1" MouseEnter="OnIncidentMouseEnter" MouseLeave="OnIncidentMouseLeave">
-        <Grid Background="White" Height="auto">
+    <Border BorderThickness="1"
+            x:Name="HighlightIncidentBorder"
+            BorderBrush="{DynamicResource cardBorderColor}"
+            Background="{DynamicResource cardBackgroundColor}"
+            CornerRadius="12"
+            MouseEnter="OnIncidentMouseEnter"
+            MouseLeave="OnIncidentMouseLeave">
+        <Grid Background="Transparent"
+              Height="auto">
             <Grid.RowDefinitions>
                 <RowDefinition Height="auto"/>
                 <RowDefinition Height="auto"/>
@@ -29,24 +36,24 @@
                 </Grid.ColumnDefinitions>
                 <DockPanel Margin="-10,0,0,0">
                     <Image Margin="5,0,5,0" Source="pack://application:,,,/Resources/StateOverlays/OverlayNewContentButton.png" Panel.ZIndex="18" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}" x:Name="signal" Width="15px" Cursor="Hand" ToolTip="{x:Static resx:Resources.removeMarkup}"/>
-                    <TextBlock  x:Name="txtTicketType"  Margin="5,0,0,0" Grid.Column="0" HorizontalAlignment="Left" Text="{Binding Path=TicketType,FallbackValue='Störung'}" FontStyle="Italic" Width="95"></TextBlock>
+                    <TextBlock  x:Name="txtTicketType"  Margin="5,0,0,0" Grid.Column="0" HorizontalAlignment="Left" Text="{Binding Path=TicketType,FallbackValue='Störung'}" FontStyle="Italic" Foreground="{DynamicResource subtleTextColor}" Width="95"></TextBlock>
                 </DockPanel>
                 <DockPanel Grid.Column="1" Margin="10,0,0,0">
-                    <TextBlock  x:Name="txtState"  HorizontalAlignment="Center" Text="{Binding Path=State, FallbackValue='State'}" FontStyle="Italic"></TextBlock>
+                    <TextBlock  x:Name="txtState"  HorizontalAlignment="Center" Text="{Binding Path=State, FallbackValue='State'}" FontStyle="Italic" Foreground="{DynamicResource subtleTextColor}"></TextBlock>
                     <Grid Grid.Column="1"  HorizontalAlignment="Right" Margin="0,0,6,0" Width="26" x:Name="sortByState" Visibility="Collapsed">
                         <TextBlock Text="&#11206;" Margin="12,0,0,0"  x:Name="descState" FontSize="14" Tag="5"   PreviewMouseDown="orderBy_PreviewMouseDown" Cursor="Hand" />
                         <TextBlock Text="&#11205;" x:Name="ascState" FontSize="14" Tag="4" Margin="0,0,10,0"  PreviewMouseDown="orderBy_PreviewMouseDown" Cursor="Hand" />
                     </Grid>
                 </DockPanel>
-                <TextBlock x:Name="txtID" Grid.Column="2" HorizontalAlignment="Right" Cursor="Hand" TextDecorations="Underline" Foreground="#1E72C7" ToolTip="{x:Static resx:Resources.CallTicketDetails}"  Text="{Binding Path=TicketNumber, FallbackValue='TCK0004'}" Margin="0,0,22,0"></TextBlock>
+                <TextBlock x:Name="txtID" Grid.Column="2" HorizontalAlignment="Right" Cursor="Hand" TextDecorations="Underline" Foreground="{DynamicResource accentColor}" ToolTip="{x:Static resx:Resources.CallTicketDetails}"  Text="{Binding Path=TicketNumber, FallbackValue='TCK0004'}" Margin="0,0,22,0"></TextBlock>
                 <Grid Grid.Column="2"  HorizontalAlignment="Right" Width="25" x:Name="sortByTicketNumber" Visibility="Collapsed" Margin="0,0,-3,0">
                     <TextBlock Text="&#11206;" Margin="12,0,0,0"  x:Name="descTicketnumber" FontSize="14" Tag="1"  PreviewMouseDown="orderBy_PreviewMouseDown" Cursor="Hand" />
                     <TextBlock Text="&#11205;" x:Name="ascTicketnumber"  FontSize="14" Margin="0,0,13,0" Tag="0"  PreviewMouseDown="orderBy_PreviewMouseDown" Cursor="Hand" />
                 </Grid>
             </Grid>
-            <TextBlock x:Name="txtContent" Grid.Row="1" VerticalAlignment="Top" Margin="8,12,5,24" FontWeight="Bold" TextWrapping="Wrap" Text="{Binding Path=Subject,FallbackValue='test Ticket'}"></TextBlock>
-            <TextBlock x:Name="txtCreatedDate" Grid.Row="1" VerticalAlignment="Bottom" HorizontalAlignment="Right" Text="{Binding Path=CreatedDate, StringFormat={}{0:dd.MM.yyyy HH:mm}, FallbackValue='Datum'}" FontStyle="Italic"  Width="100" Margin="0,32,27,6"></TextBlock>
-            <TextBlock  Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}" x:Name="txtLastAction" Grid.Row="1" HorizontalAlignment="Right" FontStyle="Italic"  Width="165" Margin="0,32,145,4" Text="{Binding Path=LastJournalEntryActionText,FallbackValue='test Ticket'}"></TextBlock>
+            <TextBlock x:Name="txtContent" Grid.Row="1" VerticalAlignment="Top" Margin="8,12,5,24" FontWeight="Bold" Foreground="{DynamicResource sectionTitleColor}" TextWrapping="Wrap" Text="{Binding Path=Subject,FallbackValue='test Ticket'}"></TextBlock>
+            <TextBlock x:Name="txtCreatedDate" Grid.Row="1" VerticalAlignment="Bottom" HorizontalAlignment="Right" Text="{Binding Path=CreatedDate, StringFormat={}{0:dd.MM.yyyy HH:mm}, FallbackValue='Datum'}" FontStyle="Italic" Foreground="{DynamicResource subtleTextColor}" Width="100" Margin="0,32,27,6"></TextBlock>
+            <TextBlock  Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}" x:Name="txtLastAction" Grid.Row="1" HorizontalAlignment="Right" FontStyle="Italic" Foreground="{DynamicResource subtleTextColor}" Width="165" Margin="0,32,145,4" Text="{Binding Path=LastJournalEntryActionText,FallbackValue='test Ticket'}"></TextBlock>
             <Grid HorizontalAlignment="Right" Width="25" Grid.Row="1" x:Name="sortByCreatedDate" Visibility="Collapsed" VerticalAlignment="Bottom" Height="16" Margin="0,0,0,4">
                 <TextBlock Text="&#11206;" Margin="12,0,0,0"  x:Name="descCreatedDate" FontSize="14" PreviewMouseDown="orderBy_PreviewMouseDown" Cursor="Hand" Tag="3"/>
                 <TextBlock Text="&#11205;" x:Name="ascCreatedDate" Tag="2" FontSize="14" Margin="0,0,13,0"  PreviewMouseDown="orderBy_PreviewMouseDown" Cursor="Hand"  />
diff --git a/UserControls/IncidentListItem.xaml.cs b/UserControls/IncidentListItem.xaml.cs
index fdbaa20..da0c726 100644
--- a/UserControls/IncidentListItem.xaml.cs
+++ b/UserControls/IncidentListItem.xaml.cs
@@ -167,12 +167,18 @@ namespace C4IT_CustomerPanel.UserControls
 
         private void OnIncidentMouseEnter(object sender, MouseEventArgs e)
         {
-            HighlightIncidentBorder.BorderBrush = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#2d45fb"));
+            if (Application.Current.TryFindResource("itemHoverBorderColor") is SolidColorBrush hoverBrush)
+            {
+                HighlightIncidentBorder.BorderBrush = hoverBrush;
+            }
         }
 
         private void OnIncidentMouseLeave(object sender, MouseEventArgs e)
         {
-            HighlightIncidentBorder.BorderBrush = new SolidColorBrush(Colors.White);
+            if (Application.Current.TryFindResource("cardBorderColor") is SolidColorBrush defaultBrush)
+            {
+                HighlightIncidentBorder.BorderBrush = defaultBrush;
+            }
         }
 
     }
diff --git a/UserControls/Incidents.xaml b/UserControls/Incidents.xaml
index 24b341f..4fa3f78 100644
--- a/UserControls/Incidents.xaml
+++ b/UserControls/Incidents.xaml
@@ -12,15 +12,27 @@
         <Style TargetType="Button"
                x:Key="ButtonStyle">
             <Setter Property="Foreground"
-                    Value="{DynamicResource navForeground}" />
+                    Value="{DynamicResource buttonTextColor}" />
             <Setter Property="Background"
                     Value="{DynamicResource inactiveButtonColor}" />
+            <Setter Property="BorderBrush"
+                    Value="{DynamicResource panelBorderColor}" />
+            <Setter Property="BorderThickness"
+                    Value="1" />
+            <Setter Property="Padding"
+                    Value="12,6" />
+            <Setter Property="Cursor"
+                    Value="Hand" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type Button}">
-                        <Border Background="{TemplateBinding Background}">
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="10">
                             <ContentPresenter HorizontalAlignment="Center"
-                                              VerticalAlignment="Center" />
+                                              VerticalAlignment="Center"
+                                              Margin="{TemplateBinding Padding}" />
                         </Border>
                     </ControlTemplate>
                 </Setter.Value>
@@ -30,6 +42,8 @@
                          Value="True">
                     <Setter Property="Background"
                             Value="{DynamicResource activeButtonColor}" />
+                    <Setter Property="Foreground"
+                            Value="White" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -57,16 +71,19 @@
                 Grid.ColumnSpan="2"
                 Grid.Row="0">
             <Image Source="{DynamicResource appbar_clipboard_variant_text}"
-                   Width="48"
+                   Width="36"
+                   Height="36"
+                   Margin="0,6,0,0"
                    Tag="MAINICO" />
-            <Label Foreground="{DynamicResource mainForeground}"
+            <Label Foreground="{DynamicResource sectionTitleColor}"
                    Content="{x:Static resx:Resources.incidents}"
-                   FontSize="16"
-                   Canvas.Top="10"
+                   FontSize="19"
+                   FontWeight="SemiBold"
+                   Canvas.Top="8"
                    Canvas.Left="40" />
             <ScrollViewer x:Name="CanvasIncident"
-                          Canvas.Top="50"
-                          Canvas.Left="10"
+                          Canvas.Top="56"
+                          Canvas.Left="0"
                           MaxHeight="460"
                           MinHeight="60"
                           HorizontalScrollBarVisibility="Disabled"
@@ -74,16 +91,22 @@
                           Width="{Binding ActualWidth, ElementName=Canvas2, Mode=OneWay}"
                           Visibility="Visible" />
             <StackPanel x:Name="NoIncident"
-                        Background="White"
+                        Background="Transparent"
                         Width="{Binding ActualWidth, ElementName=Canvas2, Mode=OneWay}"
-                        Height="50"
+                        Height="58"
                         Canvas.Top="50"
-                        Canvas.Left="10">
-                <TextBlock Text="{x:Static resx:Resources.noincidents}"
-                           Margin="25,5,10,0"
-                           Foreground="Black" />
+                        Canvas.Left="0">
+                <Border Margin="2,6,2,0"
+                        BorderThickness="1"
+                        CornerRadius="10"
+                        BorderBrush="{DynamicResource cardBorderColor}"
+                        Background="{DynamicResource cardBackgroundColor}">
+                    <TextBlock Text="{x:Static resx:Resources.noincidents}"
+                               Margin="18,12,10,0"
+                               Foreground="{DynamicResource subtleTextColor}" />
+                </Border>
             </StackPanel>
-            <Button Foreground="{DynamicResource navForeground}"
+            <Button Foreground="{DynamicResource buttonTextColor}"
                     Style="{StaticResource ButtonStyle}"
                     Canvas.Top="450"
                     Canvas.Left="62"
@@ -103,8 +126,8 @@
                Margin="153,10,0,8"
                PreviewMouseDown="ReadAll_PreviewMouseDown"
                RenderTransformOrigin="1.536,1.429"
-               Height="32"
-               Width="32"
+               Height="24"
+               Width="24"
                ToolTip="{x:Static resx:Resources.removeMarkups}" />
     </Grid>
 </UserControl>
diff --git a/UserControls/PortalSearch.xaml b/UserControls/PortalSearch.xaml
index 7b6356a..a095c73 100644
--- a/UserControls/PortalSearch.xaml
+++ b/UserControls/PortalSearch.xaml
@@ -12,15 +12,25 @@
         <Style TargetType="Button"
                x:Key="ButtonStyle">
             <Setter Property="Foreground"
-                    Value="{DynamicResource navForeground}" />
+                    Value="{DynamicResource buttonTextColor}" />
             <Setter Property="Background"
                     Value="{DynamicResource inactiveButtonColor}" />
+            <Setter Property="BorderBrush"
+                    Value="{DynamicResource panelBorderColor}" />
+            <Setter Property="BorderThickness"
+                    Value="1" />
+            <Setter Property="Padding"
+                    Value="12,6" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type Button}">
-                        <Border Background="{TemplateBinding Background}">
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="10">
                             <ContentPresenter HorizontalAlignment="Center"
-                                              VerticalAlignment="Center" />
+                                              VerticalAlignment="Center"
+                                              Margin="{TemplateBinding Padding}" />
                         </Border>
                     </ControlTemplate>
                 </Setter.Value>
@@ -30,9 +40,36 @@
                          Value="True">
                     <Setter Property="Background"
                             Value="{DynamicResource activeButtonColor}" />
+                    <Setter Property="Foreground"
+                            Value="White" />
                 </Trigger>
             </Style.Triggers>
         </Style>
+        <Style x:Key="SearchTextBoxStyle"
+               TargetType="{x:Type TextBox}">
+            <Setter Property="Foreground"
+                    Value="{DynamicResource sectionTitleColor}" />
+            <Setter Property="Background"
+                    Value="{DynamicResource inputBackgroundColor}" />
+            <Setter Property="BorderBrush"
+                    Value="{DynamicResource inputBorderColor}" />
+            <Setter Property="BorderThickness"
+                    Value="1" />
+            <Setter Property="Padding"
+                    Value="8,3" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type TextBox}">
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="8">
+                            <ScrollViewer x:Name="PART_ContentHost" />
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
     </UserControl.Resources>
     
     <Grid x:Name="GridSsp"
@@ -57,28 +94,31 @@
                 Grid.Row="0"
                 Height="70">
             <Image Source="{DynamicResource appbar_magnify}"
-                   Width="48"
+                   Width="36"
+                   Height="36"
+                   Margin="0,6,0,0"
                    Tag="MAINICO" />
-            <Label Foreground="{DynamicResource mainForeground}"
+            <Label Foreground="{DynamicResource sectionTitleColor}"
                    x:Name="LblSearch"
                    x:FieldModifier="private"
                    Content="{x:Static resx:Resources.search}"
-                   FontSize="16"
-                   Canvas.Top="10"
+                   FontSize="19"
+                   FontWeight="SemiBold"
+                   Canvas.Top="8"
                    Canvas.Left="40" />
             <StackPanel Orientation="Horizontal"
                         Width="350"
-                        Canvas.Top="45"
-                        Canvas.Left="10">
+                        Canvas.Top="50"
+                        Canvas.Left="0">
                 <TextBox x:Name="TxtSearchTerm"
                          x:FieldModifier="private"
+                         Style="{StaticResource SearchTextBoxStyle}"
                          Width="320"
-                         Background="White"
-                         Height="25"
-                         FontSize="16"
+                         Height="30"
+                         FontSize="14"
                          Panel.ZIndex="1110"
                          KeyDown="OnSearchBoxEnter"
-                         Margin="5,0,0,0" />
+                         Margin="2,0,0,0" />
                 <Image Source="../Resources/icons/light/appbar.magnify.png"
                        Width="48"
                        PreviewMouseDown="OnSearchClicked"
@@ -97,10 +137,10 @@
                     Canvas.Left="15"
                     Height="40"
                     Content="Self Service Portal"
-                    FontSize="18"
+                    FontSize="16"
                     Canvas.Top="40"
                     Click="OnSSPLinkClicked" />
-            <Button Foreground="{DynamicResource navForeground}"
+            <Button Foreground="{DynamicResource buttonTextColor}"
                     x:Name="BtnMyserviceLink"
                     x:FieldModifier="private"
                     Style="{StaticResource ButtonStyle}"
@@ -109,7 +149,7 @@
                     Height="40"
                     Content="{x:Static resx:Resources.myservices}"
                     Tag="LABEL"
-                    FontSize="18"
+                    FontSize="16"
                     Canvas.Top="90"
                     Click="OnMyServiceLinkClicked" />
             <!--<Separator Canvas.Left="15" Width="320" Canvas.Top="140" Height="2" />-->
diff --git a/themes/ThemeDarkNav.xaml b/themes/ThemeDarkNav.xaml
index e0cc894..3795652 100644
--- a/themes/ThemeDarkNav.xaml
+++ b/themes/ThemeDarkNav.xaml
@@ -1,32 +1,44 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <BitmapImage UriSource="../Resources/icons/light/appbar.newspaper.png" x:Key="nav_appbar_newspaper"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/light/appbar.book.perspective.png" x:Key="nav_appbar_book_perspective"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/light/appbar.cart.png" x:Key="nav_appbar_cart"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/light/appbar.clipboard.variant.text.png" x:Key="nav_appbar_clipboard_variant_text"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/light/appbar.folder.ellipsis.png" x:Key="nav_appbar_folder_ellipsis"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/light/appbar.home.gps.png" x:Key="nav_appbar_home_gps"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/light/appbar.list.check.png" x:Key="nav_appbar_list_check"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/light/appbar.magnify.png" x:Key="nav_appbar_magnify"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/light/appbar.monitor.png" x:Key="nav_appbar_monitor"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/light/appbar.network.png" x:Key="nav_appbar_network"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.newspaper.png" x:Key="nav_appbar_newspaper"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.book.perspective.png" x:Key="nav_appbar_book_perspective"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.cart.png" x:Key="nav_appbar_cart"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.clipboard.variant.text.png" x:Key="nav_appbar_clipboard_variant_text"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.folder.ellipsis.png" x:Key="nav_appbar_folder_ellipsis"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.information.png" x:Key="nav_appbar_information"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.list.check.png" x:Key="nav_appbar_list_check"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.magnify.png" x:Key="nav_appbar_magnify"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.monitor.png" x:Key="nav_appbar_monitor"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.network.png" x:Key="nav_appbar_network"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.home.gps.png" x:Key="nav_appbar_home_gps"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.network.server.connecting.png" x:Key="nav_appbar_network_server_connecting"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.network.server.disconnect.png" x:Key="nav_appbar_network_server_disconnect"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.page.copy.png" x:Key="nav_appbar_page_copy"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.people.png" x:Key="nav_appbar_people"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.refresh.png" x:Key="nav_appbar_refresh"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.reset.png" x:Key="nav_appbar_reset"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.star.png" x:Key="nav_appbar_star"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.window.maximize.png" x:Key="nav_appbar_window_maximize"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.speakerphone.png" x:Key="nav_appbar_speakerphone"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/dark/appbar.new.window.png" x:Key="nav_appbar_new_window"></BitmapImage>
 
-    <BitmapImage UriSource="../Resources/icons/light/appbar.network.server.connecting.png" x:Key="nav_appbar_network_server_connecting"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/light/appbar.page.copy.png" x:Key="nav_appbar_page_copy"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/light/appbar.people.png" x:Key="nav_appbar_people"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/light/appbar.refresh.png" x:Key="nav_appbar_refresh"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/light/appbar.reset.png" x:Key="nav_appbar_reset"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/light/appbar.star.png" x:Key="nav_appbar_star"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/light/appbar.window.maximize.png" x:Key="nav_appbar_window_maximize"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/light/appbar.information.png" x:Key="nav_appbar_information"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/light/appbar.speakerphone.png" x:Key="nav_appbar_speakerphone"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/light/appbar.new.window.png" x:Key="nav_appbar_new_window"></BitmapImage>
-    <SolidColorBrush x:Key="navForeground" Color="Black" ></SolidColorBrush>
-    <SolidColorBrush x:Key="headerColor" Color="#8AACDB"></SolidColorBrush>
-
-    <SolidColorBrush x:Key="backgroundColor" Color="LightGray"></SolidColorBrush>
-    <SolidColorBrush x:Key="inactiveButtonColor" Color="gray"></SolidColorBrush>
-    <SolidColorBrush x:Key="activeButtonColor" Color="#186292"></SolidColorBrush>
-
-
-</ResourceDictionary>
\ No newline at end of file
+    <SolidColorBrush x:Key="navForeground" Color="#E2E8F0"></SolidColorBrush>
+    <SolidColorBrush x:Key="buttonTextColor" Color="#E2E8F0"></SolidColorBrush>
+    <SolidColorBrush x:Key="headerColor" Color="#0B1220"></SolidColorBrush>
+    <SolidColorBrush x:Key="headerControlBackgroundColor" Color="#233550"></SolidColorBrush>
+    <SolidColorBrush x:Key="backgroundColor" Color="#0F172A"></SolidColorBrush>
+    <SolidColorBrush x:Key="panelBackgroundColor" Color="#111C33"></SolidColorBrush>
+    <SolidColorBrush x:Key="panelBorderColor" Color="#223451"></SolidColorBrush>
+    <SolidColorBrush x:Key="cardBackgroundColor" Color="#172742"></SolidColorBrush>
+    <SolidColorBrush x:Key="cardBorderColor" Color="#2A3F5F"></SolidColorBrush>
+    <SolidColorBrush x:Key="navigationRailColor" Color="#0C1A31"></SolidColorBrush>
+    <SolidColorBrush x:Key="navigationRailBorderColor" Color="#223451"></SolidColorBrush>
+    <SolidColorBrush x:Key="inputBackgroundColor" Color="#0F1E37"></SolidColorBrush>
+    <SolidColorBrush x:Key="inputBorderColor" Color="#2A4469"></SolidColorBrush>
+    <SolidColorBrush x:Key="sectionTitleColor" Color="#E2E8F0"></SolidColorBrush>
+    <SolidColorBrush x:Key="subtleTextColor" Color="#9FB2CC"></SolidColorBrush>
+    <SolidColorBrush x:Key="accentColor" Color="#38BDF8"></SolidColorBrush>
+    <SolidColorBrush x:Key="itemHoverBorderColor" Color="#38BDF8"></SolidColorBrush>
+    <SolidColorBrush x:Key="inactiveButtonColor" Color="#1E3552"></SolidColorBrush>
+    <SolidColorBrush x:Key="activeButtonColor" Color="#38BDF8"></SolidColorBrush>
+</ResourceDictionary>
diff --git a/themes/ThemeLightNav.xaml b/themes/ThemeLightNav.xaml
index bcc9f37..814e330 100644
--- a/themes/ThemeLightNav.xaml
+++ b/themes/ThemeLightNav.xaml
@@ -1,28 +1,44 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.newspaper.png" x:Key="nav_appbar_newspaper"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.book.perspective.png" x:Key="nav_appbar_book_perspective"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.cart.png" x:Key="nav_appbar_cart"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.clipboard.variant.text.png" x:Key="nav_appbar_clipboard_variant_text"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.folder.ellipsis.png" x:Key="nav_appbar_folder_ellipsis"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.information.png" x:Key="nav_appbar_information"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.list.check.png" x:Key="nav_appbar_list_check"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.magnify.png" x:Key="nav_appbar_magnify"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.monitor.png" x:Key="nav_appbar_monitor"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.network.png" x:Key="nav_appbar_network"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.home.gps.png" x:Key="nav_appbar_home_gps"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.network.server.connecting.png" x:Key="nav_appbar_network_server_connecting"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.page.copy.png" x:Key="nav_appbar_page_copy"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.people.png" x:Key="nav_appbar_people"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.refresh.png" x:Key="nav_appbar_refresh"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.reset.png" x:Key="nav_appbar_reset"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.star.png" x:Key="nav_appbar_star"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.window.maximize.png" x:Key="nav_appbar_window_maximize"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.speakerphone.png" x:Key="nav_appbar_speakerphone"></BitmapImage>
-    <BitmapImage UriSource="../Resources/icons/dark/appbar.new.window.png" x:Key="nav_appbar_new_window"></BitmapImage>
-    <SolidColorBrush x:Key="navForeground" Color="White" ></SolidColorBrush>
-    <SolidColorBrush x:Key="backgroundColor" Color="LightGray"></SolidColorBrush>
-    <SolidColorBrush x:Key="headerColor" Color="#8AACDB"></SolidColorBrush>
-    <SolidColorBrush x:Key="inactiveButtonColor" Color="gray"></SolidColorBrush>
-    <SolidColorBrush x:Key="activeButtonColor" Color="#186292"></SolidColorBrush>
-</ResourceDictionary>
\ No newline at end of file
+    <BitmapImage UriSource="../Resources/icons/light/appbar.newspaper.png" x:Key="nav_appbar_newspaper"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.book.perspective.png" x:Key="nav_appbar_book_perspective"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.cart.png" x:Key="nav_appbar_cart"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.clipboard.variant.text.png" x:Key="nav_appbar_clipboard_variant_text"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.folder.ellipsis.png" x:Key="nav_appbar_folder_ellipsis"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.home.gps.png" x:Key="nav_appbar_home_gps"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.list.check.png" x:Key="nav_appbar_list_check"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.magnify.png" x:Key="nav_appbar_magnify"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.monitor.png" x:Key="nav_appbar_monitor"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.network.png" x:Key="nav_appbar_network"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.network.server.connecting.png" x:Key="nav_appbar_network_server_connecting"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.network.server.disconnect.png" x:Key="nav_appbar_network_server_disconnect"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.page.copy.png" x:Key="nav_appbar_page_copy"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.people.png" x:Key="nav_appbar_people"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.refresh.png" x:Key="nav_appbar_refresh"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.reset.png" x:Key="nav_appbar_reset"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.star.png" x:Key="nav_appbar_star"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.window.maximize.png" x:Key="nav_appbar_window_maximize"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.information.png" x:Key="nav_appbar_information"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.speakerphone.png" x:Key="nav_appbar_speakerphone"></BitmapImage>
+    <BitmapImage UriSource="../Resources/icons/light/appbar.new.window.png" x:Key="nav_appbar_new_window"></BitmapImage>
+
+    <SolidColorBrush x:Key="navForeground" Color="#0F172A"></SolidColorBrush>
+    <SolidColorBrush x:Key="buttonTextColor" Color="#0F172A"></SolidColorBrush>
+    <SolidColorBrush x:Key="headerColor" Color="#EAF1FA"></SolidColorBrush>
+    <SolidColorBrush x:Key="headerControlBackgroundColor" Color="#C8D6EA"></SolidColorBrush>
+    <SolidColorBrush x:Key="backgroundColor" Color="#EDF3FB"></SolidColorBrush>
+    <SolidColorBrush x:Key="panelBackgroundColor" Color="#FCFDFF"></SolidColorBrush>
+    <SolidColorBrush x:Key="panelBorderColor" Color="#D6E1F0"></SolidColorBrush>
+    <SolidColorBrush x:Key="cardBackgroundColor" Color="#FFFFFFFF"></SolidColorBrush>
+    <SolidColorBrush x:Key="cardBorderColor" Color="#D7E0EE"></SolidColorBrush>
+    <SolidColorBrush x:Key="navigationRailColor" Color="#F5F8FD"></SolidColorBrush>
+    <SolidColorBrush x:Key="navigationRailBorderColor" Color="#D5E0EF"></SolidColorBrush>
+    <SolidColorBrush x:Key="inputBackgroundColor" Color="#F7FAFD"></SolidColorBrush>
+    <SolidColorBrush x:Key="inputBorderColor" Color="#CBD9EC"></SolidColorBrush>
+    <SolidColorBrush x:Key="sectionTitleColor" Color="#1E293B"></SolidColorBrush>
+    <SolidColorBrush x:Key="subtleTextColor" Color="#5B6E86"></SolidColorBrush>
+    <SolidColorBrush x:Key="accentColor" Color="#1090E0"></SolidColorBrush>
+    <SolidColorBrush x:Key="itemHoverBorderColor" Color="#1090E0"></SolidColorBrush>
+    <SolidColorBrush x:Key="inactiveButtonColor" Color="#E3EBF6"></SolidColorBrush>
+    <SolidColorBrush x:Key="activeButtonColor" Color="#1090E0"></SolidColorBrush>
+</ResourceDictionary>