diff --git a/src/KeyKeeper/App.axaml b/src/KeyKeeper/App.axaml
index bc11f2d..fbd7b8e 100644
--- a/src/KeyKeeper/App.axaml
+++ b/src/KeyKeeper/App.axaml
@@ -10,6 +10,6 @@
     </Application.DataTemplates>
   
     <Application.Styles>
-        <FluentTheme />
+        <StyleInclude Source="avares://KeyKeeper/Styles/AppTheme.axaml"/>
     </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/src/KeyKeeper/Styles/AppTheme.axaml b/src/KeyKeeper/Styles/AppTheme.axaml
new file mode 100644
index 0000000..fd9f190
--- /dev/null
+++ b/src/KeyKeeper/Styles/AppTheme.axaml
@@ -0,0 +1,38 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+        <Border Background="White" Padding="60">
+            <Button Classes="" Content="contentъ"/>
+        </Border>
+    </Design.PreviewWith>
+    
+    <StyleInclude Source="avares://Avalonia.Themes.Fluent/FluentTheme.xaml"/>
+    
+    <Style Selector="Button:not(.dummy) /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="#cccccc" />
+        <Setter Property="Foreground" Value="#000000" />
+    </Style>
+    <Style Selector="Button:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="#aaaaaa" />
+        <Setter Property="Foreground" Value="#000000" />
+    </Style>
+    <Style Selector="Button:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="#444444" />
+        <Setter Property="Foreground" Value="#ffffff" />
+    </Style>
+
+    <Style Selector="Button.accentSidebarButton /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="#00000000" />
+        <Setter Property="Foreground" Value="white" />
+    </Style>
+    <Style Selector="Button.accentSidebarButton:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="CornerRadius" Value="9" />
+        <Setter Property="BorderBrush" Value="white" />
+    </Style>
+    <Style Selector="Button.accentSidebarButton:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="CornerRadius" Value="9" />
+        <Setter Property="BorderBrush" Value="white" />
+        <Setter Property="Background" Value="white"/>
+        <Setter Property="Foreground" Value="#2328C4"/>
+    </Style>
+</Styles>
\ No newline at end of file
diff --git a/src/KeyKeeper/Views/MainWindow.axaml b/src/KeyKeeper/Views/MainWindow.axaml
index 886e14e..00b2174 100644
--- a/src/KeyKeeper/Views/MainWindow.axaml
+++ b/src/KeyKeeper/Views/MainWindow.axaml
@@ -28,27 +28,23 @@
 
                 <StackPanel Grid.Row="1" Spacing="5" VerticalAlignment="Top" Margin="0 40 0 0">
                     <Button Content="New Database"
-                            Foreground="White"
-                            Background="Transparent"
-                            BorderThickness="0"
+                            Classes="accentSidebarButton"
                             FontSize="24"
                             Cursor="Hand"
                             Click="CreateNewVault_Click"/>
 
                     <Button Content="Open Database"
-                            Foreground="White"
-                            Background="Transparent"
-                            BorderThickness="0"
+                            Classes="accentSidebarButton"
                             FontSize="24"
                             Cursor="Hand"
                             Click="OpenExistingVault_Click"/>
                 </StackPanel>
 
                 <StackPanel Grid.Row="2" Orientation="Horizontal" Spacing="25">
-					<Button Command="{Binding OpenSettingsCommand}">
+					<Button Command="{Binding OpenSettingsCommand}" Classes="accentSidebarButton">
                         <Svg Path="/Assets/settings.svg" Width="48" Height="48"/>
 					</Button>
-                    <Button Command="{Binding OpenAboutCommand}">
+                    <Button Command="{Binding OpenAboutCommand}" Classes="accentSidebarButton">
                         <Svg Path="/Assets/about.svg" Width="48" Height="48"/>
                     </Button>
                 </StackPanel>
diff --git a/src/KeyKeeper/Views/RepositoryWindow.axaml b/src/KeyKeeper/Views/RepositoryWindow.axaml
index 6e56445..5931901 100644
--- a/src/KeyKeeper/Views/RepositoryWindow.axaml
+++ b/src/KeyKeeper/Views/RepositoryWindow.axaml
@@ -38,23 +38,22 @@
                                 <Button Content="All Passwords" 
                                         Width="120"
                                         Height="30"
-                                        Foreground="Black"
                                         HorizontalAlignment="Left"/>
                             </StackPanel>
 
                         </Border>
                         <!-- Save Passwords -->
                         <Button Content="Save Passwords"
+                                Classes="accentSidebarButton"
                                 Click="SaveButton_Click"
                                 Height="30"
-                                Foreground="White"
                                 HorizontalAlignment="Left"
                                 Margin="0,20,0,0"/>
 
                         <Button Content="New Entry"
+                                Classes="accentSidebarButton"
                                 Click="AddEntryButton_Click"
                                 Height="30"
-                                Foreground="White"
                                 HorizontalAlignment="Left"
                                 Margin="0,20,0,0"/>
                     </StackPanel>
@@ -106,19 +105,7 @@
                     <Button x:Name="UnlockButton"
                             Command="{Binding TryUnlock}"
                             HorizontalAlignment="Center"
-                            Foreground="Black"
-                            Background="#aaa"
                             Content="Unlock!" />
-
-                    <StackPanel.Styles>
-                        <Style Selector="Button /template/ ContentPresenter">
-                            <Setter Property="Foreground" Value="#333" />
-                        </Style>
-                        <Style Selector="Button:pointerover /template/ ContentPresenter">
-                            <Setter Property="Background" Value="#ccc" />
-                            <Setter Property="Foreground" Value="#444" />
-                        </Style>
-                    </StackPanel.Styles>
                 </StackPanel>
             </DataTemplate>
         </Window.DataTemplates>