diff --git a/src/App.vue b/src/App.vue
index 1658626..beb8ff8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -117,6 +117,7 @@ export default class App extends Vue {
     showRss: false,
   }
   task = 0
+  mql?: MediaQueryList
 
   mainData!: MainData
   rid!: number
@@ -206,6 +207,26 @@ export default class App extends Vue {
       this.getInitData();
     }
   }
+
+  @Watch('config.darkMode', {immediate: true})
+  onDarkMode(mode: any) {
+    const { theme } = this.$vuetify;
+
+    if (mode != null) {
+      if (this.mql) {
+        this.mql.removeListener(null)
+        this.mql = undefined
+      }
+      theme.dark = mode
+      return
+    }
+
+    this.mql = window.matchMedia('(prefers-color-scheme: dark)');
+    this.mql.addListener((e: MediaQueryListEvent) => {
+      theme.dark = e.matches
+    })
+    theme.dark = this.mql.matches
+  }
 }
 </script>
 
diff --git a/src/components/drawer/DrawerFooter.vue b/src/components/drawer/DrawerFooter.vue
index 4c8bdd0..9916fa3 100644
--- a/src/components/drawer/DrawerFooter.vue
+++ b/src/components/drawer/DrawerFooter.vue
@@ -50,12 +50,31 @@
         </v-list>
       </v-menu>
 
-      <v-btn
-        icon
-        @click="toggleDarkMode"
-      >
-        <v-icon v-text="darkModeIcon" />
-      </v-btn>
+      <v-menu>
+        <template #activator="{ on }">
+          <v-btn
+            icon
+            v-on="on"
+          >
+            <v-icon v-text="darkModeIcon" />
+          </v-btn>
+        </template>
+
+        <v-list>
+          <v-list-item-group
+            v-model="currentDarkMode"
+            color="primary"
+          >
+            <v-list-item
+              v-for="item in darkModes"
+              :key="item[0]"
+              :value="item[0]"
+            >
+              <v-list-item-title>{{ item[1] }}</v-list-item-title>
+            </v-list-item>
+          </v-list-item-group>
+        </v-list>
+      </v-menu>
       <v-btn
         icon
         @click="triggerApplicationShutdown"
@@ -81,6 +100,7 @@ import AppFooter from '@/components/Footer.vue';
 const AUTO_KEY = 'auto';
 
 type AllLocaleKey = NonNullable<LocaleKey> | typeof AUTO_KEY;
+type DarkModeKey = true | false | null;
 
 @Component({
   components: {
@@ -98,16 +118,29 @@ type AllLocaleKey = NonNullable<LocaleKey> | typeof AUTO_KEY;
 })
 export default class DrawerFooter extends Vue {
   locales = this.buildLocales()
-  currentLocale = this.$store.getters.config.locale || AUTO_KEY;
+  currentLocale = this.$store.getters.config.locale || AUTO_KEY
+  currentDarkMode = this.$store.getters.config.darkMode || AUTO_KEY
   oldLocale = this.currentLocale
   showInfo = false
 
+  darkModes = [
+    [false, tr('light')],
+    [true, tr('dark')],
+    [AUTO_KEY, tr('auto')],
+  ]
+
   asyncShowDialog!: (_: DialogConfig) => Promise<string | undefined>
   showSnackBar!: (_: SnackBarConfig) => void
   updateConfig!: (_: ConfigPayload) => void
 
   get darkModeIcon() {
-    return this.$vuetify.theme.dark ? 'mdi-brightness-4' : 'mdi-brightness-7';
+    if (this.currentDarkMode == true) {
+      return 'mdi-brightness-7'
+    } else if (this.currentDarkMode == false) {
+      return 'mdi-brightness-4'
+    } else {
+      return 'mdi-brightness-auto'
+    }
   }
 
   get phoneLayout() {
@@ -131,7 +164,8 @@ export default class DrawerFooter extends Vue {
     ]
   }
 
-  async switchLocale(locale: AllLocaleKey) {
+  @Watch('currentLocale')
+  async onCurrentLocaleChanged(locale: AllLocaleKey) {
     if (locale === this.oldLocale) {
       return;
     }
@@ -159,13 +193,11 @@ export default class DrawerFooter extends Vue {
     location.reload();
   }
 
-  toggleDarkMode() {
-    const { theme } = this.$vuetify;
-    theme.dark = !theme.dark;
-
+  @Watch('currentDarkMode')
+  onDarkModeChanged(mode: DarkModeKey | typeof AUTO_KEY) {
     this.updateConfig({
       key: 'darkMode',
-      value: theme.dark,
+      value: mode == AUTO_KEY ? null : mode,
     });
   }
 
@@ -181,12 +213,6 @@ export default class DrawerFooter extends Vue {
     }
     await api.shutdownApplication();
   }
-
-
-  @Watch('currentLocale')
-  onCurrentLocaleChanged(v: AllLocaleKey) {
-    this.switchLocale(v)
-  }
 }
 </script>
 
diff --git a/src/locale/en.ts b/src/locale/en.ts
index f0661da..8e4c933 100644
--- a/src/locale/en.ts
+++ b/src/locale/en.ts
@@ -46,6 +46,8 @@ export default {
 
   settings: 'Settings',
   logs: 'Logs',
+  light: 'Light',
+  dark: 'Dark',
 
   all: 'All',
   category: 'Category |||| Categories',
diff --git a/src/locale/zh-CN.ts b/src/locale/zh-CN.ts
index 27cb6cf..77c269c 100644
--- a/src/locale/zh-CN.ts
+++ b/src/locale/zh-CN.ts
@@ -44,6 +44,8 @@ export default {
 
   settings: '设置',
   logs: '日志',
+  light: '亮色',
+  dark: '暗色',
 
   all: '全部',
   category: '分类',
diff --git a/src/plugins/vuetify.ts b/src/plugins/vuetify.ts
index 96be87f..c74ed84 100644
--- a/src/plugins/vuetify.ts
+++ b/src/plugins/vuetify.ts
@@ -1,7 +1,6 @@
 import Vue from 'vue';
 import Vuetify from 'vuetify/lib';
 import i18n from '@/locale';
-import { loadConfig } from '@/store/config';
 
 Vue.use(Vuetify);
 
@@ -10,7 +9,6 @@ locale = locale === 'zh-CN' ? 'zh-Hans' : locale.split('-', 1)[0];
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const { default: translation } = require('vuetify/src/locale/' + locale);
-const darkMode = !!loadConfig()['darkMode'];
 
 export default new Vuetify({
   lang: {
@@ -20,7 +18,4 @@ export default new Vuetify({
   icons: {
     iconfont: 'mdi',
   },
-  theme: {
-    dark: darkMode,
-  },
 });