diff --git a/src/Jaya.Shared/ThemeManager.cs b/src/Jaya.Shared/ThemeManager.cs
index 2dfd7d7..44dac27 100644
--- a/src/Jaya.Shared/ThemeManager.cs
+++ b/src/Jaya.Shared/ThemeManager.cs
@@ -69,8 +69,8 @@ public ThemeModel SelectedTheme
                 var currentAppStyles = new List<IStyle>();
                 currentAppStyles.AddRange(Application.Current.Styles);
 
-                if (currentTheme != null)
-                    currentAppStyles.RemoveRange(0, currentTheme.Styles.Count);
+                // remove default theme styles
+                currentAppStyles.RemoveRange(0, 2);
 
                 currentAppStyles.InsertRange(0, SelectedTheme.Styles);
 
diff --git a/src/Jaya.Ui/App.xaml b/src/Jaya.Ui/App.xaml
index e7c6630..d6bba11 100644
--- a/src/Jaya.Ui/App.xaml
+++ b/src/Jaya.Ui/App.xaml
@@ -4,9 +4,9 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:Jaya.Ui">
     <Application.Styles>
-        <!--  enable below two lines for designer support, keep them commented for theme switching to work dueing execution time  -->
-        <!--<StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml" />
-        <StyleInclude Source="avares://Jaya.Shared/Styles/Accents/BaseLight.xaml" />-->
+        <!--  enable below two lines for designer support, keep them commented for theme switching to work during execution time  -->
+        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml" />
+        <StyleInclude Source="avares://Jaya.Shared/Styles/Accents/BaseLight.xaml" />
 
         <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml" />
         <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Default.xaml" />