diff --git a/ModernKeePass/App.xaml b/ModernKeePass/App.xaml
index 885a6bc..ef49057 100644
--- a/ModernKeePass/App.xaml
+++ b/ModernKeePass/App.xaml
@@ -2,7 +2,7 @@
     x:Class="ModernKeePass.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    RequestedTheme="Light">
+    RequestedTheme="Dark">
     <Application.Resources>
         <Style TargetType="ToggleButton" x:Name="HamburgerToggleButton">
             <Setter Property="Template">
diff --git a/ModernKeePass/MainPage.xaml b/ModernKeePass/MainPage.xaml
index e325fbf..a779f3b 100644
--- a/ModernKeePass/MainPage.xaml
+++ b/ModernKeePass/MainPage.xaml
@@ -7,7 +7,7 @@
     xmlns:controls="using:ModernKeePass.Controls"
     x:Class="ModernKeePass.MainPage"
     mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" >
+    Background="{StaticResource ApplicationPageBackgroundThemeBrush}" >
     <Page.DataContext>
         <viewModels:MainVm />
     </Page.DataContext>
@@ -18,17 +18,19 @@
             IsSourceGrouped="True" />
     </Page.Resources>
 
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" >
+    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}" >
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="50" />
             <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
         <controls:ListViewWithDisable Grid.Column="0" 
-                  x:Name="MenuListView"
-                  SelectionChanged="ListView_SelectionChanged" 
-                  ItemsSource="{Binding Source={StaticResource MenuItemsSource}}"
-                  IsSynchronizedWithCurrentItem="False">
+            x:Name="MenuListView"
+            RequestedTheme="Light"
+            SelectionChanged="ListView_SelectionChanged" 
+            Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+            ItemsSource="{Binding Source={StaticResource MenuItemsSource}}"
+            IsSynchronizedWithCurrentItem="False">
             <ListView.Header>
                 <TextBlock Text="ModernKeePass" FontWeight="Bold" FontSize="36" Margin="20" />
             </ListView.Header>
diff --git a/ModernKeePass/Pages/EntryDetailPage.xaml b/ModernKeePass/Pages/EntryDetailPage.xaml
index 2a50976..540c6a5 100644
--- a/ModernKeePass/Pages/EntryDetailPage.xaml
+++ b/ModernKeePass/Pages/EntryDetailPage.xaml
@@ -50,9 +50,9 @@
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="200"/>
             </Grid.ColumnDefinitions>
-            <Button Margin="39,59,39,0" Command="{Binding NavigationHelper.GoBackCommand, ElementName=pageRoot}"
+            <Button Margin="39,0,39,0" Command="{Binding NavigationHelper.GoBackCommand, ElementName=pageRoot}"
                         Style="{StaticResource NavigationBackButtonNormalStyle}"
-                        VerticalAlignment="Top"
+                        VerticalAlignment="Center"
                         AutomationProperties.Name="Back"
                         AutomationProperties.AutomationId="BackButton"
                         AutomationProperties.ItemType="Navigation Button"/>
@@ -60,6 +60,7 @@
                 Grid.Column="1"
                 Text="{Binding Title, Mode=TwoWay}" 
                 Style="{StaticResource HeaderTextBoxStyle}"
+                Foreground="{ThemeResource DefaultTextForegroundThemeBrush}"
                 IsHitTestVisible="{Binding IsEditMode}" 
                 TextWrapping="NoWrap" 
                 VerticalAlignment="Center" 
diff --git a/ModernKeePass/Pages/GroupDetailPage.xaml b/ModernKeePass/Pages/GroupDetailPage.xaml
index af21e95..2d6c0ff 100644
--- a/ModernKeePass/Pages/GroupDetailPage.xaml
+++ b/ModernKeePass/Pages/GroupDetailPage.xaml
@@ -53,7 +53,7 @@
                         <DataTemplate x:Name="GroupFirstItem">
                             <Border 
                                 BorderThickness="2" 
-                                BorderBrush="{StaticResource ListViewItemFocusBorderThemeBrush}" 
+                                BorderBrush="{StaticResource SystemColor}" 
                                 Background="{StaticResource HubSectionHeaderPressedForegroundThemeBrush}" 
                                 Margin="0,10,0,0" >
                                 <Grid Height="110" Width="480">
@@ -69,7 +69,7 @@
                         <DataTemplate x:Name="GroupOtherItem">
                             <Border 
                                 BorderThickness="2" 
-                                BorderBrush="{StaticResource ListViewItemFocusBorderThemeBrush}"
+                                BorderBrush="{StaticResource SystemColor}"
                                 Background="{Binding BackgroundColor, ConverterParameter={StaticResource Transparent}, Converter={StaticResource ColorToBrushConverter}}" 
                                 Margin="0,10,0,0" >
                                 <Grid Height="110" Width="480" >
@@ -113,19 +113,20 @@
                             IsSwipeEnabled="false"
                             IsSynchronizedWithCurrentItem="False"
                             DataContext="{Binding DataContext, ElementName=PageRoot}" 
-                            RequestedTheme="Dark"
+                            RequestedTheme="Light"
                             Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
                             Foreground="{ThemeResource DefaultTextForegroundThemeBrush}">
                             <ListView.Resources>
                                 <DataTemplate x:Name="Collapsed">
-                                    <StackPanel Width="30" Orientation="Horizontal" Margin="20,0,0,0" >
-                                        <SymbolIcon Symbol="{Binding IconSymbol}" />
-                                    </StackPanel>
+                                    <SymbolIcon Symbol="{Binding IconSymbol}" />
+                                    <ToolTipService.ToolTip>
+                                        <ToolTip Content="{Binding Name}" />
+                                    </ToolTipService.ToolTip>
                                 </DataTemplate>
                                 <DataTemplate x:Name="Expanded">
-                                    <StackPanel Width="200" Orientation="Horizontal" >
-                                        <SymbolIcon Symbol="{Binding IconSymbol}" Margin="20,0,0,0" />
-                                        <TextBlock Text="{Binding Name}" FontWeight="{Binding FontWeight}" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="30,0,0,0" />
+                                    <StackPanel Orientation="Horizontal">
+                                        <SymbolIcon Symbol="{Binding IconSymbol}" />
+                                        <TextBlock Text="{Binding Name}" FontWeight="{Binding FontWeight}" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="30,0,20,0" />
                                         <!--<TextBlock Text="{Binding EntryCount}" HorizontalAlignment="Right" VerticalAlignment="Center" />-->
                                     </StackPanel>
                                 </DataTemplate>
@@ -135,8 +136,12 @@
                             </ListView.ItemsSource>
                             <ListView.ItemContainerStyle>
                                 <Style TargetType="ListViewItem">
-                                    <!--<Setter Property="HorizontalContentAlignment" Value="Stretch" />-->
+                                    <!--<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                                    <Setter Property="Padding" Value="0"/>
+                                    <Setter Property="BorderThickness" Value="0"/>-->
                                     <Setter Property="VerticalContentAlignment" Value="Stretch" />
+                                    <Setter Property="Padding" Value="20,0,0,0"/>
+                                    <Setter Property="Margin" Value="0"/>
                                 </Style>
                             </ListView.ItemContainerStyle>
                             <ListView.HeaderTemplate>
@@ -180,10 +185,10 @@
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="200"/>
             </Grid.ColumnDefinitions>
-            <Button Margin="39,59,39,0" 
+            <Button Margin="39,0,39,0" 
                     Command="{Binding NavigationHelper.GoBackCommand, ElementName=PageRoot}"
                     Style="{StaticResource NavigationBackButtonNormalStyle}"
-                    VerticalAlignment="Top"
+                    VerticalAlignment="Center"
                     AutomationProperties.Name="Back"
                     AutomationProperties.AutomationId="BackButton"
                     AutomationProperties.ItemType="Navigation Button"/>
@@ -191,6 +196,7 @@
                 Grid.Column="1" 
                 Text="{Binding Name, Mode=TwoWay}" 
                 Style="{StaticResource HeaderTextBoxStyle}"
+                Foreground="{ThemeResource DefaultTextForegroundThemeBrush}"
                 IsHitTestVisible="{Binding IsEditMode}" 
                 TextWrapping="NoWrap" 
                 VerticalAlignment="Center"