From e53d02d3ba1b4766e482612d603111c6178a7258 Mon Sep 17 00:00:00 2001
From: Mommel <mommel.dev@gmail.com>
Date: Sat, 9 May 2026 00:34:24 +0200
Subject: [PATCH] feat: implement dark and light mode

---
 App.xaml                 |   6 +-
 App.xaml.cs              |  45 ++++++++++
 MainWindow.xaml          | 173 ++++++++++++++++++++++++++++--------
 MainWindow.xaml.cs       | 183 ++++++++++++++++++++++++++++-----------
 SettingsManager.cs       |  68 +++++++++++++++
 SettingsWindow.xaml      |  17 ++++
 SettingsWindow.xaml.cs   |  48 ++++++++++
 Themes/DarkMode.xaml     |  11 +++
 Themes/GlobalStyles.xaml |  74 ++++++++++++++++
 Themes/LightMode.xaml    |  11 +++
 UnifiedExplorer.csproj   |   4 +-
 11 files changed, 554 insertions(+), 86 deletions(-)
 create mode 100644 SettingsManager.cs
 create mode 100644 SettingsWindow.xaml
 create mode 100644 SettingsWindow.xaml.cs
 create mode 100644 Themes/DarkMode.xaml
 create mode 100644 Themes/GlobalStyles.xaml
 create mode 100644 Themes/LightMode.xaml

diff --git a/App.xaml b/App.xaml
index 506bf19..75958f9 100644
--- a/App.xaml
+++ b/App.xaml
@@ -3,6 +3,10 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
-         
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Themes/LightMode.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/App.xaml.cs b/App.xaml.cs
index 1c3bc48..2381b0b 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -1,8 +1,53 @@
+using System;
 using System.Windows;
+using Microsoft.Win32;
 
 namespace UnifiedExplorer
 {
     public partial class App : Application
     {
+        public static AppSettings Settings { get; set; } = new AppSettings();
+
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            base.OnStartup(e);
+            
+            Settings = SettingsManager.LoadSettings();
+            ApplyTheme(Settings.Theme);
+
+            SystemEvents.UserPreferenceChanged += SystemEvents_UserPreferenceChanged;
+        }
+
+        private void SystemEvents_UserPreferenceChanged(object sender, UserPreferenceChangedEventArgs e)
+        {
+            if (e.Category == UserPreferenceCategory.General && Settings.Theme == ThemeMode.System)
+            {
+                ApplyTheme(ThemeMode.System);
+            }
+        }
+
+        public static void ApplyTheme(ThemeMode mode)
+        {
+            Settings.Theme = mode;
+            SettingsManager.SaveSettings(Settings);
+
+            bool isLight = true;
+            if (mode == ThemeMode.Dark)
+            {
+                isLight = false;
+            }
+            else if (mode == ThemeMode.System)
+            {
+                isLight = SettingsManager.IsSystemThemeLight();
+            }
+
+            var dict = new ResourceDictionary();
+            dict.Source = isLight 
+                ? new Uri("Themes/LightMode.xaml", UriKind.Relative)
+                : new Uri("Themes/DarkMode.xaml", UriKind.Relative);
+
+            Current.Resources.MergedDictionaries.Clear();
+            Current.Resources.MergedDictionaries.Add(dict);
+        }
     }
 }
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 52fdfec..555984a 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -3,7 +3,9 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Name="root"
         Title="Unified Explorer" Height="700" Width="1200" Loaded="Window_Loaded"
-        Icon="pack://application:,,,/assets/app.ico">
+        Icon="pack://application:,,,/assets/app.ico"
+        Background="{DynamicResource BackgroundColor}"
+        Foreground="{DynamicResource TextColor}">
     
     <Window.Resources>
         <FontFamily x:Key="FluentIcons">Segoe Fluent Icons, Segoe MDL2 Assets</FontFamily>
@@ -26,19 +28,34 @@
         </Grid.RowDefinitions>
         
         <!-- Row 0: Command Bar -->
-        <ToolBarTray Grid.Row="0" Background="Transparent" IsLocked="True">
-            <ToolBar Background="Transparent" Band="1" BandIndex="1" Margin="0,5">
-                <Button Style="{StaticResource IconButton}" Content="&#xECC8;" ToolTip="New" Click="MenuNewFolder_Click"/>
-                <Separator/>
-                <Button Style="{StaticResource IconButton}" Content="&#xE8C6;" ToolTip="Cut" Click="MenuCut_Click"/>
-                <Button Style="{StaticResource IconButton}" Content="&#xE8C8;" ToolTip="Copy" Click="MenuCopy_Click"/>
-                <Button Style="{StaticResource IconButton}" Content="&#xE77F;" ToolTip="Paste" Click="MenuPaste_Click"/>
-                <Button Style="{StaticResource IconButton}" Content="&#xE8AC;" ToolTip="Rename" Click="MenuRename_Click"/>
-                <Button Style="{StaticResource IconButton}" Content="&#xE74D;" ToolTip="Delete" Click="MenuDelete_Click"/>
-                <Separator/>
-                <Button Style="{StaticResource IconButton}" Content="&#xEA37;" ToolTip="Toggle Preview" Click="TogglePreview_Click" HorizontalAlignment="Right"/>
-            </ToolBar>
-        </ToolBarTray>
+        <Border Grid.Row="0" Background="{DynamicResource MenuBarColor}">
+            <Grid Margin="0,5">
+                <StackPanel Orientation="Horizontal">
+                    <Button Style="{StaticResource IconButton}" Content="&#xECC8;" ToolTip="New" Click="MenuNewFolder_Click" Foreground="{DynamicResource TextColor}"/>
+                    <Separator Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}"/>
+                    <Button Style="{StaticResource IconButton}" Content="&#xE8C6;" ToolTip="Cut" Click="MenuCut_Click" Foreground="{DynamicResource TextColor}"/>
+                    <Button Style="{StaticResource IconButton}" Content="&#xE8C8;" ToolTip="Copy" Click="MenuCopy_Click" Foreground="{DynamicResource TextColor}"/>
+                    <Button Style="{StaticResource IconButton}" Content="&#xE77F;" ToolTip="Paste" Click="MenuPaste_Click" Foreground="{DynamicResource TextColor}"/>
+                    <Button Style="{StaticResource IconButton}" Content="&#xE8AC;" ToolTip="Rename" Click="MenuRename_Click" Foreground="{DynamicResource TextColor}"/>
+                    <Button Style="{StaticResource IconButton}" Content="&#xE74D;" ToolTip="Delete" Click="MenuDelete_Click" Foreground="{DynamicResource TextColor}"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                    <Button Style="{StaticResource IconButton}" Content="&#xEA37;" ToolTip="Toggle Preview" Click="TogglePreview_Click" Foreground="{DynamicResource TextColor}"/>
+                    <Button Style="{StaticResource IconButton}" Content="&#xE712;" ToolTip="Options" Click="MenuOptions_Click" Foreground="{DynamicResource TextColor}">
+                        <Button.ContextMenu>
+                            <ContextMenu>
+                                <MenuItem Header="Options/Einstellungen" Click="SettingsMenuItem_Click"/>
+                                <MenuItem Header="Version" IsEnabled="False" x:Name="VersionMenuItem">
+                                    <MenuItem.Icon>
+                                        <Image Source="pack://application:,,,/assets/app.ico" Width="16" Height="16"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                            </ContextMenu>
+                        </Button.ContextMenu>
+                    </Button>
+                </StackPanel>
+            </Grid>
+        </Border>
 
         <!-- Row 1: Nav Bar -->
         <Grid Grid.Row="1" Margin="5">
@@ -49,14 +66,14 @@
             </Grid.ColumnDefinitions>
             
             <StackPanel Orientation="Horizontal" Grid.Column="0">
-                <Button Style="{StaticResource IconButton}" Content="&#xE72B;" ToolTip="Back"/>
-                <Button Style="{StaticResource IconButton}" Content="&#xE72A;" ToolTip="Forward"/>
-                <Button Style="{StaticResource IconButton}" Content="&#xE197;" ToolTip="Up" Click="Up_Click"/>
-                <Button Style="{StaticResource IconButton}" Content="&#xE72C;" ToolTip="Refresh" Click="Refresh_Click"/>
+                <Button Style="{StaticResource IconButton}" Content="&#xE72B;" ToolTip="Back" Foreground="{DynamicResource TextColor}"/>
+                <Button Style="{StaticResource IconButton}" Content="&#xE72A;" ToolTip="Forward" Foreground="{DynamicResource TextColor}"/>
+                <Button Style="{StaticResource IconButton}" Content="&#xE197;" ToolTip="Up" Click="Up_Click" Foreground="{DynamicResource TextColor}"/>
+                <Button Style="{StaticResource IconButton}" Content="&#xE72C;" ToolTip="Refresh" Click="Refresh_Click" Foreground="{DynamicResource TextColor}"/>
             </StackPanel>
 
-            <TextBox x:Name="PathTextBox" Grid.Column="1" Margin="10,0" VerticalContentAlignment="Center" KeyDown="PathTextBox_KeyDown"/>
-            <TextBox x:Name="SearchTextBox" Grid.Column="2" Margin="0,0,5,0" VerticalContentAlignment="Center" Text="Search..." Foreground="Gray" GotFocus="SearchTextBox_GotFocus" LostFocus="SearchTextBox_LostFocus"/>
+            <TextBox x:Name="PathTextBox" Grid.Column="1" Margin="10,0" Padding="21,10,0,10" VerticalContentAlignment="Center" KeyDown="PathTextBox_KeyDown" Background="{DynamicResource BackgroundColor}" Foreground="{DynamicResource TextColor}"/>
+            <TextBox x:Name="SearchTextBox" Grid.Column="2" Margin="0,0,5,0" VerticalContentAlignment="Center" Text="Search..." Foreground="{DynamicResource TextColor}" Background="{DynamicResource BackgroundColor}" GotFocus="SearchTextBox_GotFocus" LostFocus="SearchTextBox_LostFocus"/>
         </Grid>
 
         <!-- Row 2: Main Area -->
@@ -77,6 +94,23 @@
                             <Style TargetType="ListBoxItem">
                                 <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
                                 <Setter Property="Padding" Value="5,4"/>
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate TargetType="ListBoxItem">
+                                            <Border x:Name="Bd" Background="Transparent" Padding="{TemplateBinding Padding}">
+                                                <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+                                            </Border>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                    <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SelectColor}"/>
+                                                </Trigger>
+                                                <Trigger Property="IsSelected" Value="True">
+                                                    <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SelectedColor}"/>
+                                                </Trigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
                             </Style>
                         </ListBox.ItemContainerStyle>
                         <ListBox.ItemTemplate>
@@ -87,20 +121,47 @@
                                         <ColumnDefinition Width="*"/>
                                         <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Grid.Column="0" FontFamily="{StaticResource FluentIcons}" Text="{Binding Icon}" Margin="0,0,10,0" Foreground="{Binding IconColor}" VerticalAlignment="Center" FontSize="16"/>
-                                    <TextBlock Grid.Column="1" Text="{Binding Name}" VerticalAlignment="Center" TextTrimming="CharacterEllipsis"/>
-                                    <Button Grid.Column="2" Style="{StaticResource IconButton}" Content="&#xE840;" FontSize="12" Foreground="#808080" ToolTip="Unpin" Click="Unpin_Click" Tag="{Binding}"/>
+                                    <Image Grid.Column="0" Source="{Binding Icon}" Margin="24,8,10,8" Width="16" Height="16" VerticalAlignment="Center"/>
+                                    <TextBlock Grid.Column="1" Text="{Binding Name}" VerticalAlignment="Center" TextTrimming="CharacterEllipsis" Foreground="{DynamicResource TextColor}"/>
+                                    <Button Grid.Column="2" Style="{StaticResource IconButton}" Content="📌" FontFamily="Segoe UI Emoji" FontSize="12" Foreground="#808080" ToolTip="Unpin" Click="Unpin_Click" Tag="{Binding}"/>
                                 </Grid>
                             </DataTemplate>
                         </ListBox.ItemTemplate>
                     </ListBox>
-                    <Separator Margin="10,5"/>
-                    <TreeView x:Name="ThisPCTree" BorderThickness="0" Background="Transparent" FontSize="14" SelectedItemChanged="ThisPCTree_SelectedItemChanged" TreeViewItem.Expanded="TreeViewItem_Expanded">
+                    <Separator Margin="10,21"/>
+                    <TreeView x:Name="ThisPCTree" BorderThickness="0" Background="Transparent" FontSize="14" Margin="21,0,0,0" SelectedItemChanged="ThisPCTree_SelectedItemChanged" TreeViewItem.Expanded="TreeViewItem_Expanded">
+                        <TreeView.Resources>
+                            <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
+                            <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="Transparent" />
+                            <SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="Black" />
+                            <Style TargetType="ToggleButton">
+                                <Setter Property="RenderTransformOrigin" Value="0.5,0.5"/>
+                                <Setter Property="RenderTransform">
+                                    <Setter.Value>
+                                        <ScaleTransform ScaleX="1.5" ScaleY="1.5"/>
+                                    </Setter.Value>
+                                </Setter>
+                            </Style>
+                        </TreeView.Resources>
+                        <TreeView.ItemContainerStyle>
+                            <Style TargetType="TreeViewItem">
+                                <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+                                <Setter Property="Background" Value="Transparent"/>
+                                <Style.Triggers>
+                                    <Trigger Property="IsMouseOver" Value="True">
+                                        <Setter Property="Background" Value="{DynamicResource SelectColor}"/>
+                                    </Trigger>
+                                    <Trigger Property="IsSelected" Value="True">
+                                        <Setter Property="Background" Value="{DynamicResource SelectedColor}"/>
+                                    </Trigger>
+                                </Style.Triggers>
+                            </Style>
+                        </TreeView.ItemContainerStyle>
                         <TreeView.ItemTemplate>
                             <HierarchicalDataTemplate ItemsSource="{Binding Children}">
-                                <StackPanel Orientation="Horizontal" Margin="0,4">
-                                    <TextBlock FontFamily="{StaticResource FluentIcons}" Text="{Binding Icon}" Margin="0,0,10,0" Foreground="{Binding IconColor}" VerticalAlignment="Center" FontSize="16"/>
-                                    <TextBlock Text="{Binding Name}" VerticalAlignment="Center"/>
+                                <StackPanel Orientation="Horizontal" Margin="{Binding ContentMargin}">
+                                    <Image Source="{Binding Icon}" Margin="20,0,10,0" Width="16" Height="16" VerticalAlignment="Center"/>
+                                    <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Foreground="{DynamicResource TextColor}"/>
                                 </StackPanel>
                             </HierarchicalDataTemplate>
                         </TreeView.ItemTemplate>
@@ -111,7 +172,51 @@
             <GridSplitter Grid.Column="1" Width="5" HorizontalAlignment="Stretch" Background="Transparent"/>
 
             <!-- File List -->
-            <ListView x:Name="FileListView" Grid.Column="2" BorderThickness="0" MouseDoubleClick="FileListView_MouseDoubleClick" SelectionChanged="FileListView_SelectionChanged" GridViewColumnHeader.Click="GridViewColumnHeader_Click" PreviewMouseMove="FileListView_PreviewMouseMove" PreviewMouseWheel="FileListView_PreviewMouseWheel" IsTextSearchEnabled="False" PreviewTextInput="FileListView_PreviewTextInput">
+            <ListView x:Name="FileListView" Grid.Column="2" BorderThickness="0" Background="{DynamicResource BackgroundColor}" Foreground="{DynamicResource TextColor}" MouseDoubleClick="FileListView_MouseDoubleClick" SelectionChanged="FileListView_SelectionChanged" GridViewColumnHeader.Click="GridViewColumnHeader_Click" PreviewMouseMove="FileListView_PreviewMouseMove" PreviewMouseWheel="FileListView_PreviewMouseWheel" IsTextSearchEnabled="False" PreviewTextInput="FileListView_PreviewTextInput">
+                <ListView.ItemContainerStyle>
+                    <Style TargetType="ListViewItem">
+                        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+                        <Setter Property="Padding" Value="2"/>
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="ListViewItem">
+                                    <Border x:Name="Bd" Background="Transparent" Padding="{TemplateBinding Padding}">
+                                        <GridViewRowPresenter Content="{TemplateBinding Content}" Columns="{Binding Path=View.Columns, RelativeSource={RelativeSource AncestorType=ListView}}"/>
+                                    </Border>
+                                    <ControlTemplate.Triggers>
+                                        <Trigger Property="IsMouseOver" Value="True">
+                                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SelectColor}"/>
+                                        </Trigger>
+                                        <Trigger Property="IsSelected" Value="True">
+                                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SelectedColor}"/>
+                                        </Trigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListView}, Path=View}" Value="{x:Null}">
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate TargetType="ListViewItem">
+                                            <Border x:Name="Bd" Background="Transparent" Padding="{TemplateBinding Padding}">
+                                                <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+                                            </Border>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                    <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SelectColor}"/>
+                                                </Trigger>
+                                                <Trigger Property="IsSelected" Value="True">
+                                                    <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SelectedColor}"/>
+                                                </Trigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </ListView.ItemContainerStyle>
                 <ListView.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="Open" Click="MenuOpen_Click"/>
@@ -131,7 +236,7 @@
             <GridSplitter Grid.Column="3" Width="5" HorizontalAlignment="Stretch" Background="Transparent" x:Name="PreviewSplitter" Visibility="Collapsed"/>
 
             <!-- Preview Panel -->
-            <Border Grid.Column="4" Background="#F3F3F3" BorderBrush="#E5E5E5" BorderThickness="1,0,0,0" x:Name="PreviewPanelBorder" Visibility="Collapsed">
+            <Border Grid.Column="4" Background="{DynamicResource BackgroundColor}" BorderBrush="{DynamicResource MenuBarColor}" BorderThickness="1,0,0,0" x:Name="PreviewPanelBorder" Visibility="Collapsed">
                 <ScrollViewer VerticalScrollBarVisibility="Auto">
                     <StackPanel Margin="20">
                         <Grid Margin="0,20">
@@ -152,12 +257,12 @@
         </Grid>
 
         <!-- Status Bar -->
-        <StatusBar Grid.Row="3" Background="#F3F3F3" Padding="5,0">
-            <StatusBarItem x:Name="ItemCountLbl" Content="0 items"/>
+        <StatusBar Grid.Row="3" Background="{DynamicResource BottomBarColor}" Padding="5,0">
+            <StatusBarItem x:Name="ItemCountLbl" Content="0 items" Foreground="{DynamicResource TextColor}"/>
             <StatusBarItem HorizontalAlignment="Right">
                 <StackPanel Orientation="Horizontal">
-                    <Button Style="{StaticResource IconButton}" Content="&#xE14C;" ToolTip="Details View" Click="ViewDetails_Click"/>
-                    <Button Style="{StaticResource IconButton}" Content="&#xE154;" ToolTip="Large Icons View" Click="ViewLargeIcons_Click"/>
+                    <Button Style="{StaticResource IconButton}" Content="&#xE14C;" ToolTip="Details View" Click="ViewDetails_Click" Foreground="{DynamicResource TextColor}"/>
+                    <Button Style="{StaticResource IconButton}" Content="&#xE154;" ToolTip="Large Icons View" Click="ViewLargeIcons_Click" Foreground="{DynamicResource TextColor}"/>
                 </StackPanel>
             </StatusBarItem>
         </StatusBar>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 996637d..b238aaf 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -11,6 +11,8 @@
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Threading.Tasks;
+using System.Runtime.InteropServices;
+using System.Windows.Interop;
 
 namespace UnifiedExplorer
 {
@@ -60,6 +62,11 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
             SetupDetailsView();
             LoadSidebar();
             ViewLargeIcons_Click(null!, null!); // Default to Large Icons view
+            
+            if (VersionMenuItem != null)
+            {
+                VersionMenuItem.Header = $"Version {System.Reflection.Assembly.GetExecutingAssembly().GetName().Version}";
+            }
         }
 
         private void SetupContextMenu()
@@ -124,12 +131,12 @@ private void SetupDetailsView()
             var nameTemplate = new DataTemplate();
             var stackPanelFactory = new FrameworkElementFactory(typeof(StackPanel));
             stackPanelFactory.SetValue(StackPanel.OrientationProperty, Orientation.Horizontal);
-            var iconFactory = new FrameworkElementFactory(typeof(TextBlock));
-            iconFactory.SetBinding(TextBlock.TextProperty, new System.Windows.Data.Binding("Icon"));
-            iconFactory.SetBinding(TextBlock.ForegroundProperty, new System.Windows.Data.Binding("IconColor"));
-            iconFactory.SetValue(TextBlock.FontFamilyProperty, FindResource("FluentIcons"));
-            iconFactory.SetValue(TextBlock.MarginProperty, new Thickness(0,0,8,0));
-            iconFactory.SetValue(TextBlock.VerticalAlignmentProperty, VerticalAlignment.Center);
+            var iconFactory = new FrameworkElementFactory(typeof(Image));
+            iconFactory.SetBinding(Image.SourceProperty, new System.Windows.Data.Binding("Icon"));
+            iconFactory.SetValue(Image.MarginProperty, new Thickness(0,0,8,0));
+            iconFactory.SetValue(Image.WidthProperty, 16.0);
+            iconFactory.SetValue(Image.HeightProperty, 16.0);
+            iconFactory.SetValue(Image.VerticalAlignmentProperty, VerticalAlignment.Center);
             var textFactory = new FrameworkElementFactory(typeof(TextBlock));
             textFactory.SetBinding(TextBlock.TextProperty, new System.Windows.Data.Binding("Name"));
             textFactory.SetValue(TextBlock.VerticalAlignmentProperty, VerticalAlignment.Center);
@@ -159,32 +166,37 @@ private void LoadSidebar()
             _favorites.Clear();
             _thisPC.Clear();
 
-            AddSpecialFolder(_favorites, Environment.SpecialFolder.Desktop, LocalizationManager.GetString("Desktop"), "\xE869");
-            AddSpecialFolder(_favorites, Environment.SpecialFolder.UserProfile, LocalizationManager.GetString("Downloads"), "\xE896", "Downloads");
-            AddSpecialFolder(_favorites, Environment.SpecialFolder.MyDocuments, LocalizationManager.GetString("Documents"), "\xE8A5");
-            AddSpecialFolder(_favorites, Environment.SpecialFolder.MyPictures, LocalizationManager.GetString("Pictures"), "\xE8B9");
-            AddSpecialFolder(_favorites, Environment.SpecialFolder.MyMusic, LocalizationManager.GetString("Music"), "\xE8D6");
-            AddSpecialFolder(_favorites, Environment.SpecialFolder.MyVideos, LocalizationManager.GetString("Videos"), "\xE714");
+            AddSpecialFolder(_favorites, Environment.SpecialFolder.Desktop, LocalizationManager.GetString("Desktop"), "");
+            AddSpecialFolder(_favorites, Environment.SpecialFolder.UserProfile, LocalizationManager.GetString("Downloads"), "Downloads");
+            AddSpecialFolder(_favorites, Environment.SpecialFolder.MyDocuments, LocalizationManager.GetString("Documents"), "");
+            AddSpecialFolder(_favorites, Environment.SpecialFolder.MyPictures, LocalizationManager.GetString("Pictures"), "");
+            AddSpecialFolder(_favorites, Environment.SpecialFolder.MyMusic, LocalizationManager.GetString("Music"), "");
+            AddSpecialFolder(_favorites, Environment.SpecialFolder.MyVideos, LocalizationManager.GetString("Videos"), "");
 
-            var thisPCNode = new TreeNode("This PC", LocalizationManager.GetString("ThisPC"), "\xE8A6", "#808080");
+            var pcIcon = IconExtractor.GetFileIcon(Environment.GetFolderPath(Environment.SpecialFolder.System), true) ?? null;
+            var thisPCNode = new TreeNode("This PC", LocalizationManager.GetString("ThisPC"), pcIcon) { ContentMargin = new Thickness(0, 10, 0, 10) };
             foreach (var drive in DriveInfo.GetDrives())
             {
                 if (drive.IsReady)
                 {
-                    string icon = drive.DriveType == DriveType.CDRom ? "\xE958" : drive.DriveType == DriveType.Network ? "\xE839" : "\xEDA2";
-                    var node = new TreeNode(drive.RootDirectory.FullName, drive.Name, icon, "#808080");
-                    node.Children.Add(new TreeNode("", LocalizationManager.GetString("Loading"), ""));
+                    var driveIcon = IconExtractor.GetFileIcon(drive.RootDirectory.FullName, true);
+                    var node = new TreeNode(drive.RootDirectory.FullName, drive.Name, driveIcon) { ContentMargin = new Thickness(0, 10, 0, 10) };
+                    node.Children.Add(new TreeNode("", LocalizationManager.GetString("Loading"), null));
                     thisPCNode.Children.Add(node);
                 }
             }
             _thisPC.Add(thisPCNode);
         }
 
-        private void AddSpecialFolder(ObservableCollection<TreeNode> collection, Environment.SpecialFolder folder, string name, string icon, string subfolder = "")
+        private void AddSpecialFolder(ObservableCollection<TreeNode> collection, Environment.SpecialFolder folder, string name, string subfolder = "")
         {
             string path = Environment.GetFolderPath(folder);
             if (!string.IsNullOrEmpty(subfolder)) path = Path.Combine(path, subfolder);
-            if (Directory.Exists(path)) collection.Add(new TreeNode(path, name, icon, "#E8A11C"));
+            if (Directory.Exists(path))
+            {
+                var icon = IconExtractor.GetFileIcon(path, true);
+                collection.Add(new TreeNode(path, name, icon));
+            }
         }
 
         private void TreeViewItem_Expanded(object sender, RoutedEventArgs e)
@@ -201,8 +213,9 @@ private void TreeViewItem_Expanded(object sender, RoutedEventArgs e)
                             var info = new DirectoryInfo(dir);
                             if (!info.Attributes.HasFlag(FileAttributes.Hidden))
                             {
-                                var subNode = new TreeNode(dir, info.Name, "\xE8B7", "#E8A11C");
-                                subNode.Children.Add(new TreeNode("", LocalizationManager.GetString("Loading"), ""));
+                                var icon = IconExtractor.GetFileIcon(dir, true);
+                                var subNode = new TreeNode(dir, info.Name, icon) { ContentMargin = new Thickness(0, 8, 0, 8) };
+                                subNode.Children.Add(new TreeNode("", LocalizationManager.GetString("Loading"), null));
                                 node.Children.Add(subNode);
                             }
                         }
@@ -260,8 +273,8 @@ private void LoadDirectory(string path)
                             Type = LocalizationManager.GetString("FileFolder"),
                             Size = "",
                             SizeBytes = 0,
-                            Icon = "\xE8B7",
-                            IconColor = "#E8A11C",
+                            Icon = IconExtractor.GetFileIcon(dir.FullName, true),
+                            IconColor = "#FFD767",
                             Dimensions = ""
                         });
                     }
@@ -296,7 +309,7 @@ private void LoadDirectory(string path)
                             Type = file.Extension + " File",
                             Size = FormatSize(file.Length),
                             SizeBytes = file.Length,
-                            Icon = GetIconForFile(ext),
+                            Icon = IconExtractor.GetFileIcon(file.FullName, false),
                             IconColor = "#8A8A8A",
                             Dimensions = dimensions
                         };
@@ -317,11 +330,20 @@ private void LoadDirectory(string path)
                                         bitmap.StreamSource = fs;
                                         bitmap.EndInit();
                                         bitmap.Freeze();
-                                        Dispatcher.InvokeAsync(() => { newFileItem.Thumbnail = bitmap; });
+                                        Dispatcher.InvokeAsync(() => { 
+                                            newFileItem.Thumbnail = bitmap; 
+                                        });
                                     }
                                 } catch { }
                             });
                         }
+                        else
+                        {
+                            _ = Task.Run(() => {
+                                var largeIcon = IconExtractor.GetFileIcon(file.FullName, false, true);
+                                if (largeIcon != null) Dispatcher.InvokeAsync(() => { newFileItem.Thumbnail = largeIcon; });
+                            });
+                        }
                     }
                 }
                 
@@ -331,19 +353,7 @@ private void LoadDirectory(string path)
             catch (Exception ex) { MessageBox.Show(ex.Message, "Error"); }
         }
 
-        private string GetIconForFile(string ext)
-        {
-            switch (ext)
-            {
-                case ".txt": return "\xE8D5";
-                case ".jpg": case ".png": case ".jpeg": case ".gif": return "\xE8B9";
-                case ".mp4": case ".avi": case ".mkv": return "\xE714";
-                case ".mp3": case ".wav": return "\xE8D6";
-                case ".zip": case ".rar": case ".7z": return "\xE8A5";
-                case ".exe": return "\xE8A5";
-                default: return "\xE8A5";
-            }
-        }
+
 
         private string FormatSize(long bytes)
         {
@@ -381,14 +391,11 @@ private void ViewLargeIcons_Click(object sender, RoutedEventArgs e)
             gridFactory.SetValue(Grid.HorizontalAlignmentProperty, HorizontalAlignment.Center);
             gridFactory.SetValue(Grid.MarginProperty, new Thickness(0, 0, 0, 5));
 
-            var iconFactory = new FrameworkElementFactory(typeof(TextBlock));
-            iconFactory.SetBinding(TextBlock.TextProperty, new System.Windows.Data.Binding("Icon"));
-            iconFactory.SetBinding(TextBlock.ForegroundProperty, new System.Windows.Data.Binding("IconColor"));
-            iconFactory.SetValue(TextBlock.FontFamilyProperty, FindResource("FluentIcons"));
-            iconFactory.SetBinding(TextBlock.FontSizeProperty, new System.Windows.Data.Binding("IconSize") { Source = this, Converter = new SizeMultiplierConverter(), ConverterParameter = 0.6 });
-            iconFactory.SetValue(TextBlock.HorizontalAlignmentProperty, HorizontalAlignment.Center);
-            iconFactory.SetValue(TextBlock.VerticalAlignmentProperty, VerticalAlignment.Center);
-            iconFactory.SetBinding(TextBlock.VisibilityProperty, new System.Windows.Data.Binding("IconVisibility"));
+            var iconFactory = new FrameworkElementFactory(typeof(Image));
+            iconFactory.SetBinding(Image.SourceProperty, new System.Windows.Data.Binding("Icon"));
+            iconFactory.SetValue(Image.HorizontalAlignmentProperty, HorizontalAlignment.Center);
+            iconFactory.SetValue(Image.VerticalAlignmentProperty, VerticalAlignment.Center);
+            iconFactory.SetBinding(Image.VisibilityProperty, new System.Windows.Data.Binding("IconVisibility"));
             
             var imgFactory = new FrameworkElementFactory(typeof(Image));
             imgFactory.SetBinding(Image.SourceProperty, new System.Windows.Data.Binding("Thumbnail"));
@@ -584,7 +591,10 @@ private void FavoritesList_Drop(object sender, DragEventArgs e)
             {
                 string path = (string)e.Data.GetData(DataFormats.StringFormat);
                 if (Directory.Exists(path) && !_favorites.Any(f => f.Path == path))
-                    _favorites.Add(new TreeNode(path, new DirectoryInfo(path).Name, "\xE8B7", "#E8A11C"));
+                {
+                    var icon = IconExtractor.GetFileIcon(path, true);
+                    _favorites.Add(new TreeNode(path, new DirectoryInfo(path).Name, icon));
+                }
             }
         }
 
@@ -652,6 +662,23 @@ private void MenuNewFile_Click(object sender, RoutedEventArgs e)
                 catch (Exception ex) { MessageBox.Show(ex.Message, "Error"); }
             }
         }
+
+        private void MenuOptions_Click(object sender, RoutedEventArgs e)
+        {
+            var button = sender as Button;
+            if (button != null && button.ContextMenu != null)
+            {
+                button.ContextMenu.PlacementTarget = button;
+                button.ContextMenu.IsOpen = true;
+            }
+        }
+
+        private void SettingsMenuItem_Click(object sender, RoutedEventArgs e)
+        {
+            var settingsWindow = new SettingsWindow();
+            settingsWindow.Owner = this;
+            settingsWindow.ShowDialog();
+        }
     }
 
     public static class InputBox
@@ -675,10 +702,11 @@ public class TreeNode
     {
         public string Path { get; set; }
         public string Name { get; set; }
-        public string Icon { get; set; }
+        public ImageSource? Icon { get; set; }
         public string IconColor { get; set; }
+        public Thickness ContentMargin { get; set; } = new Thickness(0, 8, 0, 8);
         public ObservableCollection<TreeNode> Children { get; set; }
-        public TreeNode(string path, string name, string icon = "\xE8B7", string iconColor = "#E8A11C")
+        public TreeNode(string path, string name, ImageSource? icon = null, string iconColor = "#FFD767")
         {
             Path = path; Name = name; Icon = icon; IconColor = iconColor; Children = new ObservableCollection<TreeNode>();
         }
@@ -700,7 +728,7 @@ public class FileSystemItem : INotifyPropertyChanged
         public string Size { get; set; } = string.Empty;
         public long SizeBytes { get; set; }
         public string Dimensions { get; set; } = string.Empty;
-        public string Icon { get; set; } = string.Empty;
+        public ImageSource? Icon { get; set; }
         public string IconColor { get; set; } = string.Empty;
 
         private ImageSource? _thumbnail;
@@ -739,4 +767,61 @@ public object Convert(object value, Type targetType, object parameter, System.Gl
         }
         public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) => throw new NotImplementedException();
     }
+
+    public static class IconExtractor
+    {
+        [DllImport("shell32.dll", CharSet = CharSet.Auto)]
+        private static extern IntPtr SHGetFileInfo(string pszPath, uint dwFileAttributes, ref SHFILEINFO psfi, uint cbFileInfo, uint uFlags);
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        private struct SHFILEINFO
+        {
+            public IntPtr hIcon;
+            public int iIcon;
+            public uint dwAttributes;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)]
+            public string szDisplayName;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 80)]
+            public string szTypeName;
+        }
+
+        private const uint SHGFI_ICON = 0x000000100;
+        private const uint SHGFI_LARGEICON = 0x000000000;
+        private const uint SHGFI_SMALLICON = 0x000000001;
+        private const uint SHGFI_USEFILEATTRIBUTES = 0x000000010;
+        private const uint FILE_ATTRIBUTE_NORMAL = 0x00000080;
+        private const uint FILE_ATTRIBUTE_DIRECTORY = 0x00000010;
+
+        [DllImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool DestroyIcon(IntPtr hIcon);
+
+        public static ImageSource? GetFileIcon(string path, bool isDirectory, bool largeIcon = false)
+        {
+            uint flags = SHGFI_ICON | SHGFI_USEFILEATTRIBUTES;
+            flags |= largeIcon ? SHGFI_LARGEICON : SHGFI_SMALLICON;
+            uint attrs = isDirectory ? FILE_ATTRIBUTE_DIRECTORY : FILE_ATTRIBUTE_NORMAL;
+
+            SHFILEINFO shinfo = new SHFILEINFO();
+            IntPtr res = SHGetFileInfo(path, attrs, ref shinfo, (uint)Marshal.SizeOf(shinfo), flags);
+
+            if (res != IntPtr.Zero && shinfo.hIcon != IntPtr.Zero)
+            {
+                try
+                {
+                    var img = Imaging.CreateBitmapSourceFromHIcon(
+                        shinfo.hIcon,
+                        Int32Rect.Empty,
+                        BitmapSizeOptions.FromEmptyOptions());
+                    img.Freeze();
+                    return img;
+                }
+                finally
+                {
+                    DestroyIcon(shinfo.hIcon);
+                }
+            }
+            return null;
+        }
+    }
 }
diff --git a/SettingsManager.cs b/SettingsManager.cs
new file mode 100644
index 0000000..8e01822
--- /dev/null
+++ b/SettingsManager.cs
@@ -0,0 +1,68 @@
+using System;
+using System.IO;
+using System.Text.Json;
+using Microsoft.Win32;
+
+namespace UnifiedExplorer
+{
+    public enum ThemeMode
+    {
+        Light,
+        Dark,
+        System
+    }
+
+    public class AppSettings
+    {
+        public ThemeMode Theme { get; set; } = ThemeMode.System;
+    }
+
+    public static class SettingsManager
+    {
+        private static readonly string SettingsFile = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "appsettings.json");
+
+        public static AppSettings LoadSettings()
+        {
+            if (File.Exists(SettingsFile))
+            {
+                try
+                {
+                    string json = File.ReadAllText(SettingsFile);
+                    var settings = JsonSerializer.Deserialize<AppSettings>(json);
+                    if (settings != null) return settings;
+                }
+                catch { }
+            }
+            return new AppSettings();
+        }
+
+        public static void SaveSettings(AppSettings settings)
+        {
+            try
+            {
+                string json = JsonSerializer.Serialize(settings, new JsonSerializerOptions { WriteIndented = true });
+                File.WriteAllText(SettingsFile, json);
+            }
+            catch { }
+        }
+
+        public static bool IsSystemThemeLight()
+        {
+            try
+            {
+                using var key = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize");
+                if (key != null)
+                {
+                    var value = key.GetValue("AppsUseLightTheme");
+                    if (value is int i)
+                    {
+                        return i == 1;
+                    }
+                }
+            }
+            catch { }
+            
+            return true;
+        }
+    }
+}
diff --git a/SettingsWindow.xaml b/SettingsWindow.xaml
new file mode 100644
index 0000000..6b785a2
--- /dev/null
+++ b/SettingsWindow.xaml
@@ -0,0 +1,17 @@
+<Window x:Class="UnifiedExplorer.SettingsWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="Settings" Height="200" Width="300"
+        WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
+        Background="{DynamicResource BackgroundColor}"
+        Foreground="{DynamicResource TextColor}">
+    <Grid Margin="15">
+        <StackPanel>
+            <TextBlock Text="Theme Settings" FontSize="16" FontWeight="Bold" Margin="0,0,0,15" Foreground="{DynamicResource TextColor}"/>
+            
+            <RadioButton x:Name="DarkThemeRadio" Content="Darkmode" Margin="0,5" Checked="ThemeRadio_Checked" Tag="Dark" Foreground="{DynamicResource TextColor}"/>
+            <RadioButton x:Name="LightThemeRadio" Content="Lightmode" Margin="0,5" Checked="ThemeRadio_Checked" Tag="Light" Foreground="{DynamicResource TextColor}"/>
+            <RadioButton x:Name="SystemThemeRadio" Content="Systemsettings" Margin="0,5" Checked="ThemeRadio_Checked" Tag="System" Foreground="{DynamicResource TextColor}"/>
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/SettingsWindow.xaml.cs b/SettingsWindow.xaml.cs
new file mode 100644
index 0000000..473f2dc
--- /dev/null
+++ b/SettingsWindow.xaml.cs
@@ -0,0 +1,48 @@
+using System.Windows;
+
+namespace UnifiedExplorer
+{
+    public partial class SettingsWindow : Window
+    {
+        private bool _isInitialized = false;
+
+        public SettingsWindow()
+        {
+            InitializeComponent();
+            
+            // Set initial state based on current settings
+            switch (App.Settings.Theme)
+            {
+                case ThemeMode.Light:
+                    LightThemeRadio.IsChecked = true;
+                    break;
+                case ThemeMode.Dark:
+                    DarkThemeRadio.IsChecked = true;
+                    break;
+                case ThemeMode.System:
+                    SystemThemeRadio.IsChecked = true;
+                    break;
+            }
+            
+            _isInitialized = true;
+        }
+
+        private void ThemeRadio_Checked(object sender, RoutedEventArgs e)
+        {
+            if (!_isInitialized) return;
+
+            if (DarkThemeRadio.IsChecked == true)
+            {
+                App.ApplyTheme(ThemeMode.Dark);
+            }
+            else if (LightThemeRadio.IsChecked == true)
+            {
+                App.ApplyTheme(ThemeMode.Light);
+            }
+            else if (SystemThemeRadio.IsChecked == true)
+            {
+                App.ApplyTheme(ThemeMode.System);
+            }
+        }
+    }
+}
diff --git a/Themes/DarkMode.xaml b/Themes/DarkMode.xaml
new file mode 100644
index 0000000..98caab5
--- /dev/null
+++ b/Themes/DarkMode.xaml
@@ -0,0 +1,11 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="BackgroundColor" Color="#191919"/>
+    <SolidColorBrush x:Key="MenuBarColor" Color="#2c2c2c"/>
+    <SolidColorBrush x:Key="TextColor" Color="#98e7e5e5"/> <!-- e7e5e598 wait, ARGB in WPF is #AARRGGBB, issue has #e7e5e598, so A=98, R=e7, G=e5, B=e5 -->
+    <SolidColorBrush x:Key="SelectColor" Color="#272727"/>
+    <SolidColorBrush x:Key="SelectedColor" Color="#b68989"/>
+    <SolidColorBrush x:Key="FolderColor" Color="#ffd767"/>
+    <SolidColorBrush x:Key="FolderStringColor" Color="#2b2c31"/>
+    <SolidColorBrush x:Key="BottomBarColor" Color="#4a4a4a"/>
+</ResourceDictionary>
diff --git a/Themes/GlobalStyles.xaml b/Themes/GlobalStyles.xaml
new file mode 100644
index 0000000..f3a1a39
--- /dev/null
+++ b/Themes/GlobalStyles.xaml
@@ -0,0 +1,74 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style TargetType="ListBoxItem" x:Key="CustomListBoxItemStyle">
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="Padding" Value="5,4"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListBoxItem">
+                    <Border x:Name="Bd" Background="{TemplateBinding Background}" BorderThickness="0" Padding="{TemplateBinding Padding}">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SelectColor}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SelectedColor}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="TreeViewItem" x:Key="CustomTreeViewItemStyle">
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="Padding" Value="5,4"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TreeViewItem">
+                    <StackPanel>
+                        <Border x:Name="Bd" Background="{TemplateBinding Background}" BorderThickness="0" Padding="{TemplateBinding Padding}">
+                            <ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        </Border>
+                        <ItemsPresenter x:Name="ItemsHost" Visibility="Collapsed"/>
+                    </StackPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsExpanded" Value="True">
+                            <Setter TargetName="ItemsHost" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True" SourceName="Bd">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SelectColor}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SelectedColor}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="ListViewItem" x:Key="CustomListViewItemStyle">
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="Padding" Value="2"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListViewItem">
+                    <Border x:Name="Bd" Background="{TemplateBinding Background}" BorderThickness="0" Padding="{TemplateBinding Padding}">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SelectColor}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SelectedColor}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/Themes/LightMode.xaml b/Themes/LightMode.xaml
new file mode 100644
index 0000000..1b2cf07
--- /dev/null
+++ b/Themes/LightMode.xaml
@@ -0,0 +1,11 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="BackgroundColor" Color="#f0f0f0"/>
+    <SolidColorBrush x:Key="MenuBarColor" Color="#f3f3f3"/>
+    <SolidColorBrush x:Key="TextColor" Color="#1d1d1d"/>
+    <SolidColorBrush x:Key="SelectColor" Color="#d9d9d9"/>
+    <SolidColorBrush x:Key="SelectedColor" Color="#afaf99"/>
+    <SolidColorBrush x:Key="FolderColor" Color="#f3b10c"/>
+    <SolidColorBrush x:Key="FolderStringColor" Color="#bbbbbb"/>
+    <SolidColorBrush x:Key="BottomBarColor" Color="#f3f3f3"/>
+</ResourceDictionary>
diff --git a/UnifiedExplorer.csproj b/UnifiedExplorer.csproj
index 8488be4..a623798 100644
--- a/UnifiedExplorer.csproj
+++ b/UnifiedExplorer.csproj
@@ -6,9 +6,9 @@
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>assets\app.ico</ApplicationIcon>
-    <Version>1.0.0</Version>
+    <Version>1.0.1</Version>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <FileVersion>1.0.0.0</FileVersion>
+    <FileVersion>1.0.1.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>