diff --git a/chat/SettingsView.vue b/chat/SettingsView.vue
index c3c98d1..32915b6 100644
--- a/chat/SettingsView.vue
+++ b/chat/SettingsView.vue
@@ -219,6 +219,17 @@
                     Show high-quality portraits
                 </label>
             </div>
+
+            <div class="form-group">
+                <label class="control-label" for="risingCharacterTheme">
+                    Select character theme
+                    <select id="risingCharacterTheme" class="form-control" v-model="risingCharacterTheme" style="flex:1;margin-right:10px">
+                        <option value=undefined>Client theme</option>
+                        <option disabled>---</option>
+                        <option v-for="theme in risingAvailableThemes" :value="theme">{{theme}}</option>
+                    </select>
+                </label>
+            </div>
         </div>
 
         <div v-show="selectedTab === '3'">
@@ -334,6 +345,8 @@
 </template>
 
 <script lang="ts">
+    import * as fs from 'fs';
+    import * as path from 'path';
     import {Component} from '@f-list/vue-ts';
     import CustomDialog from '../components/custom_dialog';
     import Modal from '../components/Modal.vue';
@@ -394,6 +407,9 @@
 
         risingFilter!: SmartFilterSettings = {} as any;
 
+        risingAvailableThemes!: ReadonlyArray<string> = [];
+        risingCharacterTheme!: string | undefined;
+
         smartFilterTypes = smartFilterTypesOrigin;
 
         async load(): Promise<void> {
@@ -438,6 +454,9 @@
             this.risingShowHighQualityPortraits = settings.risingShowHighQualityPortraits;
 
             this.risingFilter = settings.risingFilter;
+
+            this.risingAvailableThemes = fs.readdirSync(path.join(__dirname, 'themes')).filter((x) => x.substr(-4) === '.css').map((x) => x.slice(0, -4));
+            this.risingCharacterTheme = settings.risingCharacterTheme;
         }
 
         async doImport(): Promise<void> {
@@ -506,7 +525,9 @@
                   ...this.risingFilter,
                   minAge: (minAge !== null && maxAge !== null) ? Math.min(minAge, maxAge) : minAge,
                   maxAge: (minAge !== null && maxAge !== null) ? Math.max(minAge, maxAge) : maxAge
-                }
+                },
+
+                risingCharacterTheme: this.risingCharacterTheme != "undefined" ? this.risingCharacterTheme : undefined
             };
 
             console.log('SETTINGS', minAge, maxAge, core.state.settings);
diff --git a/chat/common.ts b/chat/common.ts
index 6fb3a41..24b91b0 100644
--- a/chat/common.ts
+++ b/chat/common.ts
@@ -104,6 +104,8 @@ export class Settings implements ISettings {
         },
         exceptionNames: []
     };
+
+    risingCharacterTheme = undefined;
 }
 
 
diff --git a/chat/interfaces.ts b/chat/interfaces.ts
index 64d99b7..4d39387 100644
--- a/chat/interfaces.ts
+++ b/chat/interfaces.ts
@@ -240,6 +240,8 @@ export namespace Settings {
         readonly risingShowHighQualityPortraits: boolean;
 
         readonly risingFilter: SmartFilterSettings;
+
+        readonly risingCharacterTheme: string | undefined;
     }
 }
 
diff --git a/electron/Index.vue b/electron/Index.vue
index aadb816..aee9f24 100644
--- a/electron/Index.vue
+++ b/electron/Index.vue
@@ -543,7 +543,7 @@
             }
 
             return {
-              [`theme-${this.settings.theme}`]: true,
+              [`theme-${core.state.settings.risingCharacterTheme || this.settings.theme}`]: true,
               colorblindMode: core.state.settings.risingColorblindMode,
               disableWindowsHighContrast: core.state.generalSettings?.risingDisableWindowsHighContrast || false
             };
@@ -593,9 +593,9 @@
 
         get styling(): string {
             try {
-                return `<style id="themeStyle">${fs.readFileSync(path.join(__dirname, `themes/${this.settings.theme}.css`), 'utf8').toString()}</style>`;
+                return `<style id="themeStyle">${fs.readFileSync(path.join(__dirname, `themes/${((this.character != undefined && core.state.settings.risingCharacterTheme) || this.settings.theme)}.css`), 'utf8').toString()}</style>`;
             } catch(e) {
-                if((<Error & {code: string}>e).code === 'ENOENT' && this.settings.theme !== 'default') {
+              if((<Error & {code: string}>e).code === 'ENOENT' && this.settings.theme !== 'default') {
                     this.settings.theme = 'default';
                     return this.styling;
                 }