diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index 7a45c317..97ff6405 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -204,7 +204,7 @@
                                 <small>{{app.cfg.audio.equalizer.vibrantBass != 0 || app.cfg.audio.maikiwiAudio.spatial === true || app.cfg.audio.maikiwiAudio.ciderPPE === true ? `${$root.getLz('settings.option.audio.enableAdvancedFunctionality.audioNormalization.description')}\n${$root.getLz('settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled')}` : $root.getLz('settings.option.audio.enableAdvancedFunctionality.audioNormalization.description')}}</small>
                             </div>
                             <div class="md-option-segment md-option-segment_auto">
-                                <input type="checkbox" v-model="app.cfg.audio.normalization" v-on:change="toggleNormalization" 
+                                <input type="checkbox" v-model="app.cfg.audio.normalization" v-on:change="toggleNormalization"
                                 :disabled="app.cfg.audio.spatial === true || app.cfg.audio.maikiwiAudio.spatial === true || app.cfg.audio.maikiwiAudio.ciderPPE === true || app.cfg.audio.maikiwiAudio.atmosphereRealizer === true" switch/>
                             </div>
                         </div>
@@ -394,7 +394,7 @@
                                 </div>
                                 <div class="md-option-segment md-option-segment_auto">
                                     <input type="checkbox" switch checked/>
-                                    <!-- <input type="checkbox" v-model="app.cfg.lyrics.enable_mxm" switch /> --> 
+                                    <!-- <input type="checkbox" v-model="app.cfg.lyrics.enable_mxm" switch /> -->
                                 </div>
                             </div>
                         </div>
@@ -710,36 +710,68 @@
                             </div>
                         </div>
 
+                        <!-- DiscordRPC -->
                         <div class="md-option-line">
                             <div class="md-option-segment">
                                 {{$root.getLz('settings.option.connectivity.discordRPC')}}
                             </div>
                             <div class="md-option-segment md-option-segment_auto">
-                                <select class="md-select" v-model="app.cfg.general.discord_rpc">
-                                    <option value="0">{{$root.getLz('term.disabled')}}</option>
-                                    <option value="1">{{$root.getLz('settings.header.connectivity.discordRPC.cider')}}</option>
-                                    <option value="2">{{$root.getLz('settings.header.connectivity.discordRPC.appleMusic')}}
+                                <input type="checkbox" v-model="app.cfg.general.discord_rpc.enabled" switch/>
+                            </div>
+                        </div>
+
+                        <div class="md-option-line" v-show="app.cfg.general.discord_rpc.enabled != false">
+                            <div class="md-option-segment">
+                                {{$root.getLz('settings.option.connectivity.discordRPC.clientName')}}
+                            </div>
+                            <div class="md-option-segment md-option-segment_auto">
+                                <select class="md-select" v-model="app.cfg.general.discord_rpc.client">
+                                    <option value="Cider">{{$root.getLz('app.name')}}</option>
+                                    <option value="AppleMusic">{{$root.getLz('term.appleMusic')}}
                                     </option>
                                 </select>
                             </div>
                         </div>
-                        <div class="md-option-line" v-show="app.cfg.general.discord_rpc != 0">
+
+                        <div class="md-option-line" v-show="app.cfg.general.discord_rpc.enabled != false">
                             <div class="md-option-segment">
                                 {{$root.getLz('settings.option.connectivity.discordRPC.clearOnPause')}}
                             </div>
                             <div class="md-option-segment md-option-segment_auto">
-                                <input type="checkbox" v-model="app.cfg.general.discord_rpc_clear_on_pause" switch/>
+                                <input type="checkbox" v-model="app.cfg.general.discord_rpc.clear_on_pause" switch/>
                             </div>
                         </div>
-                        <div class="md-option-line" v-show="app.cfg.general.discord_rpc != 0">
+
+                        <div class="md-option-line" v-show="app.cfg.general.discord_rpc.enabled != false">
 	                        <div class="md-option-segment">
-								{{$root.getLz('settings.option.connectivity.discordRPC.hideButtons')}}<br>
-	                            <small>({{$root.getLz('settings.option.visual.hardwareAcceleration.description')}})</small>
+								{{$root.getLz('settings.option.connectivity.discordRPC.hideButtons')}}
 	                        </div>
 	                        <div class="md-option-segment md-option-segment_auto">
-	                            <input type="checkbox" v-model="app.cfg.general.discord_rpc_hide_buttons" switch/>
+	                            <input type="checkbox" v-model="app.cfg.general.discord_rpc.hide_buttons" switch/>
 	                        </div>
 	                    </div>
+
+                        <div class="md-option-line" v-show="app.cfg.general.discord_rpc.enabled != false">
+                            <div class="md-option-segment">
+                                {{$root.getLz('settings.option.connectivity.discordRPC.detailsFormat')}}<br/>
+                                <small>{{$root.getLz('term.variables')}}: {artist}, {composer}, {title}, {album}, {trackNumber}</small>
+                            </div>
+                            <div class="md-option-segment md-option-segment_auto">
+                                <input type="text" v-model="app.cfg.general.discord_rpc.details_format"/>
+                            </div>
+                        </div>
+
+                        <div class="md-option-line" v-show="app.cfg.general.discord_rpc.enabled != false">
+                            <div class="md-option-segment">
+                                {{$root.getLz('settings.option.connectivity.discordRPC.stateFormat')}}
+                                <small>{{$root.getLz('term.variables')}}: {artist}, {composer}, {title}, {album}, {trackNumber}</small>
+                            </div>
+                            <div class="md-option-segment md-option-segment_auto">
+                                <input type="text" v-model="app.cfg.general.discord_rpc.state_format"/>
+                            </div>
+                        </div>
+
+                        <!-- LastFM -->
                         <div class="md-option-line">
                             <div class="md-option-segment">
                                 {{$root.getLz('settings.option.connectivity.lastfmScrobble')}}
@@ -1010,7 +1042,7 @@
             },
             getThemeName(filename) {
                 try {
-                    return this.themes.find(theme => theme.file === filename).name;                    
+                    return this.themes.find(theme => theme.file === filename).name;
                 }catch(e) {
                     return filename;
                 }