diff --git a/EnvyUpdate/App.xaml b/EnvyUpdate/App.xaml
index 99d92b4..de53160 100644
--- a/EnvyUpdate/App.xaml
+++ b/EnvyUpdate/App.xaml
@@ -7,6 +7,7 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
+                <ui:ThemesDictionary Theme="Light"/>
                 <ui:ControlsDictionary />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
diff --git a/EnvyUpdate/App.xaml.cs b/EnvyUpdate/App.xaml.cs
index 92c551b..369d24c 100644
--- a/EnvyUpdate/App.xaml.cs
+++ b/EnvyUpdate/App.xaml.cs
@@ -19,13 +19,16 @@ namespace EnvyUpdate
     {
         protected override void OnStartup(StartupEventArgs e)
         {
+            // Remove placeholder light theme and apply system app theme
             Wpf.Ui.Appearance.Accent.ApplySystemAccent();
+            Application.Current.Resources.MergedDictionaries.RemoveAt(0);
             ThemesDictionary themedict = new ThemesDictionary();
             if (Util.IsDarkTheme())
                 themedict.Theme = Wpf.Ui.Appearance.ThemeType.Dark;
             else
                 themedict.Theme = Wpf.Ui.Appearance.ThemeType.Light;
             Application.Current.Resources.MergedDictionaries.Add(themedict);
+            // TODO: Watch for theme changes and dynamically update
 
             // Listen to notification activation
             ToastNotificationManagerCompat.OnActivated += toastArgs =>