From 3453a9733b3f895c16bd317a1333668736ade27f Mon Sep 17 00:00:00 2001
From: Mefsaal <mefsaal@gmail.com>
Date: Thu, 28 Apr 2022 19:59:58 -0300
Subject: [PATCH 001/141] some test

---
 src/i18n/en_US.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index 78413968..64eec84b 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -263,6 +263,14 @@
   "action.cast.scanning": "Scanning...",
   "action.createNew": "Create New...",
   "action.openArtworkInBrowser": "Open artwork in browser",
+  "menubar.options.about": "About",
+  "menubar.options.settings": "Settings",
+  "menubar.options.services": "Services",
+  "menubar.options.hide": "Hide Cider",
+  "menubar.options.hideothers": "Hide Others",
+  "menubar.options.unhide": "Show All",
+  "menubar.options.quit": "Quit Cider",
+  
   "settings.header.general": "General",
   "settings.header.general.description": "Adjust the general settings for Cider.",
   "settings.option.general.language": "Language",

From 3e728848d79d630d0a6a6b268ea6ad0bd5ef4a9a Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Fri, 29 Apr 2022 16:28:12 +0700
Subject: [PATCH 002/141] uptest

---
 package.json                                  |  2 +-
 src/main/base/browserwindow.ts                |  1 +
 src/main/plugins/raop.ts                      | 12 ++++++
 src/renderer/less/helpers.less                |  3 +-
 src/renderer/main/vueapp.js                   |  7 ++++
 src/renderer/views/app/panels.ejs             |  3 ++
 .../views/components/airplay-modal.ejs        | 42 +++++++++++++++++++
 7 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 src/renderer/views/components/airplay-modal.ejs

diff --git a/package.json b/package.json
index 70e22263..6cad8ece 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "@sentry/electron": "^3.0.7",
     "@sentry/integrations": "^6.19.6",
     "adm-zip": "0.4.10",
-    "airtunes2": "git+https://github.com/vapormusic/node_airtunes2.git",
+    "airtunes2": "git+https://github.com/vapormusic/node_airtunes2.git#hap",
     "castv2-client": "^1.2.0",
     "chokidar": "^3.5.3",
     "discord-rpc": "^4.0.1",
diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index afb38607..56d847be 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -95,6 +95,7 @@ export class BrowserWindow {
                 "components/fullscreen",
                 "components/miniplayer",
                 "components/castmenu",
+                "components/airplay-modal",
                 "components/artist-chip",
                 "components/hello-world",
                 "components/inline-collection-list",
diff --git a/src/main/plugins/raop.ts b/src/main/plugins/raop.ts
index e6908375..ba8e8395 100644
--- a/src/main/plugins/raop.ts
+++ b/src/main/plugins/raop.ts
@@ -178,6 +178,12 @@ export default class RAOP {
                         this._win.webContents.setAudioMuted(true);
                         this._win.webContents.executeJavaScript(`CiderAudio.sendAudio()`).catch((err: any) => console.error(err));
                     }
+                    if (status == "need_password"){
+                        this._win.webContents.executeJavaScript(`app.setAirPlayCodeUI()`)
+                    }
+                    if (status == "pair_success"){
+                        this._win.webContents.executeJavaScript(`app.sendAirPlaySuccess()`)
+                    }
                     if (status == 'stopped') {
                         this.airtunes.stopAll(() => {
                             console.log('end');
@@ -210,6 +216,12 @@ export default class RAOP {
 
         });
 
+        electron.ipcMain.on('setAirPlayPasscode', (event, passcode) => {
+            if (this.device){
+                this.device.setPasscode(passcode)
+            }
+        })
+
         electron.ipcMain.on('writeWAV', (event, leftbuffer, rightbuffer) => {
             if (this.airtunes != null) {
                 if (this.worker == null) {
diff --git a/src/renderer/less/helpers.less b/src/renderer/less/helpers.less
index db659232..245cce92 100644
--- a/src/renderer/less/helpers.less
+++ b/src/renderer/less/helpers.less
@@ -70,10 +70,11 @@
 
 .spatialproperties-panel {
   .modal-window {
+    &:not(.airplay-modal){
     height    : 700px;
     max-height: 700px;
     width     : 800px;
-    max-width : 800px;
+    max-width : 800px;}
     overflow  : hidden;
 
     .info-header {
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index bcc7dfce..e40ee7a7 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -207,6 +207,7 @@ const app = new Vue({
             showPlaylist: false,
             castMenu: false,
             moreInfo: false,
+            airplayPW: false,
         },
         socialBadges: {
             badgeMap: {},
@@ -3836,6 +3837,12 @@ const app = new Vue({
 
             // tracks are found in relationship.data
         },
+        setAirPlayCodeUI() {
+            this.modals.airplayPW = true
+        },
+        sendAirPlaySuccess(){
+            notyf.success('Device paired successfully!');
+        },
         windowFocus(val) {
             if (val) {
                 document.querySelectorAll(".animated-artwork-video").forEach(el => {
diff --git a/src/renderer/views/app/panels.ejs b/src/renderer/views/app/panels.ejs
index 69a6f18e..eaccb5f2 100644
--- a/src/renderer/views/app/panels.ejs
+++ b/src/renderer/views/app/panels.ejs
@@ -28,6 +28,9 @@
 <transition name="modal">
     <castmenu v-if="modals.castMenu"></castmenu>
 </transition>
+<transition name="modal">
+    <airplay-modal v-if="modals.airplayPW"></airplay-modal>
+</transition>
 <transition name="modal">
     <plugin-menu v-if="modals.pluginMenu"></plugin-menu>
 </transition>
diff --git a/src/renderer/views/components/airplay-modal.ejs b/src/renderer/views/components/airplay-modal.ejs
new file mode 100644
index 00000000..16ab91a4
--- /dev/null
+++ b/src/renderer/views/components/airplay-modal.ejs
@@ -0,0 +1,42 @@
+<script type="text/x-template" id="airplay-modal">
+<div class="spatialproperties-panel castmenu modal-fullscreen airplay-modal" @click.self="close()" @contextmenu.self="close()">
+    <div class="modal-window airplay-modal">
+        <div class="modal-header">
+            <div class="modal-title">{{'Enter password'}}</div>
+            <button class="close-btn" @click="close()"></button>
+        </div>
+    <div class="modal-content" style="overflow-y: overlay; padding: 3%">
+        <input type="text" v-model="passcode"/>
+    </div>
+    <div class="md-footer">
+        <div class="row">
+            <div class="col" >
+                <button style="width:100%" @click="enterPassword()" class="md-btn md-btn-block md-btn-primary">{{'OK'}}</button>
+            </div>
+        </div>
+    </div>
+</div>
+</div>
+</script>
+<script>
+    Vue.component('airplay-modal', {
+        template: '#airplay-modal',
+        data: function () {
+            return {
+                passcode: '',
+            }
+        },
+        mounted() {
+        },
+        methods: {
+            close() {
+                this.$root.modals.airplayPW = false
+            },
+            enterPassword() {
+                console.log('Entered passCode: ', this.passcode)
+                ipcRenderer.send("setAirPlayPasscode",this.passcode)
+                this.close()
+            }
+        }
+    });
+</script>
\ No newline at end of file

From f403b52af1821580a14d32be53599829574b288c Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Fri, 29 Apr 2022 21:44:15 +0200
Subject: [PATCH 003/141] test

---
 src/renderer/assets/feather/heart-fill.svg      |  1 +
 .../views/components/mediaitem-list-item.ejs    | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 src/renderer/assets/feather/heart-fill.svg

diff --git a/src/renderer/assets/feather/heart-fill.svg b/src/renderer/assets/feather/heart-fill.svg
new file mode 100644
index 00000000..1f790aad
--- /dev/null
+++ b/src/renderer/assets/feather/heart-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-heart"><path d="M20.84 4.61a5.5 5.5 0 0 0-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 0 0-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 0 0 0-7.78z"></path></svg>
\ No newline at end of file
diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index 0a1ab179..4348b125 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -67,6 +67,9 @@
             </div>
             <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"></div>
             <template v-if="showMetaData == true" @dblclick="route()">
+                <div class="metainfo" style="min-width: 70px;" v-if="getHeartStatus(item)">
+                    <div class="svg-icon" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}"></div>
+                </div>
                 <div class="metainfo">
                     {{ item.attributes.releaseDate ? new Date(item.attributes.releaseDate).toLocaleDateString()
                     : "" }}
@@ -499,6 +502,20 @@
             visibilityChanged: function (isVisible, entry) {
                 this.isVisible = isVisible
             },
+            async getHeartStatus(item) {
+                try {
+                    let rating = await app.getRating(item)
+                    if (rating == 1) {
+                        console.log(item.attributes.name + " checked for heart status! Response: true")
+                        return true;
+                    } else {
+                        console.log(item.attributes.name + " checked for heart status! Response: false")
+                        return false;
+                    } 
+                } catch (err) {
+                    console.log(err)
+                }
+            },
             addToLibrary() {
                 let item = this.item
                 if (item.attributes.playParams.id) {

From f8e66968cdea396bf9e51516d0721d5d394d939f Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Fri, 29 Apr 2022 23:24:52 +0200
Subject: [PATCH 004/141] remove some code that doesnt work

---
 src/renderer/views/components/mediaitem-list-item.ejs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index 4348b125..6f137150 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -67,7 +67,7 @@
             </div>
             <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"></div>
             <template v-if="showMetaData == true" @dblclick="route()">
-                <div class="metainfo" style="min-width: 70px;" v-if="getHeartStatus(item)">
+                <div class="metainfo" style="min-width: 70px;" v-if="getHeartStatus()">
                     <div class="svg-icon" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}"></div>
                 </div>
                 <div class="metainfo">
@@ -502,14 +502,14 @@
             visibilityChanged: function (isVisible, entry) {
                 this.isVisible = isVisible
             },
-            async getHeartStatus(item) {
+            async getHeartStatus() {
                 try {
-                    let rating = await app.getRating(item)
+                    let rating = await app.getRating(this.item)
                     if (rating == 1) {
-                        console.log(item.attributes.name + " checked for heart status! Response: true")
+                        console.log(this.item.attributes.name + " checked for heart status! Response: true")
                         return true;
                     } else {
-                        console.log(item.attributes.name + " checked for heart status! Response: false")
+                        console.log(this.item.attributes.name + " checked for heart status! Response: false")
                         return false;
                     } 
                 } catch (err) {

From b33cf304a794dca33ec48d7cb830f0f1a42f4d13 Mon Sep 17 00:00:00 2001
From: Mefsaal <mefsaal@gmail.com>
Date: Fri, 29 Apr 2022 21:47:05 -0300
Subject: [PATCH 005/141] Cider Strings RE-Work

---
 src/main/plugins/menubar.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts
index b47dcabe..fb5e7594 100644
--- a/src/main/plugins/menubar.ts
+++ b/src/main/plugins/menubar.ts
@@ -3,6 +3,7 @@ import {utils} from "../base/utils";
 
 export default class Thumbar {
 
+    private i18n: any = undefined;
     /**
      * Base Plugin Details (Eventually implemented into a GUI in settings)
      */
@@ -22,23 +23,23 @@ export default class Thumbar {
             label: app.getName(),
             submenu: [
                 {
-                    label: 'About',
+                    label: utils.getLocale('About', 'menubar.options.about'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('about')`)
                 },
                 {type: 'separator'},
                 {
-                    label: 'Settings',
+                    label: utils.getLocale('Settings', 'menubar.options.settings'),
                     accelerator: utils.getStoreValue("general.keybindings.settings").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('settings')`)
                 },
                 {type: 'separator'},
-                {role: 'services'},
+                {role: 'services', label: utils.getLocale('services', 'menubar.options.services')},
                 {type: 'separator'},
-                {role: 'hide'},
-                {role: 'hideOthers'},
-                {role: 'unhide'},
+                {role: 'hide', label: utils.getLocale('hide', 'menubar.options.hide')},
+                {role: 'hideOthers', label: utils.getLocale('hideOthers', 'menubar.options.hideothers')},
+                {role: 'unhide', label: utils.getLocale('unhide', 'menubar.options.unhide')},
                 {type: 'separator'},
-                {role: 'quit'}
+                {role: 'quit', label: utils.getLocale('quit', 'menubar.options.quit')}
             ]
         },
         {

From 0d686439d3407ab0f599007241ff21b880ea1549 Mon Sep 17 00:00:00 2001
From: Mefsaal <mefsaal@gmail.com>
Date: Fri, 29 Apr 2022 22:23:50 -0300
Subject: [PATCH 006/141] Part 2 set strings in en_US.json pending add to
 readme file

---
 src/i18n/en_US.json         | 51 +++++++++++++++++++++++++++++++++++++
 src/main/plugins/menubar.ts |  4 +--
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index 64eec84b..a6830119 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -270,7 +270,58 @@
   "menubar.options.hideothers": "Hide Others",
   "menubar.options.unhide": "Show All",
   "menubar.options.quit": "Quit Cider",
+  "menubar.options.view": "View ",
+  "menubar.options.reload": "Reload",
+  "menubar.options.forcereload": "Force Reload",
+  "menubar.options.toggledevtools": "Toggle Developer Tools",
+  "menubar.options.resetzoom": "Reset Zoom",
+  "menubar.options.zoomin": "Zoom In",
+  "menubar.options.zoomout": "Zoom Out",
+  "menubar.options.togglefullscreen": "Toggle Fullscreen",
+  "menubar.options.window": "Window",
+  "menubar.options.minimize": "Minimize",
+  "menubar.options.show": "Show",
+  "menubar.options.zoom": "Zoom",
+  "menubar.options.front": "Front",
+  "menubar.options.close": "Close",
+  "menubar.options.edit": "Edit",
+  "menubar.options.update": "Undo",
+  "menubar.options.redo": "Redo",
+  "menubar.options.cut": "Cut",
+  "menubar.options.copy": "Copy",
+  "menubar.options.paste": "Paste",
+  "menubar.options.toggleprivate": "Toggle Private Session",
+  "menubar.options.webremote": "Web Remote",
+  "menubar.options.audio": "Audio Settings",
+  "menubar.options.plugins": "Plu-gins Menu",
+  "menubar.options.control": "Controls",
+  "menubar.options.next": "Next",
+  "menubar.options.previous ": "Previous",
+  "menubar.options.volumeup": "Volume Up",
+  "menubar.options.volumedown": "Volume Down",
+  "menubar.options.browse": "Browse",
+  "menubar.options.artists": "Artists",
+  "menubar.options.search": "Search",
+  "menubar.options.albums": "Albums",
+  "menubar.options.cast": "Cast To Devices",
+  "menubar.options.account": "Account",
+  "menubar.options.accountsettings": "Account Settings",
+  "menubar.options.signout": "Sign Out",
+  "menubar.options.support": "Support",
+  "menubar.options.help": "Help",
+  "menubar.options.discord": "Discord",
+  "menubar.options.gihu": "GitHub Wiki",
+  "menubar.options.report": "Report a...",
+  "menubar.options.bug": "Bug",
+  "menubar.options.feature": "Feature Request",
+  "menubar.options.trans": "Translation Report/Request",
+  "menubar.options.license": "View License",
+  "menubar.options.conf": "Open Configuration File in Editor",
   
+
+
+
+
   "settings.header.general": "General",
   "settings.header.general.description": "Adjust the general settings for Cider.",
   "settings.option.general.language": "Language",
diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts
index fb5e7594..c7388912 100644
--- a/src/main/plugins/menubar.ts
+++ b/src/main/plugins/menubar.ts
@@ -43,9 +43,9 @@ export default class Thumbar {
             ]
         },
         {
-            label: 'View',
+            label: utils.getLocale('View', 'menubar.options.view'),
             submenu: [
-                {role: 'reload'},
+                {role: 'reload', label: utils.getLocale('reload', 'menubar.view.reload')},
                 {role: 'forceReload'},
                 {role: 'toggleDevTools'},
                 {type: 'separator'},

From 518b870f0ff6f764ae01167e4dd464163bbc6d1c Mon Sep 17 00:00:00 2001
From: Mefsaal <mefsaal@gmail.com>
Date: Fri, 29 Apr 2022 22:46:54 -0300
Subject: [PATCH 007/141] fully translation menubar strings (No more Hardcoded)

---
 src/i18n/en_US.json         |  7 +--
 src/main/plugins/menubar.ts | 98 ++++++++++++++++++-------------------
 2 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index a6830119..dbec1149 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -294,8 +294,9 @@
   "menubar.options.webremote": "Web Remote",
   "menubar.options.audio": "Audio Settings",
   "menubar.options.plugins": "Plu-gins Menu",
-  "menubar.options.control": "Controls",
+  "menubar.options.controls": "Controls",
   "menubar.options.next": "Next",
+  "menubar.options.playpause": "Play/Pause",
   "menubar.options.previous ": "Previous",
   "menubar.options.volumeup": "Volume Up",
   "menubar.options.volumedown": "Volume Down",
@@ -310,14 +311,14 @@
   "menubar.options.support": "Support",
   "menubar.options.help": "Help",
   "menubar.options.discord": "Discord",
-  "menubar.options.gihu": "GitHub Wiki",
+  "menubar.options.github": "GitHub Wiki",
   "menubar.options.report": "Report a...",
   "menubar.options.bug": "Bug",
   "menubar.options.feature": "Feature Request",
   "menubar.options.trans": "Translation Report/Request",
   "menubar.options.license": "View License",
   "menubar.options.conf": "Open Configuration File in Editor",
-  
+
 
 
 
diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts
index c7388912..e4aa67e2 100644
--- a/src/main/plugins/menubar.ts
+++ b/src/main/plugins/menubar.ts
@@ -45,185 +45,185 @@ export default class Thumbar {
         {
             label: utils.getLocale('View', 'menubar.options.view'),
             submenu: [
-                {role: 'reload', label: utils.getLocale('reload', 'menubar.view.reload')},
-                {role: 'forceReload'},
-                {role: 'toggleDevTools'},
+                {role: 'reload', label: utils.getLocale('reload', 'menubar.options.reloads')},
+                {role: 'forceReload', label: utils.getLocale('forceReload', 'menubar.options.forcereload')},
+                {role: 'toggleDevTools', label: utils.getLocale('toggleDevTools', 'menubar.options.toggledevtools')},
                 {type: 'separator'},
-                {role: 'resetZoom'},
-                {role: 'zoomIn'},
-                {role: 'zoomOut'},
+                {role: 'resetZoom', label: utils.getLocale('resetZoom', 'menubar.options.resetzoom')},
+                {role: 'zoomIn', label: utils.getLocale('zoomIn', 'menubar.options.zoomin')},
+                {role: 'zoomOut', label: utils.getLocale('zoomOut', 'menubar.options.zoomout')},
                 {type: 'separator'},
-                {role: 'togglefullscreen'},
+                {role: 'togglefullscreen', label: utils.getLocale('togglefullscreen', 'menubar.options.togglefullscreen')},
             ]
         },
         {
-            label: 'Window',
+            label: utils.getLocale('Window', 'menubar.options.window'),
             submenu: [
-                {role: 'minimize'},
+                {role: 'minimize', label: utils.getLocale('minimize', 'menubar.options.minimize')},
                 {
-                    label: 'Show',
+                    label: utils.getLocale('Show', 'menubar.options.show'),
                     click: () => utils.getWindow().show()
                 },
-                {role: 'zoom'},
+                {role: 'zoom', label: utils.getLocale('zoom', 'menubar.options.zoom')},
                 ...(this.isMac ? [
                     {type: 'separator'},
-                    {role: 'front'},
-                    {role: 'close'},
+                    {role: 'front', label: utils.getLocale('front', 'menubar.options.front')},
+                    {role: 'close', label: utils.getLocale('close', 'menubar.options.close')},
                 ] : [
-                    {role: 'close'},
+                    {role: 'close', label: utils.getLocale('close', 'menubar.options.close')},
                 ]),
 
                 {
-                    label: 'Edit',
+                    label: utils.getLocale('Edit', 'menubar.options.edit'),
                     submenu: [
-                        {role: 'undo'},
-                        {role: 'redo'},
+                        {role: 'undo', label: utils.getLocale('undo', 'menubar.options.undo')},
+                        {role: 'redo', label: utils.getLocale('redo', 'menubar.options.redo')},
                         {type: 'separator'},
-                        {role: 'cut'},
-                        {role: 'copy'},
-                        {role: 'paste'},
+                        {role: 'cut', label: utils.getLocale('cut', 'menubar.options.cut')},
+                        {role: 'copy', label: utils.getLocale('copy', 'menubar.options.copy')},
+                        {role: 'paste', label: utils.getLocale('paste', 'menubar.options.paste')},
                     ]
                 },
                 {type: 'separator'},
                 {
-                    label: 'Toggle Private Session',
+                    label: utils.getLocale('Toggle Private Session', 'menubar.options.toggleprivate'),
                     accelerator: utils.getStoreValue("general.keybindings.togglePrivateSession").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.cfg.general.privateEnabled = !app.cfg.general.privateEnabled`)
                 },
                 {type: 'separator'},
                 {
-                    label: 'Web Remote',
+                    label: utils.getLocale('Web Remote', 'menubar.options.webremote'),
                     accelerator: utils.getStoreValue("general.keybindings.webRemote").join('+'),
                     sublabel: 'Opens in external window',
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('remote-pair')`)
                 },
                 {
-                    label: 'Audio Settings',
+                    label: utils.getLocale('Audio Settings', 'menubar.options.audio'),
                     accelerator: utils.getStoreValue("general.keybindings.audioSettings").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.audioSettings = true`)
                 },
                 {
-                    label: 'Plug-in Menu',
+                    label: utils.getLocale('Plug-in Menu', 'menubar.options.plugins'),
                     accelerator: utils.getStoreValue("general.keybindings.pluginMenu").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.pluginMenu = true`)
                 }
             ]
         },
         {
-            label: 'Controls',
+            label: utils.getLocale('Controls', 'menubar.options.controls'),
             submenu: [
                 {
-                    label: 'Pause / Play',
+                    label:  utils.getLocale('Pause / Play', 'menubar.options.playpause'),
                     accelerator: 'Space',
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.SpacePause()`)
                 },
                 {
-                    label: 'Next',
+                    label: utils.getLocale('Next', 'menubar.options.next'),
                     accelerator: 'CommandOrControl+Right',
                     click: () => utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.next()`)
                 },
                 {
-                    label: 'Previous',
+                    label: utils.getLocale('Previous', 'menubar.options.previous'),
                     accelerator: 'CommandOrControl+Left',
                     click: () => utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.previous()`)
                 },
                 {type: 'separator'},
                 {
-                    label: 'Volume Up',
+                    label: utils.getLocale('Volume Up', 'menubar.options.volumeup'),
                     accelerator: 'CommandOrControl+Up',
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.volumeUp()`)
                 },
                 {
-                    label: 'Volume Down',
+                    label: utils.getLocale('Volume Down', 'menubar.options.volumedown'),
                     accelerator: 'CommandOrControl+Down',
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.volumeDown()`)
                 },
                 {
-                    label: 'Browse',
+                    label: utils.getLocale('Browse', 'menubar.options.browse'),
                     accelerator: utils.getStoreValue("general.keybindings.browse").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('browse')`)
                 },
                 {type: 'separator'},
                 {
-                    label: 'Artists',
+                    label: utils.getLocale('Artists', 'menubar.options.artists'),
                     accelerator: utils.getStoreValue("general.keybindings.artists").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-artists')`)
                 },
                 {
-                    label: 'Search',
+                    label: utils.getLocale('Search', 'menubar.options.search'),
                     accelerator: utils.getStoreValue("general.keybindings.search").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('search')`)
                 },
                 {type: 'separator'},
                 {
-                    label: 'Album',
+                    label: utils.getLocale('Album', 'menubar.options.albums'),
                     accelerator: utils.getStoreValue("general.keybindings.albums").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-albums')`)
                 },
                 {type: 'separator'},
                 {
-                    label: 'Cast To Devices',
+                    label: utils.getLocale('Cast To Devices', 'menubar.options.cast'),
                     accelerator: utils.getStoreValue("general.keybindings.castToDevices").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.castMenu = true`)
                 }
             ]
         },
         {
-            label: 'Account',
+            label: utils.getLocale('Account', 'menubar.options.account'),
             submenu: [
                 {
-                    label: 'Account Settings',
+                    label: utils.getLocale('Account Settings', 'menubar.options.accountsettings'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('apple-account-settings')`)
                 },
                 {
-                    label: 'Sign Out',
+                    label: utils.getLocale('Sign Out', 'menubar.options.signout'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.unauthorize()`)
                 }
             ]
         },
         {
-            label: 'Support',
-            role: 'help',
+            label: utils.getLocale('Support', 'menubar.options.support'),
+            role: utils.getLocale('help', 'menubar.options.help'),
             submenu: [
                 {
-                    label: 'Discord',
+                    label: utils.getLocale('Discord', 'menubar.options.discord'),
                     click: () => shell.openExternal("https://discord.gg/AppleMusic").catch(console.error)
                 },
                 {
-                    label: 'GitHub Wiki',
+                    label: utils.getLocale('GitHub Wiki', 'menubar.options.github'),
                     click: () => shell.openExternal("https://github.com/ciderapp/Cider/wiki/Troubleshooting").catch(console.error)
                 },
                 {type: 'separator'},
                 {
-                    label: 'Report a...',
+                    label: utils.getLocale('Report a...', 'menubar.options.report'),
                     submenu: [
                         {
-                            label: 'Bug',
+                            label: utils.getLocale('Bug', 'menubar.options.bug'),
                             click: () => shell.openExternal("https://github.com/ciderapp/Cider/issues/new?assignees=&labels=bug%2Ctriage&template=bug_report.yaml&title=%5BBug%5D%3A+").catch(console.error)
                         },
                         {
-                            label: 'Feature Request',
+                            label: utils.getLocale('Feature Request', 'menubar.options.feature'),
                             click: () => shell.openExternal("https://github.com/ciderapp/Cider/discussions/new?category=feature-request").catch(console.error)
                         },
                         {
-                            label: 'Translation Report/Request',
+                            label: utils.getLocale('Translation Report/Request', 'menubar.options.trans'),
                             click: () => shell.openExternal("https://github.com/ciderapp/Cider/issues/new?assignees=&labels=%F0%9F%8C%90+Translations&template=translation.yaml&title=%5BTranslation%5D%3A+").catch(console.error)
                         },
                     ]
                 },
                 {type: 'separator'},
                 {
-                    label: 'View License',
+                    label: utils.getLocale('View License', 'menubar.options.license'),
                     click: () => shell.openExternal("https://github.com/ciderapp/Cider/blob/main/LICENSE").catch(console.error)
                 },
                 {type: 'separator'},
                 {
-                    label: 'Toggle Developer Tools',
+                    label: utils.getLocale('Toggle Developer Tools', 'menubar.options.devtools'),
                     accelerator: utils.getStoreValue("general.keybindings.openDeveloperTools").join('+'),
                     click: () => utils.getWindow().webContents.openDevTools()
                 },
                 {
-                    label: 'Open Configuration File in Editor',
+                    label: utils.getLocale('Open Configuration File in Editor', 'menubar.options.conf'),
                     click: () => utils.getStoreInstance().openInEditor()
                 }
             ]

From d317df2f2058beedf1f646b46fee102128073d53 Mon Sep 17 00:00:00 2001
From: Mefsaal <mefsaal@gmail.com>
Date: Fri, 29 Apr 2022 23:05:16 -0300
Subject: [PATCH 008/141] bugfix

---
 src/i18n/en_US.json         | 2 +-
 src/main/plugins/menubar.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index dbec1149..f975a81e 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -297,7 +297,7 @@
   "menubar.options.controls": "Controls",
   "menubar.options.next": "Next",
   "menubar.options.playpause": "Play/Pause",
-  "menubar.options.previous ": "Previous",
+  "menubar.options.previous": "Previous",
   "menubar.options.volumeup": "Volume Up",
   "menubar.options.volumedown": "Volume Down",
   "menubar.options.browse": "Browse",
diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts
index e4aa67e2..07c860d1 100644
--- a/src/main/plugins/menubar.ts
+++ b/src/main/plugins/menubar.ts
@@ -218,7 +218,7 @@ export default class Thumbar {
                 },
                 {type: 'separator'},
                 {
-                    label: utils.getLocale('Toggle Developer Tools', 'menubar.options.devtools'),
+                    label: utils.getLocale('Toggle Developer Tools', 'menubar.options.toggledevtools'),
                     accelerator: utils.getStoreValue("general.keybindings.openDeveloperTools").join('+'),
                     click: () => utils.getWindow().webContents.openDevTools()
                 },

From c4a33b7cb98bdbaf8d28455c809f6d36e8ba707c Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 30 Apr 2022 10:15:52 +0700
Subject: [PATCH 009/141] Update raop.ts

---
 src/main/plugins/raop.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/plugins/raop.ts b/src/main/plugins/raop.ts
index ba8e8395..165ada02 100644
--- a/src/main/plugins/raop.ts
+++ b/src/main/plugins/raop.ts
@@ -143,7 +143,7 @@ export default class RAOP {
             this.castDevices = [];
             console.log("scan for airplay devices");
             
-            const browser = this.mdns.createBrowser(this.mdns.tcp('raop'));
+            const browser = this.mdns.createBrowser();
             browser.on('ready', browser.discover);
 
             browser.on('update', (service: any) => {

From 4b07eff71cfd08cef3559c3f789e3e74751950c1 Mon Sep 17 00:00:00 2001
From: Mefsaal <mefsaal@gmail.com>
Date: Sat, 30 Apr 2022 00:19:26 -0300
Subject: [PATCH 010/141] update documentation for now. added strings for
 readme and en_US source file pending found string to web pair (not found)

---
 src/i18n/README.md         | 58 ++++++++++++++++++++++++++++++++++++++
 src/i18n/en_US.json        |  6 +---
 src/i18n/source/en_US.json | 55 ++++++++++++++++++++++++++++++++++++
 3 files changed, 114 insertions(+), 5 deletions(-)

diff --git a/src/i18n/README.md b/src/i18n/README.md
index 4246957d..5531ab28 100644
--- a/src/i18n/README.md
+++ b/src/i18n/README.md
@@ -297,5 +297,63 @@ Update 28/04/2022 21:45 UTC
 * `settings.option.general.resumetabs.description`: Added for `en_US`
 * `settings.option.general.resumetabs.dynamic`: Added for `en_US`
 * `settings.option.general.resumetabs.dynamic.description`: Added for `en_US`
+* `term.dynamic`: Added for `en_US`
+
+Update 29/04/2022 00:00 UTC
+
+ * `menubar.options.about`: Added for `en_US`
+ * `menubar.options.settings`: Added for `en_US`
+ * `menubar.options.services`: Added for `en_US`
+ * `menubar.options.hide`: Added for `en_US`
+ * `menubar.options.hideothers`: Added for `en_US`
+ * `menubar.options.unhide`: Added for `en_US`
+ * `menubar.options.quit`: Added for `en_US`
+ * `menubar.options.view`: Added for `en_US`
+ * `menubar.options.reload`: Added for `en_US`
+ * `menubar.options.forcereload`: Added for `en_US`
+ * `menubar.options.toggledevtools`: Added for `en_US`
+ * `menubar.options.resetzoom`: Added for `en_US`
+ * `menubar.options.zoomin`: Added for `en_US`
+ * `menubar.options.zoomout`: Added for `en_US`
+ * `menubar.options.togglefullscreen`: Added for `en_US`
+ * `menubar.options.window`: Added for `en_US`
+ * `menubar.options.minimize`: Added for `en_US`
+ * `menubar.options.show`: Added for `en_US`
+ * `menubar.options.zoom`: Added for `en_US`
+ * `menubar.options.front`: Added for `en_US`
+ * `menubar.options.close`: Added for `en_US`
+ * `menubar.options.edit`: Added for `en_US`
+ * `menubar.options.update`: Added for `en_US`
+ * `menubar.options.redo`: Added for `en_US`
+ * `menubar.options.cut`: Added for `en_US`
+ * `menubar.options.copy`: Added for `en_US`
+ * `menubar.options.paste`: Added for `en_US`
+ * `menubar.options.toggleprivate`: Added for `en_US`
+ * `menubar.options.webremote`: Added for `en_US`
+ * `menubar.options.audio`: Added for `en_US`
+ * `menubar.options.plugins`: Added for `en_US`
+ * `menubar.options.control`: Added for `en_US`
+ * `menubar.options.next`: "Added for `en_US`
+ * `menubar.options.previous`: Added for `en_US`
+ * `menubar.options.volumeup`: Added for `en_US`
+ * `menubar.options.volumedown`: Added for `en_US`
+ * `menubar.options.browse`: Added for `en_US`
+ * `menubar.options.artists`: Added for `en_US`
+ * `menubar.options.search`: Added for `en_US`
+ * `menubar.options.albums`: Added for `en_US`
+ * `menubar.options.cast`: Added for `en_US`
+ * `menubar.options.account`: Added for `en_US`
+ * `menubar.options.accountsettings`: Added for `en_US`
+ * `menubar.options.signout`: Added for `en_US`
+ * `menubar.options.support`: Added for `en_US`
+ * `menubar.options.help`: Added for `en_US`
+ * `menubar.options.discord`: Added for `en_US`
+ * `menubar.options.gihu`: Added for `en_US`
+ * `menubar.options.report`: Added for `en_US`
+ * `menubar.options.bug`: Added for `en_US`
+ * `menubar.options.feature`: Added for `en_US`
+ * `menubar.options.trans`: Added for `en_US`
+ * `menubar.options.license`: Added for `en_US`
+ * `menubar.options.conf`: Added for `en_US` 
 
 
diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index f975a81e..89134fba 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -73,6 +73,7 @@
   "term.viewAs": "View As",
   "term.viewAs.coverArt": "Cover Art",
   "term.viewAs.list": "List",
+  "term.dynamic": "Dynamic",
   "term.size": "Size",
   "term.size.normal": "Normal",
   "term.size.compact": "Compact",
@@ -318,11 +319,6 @@
   "menubar.options.trans": "Translation Report/Request",
   "menubar.options.license": "View License",
   "menubar.options.conf": "Open Configuration File in Editor",
-
-
-
-
-
   "settings.header.general": "General",
   "settings.header.general.description": "Adjust the general settings for Cider.",
   "settings.option.general.language": "Language",
diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json
index 71d7a3d8..89134fba 100644
--- a/src/i18n/source/en_US.json
+++ b/src/i18n/source/en_US.json
@@ -264,6 +264,61 @@
   "action.cast.scanning": "Scanning...",
   "action.createNew": "Create New...",
   "action.openArtworkInBrowser": "Open artwork in browser",
+  "menubar.options.about": "About",
+  "menubar.options.settings": "Settings",
+  "menubar.options.services": "Services",
+  "menubar.options.hide": "Hide Cider",
+  "menubar.options.hideothers": "Hide Others",
+  "menubar.options.unhide": "Show All",
+  "menubar.options.quit": "Quit Cider",
+  "menubar.options.view": "View ",
+  "menubar.options.reload": "Reload",
+  "menubar.options.forcereload": "Force Reload",
+  "menubar.options.toggledevtools": "Toggle Developer Tools",
+  "menubar.options.resetzoom": "Reset Zoom",
+  "menubar.options.zoomin": "Zoom In",
+  "menubar.options.zoomout": "Zoom Out",
+  "menubar.options.togglefullscreen": "Toggle Fullscreen",
+  "menubar.options.window": "Window",
+  "menubar.options.minimize": "Minimize",
+  "menubar.options.show": "Show",
+  "menubar.options.zoom": "Zoom",
+  "menubar.options.front": "Front",
+  "menubar.options.close": "Close",
+  "menubar.options.edit": "Edit",
+  "menubar.options.update": "Undo",
+  "menubar.options.redo": "Redo",
+  "menubar.options.cut": "Cut",
+  "menubar.options.copy": "Copy",
+  "menubar.options.paste": "Paste",
+  "menubar.options.toggleprivate": "Toggle Private Session",
+  "menubar.options.webremote": "Web Remote",
+  "menubar.options.audio": "Audio Settings",
+  "menubar.options.plugins": "Plu-gins Menu",
+  "menubar.options.controls": "Controls",
+  "menubar.options.next": "Next",
+  "menubar.options.playpause": "Play/Pause",
+  "menubar.options.previous": "Previous",
+  "menubar.options.volumeup": "Volume Up",
+  "menubar.options.volumedown": "Volume Down",
+  "menubar.options.browse": "Browse",
+  "menubar.options.artists": "Artists",
+  "menubar.options.search": "Search",
+  "menubar.options.albums": "Albums",
+  "menubar.options.cast": "Cast To Devices",
+  "menubar.options.account": "Account",
+  "menubar.options.accountsettings": "Account Settings",
+  "menubar.options.signout": "Sign Out",
+  "menubar.options.support": "Support",
+  "menubar.options.help": "Help",
+  "menubar.options.discord": "Discord",
+  "menubar.options.github": "GitHub Wiki",
+  "menubar.options.report": "Report a...",
+  "menubar.options.bug": "Bug",
+  "menubar.options.feature": "Feature Request",
+  "menubar.options.trans": "Translation Report/Request",
+  "menubar.options.license": "View License",
+  "menubar.options.conf": "Open Configuration File in Editor",
   "settings.header.general": "General",
   "settings.header.general.description": "Adjust the general settings for Cider.",
   "settings.option.general.language": "Language",

From fb5ab7b6fd8066d7b8566da2a9b9239e594e5d83 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 30 Apr 2022 10:31:57 +0700
Subject: [PATCH 011/141] Update raop.ts

---
 src/main/plugins/raop.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/plugins/raop.ts b/src/main/plugins/raop.ts
index 165ada02..ce7127b3 100644
--- a/src/main/plugins/raop.ts
+++ b/src/main/plugins/raop.ts
@@ -147,12 +147,13 @@ export default class RAOP {
             browser.on('ready', browser.discover);
 
             browser.on('update', (service: any) => {
-                if (service.addresses && service.fullname && (service.fullname.includes('_raop._tcp') ||  service.fullname.includes('_airplay._tcp'))) {
+//                 if (service.addresses && service.fullname && (service.fullname.includes('_raop._tcp') ||  service.fullname.includes('_airplay._tcp'))) {
                     // console.log(service.txt)
                 this._win.webContents.executeJavaScript(`console.log(
                     "${service.name} ${service.host}:${service.port} ${service.addresses}"
                 )`);
-                this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt);}
+                this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt);
+//             }
             });
 
         });

From 223c5e7b3adeb8e44e91b24e85f316bcf0a8ad6c Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 30 Apr 2022 10:48:22 +0700
Subject: [PATCH 012/141] Update raop.ts

---
 src/main/plugins/raop.ts | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/plugins/raop.ts b/src/main/plugins/raop.ts
index ce7127b3..ae37f138 100644
--- a/src/main/plugins/raop.ts
+++ b/src/main/plugins/raop.ts
@@ -143,17 +143,30 @@ export default class RAOP {
             this.castDevices = [];
             console.log("scan for airplay devices");
             
-            const browser = this.mdns.createBrowser();
+            const browser = this.mdns.createBrowser(this.mdns.tcp('raop');
             browser.on('ready', browser.discover);
 
             browser.on('update', (service: any) => {
-//                 if (service.addresses && service.fullname && (service.fullname.includes('_raop._tcp') ||  service.fullname.includes('_airplay._tcp'))) {
+                 if (service.addresses && service.fullname && (service.fullname.includes('_raop._tcp') ||  service.fullname.includes('_airplay._tcp'))) {
                     // console.log(service.txt)
                 this._win.webContents.executeJavaScript(`console.log(
                     "${service.name} ${service.host}:${service.port} ${service.addresses}"
                 )`);
                 this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt);
-//             }
+             }
+            });
+            
+            const browser2 = this.mdns.createBrowser(this.mdns.tcp('airplay');
+            browser2.on('ready', browser.discover);
+
+            browser2.on('update', (service: any) => {
+                 if (service.addresses && service.fullname && (service.fullname.includes('_raop._tcp') ||  service.fullname.includes('_airplay._tcp'))) {
+                    // console.log(service.txt)
+                this._win.webContents.executeJavaScript(`console.log(
+                    "${service.name} ${service.host}:${service.port} ${service.addresses}"
+                )`);
+                this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt);
+             }
             });
 
         });

From 9bec345a500f6c55a9e0bb48acdbb69cf9a9002f Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 30 Apr 2022 10:52:01 +0700
Subject: [PATCH 013/141] Update raop.ts

---
 src/main/plugins/raop.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/plugins/raop.ts b/src/main/plugins/raop.ts
index ae37f138..59c4a09c 100644
--- a/src/main/plugins/raop.ts
+++ b/src/main/plugins/raop.ts
@@ -143,7 +143,7 @@ export default class RAOP {
             this.castDevices = [];
             console.log("scan for airplay devices");
             
-            const browser = this.mdns.createBrowser(this.mdns.tcp('raop');
+            const browser = this.mdns.createBrowser(this.mdns.tcp('raop'));
             browser.on('ready', browser.discover);
 
             browser.on('update', (service: any) => {
@@ -156,7 +156,7 @@ export default class RAOP {
              }
             });
             
-            const browser2 = this.mdns.createBrowser(this.mdns.tcp('airplay');
+            const browser2 = this.mdns.createBrowser(this.mdns.tcp('airplay'));
             browser2.on('ready', browser.discover);
 
             browser2.on('update', (service: any) => {

From 11f34ca4664c327f7a13a5df6448abc9a2d4f914 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 30 Apr 2022 10:54:24 +0700
Subject: [PATCH 014/141] Update raop.ts

---
 src/main/plugins/raop.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/plugins/raop.ts b/src/main/plugins/raop.ts
index 59c4a09c..cb18ab39 100644
--- a/src/main/plugins/raop.ts
+++ b/src/main/plugins/raop.ts
@@ -157,7 +157,7 @@ export default class RAOP {
             });
             
             const browser2 = this.mdns.createBrowser(this.mdns.tcp('airplay'));
-            browser2.on('ready', browser.discover);
+            browser2.on('ready', browser2.discover);
 
             browser2.on('update', (service: any) => {
                  if (service.addresses && service.fullname && (service.fullname.includes('_raop._tcp') ||  service.fullname.includes('_airplay._tcp'))) {

From 092a1931ace0b20f81df7a27153d35e6fb22fb71 Mon Sep 17 00:00:00 2001
From: Mefsaal <mefsaal@gmail.com>
Date: Sat, 30 Apr 2022 01:00:22 -0300
Subject: [PATCH 015/141] some bugfixes and updated es_ES json file to last
 string in cider

---
 src/i18n/README.md         |  2 +-
 src/i18n/en_US.json        |  2 +-
 src/i18n/es_ES.json        | 70 +++++++++++++++++++++++++++++++++++++-
 src/i18n/source/en_US.json |  2 +-
 4 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/src/i18n/README.md b/src/i18n/README.md
index 5531ab28..cec535da 100644
--- a/src/i18n/README.md
+++ b/src/i18n/README.md
@@ -323,7 +323,7 @@ Update 29/04/2022 00:00 UTC
  * `menubar.options.front`: Added for `en_US`
  * `menubar.options.close`: Added for `en_US`
  * `menubar.options.edit`: Added for `en_US`
- * `menubar.options.update`: Added for `en_US`
+ * `menubar.options.undo`: Added for `en_US`
  * `menubar.options.redo`: Added for `en_US`
  * `menubar.options.cut`: Added for `en_US`
  * `menubar.options.copy`: Added for `en_US`
diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index 89134fba..9dafaf53 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -286,7 +286,7 @@
   "menubar.options.front": "Front",
   "menubar.options.close": "Close",
   "menubar.options.edit": "Edit",
-  "menubar.options.update": "Undo",
+  "menubar.options.undo": "Undo",
   "menubar.options.redo": "Redo",
   "menubar.options.cut": "Cut",
   "menubar.options.copy": "Copy",
diff --git a/src/i18n/es_ES.json b/src/i18n/es_ES.json
index e10bab53..51701558 100644
--- a/src/i18n/es_ES.json
+++ b/src/i18n/es_ES.json
@@ -73,6 +73,7 @@
   "term.viewAs": "Ver como",
   "term.viewAs.coverArt": "Portada",
   "term.viewAs.list": "Lista",
+  "term.dynamic": "Dinámico",
   "term.size": "Tamaño",
   "term.size.normal": "Normal",
   "term.size.compact": "Compacto",
@@ -199,6 +200,9 @@
   "podcast.episodes": "Episodios",
   "podcast.playEpisode": "Reproducir Episodio",
   "podcast.website": "Sitio web de Podcasts",
+  "action.edit": "Editar",
+  "action.done": "Hecho",
+  "action.editTracklist": "Edit Tracklist",
   "action.addToLibrary": "Agregar a la Biblioteca",
   "action.addToLibrary.success": "Agregado a la Biblioteca",
   "action.addToLibrary.error": "Error al agregar a la Biblioteca",
@@ -260,6 +264,61 @@
   "action.cast.scanning": "Escaneando...",
   "action.createNew": "Crear Nuevo...",
   "action.openArtworkInBrowser": "Abrir Ilustración en el navegador",
+  "menubar.options.about": "Acerca de",
+  "menubar.options.settings": "Ajustes",
+  "menubar.options.services": "Servicios",
+  "menubar.options.hide": "Ocultar Cider",
+  "menubar.options.hideothers": "Ocultar Otros",
+  "menubar.options.unhide": "Mostrar Todos",
+  "menubar.options.quit": "Salir",
+  "menubar.options.view": "Ver",
+  "menubar.options.reload": "Recargar",
+  "menubar.options.forcereload": "Forzar Recarga",
+  "menubar.options.toggledevtools": "Herramientas de Desarrollo",
+  "menubar.options.resetzoom": "Restablecer Zoom",
+  "menubar.options.zoomin": "Acercar",
+  "menubar.options.zoomout": "Alejar",
+  "menubar.options.togglefullscreen": "Pantalla Completa",
+  "menubar.options.window": "Ventana",
+  "menubar.options.minimize": "Minimizar",
+  "menubar.options.show": "Mostrar",
+  "menubar.options.zoom": "Zoom",
+  "menubar.options.front": "Frente",
+  "menubar.options.close": "Cerrar",
+  "menubar.options.edit": "Editar",
+  "menubar.options.undo": "Deshacer",
+  "menubar.options.redo": "Rehacer",
+  "menubar.options.cut": "Cortar",
+  "menubar.options.copy": "Copiar",
+  "menubar.options.paste": "Pegar",
+  "menubar.options.toggleprivate": "Cambiar Sesión Privada",
+  "menubar.options.webremote": "Web Remoto",
+  "menubar.options.audio": "Configuraciones de Audio",
+  "menubar.options.plugins": "Menu de Plu-gins",
+  "menubar.options.controls": "Controles",
+  "menubar.options.next": "Siguiente",
+  "menubar.options.playpause": "Reproducir/Pausar",
+  "menubar.options.previous": "Anterior",
+  "menubar.options.volumeup": "Subir Volumen",
+  "menubar.options.volumedown": "Bajar Volumen",
+  "menubar.options.browse": "Explorar",
+  "menubar.options.artists": "Artistas",
+  "menubar.options.search": "Buscar",
+  "menubar.options.albums": "Álbumes",
+  "menubar.options.cast": "Transmitir a Dispositivos",
+  "menubar.options.account": "Cuenta",
+  "menubar.options.accountsettings": "Ajustes de Cuenta",
+  "menubar.options.signout": "Cerrar Sesión",
+  "menubar.options.support": "Soporte",
+  "menubar.options.help": "Ayuda",
+  "menubar.options.discord": "Discord",
+  "menubar.options.github": "GitHub Wiki",
+  "menubar.options.report": "Reportar a...",
+  "menubar.options.bug": "Bug",
+  "menubar.options.feature": "Solicitud de características",
+  "menubar.options.trans": "Solicitud de Informe/Traducción",
+  "menubar.options.license": "Ver licencia",
+  "menubar.options.conf": "Abrir archivo de configuración en el editor",
   "settings.header.general": "General",
   "settings.header.general.description": "Ajuste la configuración general de Cider.",
   "settings.option.general.language": "Idioma",
@@ -269,6 +328,10 @@
   "settings.option.general.resumebehavior.locally.description": "Cider reanudará su última sesión en esta PC.",
   "settings.option.general.resumebehavior.history": "Histórico",
   "settings.option.general.resumebehavior.history.description": "Cider pondrá en cola la última canción de su historial general de Apple Music, en todos sus dispositivos.",
+  "settings.option.general.resumetabs" : "Abrir pestaña al iniciar",
+  "settings.option.general.resumetabs.description" : "Puede elegir qué pestaña desea abrir cuando inicie Cider.",
+  "settings.option.general.resumetabs.dynamic" : "Dinámico",
+  "settings.option.general.resumetabs.dynamic.description" : "Cider abrirá la pestaña que utilizó por última vez.",
   "settings.option.general.language.main": "Idiomas",
   "settings.option.general.language.fun": "Idiomas Fun (Parodias)",
   "settings.option.general.language.unsorted": "Sin Clasificar",
@@ -280,6 +343,8 @@
   "settings.option.general.customizeSidebar": "Personalizar elementos de la barra lateral",
   "settings.option.general.customizeSidebar.customize": "Personalizar",
   "settings.option.general.keybindings": "Combinaciones de Teclas",
+  "settings.notyf.general.keybindings.update.success": "Combinación de teclas actualizada correctamente",
+  "settings.prompt.general.keybindings.update.success": "La combinación de teclas se actualizó correctamente. Pulsa OK para reiniciar Cider",
   "settings.option.general.keybindings.open": "Abrir",
   "settings.description.search": "Buscar",
   "settings.description.albums": "Álbumes de la biblioteca",
@@ -410,6 +475,7 @@
   "settings.option.lyrics.enableMusixmatchKaraoke": "Habilitar el modo Karaoke (solo Musixmatch)",
   "settings.option.lyrics.musixmatchPreferredLanguage": "Idioma preferido de traducción de Musixmatch",
   "settings.option.lyrics.enableYoutubeLyrics": "Habilitar letras de YouTube para videos musicales",
+  "settings.option.lyrics.enableQQLyrics": "Habilitar letras de QQ",
   "settings.header.connectivity": "Conectividad",
   "settings.header.connectivity.description": "Ajuste la configuración de conectividad para Cider.",
   "settings.option.connectivity.playbackNotifications": "Notificaciones de Reproducción",
@@ -442,7 +508,9 @@
   "settings.option.visual.transparent.description": "Marco transparente (necesita compatibilidad con temas, requiere reiniciar)",
   "settings.header.advanced": "Avanzado",
   "settings.header.connect": "Conectar",
-  "spatial.notTurnedOn": "La espacialización de audio está deshabilitada. Para usar, habilítelo primero.",
+  "settings.option.connect.link_account": "Habilitar sincronización con Cider Connect",
+  "settings.option.connect.link_account.description": "Vincular su cuenta de Discord con Cider Connect le permite almacenar datos de usuario que incluyen configuraciones, ecualizadores y eventualmente más, una vez que haya terminado. (Trabajo en progreso)",
+  "spatial.notTurnedOn": "La Espacialización de audio está deshabilitada. Para usar, habilítelo primero.",
   "spatial.spatialProperties": "Propiedades de Espacialización",
   "spatial.width": "Ancho",
   "spatial.height": "Alto",
diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json
index 89134fba..9dafaf53 100644
--- a/src/i18n/source/en_US.json
+++ b/src/i18n/source/en_US.json
@@ -286,7 +286,7 @@
   "menubar.options.front": "Front",
   "menubar.options.close": "Close",
   "menubar.options.edit": "Edit",
-  "menubar.options.update": "Undo",
+  "menubar.options.undo": "Undo",
   "menubar.options.redo": "Redo",
   "menubar.options.cut": "Cut",
   "menubar.options.copy": "Copy",

From 3aca5dc92bffb6429a79cb757a5cc57103ac51f1 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 30 Apr 2022 11:20:54 +0700
Subject: [PATCH 016/141] Update raop.ts

---
 src/main/plugins/raop.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/plugins/raop.ts b/src/main/plugins/raop.ts
index cb18ab39..a7de1854 100644
--- a/src/main/plugins/raop.ts
+++ b/src/main/plugins/raop.ts
@@ -168,7 +168,7 @@ export default class RAOP {
                 this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt);
              }
             });
-
+    
         });
 
 

From b0a8c18e438452a02a96b388ef589f4838268de6 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 14:58:15 +0100
Subject: [PATCH 017/141] fix

---
 .circleci/config.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 62dc1183..9d722d40 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,16 +1,15 @@
 version: 2.1
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
-branches:
-      only:
-        - main
-        - develop
 jobs:
   build:
     working_directory: ~/Cider
     docker:
       - image: circleci/node:16
-      
+    filters:
+      branches:
+        only:
+          - main
     steps:
       - checkout
       - run:

From 0261362f143bc0d39280378479aae11f63772336 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:06:52 +0100
Subject: [PATCH 018/141] Updated config.yml

---
 .circleci/config.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9d722d40..d999784d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,15 +1,13 @@
 version: 2.1
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
+branches:
+  only: main
 jobs:
   build:
     working_directory: ~/Cider
     docker:
       - image: circleci/node:16
-    filters:
-      branches:
-        only:
-          - main
     steps:
       - checkout
       - run:

From 8c7f2e459e4c61373f9a7fcb80da40c1aef9f0d9 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:19:03 +0100
Subject: [PATCH 019/141] Updated config.yml

---
 .circleci/config.yml | 61 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 53 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d999784d..baf974ad 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,10 +1,11 @@
 version: 2.1
+
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
-branches:
-  only: main
+
+# The jobs for this project
 jobs:
-  build:
+  prepare-build:
     working_directory: ~/Cider
     docker:
       - image: circleci/node:16
@@ -45,21 +46,45 @@ jobs:
       - run:
           name: TypeScript Compile
           command: yarn build
-      - run:
-          name: Generate Builds (Linux)
-          command: yarn electron-builder -l -p never
-          post-steps:
-            - jira/notify
+  
+  build-windows:
+    working_directory: ~/Cider
+    docker:
+      - image: circleci/node:16
+    steps:
       - run:
           name: Generate Builds (Windows)
           command: yarn electron-builder -w --x64 -p never
           post-steps:
             - jira/notify
+
+  build-linux:
+    working_directory: ~/Cider
+    docker:
+      - image: circleci/node:16
+    steps:
+      - run:
+          name: Generate Builds (Linux)
+          command: yarn electron-builder -l -p never
+          post-steps:
+            - jira/notify
+
+  build-winget:
+    working_directory: ~/Cider
+    docker:
+      - image: circleci/node:16
+    steps:
       - run:
           name: Generate Builds (Winget)
           command: yarn electron-builder --win -c winget.json -p never
           post-steps:
             - jira/notify
+
+  release:
+    working_directory: ~/Cider
+    docker:
+      - image: circleci/node:16
+    steps:
       - run:
           name: Move Build Files
           command: |
@@ -76,3 +101,23 @@ jobs:
           name: Publish Release
           command: |
               gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
+
+# Orchestrate our job run sequence
+workflows:
+  build_and_test:
+    jobs:
+      - prepare-build
+      - build-windows:
+          requires:
+            - prepare-build
+      - build-linux:
+          requires:
+            - prepare-build
+      - build-winget:
+          requires:
+            - prepare-build
+      - release:
+          requires:
+            - build-windows
+            - build-linux
+            - build-winget
\ No newline at end of file

From 1f5982f50da4254256dfd3c2651fa2557bd79fee Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:27:03 +0100
Subject: [PATCH 020/141] Updated config.yml

---
 .circleci/config.yml | 63 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 52 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index baf974ad..f6025161 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,10 +1,45 @@
 version: 2.1
 
+executors:
+  my-executor:
+    docker:
+      - image: circleci/node:16
+    working_directory: ~/Cider
+
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
 
 # The jobs for this project
 jobs:
+  flow:
+    executor: my-executor
+    steps:
+      - run: mkdir -p workspace
+      - run: echo "Hello, world!" > workspace/echo-output
+
+      # Persist the specified paths (workspace/echo-output) into the workspace for use in downstream job.
+      - persist_to_workspace:
+          # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
+          # taken to be the root directory of the workspace.
+          root: workspace
+          # Must be relative path from root
+          paths:
+            - echo-output
+
+  downstream:
+    executor: my-executor
+    steps:
+      - attach_workspace:
+          # Must be absolute path or relative path from working_directory
+          at: /tmp/workspace
+
+      - run: |
+          if [[ `cat /tmp/workspace/echo-output` == "Hello, world!" ]]; then
+            echo "It worked!";
+          else
+            echo "Nope!"; exit 1
+          fi
+
   prepare-build:
     working_directory: ~/Cider
     docker:
@@ -46,7 +81,7 @@ jobs:
       - run:
           name: TypeScript Compile
           command: yarn build
-  
+
   build-windows:
     working_directory: ~/Cider
     docker:
@@ -88,22 +123,28 @@ jobs:
       - run:
           name: Move Build Files
           command: |
-              mkdir ~/Cider/dist/artifacts/
-              mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
+            mkdir ~/Cider/dist/artifacts/
+            mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
       - store_artifacts:
-          path: ~/Cider/dist/artifacts 
+          path: ~/Cider/dist/artifacts
       - run:
           name: Publish Release
           command: |
-              gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
+            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
 
 # Orchestrate our job run sequence
 workflows:
+  btd:
+    jobs:
+      - flow
+      - downstream:
+          requires:
+            - flow
   build_and_test:
     jobs:
       - prepare-build
@@ -120,4 +161,4 @@ workflows:
           requires:
             - build-windows
             - build-linux
-            - build-winget
\ No newline at end of file
+            - build-winget

From 18cd463579db8c763e221477b882158389a4132a Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:34:07 +0100
Subject: [PATCH 021/141] Updated config.yml

---
 .circleci/config.yml | 96 ++++++++++++++++----------------------------
 1 file changed, 34 insertions(+), 62 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f6025161..d18124bc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,50 +1,20 @@
 version: 2.1
 
 executors:
-  my-executor:
+  cider-ci:
     docker:
       - image: circleci/node:16
-    working_directory: ~/Cider
+    working_directory: /tmp/cider
 
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
 
 # The jobs for this project
 jobs:
-  flow:
-    executor: my-executor
-    steps:
-      - run: mkdir -p workspace
-      - run: echo "Hello, world!" > workspace/echo-output
-
-      # Persist the specified paths (workspace/echo-output) into the workspace for use in downstream job.
-      - persist_to_workspace:
-          # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
-          # taken to be the root directory of the workspace.
-          root: workspace
-          # Must be relative path from root
-          paths:
-            - echo-output
-
-  downstream:
-    executor: my-executor
-    steps:
-      - attach_workspace:
-          # Must be absolute path or relative path from working_directory
-          at: /tmp/workspace
-
-      - run: |
-          if [[ `cat /tmp/workspace/echo-output` == "Hello, world!" ]]; then
-            echo "It worked!";
-          else
-            echo "Nope!"; exit 1
-          fi
-
   prepare-build:
-    working_directory: ~/Cider
-    docker:
-      - image: circleci/node:16
+    executor: cider-ci
     steps:
+      - run: mkdir -p Cider
       - checkout
       - run:
           name: Set App Version
@@ -81,12 +51,20 @@ jobs:
       - run:
           name: TypeScript Compile
           command: yarn build
+      # Persist the specified paths (workspace/echo-output) into the workspace for use in downstream job.
+      - persist_to_workspace:
+          # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
+          # taken to be the root directory of the workspace.
+          root: workspace
+          # Must be relative path from root
+          paths:
+            - echo-output
 
   build-windows:
-    working_directory: ~/Cider
-    docker:
-      - image: circleci/node:16
+    executor: cider-ci
     steps:
+      - attach_workspace:
+          at: /tmp/cider
       - run:
           name: Generate Builds (Windows)
           command: yarn electron-builder -w --x64 -p never
@@ -94,10 +72,10 @@ jobs:
             - jira/notify
 
   build-linux:
-    working_directory: ~/Cider
-    docker:
-      - image: circleci/node:16
+    executor: cider-ci
     steps:
+      - attach_workspace:
+          at: /tmp/cider
       - run:
           name: Generate Builds (Linux)
           command: yarn electron-builder -l -p never
@@ -105,10 +83,10 @@ jobs:
             - jira/notify
 
   build-winget:
-    working_directory: ~/Cider
-    docker:
-      - image: circleci/node:16
+    executor: cider-ci
     steps:
+      - attach_workspace:
+          at: /tmp/cider
       - run:
           name: Generate Builds (Winget)
           command: yarn electron-builder --win -c winget.json -p never
@@ -116,36 +94,30 @@ jobs:
             - jira/notify
 
   release:
-    working_directory: ~/Cider
-    docker:
-      - image: circleci/node:16
+    executor: cider-ci
     steps:
+      - attach_workspace:
+          at: /tmp/cider
       - run:
           name: Move Build Files
           command: |
-            mkdir ~/Cider/dist/artifacts/
-            mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
+            mkdir /tmp/cider/dist/artifacts/
+            mv /tmp/cider/dist/*.exe /tmp/cider/dist/artifacts
+            mv /tmp/cider/dist/*.deb /tmp/cider/dist/artifacts
+            mv /tmp/cider/dist/*.AppImage /tmp/cider/dist/artifacts
+            mv /tmp/cider/dist/*.snap /tmp/cider/dist/artifacts
+            mv /tmp/cider/dist/*.yml /tmp/cider/dist/artifacts
+            mv /tmp/cider/dist/*.blockmap /tmp/cider/dist/artifacts
       - store_artifacts:
-          path: ~/Cider/dist/artifacts
+          path: /tmp/cider/dist/artifacts
       - run:
           name: Publish Release
           command: |
-            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
+            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases /tmp/cider/dist/artifacts/*.deb /tmp/cider/dist/artifacts/*.AppImage /tmp/cider/dist/artifacts/*.snap /tmp/cider/dist/artifacts/*.exe /tmp/cider/dist/artifacts/*.yml /tmp/cider/dist/artifacts/*.blockmap
 
 # Orchestrate our job run sequence
 workflows:
-  btd:
-    jobs:
-      - flow
-      - downstream:
-          requires:
-            - flow
-  build_and_test:
+  build_and_release:
     jobs:
       - prepare-build
       - build-windows:

From 29d06d109ce1ad64f3586620d3cec8cdd462f5c4 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:36:28 +0100
Subject: [PATCH 022/141] Updated config.yml

---
 .circleci/config.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d18124bc..592d62b2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ executors:
   cider-ci:
     docker:
       - image: circleci/node:16
-    working_directory: /tmp/cider
+    working_directory: ~/Cider
 
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
@@ -14,8 +14,8 @@ jobs:
   prepare-build:
     executor: cider-ci
     steps:
-      - run: mkdir -p Cider
       - checkout
+      - run: mkdir -p Cider
       - run:
           name: Set App Version
           command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
@@ -64,7 +64,7 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: /tmp/cider
+          at: ~/Cider
       - run:
           name: Generate Builds (Windows)
           command: yarn electron-builder -w --x64 -p never
@@ -75,7 +75,7 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: /tmp/cider
+          at: ~/Cider
       - run:
           name: Generate Builds (Linux)
           command: yarn electron-builder -l -p never
@@ -86,7 +86,7 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: /tmp/cider
+          at: ~/Cider
       - run:
           name: Generate Builds (Winget)
           command: yarn electron-builder --win -c winget.json -p never
@@ -97,23 +97,23 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: /tmp/cider
+          at: ~/Cider
       - run:
           name: Move Build Files
           command: |
-            mkdir /tmp/cider/dist/artifacts/
-            mv /tmp/cider/dist/*.exe /tmp/cider/dist/artifacts
-            mv /tmp/cider/dist/*.deb /tmp/cider/dist/artifacts
-            mv /tmp/cider/dist/*.AppImage /tmp/cider/dist/artifacts
-            mv /tmp/cider/dist/*.snap /tmp/cider/dist/artifacts
-            mv /tmp/cider/dist/*.yml /tmp/cider/dist/artifacts
-            mv /tmp/cider/dist/*.blockmap /tmp/cider/dist/artifacts
+            mkdir ~/Cider/dist/artifacts/
+            mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
       - store_artifacts:
-          path: /tmp/cider/dist/artifacts
+          path: ~/Cider/dist/artifacts
       - run:
           name: Publish Release
           command: |
-            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases /tmp/cider/dist/artifacts/*.deb /tmp/cider/dist/artifacts/*.AppImage /tmp/cider/dist/artifacts/*.snap /tmp/cider/dist/artifacts/*.exe /tmp/cider/dist/artifacts/*.yml /tmp/cider/dist/artifacts/*.blockmap
+            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
 
 # Orchestrate our job run sequence
 workflows:

From 489ebbc31d1d042b1e6b2a0dc20a3757a583c1fb Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:39:12 +0100
Subject: [PATCH 023/141] Updated config.yml

---
 .circleci/config.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 592d62b2..a6fb377c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,7 +15,6 @@ jobs:
     executor: cider-ci
     steps:
       - checkout
-      - run: mkdir -p Cider
       - run:
           name: Set App Version
           command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
@@ -55,10 +54,10 @@ jobs:
       - persist_to_workspace:
           # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
           # taken to be the root directory of the workspace.
-          root: workspace
+          root: .
           # Must be relative path from root
           paths:
-            - echo-output
+            - Cider
 
   build-windows:
     executor: cider-ci

From 79e6907b9bf82a71093e366a286ef782bf59ab3f Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:42:52 +0100
Subject: [PATCH 024/141] Updated config.yml

---
 .circleci/config.yml | 103 ++++++++++++++++++++++---------------------
 1 file changed, 52 insertions(+), 51 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a6fb377c..7e864198 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ executors:
   cider-ci:
     docker:
       - image: circleci/node:16
-    working_directory: ~/Cider
+    working_directory: /tmp
 
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
@@ -14,47 +14,48 @@ jobs:
   prepare-build:
     executor: cider-ci
     steps:
-      - checkout
-      - run:
-          name: Set App Version
-          command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
-      - run:
-          name: Update Package Managers
-          command: sudo npm update -g npm yarn
-      - restore_cache:
-          name: Restore Yarn Package Cache
-          keys:
-            - yarn-packages-{{ checksum "cider.lock" }}
-      - run:
-          name: Install Dependencies
-          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
-      - save_cache:
-          name: Save Yarn Package Cache
-          key: yarn-packages-{{ checksum "cider.lock" }}
-          paths:
-            - ~/.cache/yarn
-      - run:
-          name: Install system build dependencies
-          command: |
-            sudo apt-get update -y
-            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-            sudo apt-get install -y dpkg fakeroot wine64
-            sudo dpkg --add-architecture i386
-            sudo apt-get update -y
-            sudo apt-get install -y wine32
-            sudo apt install -y gh
-      - run:
-          name: Fix Versioning and Add Channel
-          command: yarn circle:script
-      - run:
-          name: TypeScript Compile
-          command: yarn build
+      - run: ls -la
+      # - checkout
+      # - run:
+      #     name: Set App Version
+      #     command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
+      # - run:
+      #     name: Update Package Managers
+      #     command: sudo npm update -g npm yarn
+      # - restore_cache:
+      #     name: Restore Yarn Package Cache
+      #     keys:
+      #       - yarn-packages-{{ checksum "cider.lock" }}
+      # - run:
+      #     name: Install Dependencies
+      #     command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+      # - save_cache:
+      #     name: Save Yarn Package Cache
+      #     key: yarn-packages-{{ checksum "cider.lock" }}
+      #     paths:
+      #       - ~/.cache/yarn
+      # - run:
+      #     name: Install system build dependencies
+      #     command: |
+      #       sudo apt-get update -y
+      #       curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+      #       echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+      #       sudo apt-get install -y dpkg fakeroot wine64
+      #       sudo dpkg --add-architecture i386
+      #       sudo apt-get update -y
+      #       sudo apt-get install -y wine32
+      #       sudo apt install -y gh
+      # - run:
+      #     name: Fix Versioning and Add Channel
+      #     command: yarn circle:script
+      # - run:
+      #     name: TypeScript Compile
+      #     command: yarn build
       # Persist the specified paths (workspace/echo-output) into the workspace for use in downstream job.
       - persist_to_workspace:
           # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
           # taken to be the root directory of the workspace.
-          root: .
+          root: /tmp
           # Must be relative path from root
           paths:
             - Cider
@@ -63,7 +64,7 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: ~/Cider
+          at: /tmp/Cider
       - run:
           name: Generate Builds (Windows)
           command: yarn electron-builder -w --x64 -p never
@@ -74,7 +75,7 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: ~/Cider
+          at: /tmp/Cider
       - run:
           name: Generate Builds (Linux)
           command: yarn electron-builder -l -p never
@@ -85,7 +86,7 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: ~/Cider
+          at: /tmp/Cider
       - run:
           name: Generate Builds (Winget)
           command: yarn electron-builder --win -c winget.json -p never
@@ -96,23 +97,23 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: ~/Cider
+          at: /tmp/Cider
       - run:
           name: Move Build Files
           command: |
-            mkdir ~/Cider/dist/artifacts/
-            mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
+            mkdir /tmp/Cider/dist/artifacts/
+            mv /tmp/Cider/dist/*.exe /tmp/Cider/dist/artifacts
+            mv /tmp/Cider/dist/*.deb /tmp/Cider/dist/artifacts
+            mv /tmp/Cider/dist/*.AppImage /tmp/Cider/dist/artifacts
+            mv /tmp/Cider/dist/*.snap /tmp/Cider/dist/artifacts
+            mv /tmp/Cider/dist/*.yml /tmp/Cider/dist/artifacts
+            mv /tmp/Cider/dist/*.blockmap /tmp/Cider/dist/artifacts
       - store_artifacts:
-          path: ~/Cider/dist/artifacts
+          path: /tmp/Cider/dist/artifacts
       - run:
           name: Publish Release
           command: |
-            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
+            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases /tmp/Cider/dist/artifacts/*.deb /tmp/Cider/dist/artifacts/*.AppImage /tmp/Cider/dist/artifacts/*.snap /tmp/Cider/dist/artifacts/*.exe /tmp/Cider/dist/artifacts/*.yml /tmp/Cider/dist/artifacts/*.blockmap
 
 # Orchestrate our job run sequence
 workflows:

From ca5ca9e729f936eac2c2cc1bcf4238a830efa965 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:45:13 +0100
Subject: [PATCH 025/141] Updated config.yml

---
 .circleci/config.yml | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7e864198..4fdf8d99 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ executors:
   cider-ci:
     docker:
       - image: circleci/node:16
-    working_directory: /tmp
+    working_directory: ~/Cider
 
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
@@ -55,16 +55,18 @@ jobs:
       - persist_to_workspace:
           # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
           # taken to be the root directory of the workspace.
-          root: /tmp
+          root: .
           # Must be relative path from root
           paths:
-            - Cider
+            - node_modules
+            - build
+            - yarn.lock
 
   build-windows:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: /tmp/Cider
+          at: ~/Cider
       - run:
           name: Generate Builds (Windows)
           command: yarn electron-builder -w --x64 -p never
@@ -75,7 +77,7 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: /tmp/Cider
+          at: ~/Cider
       - run:
           name: Generate Builds (Linux)
           command: yarn electron-builder -l -p never
@@ -86,7 +88,7 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: /tmp/Cider
+          at: ~/Cider
       - run:
           name: Generate Builds (Winget)
           command: yarn electron-builder --win -c winget.json -p never
@@ -97,23 +99,23 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: /tmp/Cider
+          at: ~/Cider
       - run:
           name: Move Build Files
           command: |
-            mkdir /tmp/Cider/dist/artifacts/
-            mv /tmp/Cider/dist/*.exe /tmp/Cider/dist/artifacts
-            mv /tmp/Cider/dist/*.deb /tmp/Cider/dist/artifacts
-            mv /tmp/Cider/dist/*.AppImage /tmp/Cider/dist/artifacts
-            mv /tmp/Cider/dist/*.snap /tmp/Cider/dist/artifacts
-            mv /tmp/Cider/dist/*.yml /tmp/Cider/dist/artifacts
-            mv /tmp/Cider/dist/*.blockmap /tmp/Cider/dist/artifacts
+            mkdir ~/Cider/dist/artifacts/
+            mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
       - store_artifacts:
-          path: /tmp/Cider/dist/artifacts
+          path: ~/Cider/dist/artifacts
       - run:
           name: Publish Release
           command: |
-            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases /tmp/Cider/dist/artifacts/*.deb /tmp/Cider/dist/artifacts/*.AppImage /tmp/Cider/dist/artifacts/*.snap /tmp/Cider/dist/artifacts/*.exe /tmp/Cider/dist/artifacts/*.yml /tmp/Cider/dist/artifacts/*.blockmap
+            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
 
 # Orchestrate our job run sequence
 workflows:

From 6be02711a0784d76c6ade88f8c1811f29678e56c Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:45:55 +0200
Subject: [PATCH 026/141] kinda works

---
 .../views/components/mediaitem-list-item.ejs  | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index 6f137150..22a26f36 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -67,7 +67,7 @@
             </div>
             <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"></div>
             <template v-if="showMetaData == true" @dblclick="route()">
-                <div class="metainfo" style="min-width: 70px;" v-if="getHeartStatus()">
+                <div class="metainfo" style="min-width: 70px;" v-if="isLoved">
                     <div class="svg-icon" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}"></div>
                 </div>
                 <div class="metainfo">
@@ -101,7 +101,8 @@
                 displayDuration: true,
                 addClasses: {},
                 itemId: 0,
-                isLibrary: false
+                isLibrary: false,
+                isLoved: null
             }
         },
         props: {
@@ -124,6 +125,9 @@
             } else {
                 this.itemId = this.item.id;
             }
+            if (this.item.attributes.playParams) {
+                this.getHeartStatus();
+            }
             let duration = this.item.attributes.durationInMillis ?? 0
             if (duration == 0 || !this.showDuration) {
                 this.displayDuration = false
@@ -504,14 +508,13 @@
             },
             async getHeartStatus() {
                 try {
-                    let rating = await app.getRating(this.item)
-                    if (rating == 1) {
-                        console.log(this.item.attributes.name + " checked for heart status! Response: true")
-                        return true;
-                    } else {
-                        console.log(this.item.attributes.name + " checked for heart status! Response: false")
-                        return false;
-                    } 
+                    await app.getRating(this.item).then(res => {
+                        if (res == 1) {
+                            this.isLoved = true
+                        } else {
+                            this.isLoved = false
+                        }
+                    })
                 } catch (err) {
                     console.log(err)
                 }

From a486de3fdc1ac4ca8b3b9fb75dbad1a0ecb44a69 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:46:34 +0100
Subject: [PATCH 027/141] Updated config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4fdf8d99..6cc5bcc2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,8 +14,8 @@ jobs:
   prepare-build:
     executor: cider-ci
     steps:
+      - checkout
       - run: ls -la
-      # - checkout
       # - run:
       #     name: Set App Version
       #     command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV

From a55dbc716e1cbb92e78abd7e131767ca21cdf479 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:47:43 +0100
Subject: [PATCH 028/141] Updated config.yml

---
 .circleci/config.yml | 70 ++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6cc5bcc2..92de906e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,41 +16,41 @@ jobs:
     steps:
       - checkout
       - run: ls -la
-      # - run:
-      #     name: Set App Version
-      #     command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
-      # - run:
-      #     name: Update Package Managers
-      #     command: sudo npm update -g npm yarn
-      # - restore_cache:
-      #     name: Restore Yarn Package Cache
-      #     keys:
-      #       - yarn-packages-{{ checksum "cider.lock" }}
-      # - run:
-      #     name: Install Dependencies
-      #     command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
-      # - save_cache:
-      #     name: Save Yarn Package Cache
-      #     key: yarn-packages-{{ checksum "cider.lock" }}
-      #     paths:
-      #       - ~/.cache/yarn
-      # - run:
-      #     name: Install system build dependencies
-      #     command: |
-      #       sudo apt-get update -y
-      #       curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-      #       echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-      #       sudo apt-get install -y dpkg fakeroot wine64
-      #       sudo dpkg --add-architecture i386
-      #       sudo apt-get update -y
-      #       sudo apt-get install -y wine32
-      #       sudo apt install -y gh
-      # - run:
-      #     name: Fix Versioning and Add Channel
-      #     command: yarn circle:script
-      # - run:
-      #     name: TypeScript Compile
-      #     command: yarn build
+      - run:
+          name: Set App Version
+          command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
+      - run:
+          name: Update Package Managers
+          command: sudo npm update -g npm yarn
+      - restore_cache:
+          name: Restore Yarn Package Cache
+          keys:
+            - yarn-packages-{{ checksum "cider.lock" }}
+      - run:
+          name: Install Dependencies
+          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+      - save_cache:
+          name: Save Yarn Package Cache
+          key: yarn-packages-{{ checksum "cider.lock" }}
+          paths:
+            - ~/.cache/yarn
+      - run:
+          name: Install system build dependencies
+          command: |
+            sudo apt-get update -y
+            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+            sudo apt-get install -y dpkg fakeroot wine64
+            sudo dpkg --add-architecture i386
+            sudo apt-get update -y
+            sudo apt-get install -y wine32
+            sudo apt install -y gh
+      - run:
+          name: Fix Versioning and Add Channel
+          command: yarn circle:script
+      - run:
+          name: TypeScript Compile
+          command: yarn build
       # Persist the specified paths (workspace/echo-output) into the workspace for use in downstream job.
       - persist_to_workspace:
           # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is

From a85a15eaf3d238b3283fcd9747c928483a631f6a Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:50:49 +0100
Subject: [PATCH 029/141] Updated config.yml

---
 .circleci/config.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 92de906e..81b54690 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -65,6 +65,7 @@ jobs:
   build-windows:
     executor: cider-ci
     steps:
+      - checkout
       - attach_workspace:
           at: ~/Cider
       - run:
@@ -76,6 +77,7 @@ jobs:
   build-linux:
     executor: cider-ci
     steps:
+      - checkout
       - attach_workspace:
           at: ~/Cider
       - run:
@@ -87,6 +89,7 @@ jobs:
   build-winget:
     executor: cider-ci
     steps:
+      - checkout
       - attach_workspace:
           at: ~/Cider
       - run:
@@ -98,6 +101,7 @@ jobs:
   release:
     executor: cider-ci
     steps:
+      - checkout
       - attach_workspace:
           at: ~/Cider
       - run:

From 6e693339325c36eaf8731a8b8d67f46cafc28a2c Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:56:09 +0100
Subject: [PATCH 030/141] Updated config.yml

---
 .circleci/config.yml | 69 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 54 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 81b54690..3447903e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,24 +34,9 @@ jobs:
           key: yarn-packages-{{ checksum "cider.lock" }}
           paths:
             - ~/.cache/yarn
-      - run:
-          name: Install system build dependencies
-          command: |
-            sudo apt-get update -y
-            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-            sudo apt-get install -y dpkg fakeroot wine64
-            sudo dpkg --add-architecture i386
-            sudo apt-get update -y
-            sudo apt-get install -y wine32
-            sudo apt install -y gh
-      - run:
-          name: Fix Versioning and Add Channel
-          command: yarn circle:script
       - run:
           name: TypeScript Compile
           command: yarn build
-      # Persist the specified paths (workspace/echo-output) into the workspace for use in downstream job.
       - persist_to_workspace:
           # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
           # taken to be the root directory of the workspace.
@@ -68,11 +53,29 @@ jobs:
       - checkout
       - attach_workspace:
           at: ~/Cider
+      - run:
+          name: Install system build dependencies
+          command: |
+            sudo apt-get update -y
+            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+            sudo apt-get install -y dpkg fakeroot wine64
+            sudo dpkg --add-architecture i386
+            sudo apt-get update -y
+            sudo apt-get install -y wine32
+            sudo apt install -y gh
+      - run:
+          name: Fix Versioning and Add Channel
+          command: yarn circle:script
       - run:
           name: Generate Builds (Windows)
           command: yarn electron-builder -w --x64 -p never
           post-steps:
             - jira/notify
+      - persist_to_workspace:
+          root: .
+          paths:
+            - dist
 
   build-linux:
     executor: cider-ci
@@ -80,11 +83,29 @@ jobs:
       - checkout
       - attach_workspace:
           at: ~/Cider
+      - run:
+          name: Install system build dependencies
+          command: |
+            sudo apt-get update -y
+            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+            sudo apt-get install -y dpkg fakeroot wine64
+            sudo dpkg --add-architecture i386
+            sudo apt-get update -y
+            sudo apt-get install -y wine32
+            sudo apt install -y gh
+      - run:
+          name: Fix Versioning and Add Channel
+          command: yarn circle:script
       - run:
           name: Generate Builds (Linux)
           command: yarn electron-builder -l -p never
           post-steps:
             - jira/notify
+      - persist_to_workspace:
+          root: .
+          paths:
+            - dist
 
   build-winget:
     executor: cider-ci
@@ -92,11 +113,29 @@ jobs:
       - checkout
       - attach_workspace:
           at: ~/Cider
+      - run:
+          name: Install system build dependencies
+          command: |
+            sudo apt-get update -y
+            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+            sudo apt-get install -y dpkg fakeroot wine64
+            sudo dpkg --add-architecture i386
+            sudo apt-get update -y
+            sudo apt-get install -y wine32
+            sudo apt install -y gh
+      - run:
+          name: Fix Versioning and Add Channel
+          command: yarn circle:script
       - run:
           name: Generate Builds (Winget)
           command: yarn electron-builder --win -c winget.json -p never
           post-steps:
             - jira/notify
+      - persist_to_workspace:
+          root: .
+          paths:
+            - dist
 
   release:
     executor: cider-ci

From 5158205f28b9a8b6e39c8690847d09f87fa53b9f Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:04:24 +0100
Subject: [PATCH 031/141] Updated config.yml

---
 .circleci/config.yml | 44 +++++++++++++++-----------------------------
 1 file changed, 15 insertions(+), 29 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3447903e..fbbb5e95 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -54,16 +54,10 @@ jobs:
       - attach_workspace:
           at: ~/Cider
       - run:
-          name: Install system build dependencies
+          name: Install Windows System Build Dependencies
           command: |
-            sudo apt-get update -y
-            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-            sudo apt-get install -y dpkg fakeroot wine64
-            sudo dpkg --add-architecture i386
             sudo apt-get update -y
             sudo apt-get install -y wine32
-            sudo apt install -y gh
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script
@@ -75,7 +69,7 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
-            - dist
+            - dist/*.exe
 
   build-linux:
     executor: cider-ci
@@ -83,17 +77,6 @@ jobs:
       - checkout
       - attach_workspace:
           at: ~/Cider
-      - run:
-          name: Install system build dependencies
-          command: |
-            sudo apt-get update -y
-            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-            sudo apt-get install -y dpkg fakeroot wine64
-            sudo dpkg --add-architecture i386
-            sudo apt-get update -y
-            sudo apt-get install -y wine32
-            sudo apt install -y gh
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script
@@ -105,7 +88,9 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
-            - dist
+            - dist/*.deb
+            - dist/*.appimage
+            - dist/*.snap
 
   build-winget:
     executor: cider-ci
@@ -114,16 +99,10 @@ jobs:
       - attach_workspace:
           at: ~/Cider
       - run:
-          name: Install system build dependencies
+          name: Install Windows System Build Dependencies
           command: |
-            sudo apt-get update -y
-            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-            sudo apt-get install -y dpkg fakeroot wine64
-            sudo dpkg --add-architecture i386
             sudo apt-get update -y
             sudo apt-get install -y wine32
-            sudo apt install -y gh
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script
@@ -135,14 +114,21 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
-            - dist
+            - dist/*.exe
 
   release:
     executor: cider-ci
     steps:
       - checkout
       - attach_workspace:
-          at: ~/Cider
+          at: ~/Cider/dist
+      - run:
+          name: Installing GitHub Command Line Interface
+          command: |
+            sudo apt-get update -y
+            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+            sudo apt install -y gh
       - run:
           name: Move Build Files
           command: |

From 19d6d06a8d01c419dbcfbae204693d2013b3f111 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:07:56 +0100
Subject: [PATCH 032/141] Updated config.yml

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fbbb5e95..44e956ce 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -57,7 +57,7 @@ jobs:
           name: Install Windows System Build Dependencies
           command: |
             sudo apt-get update -y
-            sudo apt-get install -y wine32
+            sudo apt-get install -y wine
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script
@@ -102,7 +102,7 @@ jobs:
           name: Install Windows System Build Dependencies
           command: |
             sudo apt-get update -y
-            sudo apt-get install -y wine32
+            sudo apt-get install -y wine
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script

From b02214173c39017abf538cead786e8b1da260429 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:17:07 +0100
Subject: [PATCH 033/141] Updated config.yml

---
 .circleci/config.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 44e956ce..de602401 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -102,7 +102,10 @@ jobs:
           name: Install Windows System Build Dependencies
           command: |
             sudo apt-get update -y
-            sudo apt-get install -y wine
+            sudo apt-get install -y dpkg fakeroot wine64
+            sudo dpkg --add-architecture i386
+            sudo apt-get update -y
+            sudo apt-get install -y wine32
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script

From 5c76eb97bc7a988a319ca4c80fd78b7fe24d9049 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:22:51 +0100
Subject: [PATCH 034/141] Updated config.yml

---
 .circleci/config.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index de602401..70d6f4a1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -46,18 +46,22 @@ jobs:
             - node_modules
             - build
             - yarn.lock
+            - package.json
+            - winget.json # winget.json is a file that is generated by the winget package manager
 
   build-windows:
     executor: cider-ci
     steps:
-      - checkout
       - attach_workspace:
           at: ~/Cider
       - run:
           name: Install Windows System Build Dependencies
           command: |
             sudo apt-get update -y
-            sudo apt-get install -y wine
+            sudo apt-get install -y dpkg fakeroot wine64
+            sudo dpkg --add-architecture i386
+            sudo apt-get update -y
+            sudo apt-get install -y wine32
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script
@@ -74,7 +78,6 @@ jobs:
   build-linux:
     executor: cider-ci
     steps:
-      - checkout
       - attach_workspace:
           at: ~/Cider
       - run:
@@ -95,7 +98,6 @@ jobs:
   build-winget:
     executor: cider-ci
     steps:
-      - checkout
       - attach_workspace:
           at: ~/Cider
       - run:
@@ -122,7 +124,6 @@ jobs:
   release:
     executor: cider-ci
     steps:
-      - checkout
       - attach_workspace:
           at: ~/Cider/dist
       - run:

From bcf91c561f85b7a9f66bb59fb363f0fe72ea6bf5 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:30:23 +0100
Subject: [PATCH 035/141] Updated config.yml

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 70d6f4a1..b910579b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -48,6 +48,7 @@ jobs:
             - yarn.lock
             - package.json
             - winget.json # winget.json is a file that is generated by the winget package manager
+            - resources/circle.js
 
   build-windows:
     executor: cider-ci

From 5fe0b80664c84eef785071d861e043a5a55034b7 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:33:18 +0100
Subject: [PATCH 036/141] Updated config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b910579b..50b6c112 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -45,10 +45,10 @@ jobs:
           paths:
             - node_modules
             - build
+            - resources
             - yarn.lock
             - package.json
             - winget.json # winget.json is a file that is generated by the winget package manager
-            - resources/circle.js
 
   build-windows:
     executor: cider-ci

From 1dbced62176cc9aee019691ae3006929a0e0ca23 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:37:33 +0100
Subject: [PATCH 037/141] Updated config.yml

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 50b6c112..1dfd6f8f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -49,6 +49,8 @@ jobs:
             - yarn.lock
             - package.json
             - winget.json # winget.json is a file that is generated by the winget package manager
+            - LICENSE
+            - license.txt
 
   build-windows:
     executor: cider-ci

From aa1ecd44505f7ce555222f475ff4d7f6d3234350 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:42:49 +0100
Subject: [PATCH 038/141] Updated config.yml

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1dfd6f8f..41dd98e5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -135,6 +135,7 @@ jobs:
             sudo apt-get update -y
             curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
             echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+            sudo apt-get update -y
             sudo apt install -y gh
       - run:
           name: Move Build Files

From 49f402d0ff1193c4019fedf0791a338194ddd741 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:48:32 +0100
Subject: [PATCH 039/141] Updated config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 41dd98e5..005bf25e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -128,7 +128,7 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: ~/Cider/dist
+          at: ~/Cider/
       - run:
           name: Installing GitHub Command Line Interface
           command: |

From decf313094920e2a2ff0ffa29f38666d3862582b Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:54:05 +0100
Subject: [PATCH 040/141] Updated config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 005bf25e..26492b1f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -95,7 +95,7 @@ jobs:
           root: .
           paths:
             - dist/*.deb
-            - dist/*.appimage
+            - dist/*.AppImage
             - dist/*.snap
 
   build-winget:

From 7335e71b40877eefd9be89b1ec432e043428e9bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=A5=E5=8F=A1?=
 <46503943+jay900604@users.noreply.github.com>
Date: Sat, 30 Apr 2022 23:55:09 +0800
Subject: [PATCH 041/141] Update zh_TW.json

Update TW language.
---
 src/i18n/zh_TW.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/i18n/zh_TW.json b/src/i18n/zh_TW.json
index 8c5083cc..ace4cc50 100644
--- a/src/i18n/zh_TW.json
+++ b/src/i18n/zh_TW.json
@@ -215,6 +215,10 @@
   "settings.option.general.resumebehavior.locally.description": "Cider 將還原你在這台電腦上的最後一次操作。",
   "settings.option.general.resumebehavior.history": "歷史",
   "settings.option.general.resumebehavior.history.description": "Cider 將跨裝置將你的整個 Apple Music 歷史記錄中的最後一首歌曲排隊入列。",
+  "settings.option.general.resumetabs" : "啟動時打開的選項",
+  "settings.option.general.resumetabs.description" : "你可以選擇啟動 Cider 時要預設打開的左側選項欄。",
+  "settings.option.general.resumetabs.dynamic" : "動態",
+  "settings.option.general.resumetabs.dynamic.description" : "Cider 將打開你上次停留的左側選項欄。",
   "settings.option.general.language.main": "語言",
   "settings.option.general.language.fun": "特殊語言",
   "settings.option.general.language.unsorted": "未分類",
@@ -345,8 +349,8 @@
   "settings.option.connectivity.discordRPC.hideButtons": "隱藏 Discord 動態上的按鈕",
   "settings.option.connectivity.discordRPC.detailsFormat": "詳細資訊格式",
   "settings.option.connectivity.discordRPC.stateFormat": "狀態格式",
-  "settings.option.connectivity.lastfmScrobble": "Last.FM Scrobbling 記錄",
-  "settings.option.connectivity.lastfmScrobble.delay": "Last.FM Scrobble 延遲 (%)",
+  "settings.option.connectivity.lastfmScrobble": "Last.FM 音樂記錄",
+  "settings.option.connectivity.lastfmScrobble.delay": "Last.FM 歌曲追蹤延遲 (%)",
   "settings.option.connectivity.lastfmScrobble.nowPlaying": "開啟 Last.FM 正在聆聽",
   "settings.option.connectivity.lastfmScrobble.removeFeatured": "從歌名中移除客串藝人 (Last.FM)",
   "settings.option.connectivity.lastfmScrobble.filterLoop": "不記錄單曲循環 (Last.FM)",

From a8a638e9278a50d07da9f80479f3cc36197e9af4 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:59:38 +0100
Subject: [PATCH 042/141] Updated config.yml

---
 .circleci/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 26492b1f..d73dc419 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -77,6 +77,7 @@ jobs:
           root: .
           paths:
             - dist/*.exe
+            - dist/*.yml
 
   build-linux:
     executor: cider-ci
@@ -97,6 +98,7 @@ jobs:
             - dist/*.deb
             - dist/*.AppImage
             - dist/*.snap
+            - dist/*.yml
 
   build-winget:
     executor: cider-ci
@@ -123,6 +125,7 @@ jobs:
           root: .
           paths:
             - dist/*.exe
+            - dist/*.yml
 
   release:
     executor: cider-ci

From 62cda31eeeed6ece32203fbc1daf25adc2b48efa Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 17:08:26 +0100
Subject: [PATCH 043/141] Updated config.yml

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d73dc419..83d25acc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -77,7 +77,7 @@ jobs:
           root: .
           paths:
             - dist/*.exe
-            - dist/*.yml
+            - dist/latest.yml
 
   build-linux:
     executor: cider-ci
@@ -98,7 +98,7 @@ jobs:
             - dist/*.deb
             - dist/*.AppImage
             - dist/*.snap
-            - dist/*.yml
+            - dist/latest-linux.yml
 
   build-winget:
     executor: cider-ci
@@ -125,7 +125,7 @@ jobs:
           root: .
           paths:
             - dist/*.exe
-            - dist/*.yml
+            # - dist/*.yml
 
   release:
     executor: cider-ci

From ee228566ae68a59eefcc9f884ddde0bcf5358899 Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 18:21:26 +0200
Subject: [PATCH 044/141] recheck on context menu button click

---
 src/renderer/views/components/mediaitem-list-item.ejs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index 22a26f36..7ae5ed4e 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -331,6 +331,7 @@
                                 "disabled": true,
                                 "action": function () {
                                     app.love(self.item)
+                                    self.getHeartStatus()
                                 }
                             },
                             {
@@ -341,6 +342,7 @@
                                 "hidden": true,
                                 "action": function () {
                                     app.unlove(self.item)
+                                    self.getHeartStatus()
                                 }
                             },
                             {

From 1ae81aebc04fa45472502c69f60c166ceafa7388 Mon Sep 17 00:00:00 2001
From: umbreon22 <umbreon22@users.noreply.github.com>
Date: Fri, 29 Apr 2022 19:19:38 -0700
Subject: [PATCH 045/141] fix(songs context menu): check for presence of
 container before displaying 'showInMusic' item

---
 src/renderer/main/vueapp.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index d6dfb6cd..e62e8040 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -4009,7 +4009,8 @@ const app = new Vue({
                 }
             }
 
-            if (app.mk.nowPlayingItem._container["attributes"] && app.mk.nowPlayingItem._container.name != "station") {
+            const nowPlayingContainer = app.mk.nowPlayingItem._container;
+            if (nowPlayingContainer && nowPlayingContainer["attributes"] && nowPlayingContainer.name != "station") {
                 menus.normal.items.find(x => x.id == "showInMusic").hidden = false
             }
 

From 4ff7258a81378a847a05795eb3c712fc24ba35b6 Mon Sep 17 00:00:00 2001
From: umbreon22 <umbreon22@users.noreply.github.com>
Date: Fri, 29 Apr 2022 18:22:47 -0700
Subject: [PATCH 046/141] Limits the display of very large queue items to 50 at
 a time

---
 src/renderer/views/components/queue.ejs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/renderer/views/components/queue.ejs b/src/renderer/views/components/queue.ejs
index fc675bd5..013cb796 100644
--- a/src/renderer/views/components/queue.ejs
+++ b/src/renderer/views/components/queue.ejs
@@ -13,12 +13,11 @@
         </div>
         <div class="queue-body" v-if="page == 'queue'">
             <draggable v-model="queueItems" @start="drag=true" @end="drag=false;move()">
-                <template v-for="(queueItem, position) in queueItems">
-                    <div v-if="position <= queuePosition" style="display: none;">{{ position }}</div>
+                <template v-for="(queueItem, position) in displayQueueItems">
                     <div class="cd-queue-item"
                          :class="{selected: selectedItems.includes(position)}"
                          @click="select($event, position)"
-                         @dblclick="playQueueItem(position)" v-else :key="position"
+                         @dblclick="playQueueItem(position)" :key="position"
                          @contextmenu="selected = position;queueContext($event, queueItem.item, position)">
                         <div class="row">
                             <div class="col-auto flex-center">
@@ -61,6 +60,13 @@
                 app: this.$root
             }
         },
+        computed: {
+            displayQueueItems() {
+                const displayLimit = 50;
+                const lastDisplayPosition = Math.min(displayLimit + this.queuePosition, this.queueItems.length);
+                return this.queueItems.slice(this.queuePosition, lastDisplayPosition);
+            }
+        },
         mounted() {
             this.updateQueue()
         },

From 1a3ceb7299adfb23c086e1b3116b9217e31853d4 Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 19:36:47 +0200
Subject: [PATCH 047/141] Remove spaces after strings

---
 src/i18n/zh_TW.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/i18n/zh_TW.json b/src/i18n/zh_TW.json
index ace4cc50..ce9cf9a4 100644
--- a/src/i18n/zh_TW.json
+++ b/src/i18n/zh_TW.json
@@ -215,10 +215,10 @@
   "settings.option.general.resumebehavior.locally.description": "Cider 將還原你在這台電腦上的最後一次操作。",
   "settings.option.general.resumebehavior.history": "歷史",
   "settings.option.general.resumebehavior.history.description": "Cider 將跨裝置將你的整個 Apple Music 歷史記錄中的最後一首歌曲排隊入列。",
-  "settings.option.general.resumetabs" : "啟動時打開的選項",
-  "settings.option.general.resumetabs.description" : "你可以選擇啟動 Cider 時要預設打開的左側選項欄。",
-  "settings.option.general.resumetabs.dynamic" : "動態",
-  "settings.option.general.resumetabs.dynamic.description" : "Cider 將打開你上次停留的左側選項欄。",
+  "settings.option.general.resumetabs": "啟動時打開的選項",
+  "settings.option.general.resumetabs.description": "你可以選擇啟動 Cider 時要預設打開的左側選項欄。",
+  "settings.option.general.resumetabs.dynamic": "動態",
+  "settings.option.general.resumetabs.dynamic.description": "Cider 將打開你上次停留的左側選項欄。",
   "settings.option.general.language.main": "語言",
   "settings.option.general.language.fun": "特殊語言",
   "settings.option.general.language.unsorted": "未分類",

From b0c4240c17e0dcd6c869d92ae88ed9a6293aad65 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 18:37:21 +0100
Subject: [PATCH 048/141] Update config.yml

---
 .circleci/config.yml | 162 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 130 insertions(+), 32 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 62dc1183..c9484eb6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,18 +1,21 @@
 version: 2.1
-orbs: # adds orbs to your configuration
-  jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
-branches:
-      only:
-        - main
-        - develop
-jobs:
-  build:
-    working_directory: ~/Cider
+
+executors:
+  cider-ci:
     docker:
       - image: circleci/node:16
-      
+    working_directory: ~/Cider
+
+orbs: # adds orbs to your configuration
+  jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
+
+# The jobs for this project
+jobs:
+  prepare-build:
+    executor: cider-ci
     steps:
       - checkout
+      - run: ls -la
       - run:
           name: Set App Version
           command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
@@ -32,50 +35,145 @@ jobs:
           paths:
             - ~/.cache/yarn
       - run:
-          name: Install system build dependencies
-          command: |
-            sudo apt-get update -y
-            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-            sudo apt-get install -y dpkg fakeroot wine64
-            sudo dpkg --add-architecture i386
-            sudo apt-get update -y
-            sudo apt-get install -y wine32
-            sudo apt install -y gh
+          name: TypeScript Compile
+          command: yarn build
+      - persist_to_workspace:
+          # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
+          # taken to be the root directory of the workspace.
+          root: .
+          # Must be relative path from root
+          paths:
+            - node_modules
+            - build
+            - resources
+            - yarn.lock
+            - package.json
+            - winget.json # winget.json is a file that is generated by the winget package manager
+            - LICENSE
+            - license.txt
+
+  build-linux:
+    executor: cider-ci
+    steps:
+      - attach_workspace:
+          at: ~/Cider
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script
-      - run:
-          name: TypeScript Compile
-          command: yarn build
       - run:
           name: Generate Builds (Linux)
           command: yarn electron-builder -l -p never
           post-steps:
             - jira/notify
+      - persist_to_workspace:
+          root: .
+          paths:
+            - dist/*.deb
+            - dist/*.AppImage
+            - dist/*.snap
+            - dist/latest-linux.yml
+
+  build-windows:
+    executor: cider-ci
+    steps:
+      - attach_workspace:
+          at: ~/Cider
+      - run:
+          name: Install Windows System Build Dependencies
+          command: |
+            sudo apt-get update -y
+            sudo apt-get install -y dpkg fakeroot wine64
+            sudo dpkg --add-architecture i386
+            sudo apt-get update -y
+            sudo apt-get install -y wine32
+      - run:
+          name: Fix Versioning and Add Channel
+          command: yarn circle:script
       - run:
           name: Generate Builds (Windows)
           command: yarn electron-builder -w --x64 -p never
           post-steps:
             - jira/notify
+      - persist_to_workspace:
+          root: .
+          paths:
+            - dist/*.exe
+            - dist/Cider-Setup-*.exe.blockmap
+            - dist/latest.yml
+
+  build-winget:
+    executor: cider-ci
+    steps:
+      - attach_workspace:
+          at: ~/Cider
+      - run:
+          name: Install Windows System Build Dependencies
+          command: |
+            sudo apt-get update -y
+            sudo apt-get install -y dpkg fakeroot wine64
+            sudo dpkg --add-architecture i386
+            sudo apt-get update -y
+            sudo apt-get install -y wine32
+      - run:
+          name: Fix Versioning and Add Channel
+          command: yarn circle:script
       - run:
           name: Generate Builds (Winget)
           command: yarn electron-builder --win -c winget.json -p never
           post-steps:
             - jira/notify
+      - persist_to_workspace:
+          root: .
+          paths:
+            - dist/*.exe
+            - dist/Cider-Setup-winget-*.exe.blockmap
+
+  release:
+    executor: cider-ci
+    steps:
+      - attach_workspace:
+          at: ~/Cider/
+      - run:
+          name: Installing GitHub Command Line Interface
+          command: |
+            sudo apt-get update -y
+            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+            sudo apt-get update -y
+            sudo apt install -y gh
       - run:
           name: Move Build Files
           command: |
-              mkdir ~/Cider/dist/artifacts/
-              mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
+            mkdir ~/Cider/dist/artifacts/
+            mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
       - store_artifacts:
-          path: ~/Cider/dist/artifacts 
+          path: ~/Cider/dist/artifacts
       - run:
           name: Publish Release
           command: |
-              gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
+            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
+
+# Orchestrate our job run sequence
+workflows:
+  build_and_release:
+    jobs:
+      - prepare-build
+      - build-windows:
+          requires:
+            - prepare-build
+      - build-linux:
+          requires:
+            - prepare-build
+      - build-winget:
+          requires:
+            - prepare-build
+      - release:
+          requires:
+            - build-windows
+            - build-linux
+            - build-winget

From 106abcef2643db744a52fb502764743362101ee3 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 18:38:15 +0100
Subject: [PATCH 049/141] Reverted 'config.yml'

---
 .circleci/config.yml | 153 ++++++++-----------------------------------
 1 file changed, 28 insertions(+), 125 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 83d25acc..62dc1183 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,21 +1,18 @@
 version: 2.1
-
-executors:
-  cider-ci:
-    docker:
-      - image: circleci/node:16
-    working_directory: ~/Cider
-
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
-
-# The jobs for this project
+branches:
+      only:
+        - main
+        - develop
 jobs:
-  prepare-build:
-    executor: cider-ci
+  build:
+    working_directory: ~/Cider
+    docker:
+      - image: circleci/node:16
+      
     steps:
       - checkout
-      - run: ls -la
       - run:
           name: Set App Version
           command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
@@ -35,144 +32,50 @@ jobs:
           paths:
             - ~/.cache/yarn
       - run:
-          name: TypeScript Compile
-          command: yarn build
-      - persist_to_workspace:
-          # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
-          # taken to be the root directory of the workspace.
-          root: .
-          # Must be relative path from root
-          paths:
-            - node_modules
-            - build
-            - resources
-            - yarn.lock
-            - package.json
-            - winget.json # winget.json is a file that is generated by the winget package manager
-            - LICENSE
-            - license.txt
-
-  build-windows:
-    executor: cider-ci
-    steps:
-      - attach_workspace:
-          at: ~/Cider
-      - run:
-          name: Install Windows System Build Dependencies
+          name: Install system build dependencies
           command: |
             sudo apt-get update -y
+            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
             sudo apt-get install -y dpkg fakeroot wine64
             sudo dpkg --add-architecture i386
             sudo apt-get update -y
             sudo apt-get install -y wine32
+            sudo apt install -y gh
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script
       - run:
-          name: Generate Builds (Windows)
-          command: yarn electron-builder -w --x64 -p never
-          post-steps:
-            - jira/notify
-      - persist_to_workspace:
-          root: .
-          paths:
-            - dist/*.exe
-            - dist/latest.yml
-
-  build-linux:
-    executor: cider-ci
-    steps:
-      - attach_workspace:
-          at: ~/Cider
-      - run:
-          name: Fix Versioning and Add Channel
-          command: yarn circle:script
+          name: TypeScript Compile
+          command: yarn build
       - run:
           name: Generate Builds (Linux)
           command: yarn electron-builder -l -p never
           post-steps:
             - jira/notify
-      - persist_to_workspace:
-          root: .
-          paths:
-            - dist/*.deb
-            - dist/*.AppImage
-            - dist/*.snap
-            - dist/latest-linux.yml
-
-  build-winget:
-    executor: cider-ci
-    steps:
-      - attach_workspace:
-          at: ~/Cider
       - run:
-          name: Install Windows System Build Dependencies
-          command: |
-            sudo apt-get update -y
-            sudo apt-get install -y dpkg fakeroot wine64
-            sudo dpkg --add-architecture i386
-            sudo apt-get update -y
-            sudo apt-get install -y wine32
-      - run:
-          name: Fix Versioning and Add Channel
-          command: yarn circle:script
+          name: Generate Builds (Windows)
+          command: yarn electron-builder -w --x64 -p never
+          post-steps:
+            - jira/notify
       - run:
           name: Generate Builds (Winget)
           command: yarn electron-builder --win -c winget.json -p never
           post-steps:
             - jira/notify
-      - persist_to_workspace:
-          root: .
-          paths:
-            - dist/*.exe
-            # - dist/*.yml
-
-  release:
-    executor: cider-ci
-    steps:
-      - attach_workspace:
-          at: ~/Cider/
-      - run:
-          name: Installing GitHub Command Line Interface
-          command: |
-            sudo apt-get update -y
-            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-            sudo apt-get update -y
-            sudo apt install -y gh
       - run:
           name: Move Build Files
           command: |
-            mkdir ~/Cider/dist/artifacts/
-            mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
+              mkdir ~/Cider/dist/artifacts/
+              mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
+              mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
+              mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
+              mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
+              mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
+              mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
       - store_artifacts:
-          path: ~/Cider/dist/artifacts
+          path: ~/Cider/dist/artifacts 
       - run:
           name: Publish Release
           command: |
-            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
-
-# Orchestrate our job run sequence
-workflows:
-  build_and_release:
-    jobs:
-      - prepare-build
-      - build-windows:
-          requires:
-            - prepare-build
-      - build-linux:
-          requires:
-            - prepare-build
-      - build-winget:
-          requires:
-            - prepare-build
-      - release:
-          requires:
-            - build-windows
-            - build-linux
-            - build-winget
+              gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap

From 70ca60fa43e9d336bbb5937c0338be2fc1f81069 Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 19:45:44 +0200
Subject: [PATCH 050/141] finally ffs

---
 src/renderer/views/components/mediaitem-list-item.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index 7ae5ed4e..d4a96c93 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -330,8 +330,8 @@
                                 "hidden": false,
                                 "disabled": true,
                                 "action": function () {
+                                    self.isLoved = true
                                     app.love(self.item)
-                                    self.getHeartStatus()
                                 }
                             },
                             {
@@ -341,8 +341,8 @@
                                 "name": this.app.getLz('action.unlove'),
                                 "hidden": true,
                                 "action": function () {
+                                    self.isLoved = false
                                     app.unlove(self.item)
-                                    self.getHeartStatus()
                                 }
                             },
                             {

From 4e22857ccda94deba06476ef1a04f530a8f3e553 Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 20:21:28 +0200
Subject: [PATCH 051/141] Align heart icon

---
 src/renderer/less/elements.css                        | 6 ++++++
 src/renderer/less/elements.less                       | 7 +++++++
 src/renderer/style.css                                | 6 ++++++
 src/renderer/style.less                               | 8 ++++++++
 src/renderer/views/components/mediaitem-list-item.ejs | 2 +-
 5 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/renderer/less/elements.css b/src/renderer/less/elements.css
index d4547eae..7aef758e 100644
--- a/src/renderer/less/elements.css
+++ b/src/renderer/less/elements.css
@@ -371,6 +371,12 @@
   filter: contrast(0);
   background-repeat: no-repeat;
 }
+.heart-icon {
+  height: 18px;
+  width: 39px;
+  filter: contrast(0);
+  background-repeat: no-repeat;
+}
 @keyframes load-bar {
   10% {
     box-shadow: inset 0 -4px 0;
diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less
index 716b71a4..c5fae7a8 100644
--- a/src/renderer/less/elements.less
+++ b/src/renderer/less/elements.less
@@ -456,6 +456,13 @@
     background-repeat: no-repeat;
   }
 
+  .heart-icon {
+    height: 18px;
+    width: 39px;
+    filter: contrast(0);
+    background-repeat: no-repeat;
+  }
+
   /* CSS.gg
   */
   @keyframes load-bar {
diff --git a/src/renderer/style.css b/src/renderer/style.css
index 180d1296..4ef47570 100644
--- a/src/renderer/style.css
+++ b/src/renderer/style.css
@@ -7936,6 +7936,12 @@ fieldset:disabled .btn {
   filter: contrast(0);
   background-repeat: no-repeat;
 }
+.cd-mediaitem-list-item .heart-icon {
+  height: 18px;
+  width: 39px;
+  filter: contrast(0);
+  background-repeat: no-repeat;
+}
 @keyframes load-bar {
   10% {
     box-shadow: inset 0 -4px 0;
diff --git a/src/renderer/style.less b/src/renderer/style.less
index 13e7de3b..3900c772 100644
--- a/src/renderer/style.less
+++ b/src/renderer/style.less
@@ -1207,6 +1207,14 @@ body[platform="darwin"] .app-chrome .app-chrome-item > .window-controls > div.cl
       background-repeat: no-repeat;
       margin-left: 3px;
     }
+
+    .heart-icon {
+      height: 9px;
+      width: 13px;
+      filter: contrast(0);
+      background-repeat: no-repeat;
+      margin-left: 3px;
+    }
   }
 
   .lossless-icon {
diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index d4a96c93..83189c1e 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -67,7 +67,7 @@
             </div>
             <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"></div>
             <template v-if="showMetaData == true" @dblclick="route()">
-                <div class="metainfo" style="min-width: 70px;" v-if="isLoved">
+                <div class="heart-icon" v-if="isLoved">
                     <div class="svg-icon" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}"></div>
                 </div>
                 <div class="metainfo">

From 91ac19974cc5407473757bbbf6a72a4f1cefbefe Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 21:06:25 +0200
Subject: [PATCH 052/141] Translate enableQQLyrics to Hungarian

---
 src/i18n/hu_HU.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/hu_HU.json b/src/i18n/hu_HU.json
index f1c47c8b..55706b2c 100644
--- a/src/i18n/hu_HU.json
+++ b/src/i18n/hu_HU.json
@@ -406,6 +406,7 @@
   "settings.option.lyrics.enableMusixmatchKaraoke": "Karaoke mód bekapcsolása (Csak MusixMatch)",
   "settings.option.lyrics.musixmatchPreferredLanguage": "MusixMatch fordítás nyelve",
   "settings.option.lyrics.enableYoutubeLyrics": "YouTube dalszövegek engedélyezése a zenei videóknál",
+  "settings.option.lyrics.enableQQLyrics": "QQLyrics dalszövegek engedélyezése",
   "settings.header.connectivity": "Csatlakozások",
   "settings.header.connectivity.description": "A Cider csatlakozás beállításainak módosítása.",
   "settings.option.connectivity.playbackNotifications": "Lejátszási értesítések",

From 9c85fafd1dd38684b89baa7536af360ba05218a1 Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 21:27:00 +0200
Subject: [PATCH 053/141] Changed if() to if ()

---
 src/main/base/plugins.ts                       |  2 +-
 src/renderer/index.js                          |  4 ++--
 src/renderer/main/events.js                    |  2 +-
 src/renderer/main/gamepad.js                   |  4 ++--
 src/renderer/main/vueapp.js                    |  2 +-
 src/renderer/main/wsapi_interop.js             |  4 ++--
 src/renderer/todo.js                           |  2 +-
 src/renderer/views/components/artist-chip.ejs  |  2 +-
 .../views/components/audio-settings.ejs        |  2 +-
 src/renderer/views/components/lyrics-view.ejs  |  4 ++--
 .../views/components/mediaitem-artwork.ejs     |  2 +-
 .../views/components/mediaitem-list-item.ejs   |  2 +-
 .../views/components/mediaitem-mvview.ejs      |  2 +-
 .../views/components/mediaitem-square.ejs      | 18 +++++++++---------
 src/renderer/views/components/queue.ejs        |  6 +++---
 src/renderer/views/components/share-sheet.ejs  |  2 +-
 .../views/components/spatial-properties.ejs    |  6 +++---
 src/renderer/views/pages/artist.ejs            |  2 +-
 src/renderer/views/pages/plugins-github.ejs    |  4 ++--
 src/renderer/views/pages/podcasts.ejs          |  4 ++--
 .../views/components/mediaitem-artwork.ejs     |  2 +-
 .../views/components/mediaitem-square.ejs      | 10 +++++-----
 22 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/main/base/plugins.ts b/src/main/base/plugins.ts
index a09ee3e9..08bbb653 100644
--- a/src/main/base/plugins.ts
+++ b/src/main/base/plugins.ts
@@ -26,7 +26,7 @@ export class Plugins {
     }
 
     public static getPluginFromMap(plugin: string): any {
-        if(Plugins.PluginMap[plugin]) {
+        if (Plugins.PluginMap[plugin]) {
             return Plugins.PluginMap[plugin];
         }else{
             return plugin;
diff --git a/src/renderer/index.js b/src/renderer/index.js
index 8df442f8..6f83b9b1 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -105,7 +105,7 @@ function fallbackinitMusicKit() {
         })
         setTimeout(() => {
             app.init()
-            if(app.cfg.visual.window_background_style == "mica" && !app.isDev) {
+            if (app.cfg.visual.window_background_style == "mica" && !app.isDev) {
                 app.spawnMica()
             }
         }, 1000)
@@ -134,7 +134,7 @@ document.addEventListener('musickitloaded', function () {
             function waitForApp() {
                 if (typeof app.init !== "undefined") {
                     app.init()
-                    if(app.cfg.visual.window_background_style == "mica" && !app.isDev) {
+                    if (app.cfg.visual.window_background_style == "mica" && !app.isDev) {
                         app.spawnMica()
                     }
                 }
diff --git a/src/renderer/main/events.js b/src/renderer/main/events.js
index 0b2e13d3..f2140460 100644
--- a/src/renderer/main/events.js
+++ b/src/renderer/main/events.js
@@ -22,7 +22,7 @@ const Events = {
             if (event.keyCode === 82 && event.ctrlKey) {
                 event.preventDefault()
                 bootbox.confirm("Reload Cider?", (res)=>{
-                    if(res) {
+                    if (res) {
                         window.location.reload()
                     }
                 })
diff --git a/src/renderer/main/gamepad.js b/src/renderer/main/gamepad.js
index a902cd5f..e46c78c4 100644
--- a/src/renderer/main/gamepad.js
+++ b/src/renderer/main/gamepad.js
@@ -251,7 +251,7 @@ function simulateGamepad () {
 
                 cursorPos[1] -= cursorSpeed
                 // sounds.Hover.play()
-                // if(intTabIndex <= 0) {
+                // if (intTabIndex <= 0) {
                 //     intTabIndex = 0
                 // }else{
                 //     intTabIndex--
@@ -263,7 +263,7 @@ function simulateGamepad () {
                 e.preventDefault()
 
                 cursorPos[1] += cursorSpeed
-                // if(intTabIndex < tabbable.length) {
+                // if (intTabIndex < tabbable.length) {
                 //     intTabIndex++
                 // }else{
                 //     intTabIndex = tabbable.length
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 58b49752..4ac66422 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -1671,7 +1671,7 @@ const app = new Vue({
                     params["meta[albums:tracks]"] = 'popularity'
                     params["fields[albums]"] = "artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialNotes,editorialVideo,name,playParams,releaseDate,url,copyright"
                 }
-                if(kind.includes("playlist") || kind.includes("album")){
+                if (kind.includes("playlist") || kind.includes("album")){
                     app.page = (kind) + "_" + (id);
                     window.location.hash = `${kind}/${id}${isLibrary ? "/" + isLibrary : ''}`
                     app.getTypeFromID((kind), (id), (isLibrary), params);
diff --git a/src/renderer/main/wsapi_interop.js b/src/renderer/main/wsapi_interop.js
index d9477a23..8f5e8f9e 100644
--- a/src/renderer/main/wsapi_interop.js
+++ b/src/renderer/main/wsapi_interop.js
@@ -108,9 +108,9 @@ const wsapi = {
         app.mk.isPlaying ? app.mk.pause() : app.mk.play()
     },
     toggleRepeat() {
-        if(MusicKit.getInstance().repeatMode == 0) {
+        if (MusicKit.getInstance().repeatMode == 0) {
             MusicKit.getInstance().repeatMode = 1
-        }else if(MusicKit.getInstance().repeatMode == 1){
+        }else if (MusicKit.getInstance().repeatMode == 1){
             MusicKit.getInstance().repeatMode = 2
         }else{
             MusicKit.getInstance().repeatMode = 0
diff --git a/src/renderer/todo.js b/src/renderer/todo.js
index 3e8deaf9..5ef529f2 100644
--- a/src/renderer/todo.js
+++ b/src/renderer/todo.js
@@ -133,7 +133,7 @@ app.mkapi("artists", false, "412778295", {
 var library = []
 var downloaded = null;
 function downloadChunk () {
-    if(downloaded == null) {
+    if (downloaded == null) {
         app.mk.api.library.songs("", {limit: 100}, {includeResponseMeta: !0}).then((response)=>{
             processChunk(response)
         })
diff --git a/src/renderer/views/components/artist-chip.ejs b/src/renderer/views/components/artist-chip.ejs
index 12453996..9c2d884b 100644
--- a/src/renderer/views/components/artist-chip.ejs
+++ b/src/renderer/views/components/artist-chip.ejs
@@ -29,7 +29,7 @@
         template: '#artist-chip',
         async mounted() {
             let artistId = this.item.id
-            if(typeof this.item.relationships == "object") {
+            if (typeof this.item.relationships == "object") {
                 artistId = this.item.relationships.catalog.data[0].id
             }
             app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists/${artistId}`).then(response => {
diff --git a/src/renderer/views/components/audio-settings.ejs b/src/renderer/views/components/audio-settings.ejs
index c8e0c5d4..249d49ca 100644
--- a/src/renderer/views/components/audio-settings.ejs
+++ b/src/renderer/views/components/audio-settings.ejs
@@ -54,7 +54,7 @@
                 app.modals.audioSettings = false
             },
             openSpatialAudio() {
-                if(app.cfg.audio.spatial === true && app.cfg.audio.maikiwiAudio.spatial === false) {
+                if (app.cfg.audio.spatial === true && app.cfg.audio.maikiwiAudio.spatial === false) {
                     app.modals.spatialProperties = true
                     app.modals.audioSettings = false
                 } else {
diff --git a/src/renderer/views/components/lyrics-view.ejs b/src/renderer/views/components/lyrics-view.ejs
index 3047bde6..26001890 100644
--- a/src/renderer/views/components/lyrics-view.ejs
+++ b/src/renderer/views/components/lyrics-view.ejs
@@ -115,7 +115,7 @@
         },
         methods: {
             seekTo(startTime) {
-                if(startTime != 9999999) this.app.seekTo(startTime, false);
+                if (startTime != 9999999) this.app.seekTo(startTime, false);
             },
             getActiveLyric() {
                 const delayfix = 0.1
@@ -125,7 +125,7 @@
                         if (app.currentLyricsLine != i) {
                             app.currentLyricsLine = i;
                             if (((app.lyricon && app.drawer.open) || app.appMode == 'fullscreen') && this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${i}"]`)) {
-                               if(this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${prevLine}"]`)) {this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${prevLine}"]`).classList.remove("active");}
+                               if (this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${prevLine}"]`)) {this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${prevLine}"]`).classList.remove("active");}
                                 this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${i}"]`).classList.add("active")
                                 if (this.checkIfScrollIsStatic) {
                                     let lyricElement = this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${i}"]`)
diff --git a/src/renderer/views/components/mediaitem-artwork.ejs b/src/renderer/views/components/mediaitem-artwork.ejs
index f282629b..73cb478d 100644
--- a/src/renderer/views/components/mediaitem-artwork.ejs
+++ b/src/renderer/views/components/mediaitem-artwork.ejs
@@ -76,7 +76,7 @@
                 }, event)
             },
             getVideoPriority() {
-                if(app.cfg.visual.animated_artwork == "always") {
+                if (app.cfg.visual.animated_artwork == "always") {
                     return true;
                 }else if (this.videoPriority && app.cfg.visual.animated_artwork == "limited") {
                     return true
diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index 83189c1e..f532f33a 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -152,7 +152,7 @@
             },
             getClasses() {
                 this.addClasses = {}
-                if(typeof this.item.attributes.playParams == "undefined") {
+                if (typeof this.item.attributes.playParams == "undefined") {
                     this.addClasses["disabled"] = true
                 }
                 if (this.classList) {
diff --git a/src/renderer/views/components/mediaitem-mvview.ejs b/src/renderer/views/components/mediaitem-mvview.ejs
index 3dc241e8..b915768f 100644
--- a/src/renderer/views/components/mediaitem-mvview.ejs
+++ b/src/renderer/views/components/mediaitem-mvview.ejs
@@ -27,7 +27,7 @@
                 <div class="title text-overflow-elipsis" @click='app.routeView(item)'>
                     {{ item.attributes.name ?? '' }}
                 </div>
-                <div class="subtitle text-overflow-elipsis item-navigate" v-if="item.attributes.artistName" :style = "{'z-index': ((item.attributes.editorialNotes == null) && item.attributes.artistName) ? '4' : ''}" @click="if(item.attributes.artistName)app.searchAndNavigate(item,'artist')">
+                <div class="subtitle text-overflow-elipsis item-navigate" v-if="item.attributes.artistName" :style = "{'z-index': ((item.attributes.editorialNotes == null) && item.attributes.artistName) ? '4' : ''}" @click="if (item.attributes.artistName)app.searchAndNavigate(item,'artist')">
                     {{ item.attributes.artistName ?? '' }}
                 </div>
 
diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs
index 93fc2dfd..9a7ac134 100644
--- a/src/renderer/views/components/mediaitem-square.ejs
+++ b/src/renderer/views/components/mediaitem-square.ejs
@@ -93,12 +93,12 @@
         },
         async mounted() {
             await this.getBadges()
-            if(typeof this.item.attributes.playParams == "object") {
-                if(this.item.attributes.playParams.kind.includes("radioStation") && (this.item.attributes.playParams.streamingKind == 1 || this.item.attributes.playParams.streamingKind == 2)) {
+            if (typeof this.item.attributes.playParams == "object") {
+                if (this.item.attributes.playParams.kind.includes("radioStation") && (this.item.attributes.playParams.streamingKind == 1 || this.item.attributes.playParams.streamingKind == 2)) {
                     this.unavailable = true
                 }
             }else{
-                if(this.item.type == "music-movies" || this.item.type == "tv-episodes") {
+                if (this.item.type == "music-movies" || this.item.type == "tv-episodes") {
                     this.unavailable = true
                 }
             }
@@ -116,7 +116,7 @@
                 }
             },
             getSubtitle() {
-                if(this.kind == 'card') {
+                if (this.kind == 'card') {
                     try {
                         if (typeof this.item.attributes.artistNames != "undefined") {
                             return this.item.attributes.artistNames
@@ -139,7 +139,7 @@
                 }
             },
             getSubtitleNavigation() {
-                if(this.kind == 'card') {
+                if (this.kind == 'card') {
                     try {
                         if (typeof this.item.attributes.artistNames != "undefined") {
                             return app.routeView(this.item)
@@ -224,7 +224,7 @@
             },
             getArtworkUrl(size = -1, includeUrl = false) {
                 let artwork = this.item.attributes.artwork ? this.item.attributes.artwork.url : ''
-                if(size != -1) {
+                if (size != -1) {
                     artwork = artwork.replace('{w}', size).replace('{h}', size).replace('{f}', "webp").replace('{c}', ((size === 900) ? "sr" : "cc"))
                 }
                 switch (this.kind) {
@@ -232,7 +232,7 @@
                         artwork = this.item.attributes.editorialArtwork?.subscriptionHero?.url ?? (this.item.attributes.artwork?.url ?? (this.item.relationships?.contents?.data[0]?.attributes?.editorialArtwork?.subscriptionHero?.url ?? ''))
                         break;
                 }
-                if(!includeUrl) {
+                if (!includeUrl) {
                     return artwork
                 }else{
                     return `url("${artwork}")`
@@ -471,7 +471,7 @@
 
                 try {
                     await this.isInLibrary().then((_) => {
-                        if(self.addedToLibrary) {
+                        if (self.addedToLibrary) {
                             menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
                             menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
                         }else{
@@ -530,7 +530,7 @@
                         }
                     }
                 }
-                if(self.app.cfg.home.followedArtists.includes(this.item.id)) {
+                if (self.app.cfg.home.followedArtists.includes(this.item.id)) {
                     followAction = "unfollow"
                 }
                 app.showMenuPanel({
diff --git a/src/renderer/views/components/queue.ejs b/src/renderer/views/components/queue.ejs
index fc675bd5..92d8329f 100644
--- a/src/renderer/views/components/queue.ejs
+++ b/src/renderer/views/components/queue.ejs
@@ -70,8 +70,8 @@
                 this.history = history.data.data
             },
             select(e, position) {
-                if(e.ctrlKey || e.shiftKey) {
-                    if(this.selectedItems.indexOf(position) == -1) {
+                if (e.ctrlKey || e.shiftKey) {
+                    if (this.selectedItems.indexOf(position) == -1) {
                         this.selectedItems.push(position)
                     } else {
                         this.selectedItems.splice(this.selectedItems.indexOf(position), 1)
@@ -83,7 +83,7 @@
             queueContext(event, item, position) {
                 let self = this
                 let useMenu = "single"
-                if(this.selectedItems.length > 1) {
+                if (this.selectedItems.length > 1) {
                     useMenu = "multiple"
                 }
                 let menus = {
diff --git a/src/renderer/views/components/share-sheet.ejs b/src/renderer/views/components/share-sheet.ejs
index ee093413..9e08a438 100644
--- a/src/renderer/views/components/share-sheet.ejs
+++ b/src/renderer/views/components/share-sheet.ejs
@@ -63,7 +63,7 @@
         },
         methods: {
             playlistSelect(playlist) {
-                if(playlist.type != "library-playlist-folders") {
+                if (playlist.type != "library-playlist-folders") {
                     this.addToPlaylist(playlist.id)
                 }
             },
diff --git a/src/renderer/views/components/spatial-properties.ejs b/src/renderer/views/components/spatial-properties.ejs
index d802ca2a..ccaf53cb 100644
--- a/src/renderer/views/components/spatial-properties.ejs
+++ b/src/renderer/views/components/spatial-properties.ejs
@@ -294,7 +294,7 @@
             this.room_materials = JSON.parse(JSON.stringify(this.$root.cfg.audio.spatial_properties.room_materials))
             this.audio_position = JSON.parse(JSON.stringify(this.$root.cfg.audio.spatial_properties.audio_position))
             this.listener_position = JSON.parse(JSON.stringify(this.$root.cfg.audio.spatial_properties.listener_position))
-            if(typeof this.app.mk.nowPlayingItem != "undefined") {
+            if (typeof this.app.mk.nowPlayingItem != "undefined") {
                 this.setRoom()
             }
             this.ready = true
@@ -320,7 +320,7 @@
             },
             objectContainerStyle() {
                 let scale = 1
-                if(this.room_dimensions.width * this.visualMultiplier > 300) {
+                if (this.room_dimensions.width * this.visualMultiplier > 300) {
                     scale = 300 / (this.room_dimensions.width * this.visualMultiplier)
                 }
                 let style = {
@@ -346,7 +346,7 @@
                 window.CiderAudio.audioNodes.spatialNode.setRoomProperties(this.room_dimensions, this.room_materials);
                 CiderAudio.audioNodes.spatialInput.setPosition(...this.audio_position)
                 CiderAudio.audioNodes.spatialNode.setListenerPosition(...this.listener_position)
-                if(!this.app.cfg.audio.normalization) {
+                if (!this.app.cfg.audio.normalization) {
                     window.CiderAudio.audioNodes.gainNode.gain.value = app.cfg.audio.spatial_properties.gain
                 }
             }
diff --git a/src/renderer/views/pages/artist.ejs b/src/renderer/views/pages/artist.ejs
index 04171b26..3136dd12 100644
--- a/src/renderer/views/pages/artist.ejs
+++ b/src/renderer/views/pages/artist.ejs
@@ -172,7 +172,7 @@
                         }
                     }
                 }
-                if(this.app.cfg.home.followedArtists.includes(self.data.id)) {
+                if (this.app.cfg.home.followedArtists.includes(self.data.id)) {
                     followAction = "unfollow"
                 }
                 app.showMenuPanel({
diff --git a/src/renderer/views/pages/plugins-github.ejs b/src/renderer/views/pages/plugins-github.ejs
index 5d0bc28b..f760cdee 100644
--- a/src/renderer/views/pages/plugins-github.ejs
+++ b/src/renderer/views/pages/plugins-github.ejs
@@ -132,7 +132,7 @@
                                 self.themes = []
                                 notyf.success(app.getLz('settings.notyf.visual.plugin.install.success'));
                                 bootbox.confirm(app.getLz("settings.prompt.visual.plugin.github.success"), (ok)=>{
-                                    if(ok) {
+                                    if (ok) {
                                         ipcRenderer.invoke("relaunchApp")
                                     }else{
                                         return
@@ -154,7 +154,7 @@
                             if (arg.success) {
                                 self.themes = ipcRenderer.sendSync("get-themes")
                                 bootbox.confirm(app.getLz("settings.prompt.visual.plugin.github.success"), (ok)=>{
-                                    if(ok) {
+                                    if (ok) {
                                         ipcRenderer.invoke("relaunchApp")
                                     }else{
                                         return
diff --git a/src/renderer/views/pages/podcasts.ejs b/src/renderer/views/pages/podcasts.ejs
index b13821ff..7430c01d 100644
--- a/src/renderer/views/pages/podcasts.ejs
+++ b/src/renderer/views/pages/podcasts.ejs
@@ -187,7 +187,7 @@
             },
             searchPodcasts() {
                 let self = this
-                if(this.search.term == "") {
+                if (this.search.term == "") {
                     return
                 }
                 app.mk.api.v3.podcasts("/v1/catalog/us/search", {term: this.search.term, types: ["podcasts"], limit: 25}).then(response => {
@@ -227,7 +227,7 @@
             async getNextEpisodes(next, podcastId) {
 
                 let podcastShow = await app.mk.api.v3.podcasts(next)
-                if(podcastId != this.podcastSelected.id) {
+                if (podcastId != this.podcastSelected.id) {
                     return
                 }
                 podcastShow.data.data.forEach(ep => {
diff --git a/src/web-remote/views/components/mediaitem-artwork.ejs b/src/web-remote/views/components/mediaitem-artwork.ejs
index faf19dd4..0f8dc225 100644
--- a/src/web-remote/views/components/mediaitem-artwork.ejs
+++ b/src/web-remote/views/components/mediaitem-artwork.ejs
@@ -90,7 +90,7 @@
                 return "https://beta.music.apple.com/assets/product/MissingArtworkMusic.svg"
             }
             height = parseInt(height * window.devicePixelRatio)
-            if(width) {
+            if (width) {
                 width = parseInt(width * window.devicePixelRatio)
             }
             let newurl = `${url.replace('{w}', width ?? height).replace('{h}', height).replace('{f}', "webp").replace('{c}', ((width === 900) ? "sr" : "cc"))}`;
diff --git a/src/web-remote/views/components/mediaitem-square.ejs b/src/web-remote/views/components/mediaitem-square.ejs
index 90e9aa9b..04aef194 100644
--- a/src/web-remote/views/components/mediaitem-square.ejs
+++ b/src/web-remote/views/components/mediaitem-square.ejs
@@ -93,7 +93,7 @@
 
             },
             getSubtitle() {
-                if(this.kind == 'card') {
+                if (this.kind == 'card') {
                     try {
                         if (typeof this.item.attributes.artistNames != "undefined") {
                             return this.item.attributes.artistNames
@@ -116,7 +116,7 @@
                 }
             },
             getSubtitleNavigation() {
-                if(this.kind == 'card') {
+                if (this.kind == 'card') {
                     try {
                         if (typeof this.item.attributes.artistNames != "undefined") {
                             return app.routeView(this.item)
@@ -200,7 +200,7 @@
             },
             getArtworkUrl(size = -1, includeUrl = false) {
                 let artwork = this.item.attributes.artwork ? this.item.attributes.artwork.url : ''
-                if(size != -1) {
+                if (size != -1) {
                     artwork = artwork.replace('{w}', size).replace('{h}', size).replace('{f}', "webp").replace('{c}', ((size === 900) ? "sr" : "cc"))
                 }
                 switch (this.kind) {
@@ -208,7 +208,7 @@
                         artwork = this.item.attributes.editorialArtwork.subscriptionHero.url
                         break;
                 }
-                if(!includeUrl) {
+                if (!includeUrl) {
                     return artwork
                 }else{
                     return `url("${artwork}")`
@@ -423,7 +423,7 @@
 
                 try {
                     await this.isInLibrary().then((_) => {
-                        if(self.addedToLibrary) {
+                        if (self.addedToLibrary) {
                             menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
                             menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
                         }else{

From 422c869568fc69bdb33e0e52208ec0b890b4d32d Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 21:28:18 +0200
Subject: [PATCH 054/141] Change }else to } else

---
 src/main/base/plugins.ts                           |  2 +-
 src/renderer/main/gamepad.js                       |  4 ++--
 src/renderer/main/vueapp.js                        |  2 +-
 src/renderer/main/wsapi_interop.js                 |  4 ++--
 src/renderer/todo.js                               |  2 +-
 .../views/components/mediaitem-artwork.ejs         |  2 +-
 .../views/components/mediaitem-list-item.ejs       |  2 +-
 src/renderer/views/components/mediaitem-square.ejs | 14 +++++++-------
 src/renderer/views/pages/plugins-github.ejs        |  4 ++--
 src/renderer/views/pages/settings.ejs              |  2 +-
 .../views/components/mediaitem-square.ejs          | 10 +++++-----
 11 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/main/base/plugins.ts b/src/main/base/plugins.ts
index 08bbb653..6cc593d4 100644
--- a/src/main/base/plugins.ts
+++ b/src/main/base/plugins.ts
@@ -28,7 +28,7 @@ export class Plugins {
     public static getPluginFromMap(plugin: string): any {
         if (Plugins.PluginMap[plugin]) {
             return Plugins.PluginMap[plugin];
-        }else{
+        } else{
             return plugin;
         }
     }
diff --git a/src/renderer/main/gamepad.js b/src/renderer/main/gamepad.js
index e46c78c4..3a176616 100644
--- a/src/renderer/main/gamepad.js
+++ b/src/renderer/main/gamepad.js
@@ -253,7 +253,7 @@ function simulateGamepad () {
                 // sounds.Hover.play()
                 // if (intTabIndex <= 0) {
                 //     intTabIndex = 0
-                // }else{
+                // } else{
                 //     intTabIndex--
                 // }
                 // $(tabbable[intTabIndex]).focus()
@@ -265,7 +265,7 @@ function simulateGamepad () {
                 cursorPos[1] += cursorSpeed
                 // if (intTabIndex < tabbable.length) {
                 //     intTabIndex++
-                // }else{
+                // } else{
                 //     intTabIndex = tabbable.length
                 // }
                 // $(tabbable[intTabIndex]).focus()
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 4ac66422..ee9c9bce 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -1675,7 +1675,7 @@ const app = new Vue({
                     app.page = (kind) + "_" + (id);
                     window.location.hash = `${kind}/${id}${isLibrary ? "/" + isLibrary : ''}`
                     app.getTypeFromID((kind), (id), (isLibrary), params);
-                }else{
+                } else{
                     app.page = (kind)
                     window.location.hash = `${kind}/${id}${isLibrary ? "/" + isLibrary : ''}`
                 }
diff --git a/src/renderer/main/wsapi_interop.js b/src/renderer/main/wsapi_interop.js
index 8f5e8f9e..3d9f9fcf 100644
--- a/src/renderer/main/wsapi_interop.js
+++ b/src/renderer/main/wsapi_interop.js
@@ -110,9 +110,9 @@ const wsapi = {
     toggleRepeat() {
         if (MusicKit.getInstance().repeatMode == 0) {
             MusicKit.getInstance().repeatMode = 1
-        }else if (MusicKit.getInstance().repeatMode == 1){
+        } else if (MusicKit.getInstance().repeatMode == 1){
             MusicKit.getInstance().repeatMode = 2
-        }else{
+        } else{
             MusicKit.getInstance().repeatMode = 0
         }
     },
diff --git a/src/renderer/todo.js b/src/renderer/todo.js
index 5ef529f2..15b30520 100644
--- a/src/renderer/todo.js
+++ b/src/renderer/todo.js
@@ -137,7 +137,7 @@ function downloadChunk () {
         app.mk.api.library.songs("", {limit: 100}, {includeResponseMeta: !0}).then((response)=>{
             processChunk(response)
         })
-    }else{
+    } else{
         downloaded.next("", {limit: 100}, {includeResponseMeta: !0}).then((response)=>{
             processChunk(response)
         })
diff --git a/src/renderer/views/components/mediaitem-artwork.ejs b/src/renderer/views/components/mediaitem-artwork.ejs
index 73cb478d..7fa4ea0d 100644
--- a/src/renderer/views/components/mediaitem-artwork.ejs
+++ b/src/renderer/views/components/mediaitem-artwork.ejs
@@ -78,7 +78,7 @@
             getVideoPriority() {
                 if (app.cfg.visual.animated_artwork == "always") {
                     return true;
-                }else if (this.videoPriority && app.cfg.visual.animated_artwork == "limited") {
+                } else if (this.videoPriority && app.cfg.visual.animated_artwork == "limited") {
                     return true
                 } else if (app.cfg.visual.animated_artwork == "disabled") {
                     return false
diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index f532f33a..e4e4b0a9 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -185,7 +185,7 @@
                     } else {
                         return this.item.attributes.playParams.kind
                     }
-                }else{
+                } else{
                     return this.item.type
                 }
             },
diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs
index 9a7ac134..96f1407b 100644
--- a/src/renderer/views/components/mediaitem-square.ejs
+++ b/src/renderer/views/components/mediaitem-square.ejs
@@ -97,7 +97,7 @@
                 if (this.item.attributes.playParams.kind.includes("radioStation") && (this.item.attributes.playParams.streamingKind == 1 || this.item.attributes.playParams.streamingKind == 2)) {
                     this.unavailable = true
                 }
-            }else{
+            } else{
                 if (this.item.type == "music-movies" || this.item.type == "tv-episodes") {
                     this.unavailable = true
                 }
@@ -130,7 +130,7 @@
                     }catch(e) {
                         return ''
                     }
-                }else {
+                } else {
                     if (typeof this.item.attributes.artistName != "undefined") {
                         return this.item.attributes.artistName
                     } else {
@@ -153,7 +153,7 @@
                     }catch(e) {
                         return app.routeView(this.item)
                     }
-                }else {
+                } else {
                     if (typeof this.item.attributes.artistName != "undefined") {
                         return app.searchAndNavigate(this.item,'artist')
                     } else {
@@ -234,7 +234,7 @@
                 }
                 if (!includeUrl) {
                     return artwork
-                }else{
+                } else{
                     return `url("${artwork}")`
                 }
             },
@@ -442,7 +442,7 @@
                                         if (self.item.relationships.catalog){
                                             app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {self.app.copyToClipboard((u.data.data.length && u.data.data.length > 0)? u.data.data[0].attributes.url : u.data.data.attributes.url)})
                                         }
-                                    }else {
+                                    } else {
                                     self.app.copyToClipboard(self.item.attributes.url)}
                                 }
                             },
@@ -454,7 +454,7 @@
                                         if (self.item.relationships.catalog){
                                             app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {self.app.songLinkShare((u.data.data.length && u.data.data.length > 0)? u.data.data[0].attributes.url : u.data.data.attributes.url)})
                                         }
-                                    }else {
+                                    } else {
                                     self.app.songLinkShare(self.item.attributes.url)}
                                 }
                             }
@@ -474,7 +474,7 @@
                         if (self.addedToLibrary) {
                             menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
                             menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
-                        }else{
+                        } else{
                             menus.normal.items.find(x => x.id == 'addToLibrary').disabled = false
                         }
                     })
diff --git a/src/renderer/views/pages/plugins-github.ejs b/src/renderer/views/pages/plugins-github.ejs
index f760cdee..8a636d7e 100644
--- a/src/renderer/views/pages/plugins-github.ejs
+++ b/src/renderer/views/pages/plugins-github.ejs
@@ -134,7 +134,7 @@
                                 bootbox.confirm(app.getLz("settings.prompt.visual.plugin.github.success"), (ok)=>{
                                     if (ok) {
                                         ipcRenderer.invoke("relaunchApp")
-                                    }else{
+                                    } else{
                                         return
                                     }
                                 })
@@ -156,7 +156,7 @@
                                 bootbox.confirm(app.getLz("settings.prompt.visual.plugin.github.success"), (ok)=>{
                                     if (ok) {
                                         ipcRenderer.invoke("relaunchApp")
-                                    }else{
+                                    } else{
                                         return
                                     }
                                 })
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index 09ff4a8c..377aea79 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -1542,7 +1542,7 @@
                     this.tabIndex = parseInt(window.location.hash.split("/")[1])
                     console.debug("tabIndex", this.tabIndex)
                     this.canChangeHash = true
-                }else{
+                } else{
                     this.canChangeHash = true
                 }
             })
diff --git a/src/web-remote/views/components/mediaitem-square.ejs b/src/web-remote/views/components/mediaitem-square.ejs
index 04aef194..5c907484 100644
--- a/src/web-remote/views/components/mediaitem-square.ejs
+++ b/src/web-remote/views/components/mediaitem-square.ejs
@@ -86,7 +86,7 @@
 
                 if (luma > 140) {
                     return "#aaaaaa"
-                }else{
+                } else{
                     return color
                 }
 
@@ -107,7 +107,7 @@
                     }catch(e) {
                         return ''
                     }
-                }else {
+                } else {
                     if (typeof this.item.attributes.artistName != "undefined") {
                         return this.item.attributes.artistName
                     } else {
@@ -130,7 +130,7 @@
                     }catch(e) {
                         return app.routeView(this.item)
                     }
-                }else {
+                } else {
                     if (typeof this.item.attributes.artistName != "undefined") {
                         return app.searchAndNavigate(this.item,'artist')
                     } else {
@@ -210,7 +210,7 @@
                 }
                 if (!includeUrl) {
                     return artwork
-                }else{
+                } else{
                     return `url("${artwork}")`
                 }
             },
@@ -426,7 +426,7 @@
                         if (self.addedToLibrary) {
                             menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
                             menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
-                        }else{
+                        } else{
                             menus.normal.items.find(x => x.id == 'addToLibrary').disabled = false
                         }
                     })

From 48cce96beac6070fadff57ec959b3d550fe8591b Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 21:29:44 +0200
Subject: [PATCH 055/141] Change else{ to else {

---
 src/main/base/plugins.ts                              | 2 +-
 src/renderer/main/gamepad.js                          | 4 ++--
 src/renderer/main/vueapp.js                           | 2 +-
 src/renderer/main/wsapi_interop.js                    | 2 +-
 src/renderer/todo.js                                  | 2 +-
 src/renderer/views/components/mediaitem-list-item.ejs | 2 +-
 src/renderer/views/components/mediaitem-square.ejs    | 6 +++---
 src/renderer/views/pages/plugins-github.ejs           | 4 ++--
 src/renderer/views/pages/settings.ejs                 | 2 +-
 src/web-remote/views/components/mediaitem-square.ejs  | 6 +++---
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/base/plugins.ts b/src/main/base/plugins.ts
index 6cc593d4..d51e8a85 100644
--- a/src/main/base/plugins.ts
+++ b/src/main/base/plugins.ts
@@ -28,7 +28,7 @@ export class Plugins {
     public static getPluginFromMap(plugin: string): any {
         if (Plugins.PluginMap[plugin]) {
             return Plugins.PluginMap[plugin];
-        } else{
+        } else {
             return plugin;
         }
     }
diff --git a/src/renderer/main/gamepad.js b/src/renderer/main/gamepad.js
index 3a176616..abe20631 100644
--- a/src/renderer/main/gamepad.js
+++ b/src/renderer/main/gamepad.js
@@ -253,7 +253,7 @@ function simulateGamepad () {
                 // sounds.Hover.play()
                 // if (intTabIndex <= 0) {
                 //     intTabIndex = 0
-                // } else{
+                // } else {
                 //     intTabIndex--
                 // }
                 // $(tabbable[intTabIndex]).focus()
@@ -265,7 +265,7 @@ function simulateGamepad () {
                 cursorPos[1] += cursorSpeed
                 // if (intTabIndex < tabbable.length) {
                 //     intTabIndex++
-                // } else{
+                // } else {
                 //     intTabIndex = tabbable.length
                 // }
                 // $(tabbable[intTabIndex]).focus()
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index ee9c9bce..a00c345d 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -1675,7 +1675,7 @@ const app = new Vue({
                     app.page = (kind) + "_" + (id);
                     window.location.hash = `${kind}/${id}${isLibrary ? "/" + isLibrary : ''}`
                     app.getTypeFromID((kind), (id), (isLibrary), params);
-                } else{
+                } else {
                     app.page = (kind)
                     window.location.hash = `${kind}/${id}${isLibrary ? "/" + isLibrary : ''}`
                 }
diff --git a/src/renderer/main/wsapi_interop.js b/src/renderer/main/wsapi_interop.js
index 3d9f9fcf..4439d956 100644
--- a/src/renderer/main/wsapi_interop.js
+++ b/src/renderer/main/wsapi_interop.js
@@ -112,7 +112,7 @@ const wsapi = {
             MusicKit.getInstance().repeatMode = 1
         } else if (MusicKit.getInstance().repeatMode == 1){
             MusicKit.getInstance().repeatMode = 2
-        } else{
+        } else {
             MusicKit.getInstance().repeatMode = 0
         }
     },
diff --git a/src/renderer/todo.js b/src/renderer/todo.js
index 15b30520..4c95d8ed 100644
--- a/src/renderer/todo.js
+++ b/src/renderer/todo.js
@@ -137,7 +137,7 @@ function downloadChunk () {
         app.mk.api.library.songs("", {limit: 100}, {includeResponseMeta: !0}).then((response)=>{
             processChunk(response)
         })
-    } else{
+    } else {
         downloaded.next("", {limit: 100}, {includeResponseMeta: !0}).then((response)=>{
             processChunk(response)
         })
diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index e4e4b0a9..caf6ef1a 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -185,7 +185,7 @@
                     } else {
                         return this.item.attributes.playParams.kind
                     }
-                } else{
+                } else {
                     return this.item.type
                 }
             },
diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs
index 96f1407b..5f4a9aa0 100644
--- a/src/renderer/views/components/mediaitem-square.ejs
+++ b/src/renderer/views/components/mediaitem-square.ejs
@@ -97,7 +97,7 @@
                 if (this.item.attributes.playParams.kind.includes("radioStation") && (this.item.attributes.playParams.streamingKind == 1 || this.item.attributes.playParams.streamingKind == 2)) {
                     this.unavailable = true
                 }
-            } else{
+            } else {
                 if (this.item.type == "music-movies" || this.item.type == "tv-episodes") {
                     this.unavailable = true
                 }
@@ -234,7 +234,7 @@
                 }
                 if (!includeUrl) {
                     return artwork
-                } else{
+                } else {
                     return `url("${artwork}")`
                 }
             },
@@ -474,7 +474,7 @@
                         if (self.addedToLibrary) {
                             menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
                             menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
-                        } else{
+                        } else {
                             menus.normal.items.find(x => x.id == 'addToLibrary').disabled = false
                         }
                     })
diff --git a/src/renderer/views/pages/plugins-github.ejs b/src/renderer/views/pages/plugins-github.ejs
index 8a636d7e..a07d8aa1 100644
--- a/src/renderer/views/pages/plugins-github.ejs
+++ b/src/renderer/views/pages/plugins-github.ejs
@@ -134,7 +134,7 @@
                                 bootbox.confirm(app.getLz("settings.prompt.visual.plugin.github.success"), (ok)=>{
                                     if (ok) {
                                         ipcRenderer.invoke("relaunchApp")
-                                    } else{
+                                    } else {
                                         return
                                     }
                                 })
@@ -156,7 +156,7 @@
                                 bootbox.confirm(app.getLz("settings.prompt.visual.plugin.github.success"), (ok)=>{
                                     if (ok) {
                                         ipcRenderer.invoke("relaunchApp")
-                                    } else{
+                                    } else {
                                         return
                                     }
                                 })
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index 377aea79..40e7439e 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -1542,7 +1542,7 @@
                     this.tabIndex = parseInt(window.location.hash.split("/")[1])
                     console.debug("tabIndex", this.tabIndex)
                     this.canChangeHash = true
-                } else{
+                } else {
                     this.canChangeHash = true
                 }
             })
diff --git a/src/web-remote/views/components/mediaitem-square.ejs b/src/web-remote/views/components/mediaitem-square.ejs
index 5c907484..b58a5271 100644
--- a/src/web-remote/views/components/mediaitem-square.ejs
+++ b/src/web-remote/views/components/mediaitem-square.ejs
@@ -86,7 +86,7 @@
 
                 if (luma > 140) {
                     return "#aaaaaa"
-                } else{
+                } else {
                     return color
                 }
 
@@ -210,7 +210,7 @@
                 }
                 if (!includeUrl) {
                     return artwork
-                } else{
+                } else {
                     return `url("${artwork}")`
                 }
             },
@@ -426,7 +426,7 @@
                         if (self.addedToLibrary) {
                             menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
                             menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
-                        } else{
+                        } else {
                             menus.normal.items.find(x => x.id == 'addToLibrary').disabled = false
                         }
                     })

From f5ff731c3f0e6dd95a666190c7c33cc54fbc389f Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 21:55:54 +0200
Subject: [PATCH 056/141] Add Love indicator to albums too

---
 src/renderer/views/components/mediaitem-list-item.ejs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index caf6ef1a..086e27a0 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -66,10 +66,10 @@
                 </div>
             </div>
             <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"></div>
+            <div class="heart-icon" v-if="isLoved">
+                <div class="svg-icon" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}"></div>
+            </div>
             <template v-if="showMetaData == true" @dblclick="route()">
-                <div class="heart-icon" v-if="isLoved">
-                    <div class="svg-icon" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}"></div>
-                </div>
                 <div class="metainfo">
                     {{ item.attributes.releaseDate ? new Date(item.attributes.releaseDate).toLocaleDateString()
                     : "" }}

From 42569ae9c5899fc8b02ef10d4ed6f737d82e7234 Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 22:23:08 +0200
Subject: [PATCH 057/141] Swap heart with explicit

---
 src/renderer/views/components/mediaitem-list-item.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index 086e27a0..d2b318d6 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -65,10 +65,10 @@
                     </template>
                 </div>
             </div>
-            <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"></div>
             <div class="heart-icon" v-if="isLoved">
                 <div class="svg-icon" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}"></div>
             </div>
+            <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"></div>
             <template v-if="showMetaData == true" @dblclick="route()">
                 <div class="metainfo">
                     {{ item.attributes.releaseDate ? new Date(item.attributes.releaseDate).toLocaleDateString()

From 3896bd2e366e742d35049871b92fc0126843dfd2 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sun, 1 May 2022 01:57:21 +0100
Subject: [PATCH 058/141] Update config.yml

---
 .circleci/config.yml | 153 ++++++++-----------------------------------
 1 file changed, 28 insertions(+), 125 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 83d25acc..62dc1183 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,21 +1,18 @@
 version: 2.1
-
-executors:
-  cider-ci:
-    docker:
-      - image: circleci/node:16
-    working_directory: ~/Cider
-
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
-
-# The jobs for this project
+branches:
+      only:
+        - main
+        - develop
 jobs:
-  prepare-build:
-    executor: cider-ci
+  build:
+    working_directory: ~/Cider
+    docker:
+      - image: circleci/node:16
+      
     steps:
       - checkout
-      - run: ls -la
       - run:
           name: Set App Version
           command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
@@ -35,144 +32,50 @@ jobs:
           paths:
             - ~/.cache/yarn
       - run:
-          name: TypeScript Compile
-          command: yarn build
-      - persist_to_workspace:
-          # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
-          # taken to be the root directory of the workspace.
-          root: .
-          # Must be relative path from root
-          paths:
-            - node_modules
-            - build
-            - resources
-            - yarn.lock
-            - package.json
-            - winget.json # winget.json is a file that is generated by the winget package manager
-            - LICENSE
-            - license.txt
-
-  build-windows:
-    executor: cider-ci
-    steps:
-      - attach_workspace:
-          at: ~/Cider
-      - run:
-          name: Install Windows System Build Dependencies
+          name: Install system build dependencies
           command: |
             sudo apt-get update -y
+            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
             sudo apt-get install -y dpkg fakeroot wine64
             sudo dpkg --add-architecture i386
             sudo apt-get update -y
             sudo apt-get install -y wine32
+            sudo apt install -y gh
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script
       - run:
-          name: Generate Builds (Windows)
-          command: yarn electron-builder -w --x64 -p never
-          post-steps:
-            - jira/notify
-      - persist_to_workspace:
-          root: .
-          paths:
-            - dist/*.exe
-            - dist/latest.yml
-
-  build-linux:
-    executor: cider-ci
-    steps:
-      - attach_workspace:
-          at: ~/Cider
-      - run:
-          name: Fix Versioning and Add Channel
-          command: yarn circle:script
+          name: TypeScript Compile
+          command: yarn build
       - run:
           name: Generate Builds (Linux)
           command: yarn electron-builder -l -p never
           post-steps:
             - jira/notify
-      - persist_to_workspace:
-          root: .
-          paths:
-            - dist/*.deb
-            - dist/*.AppImage
-            - dist/*.snap
-            - dist/latest-linux.yml
-
-  build-winget:
-    executor: cider-ci
-    steps:
-      - attach_workspace:
-          at: ~/Cider
       - run:
-          name: Install Windows System Build Dependencies
-          command: |
-            sudo apt-get update -y
-            sudo apt-get install -y dpkg fakeroot wine64
-            sudo dpkg --add-architecture i386
-            sudo apt-get update -y
-            sudo apt-get install -y wine32
-      - run:
-          name: Fix Versioning and Add Channel
-          command: yarn circle:script
+          name: Generate Builds (Windows)
+          command: yarn electron-builder -w --x64 -p never
+          post-steps:
+            - jira/notify
       - run:
           name: Generate Builds (Winget)
           command: yarn electron-builder --win -c winget.json -p never
           post-steps:
             - jira/notify
-      - persist_to_workspace:
-          root: .
-          paths:
-            - dist/*.exe
-            # - dist/*.yml
-
-  release:
-    executor: cider-ci
-    steps:
-      - attach_workspace:
-          at: ~/Cider/
-      - run:
-          name: Installing GitHub Command Line Interface
-          command: |
-            sudo apt-get update -y
-            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-            sudo apt-get update -y
-            sudo apt install -y gh
       - run:
           name: Move Build Files
           command: |
-            mkdir ~/Cider/dist/artifacts/
-            mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
+              mkdir ~/Cider/dist/artifacts/
+              mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
+              mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
+              mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
+              mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
+              mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
+              mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
       - store_artifacts:
-          path: ~/Cider/dist/artifacts
+          path: ~/Cider/dist/artifacts 
       - run:
           name: Publish Release
           command: |
-            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
-
-# Orchestrate our job run sequence
-workflows:
-  build_and_release:
-    jobs:
-      - prepare-build
-      - build-windows:
-          requires:
-            - prepare-build
-      - build-linux:
-          requires:
-            - prepare-build
-      - build-winget:
-          requires:
-            - prepare-build
-      - release:
-          requires:
-            - build-windows
-            - build-linux
-            - build-winget
+              gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap

From 0baafbf447330edb3cf766406b4b9fa3da223198 Mon Sep 17 00:00:00 2001
From: Mefsaal <mefsaal@gmail.com>
Date: Sat, 30 Apr 2022 23:22:15 -0300
Subject: [PATCH 059/141] Now works with other languages pending MacOS Strings
 deletes

---
 src/main/plugins/menubar.ts | 110 ++++++++++++++++++------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts
index 07c860d1..54092c80 100644
--- a/src/main/plugins/menubar.ts
+++ b/src/main/plugins/menubar.ts
@@ -3,7 +3,7 @@ import {utils} from "../base/utils";
 
 export default class Thumbar {
 
-    private i18n: any = undefined;
+
     /**
      * Base Plugin Details (Eventually implemented into a GUI in settings)
      */
@@ -17,173 +17,173 @@ export default class Thumbar {
      * Menubar Assets
      * @private
      */
-    private isMac: boolean = process.platform === 'darwin';
+    private isMac: boolean = process.platform === 'darwin';    
     private _menuTemplate: any = [
         {
             label: app.getName(),
             submenu: [
                 {
-                    label: utils.getLocale('About', 'menubar.options.about'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.about'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('about')`)
                 },
                 {type: 'separator'},
                 {
-                    label: utils.getLocale('Settings', 'menubar.options.settings'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.settings'),
                     accelerator: utils.getStoreValue("general.keybindings.settings").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('settings')`)
                 },
                 {type: 'separator'},
-                {role: 'services', label: utils.getLocale('services', 'menubar.options.services')},
+                {role: 'services', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.services')},
                 {type: 'separator'},
-                {role: 'hide', label: utils.getLocale('hide', 'menubar.options.hide')},
-                {role: 'hideOthers', label: utils.getLocale('hideOthers', 'menubar.options.hideothers')},
-                {role: 'unhide', label: utils.getLocale('unhide', 'menubar.options.unhide')},
+                {role: 'hide', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.hide')},
+                {role: 'hideOthers', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.hideothers')},
+                {role: 'unhide', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.unhide')},
                 {type: 'separator'},
-                {role: 'quit', label: utils.getLocale('quit', 'menubar.options.quit')}
+                {role: 'quit', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.quit')}
             ]
         },
         {
-            label: utils.getLocale('View', 'menubar.options.view'),
+            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.view'),
             submenu: [
-                {role: 'reload', label: utils.getLocale('reload', 'menubar.options.reloads')},
-                {role: 'forceReload', label: utils.getLocale('forceReload', 'menubar.options.forcereload')},
-                {role: 'toggleDevTools', label: utils.getLocale('toggleDevTools', 'menubar.options.toggledevtools')},
+                {role: 'reload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.reloads')},
+                {role: 'forceReload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.forcereload')},
+                {role: 'toggleDevTools', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggledevtools')},
                 {type: 'separator'},
-                {role: 'resetZoom', label: utils.getLocale('resetZoom', 'menubar.options.resetzoom')},
-                {role: 'zoomIn', label: utils.getLocale('zoomIn', 'menubar.options.zoomin')},
-                {role: 'zoomOut', label: utils.getLocale('zoomOut', 'menubar.options.zoomout')},
+                {role: 'resetZoom', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.resetzoom')},
+                {role: 'zoomIn', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.zoomin')},
+                {role: 'zoomOut', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.zoomout')},
                 {type: 'separator'},
-                {role: 'togglefullscreen', label: utils.getLocale('togglefullscreen', 'menubar.options.togglefullscreen')},
+                {role: 'togglefullscreen', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.togglefullscreen')},
             ]
         },
         {
-            label: utils.getLocale('Window', 'menubar.options.window'),
+            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.window'),
             submenu: [
-                {role: 'minimize', label: utils.getLocale('minimize', 'menubar.options.minimize')},
+                {role: 'minimize', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.minimize')},
                 {
-                    label: utils.getLocale('Show', 'menubar.options.show'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.show'),
                     click: () => utils.getWindow().show()
                 },
-                {role: 'zoom', label: utils.getLocale('zoom', 'menubar.options.zoom')},
+                {role: 'zoom', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.zoom')},
                 ...(this.isMac ? [
                     {type: 'separator'},
                     {role: 'front', label: utils.getLocale('front', 'menubar.options.front')},
                     {role: 'close', label: utils.getLocale('close', 'menubar.options.close')},
                 ] : [
-                    {role: 'close', label: utils.getLocale('close', 'menubar.options.close')},
+                    {role: 'close', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.close')},
                 ]),
 
                 {
-                    label: utils.getLocale('Edit', 'menubar.options.edit'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.edit'),
                     submenu: [
-                        {role: 'undo', label: utils.getLocale('undo', 'menubar.options.undo')},
-                        {role: 'redo', label: utils.getLocale('redo', 'menubar.options.redo')},
+                        {role: 'undo', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.undo')},
+                        {role: 'redo', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.redo')},
                         {type: 'separator'},
-                        {role: 'cut', label: utils.getLocale('cut', 'menubar.options.cut')},
-                        {role: 'copy', label: utils.getLocale('copy', 'menubar.options.copy')},
-                        {role: 'paste', label: utils.getLocale('paste', 'menubar.options.paste')},
+                        {role: 'cut', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.cut')},
+                        {role: 'copy', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.copy')},
+                        {role: 'paste', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.paste')},
                     ]
                 },
                 {type: 'separator'},
                 {
-                    label: utils.getLocale('Toggle Private Session', 'menubar.options.toggleprivate'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggleprivate'),
                     accelerator: utils.getStoreValue("general.keybindings.togglePrivateSession").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.cfg.general.privateEnabled = !app.cfg.general.privateEnabled`)
                 },
                 {type: 'separator'},
                 {
-                    label: utils.getLocale('Web Remote', 'menubar.options.webremote'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.webremote'),
                     accelerator: utils.getStoreValue("general.keybindings.webRemote").join('+'),
                     sublabel: 'Opens in external window',
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('remote-pair')`)
                 },
                 {
-                    label: utils.getLocale('Audio Settings', 'menubar.options.audio'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.audio'),
                     accelerator: utils.getStoreValue("general.keybindings.audioSettings").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.audioSettings = true`)
                 },
                 {
-                    label: utils.getLocale('Plug-in Menu', 'menubar.options.plugins'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.plugins'),
                     accelerator: utils.getStoreValue("general.keybindings.pluginMenu").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.pluginMenu = true`)
                 }
             ]
         },
         {
-            label: utils.getLocale('Controls', 'menubar.options.controls'),
+            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.controls'),
             submenu: [
                 {
-                    label:  utils.getLocale('Pause / Play', 'menubar.options.playpause'),
+                    label:  utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.playpause'),
                     accelerator: 'Space',
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.SpacePause()`)
                 },
                 {
-                    label: utils.getLocale('Next', 'menubar.options.next'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.next'),
                     accelerator: 'CommandOrControl+Right',
                     click: () => utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.next()`)
                 },
                 {
-                    label: utils.getLocale('Previous', 'menubar.options.previous'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.previous'),
                     accelerator: 'CommandOrControl+Left',
                     click: () => utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.previous()`)
                 },
                 {type: 'separator'},
                 {
-                    label: utils.getLocale('Volume Up', 'menubar.options.volumeup'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.volumeup'),
                     accelerator: 'CommandOrControl+Up',
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.volumeUp()`)
                 },
                 {
-                    label: utils.getLocale('Volume Down', 'menubar.options.volumedown'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.volumedown'),
                     accelerator: 'CommandOrControl+Down',
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.volumeDown()`)
                 },
                 {
-                    label: utils.getLocale('Browse', 'menubar.options.browse'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.browse'),
                     accelerator: utils.getStoreValue("general.keybindings.browse").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('browse')`)
                 },
                 {type: 'separator'},
                 {
-                    label: utils.getLocale('Artists', 'menubar.options.artists'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.artists'),
                     accelerator: utils.getStoreValue("general.keybindings.artists").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-artists')`)
                 },
                 {
-                    label: utils.getLocale('Search', 'menubar.options.search'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.search'),
                     accelerator: utils.getStoreValue("general.keybindings.search").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('search')`)
                 },
                 {type: 'separator'},
                 {
-                    label: utils.getLocale('Album', 'menubar.options.albums'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.albums'),
                     accelerator: utils.getStoreValue("general.keybindings.albums").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-albums')`)
                 },
                 {type: 'separator'},
                 {
-                    label: utils.getLocale('Cast To Devices', 'menubar.options.cast'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.cast'),
                     accelerator: utils.getStoreValue("general.keybindings.castToDevices").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.castMenu = true`)
                 }
             ]
         },
         {
-            label: utils.getLocale('Account', 'menubar.options.account'),
+            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.account'),
             submenu: [
                 {
-                    label: utils.getLocale('Account Settings', 'menubar.options.accountsettings'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.accountsettings'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('apple-account-settings')`)
                 },
                 {
-                    label: utils.getLocale('Sign Out', 'menubar.options.signout'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.signout'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.unauthorize()`)
                 }
             ]
         },
         {
-            label: utils.getLocale('Support', 'menubar.options.support'),
-            role: utils.getLocale('help', 'menubar.options.help'),
+            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.support'),
+            role: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.help'),
             submenu: [
                 {
                     label: utils.getLocale('Discord', 'menubar.options.discord'),
@@ -195,35 +195,35 @@ export default class Thumbar {
                 },
                 {type: 'separator'},
                 {
-                    label: utils.getLocale('Report a...', 'menubar.options.report'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.report'),
                     submenu: [
                         {
-                            label: utils.getLocale('Bug', 'menubar.options.bug'),
+                            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.bug'),
                             click: () => shell.openExternal("https://github.com/ciderapp/Cider/issues/new?assignees=&labels=bug%2Ctriage&template=bug_report.yaml&title=%5BBug%5D%3A+").catch(console.error)
                         },
                         {
-                            label: utils.getLocale('Feature Request', 'menubar.options.feature'),
+                            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.feature'),
                             click: () => shell.openExternal("https://github.com/ciderapp/Cider/discussions/new?category=feature-request").catch(console.error)
                         },
                         {
-                            label: utils.getLocale('Translation Report/Request', 'menubar.options.trans'),
+                            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.trans'),
                             click: () => shell.openExternal("https://github.com/ciderapp/Cider/issues/new?assignees=&labels=%F0%9F%8C%90+Translations&template=translation.yaml&title=%5BTranslation%5D%3A+").catch(console.error)
                         },
                     ]
                 },
                 {type: 'separator'},
                 {
-                    label: utils.getLocale('View License', 'menubar.options.license'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.license'),
                     click: () => shell.openExternal("https://github.com/ciderapp/Cider/blob/main/LICENSE").catch(console.error)
                 },
                 {type: 'separator'},
                 {
-                    label: utils.getLocale('Toggle Developer Tools', 'menubar.options.toggledevtools'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggledevtools'),
                     accelerator: utils.getStoreValue("general.keybindings.openDeveloperTools").join('+'),
                     click: () => utils.getWindow().webContents.openDevTools()
                 },
                 {
-                    label: utils.getLocale('Open Configuration File in Editor', 'menubar.options.conf'),
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.conf'),
                     click: () => utils.getStoreInstance().openInEditor()
                 }
             ]

From c397b2b2b9ae0f4f96a7c8665e8ffcd41227245d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=A5=E5=8F=A1?=
 <46503943+jay900604@users.noreply.github.com>
Date: Sun, 1 May 2022 14:03:47 +0800
Subject: [PATCH 060/141] Update zh_CN.json

Update CN language.
---
 src/i18n/zh_CN.json | 44 +++++++++++++++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/i18n/zh_CN.json b/src/i18n/zh_CN.json
index 356b70c1..8e4fb5ff 100644
--- a/src/i18n/zh_CN.json
+++ b/src/i18n/zh_CN.json
@@ -22,6 +22,7 @@
   "term.login": "登录",
   "term.about": "关于",
   "term.privateSession": "私人聆听",
+  "term.lyrics": "歌词",
   "term.queue": "待播清单",
   "term.history": "历史记录",
   "term.miniplayer": "迷你播放器",
@@ -115,7 +116,11 @@
   "term.contributors": "贡献者",
   "term.equalizer": "均衡器",
   "term.reset": "重置",
-  "term.tracks": "首歌曲",
+  "term.track": {
+    "one": "首歌曲",
+    "other": "首歌曲"
+  },
+  "term.tracks": "歌曲",
   "term.videos": "音乐视频",
   "term.menu": "菜单",
   "term.check": "检查",
@@ -187,6 +192,7 @@
   "action.startRadio": "开始电台",
   "action.goToArtist": "前往艺人",
   "action.goToAlbum": "前往专辑",
+  "action.showInAppleMusic": "显示于 Apple Music",
   "action.moveToTop": "移到顶部",
   "action.share": "分享歌曲",
   "action.rename": "重命名",
@@ -203,11 +209,19 @@
   "action.showAlbum": "显示专辑",
   "action.tray.minimize": "最小化",
   "action.tray.quit": "退出",
-
   "action.update": "更新",
   "action.copy": "复制",
   "action.newpreset": "新建默认...",
   "action.deletepreset": "删除默认",
+  "action.open": "打开",
+  "action.cast.chromecast": "Chromecast",
+  "action.cast.todevices": "投射到设备",
+  "action.cast.stop": "停止投射到所有设备",
+  "action.cast.airplay": "AirPlay",
+  "action.cast.airplay.underdevelopment": "AirPlay 仍处于开发阶段中，敬请期待。",
+  "action.cast.scan": "搜索",
+  "action.cast.scanning": "搜索中...",
+  "action.createNew": "添加...",
   "settings.header.general": "通用",
   "settings.header.general.description": "调整 Cider 的通用设置",
   "settings.option.audio.volumeStep": "音量改变量",
@@ -218,6 +232,10 @@
   "settings.option.general.resumebehavior.locally.description": "Cider 将还原你在这台电脑上的最后一次操作。",
   "settings.option.general.resumebehavior.history": "历史",
   "settings.option.general.resumebehavior.history.description": "Cider 将跨设备将你的整个 Apple Music 历史记录中的最后一首歌曲排队入列。",
+  "settings.option.general.resumetabs": "启动时打开的选项页面",
+  "settings.option.general.resumetabs.description": "你可以选择启动 Cider 时要默认打开的页面。",
+  "settings.option.general.resumetabs.dynamic": "动态",
+  "settings.option.general.resumetabs.dynamic.description": "Cider 将自动打开你上次停留的页面。",
   "settings.option.general.language": "语言",
   "settings.option.general.language.main": "语言",
   "settings.option.general.language.fun": "恶搞语言",
@@ -229,6 +247,8 @@
   "settings.option.general.updateCider.branch.develop": "测试(Develop)",
   "settings.option.general.customizeSidebar": "自定义侧边栏的功能",
   "settings.option.general.customizeSidebar.customize": "自定义",
+  "settings.option.general.keybindings": "快捷操作键",
+  "settings.option.general.keybindings.open": "打开",
   "settings.notyf.updateCider.update-not-available": "没有可用的更新",
   "settings.notyf.updateCider.update-downloaded": "更新已成功下载，重启后进行更新",
   "settings.notyf.updateCider.update-error": "更新时，发生错误",
@@ -250,20 +270,27 @@
   "settings.option.audio.audioLab": "Cider 音频实验室",
   "settings.option.audio.audioLab.description": "包含由 Cider 开发团队进行的各种音频优化功能。",
   "settings.warn.audioLab.withoutAF": "使用 Cider 音频实验室需要打开进阶音频功能才可使用。" ,
-"settings.option.audio.enableAdvancedFunctionality.analogWarmth": "模拟温暖",
+  "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "模拟温暖",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmth.description": "以 Korg Nutube 6P1 为蓝本的模拟温暖。",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity": "模拟温暖强度",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.description": "改变模拟温暖模组处理的强度。",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.smooth": "温和",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.warm": "温暖",
-"settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider 数码增强音频处理™️",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer": "Cider 音乐气氛实现器™️",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer.description": "以最先进的音频置为蓝本，实现不同的音乐气氛。",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode": "Cider 音乐气氛™️模式",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.description": "更改气氛实现器模块的操作模式。",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural1": "自然（标准）",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural2": "自然（高）",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural3": "自然（增强）",
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider 数码增强音频处理™️",
   "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "通过人类的听力心理学模型和 AAC 编码特色的即时算法，强化 256 kbps AAC 音频的感知音频质量。",
   "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength": "数码增强音频处理设置",
   "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description": "将更改音频处理的激进/振奋程度（增强选项有可能会引起杂讯）。",
   "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard": "标准",
   "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "增强",
   "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "音量平衡",
-"settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "自动将歌曲播放音量调整到相同水平，享受更舒适的聆听体验。",
+  "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "自动将歌曲播放音量调整到相同水平，享受更舒适的聆听体验。",
   "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "此功能由音频实验室管理",
   "settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "空间音频",
   "settings.option.audio.enableAdvancedFunctionality.audioSpatialization.description": "将音频进行空间化处理来制造一个更立体的聆听体验（注：此功能不是官方的杜比全景声）。",
@@ -274,6 +301,7 @@
   "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "标准",
   "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.audiophile": "发烧友",
   "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "音频空间无法与 CAP 相容，请关闭 CAP 在进行操作。",
+  "settings.option.visual.uiscale": "UI界面大小",
   "settings.header.visual": "外观",
   "settings.header.visual.description": "调整 Cider 的外观",
   "settings.option.visual.windowBackgroundStyle": "窗口背景样式",
@@ -327,14 +355,16 @@
   "settings.option.lyrics.enableMusixmatchKaraoke": "启用卡拉 OK 模式（仅 Musixmatch）",
   "settings.option.lyrics.musixmatchPreferredLanguage": "Musixmatch 歌词语言偏好",
   "settings.option.lyrics.enableYoutubeLyrics": "播放 MV 时使用 YouTube 歌词",
+  "settings.option.lyrics.enableQQLyrics": "启用 QQ 音乐的歌词",
   "settings.header.connectivity": "外部连接",
   "settings.header.connectivity.description": "调整 Cider 与外部应用的交互设置",
   "settings.option.connectivity.discordRPC": "Discord 动态",
   "settings.option.connectivity.playbackNotifications": "歌曲播放通知",
-  "settings.header.connectivity.discordRPC.cider": "显示正在使用 'Cider'",
-  "settings.header.connectivity.discordRPC.appleMusic": "显示正在使用 'Apple Music'",
+  "settings.option.connectivity.discordRPC.clientName": "应用程序名称",
   "settings.option.connectivity.discordRPC.clearOnPause": "暂停时清除 Discord 动态",
   "settings.option.connectivity.discordRPC.hideButtons": "隐藏 Discord 动态上的按钮",
+  "settings.option.connectivity.discordRPC.detailsFormat": "详细信息格式",
+  "settings.option.connectivity.discordRPC.stateFormat": "动态格式",
   "settings.option.connectivity.lastfmScrobble": "LastFM Scrobbling 记录",
   "settings.option.connectivity.lastfmScrobble.delay": "LastFM Scrobble 延迟 (%)",
   "settings.option.connectivity.lastfmScrobble.nowPlaying": "打开 LastFM 正在播放",

From ef05f20534fb4801b8b14976c5bb0558b9d7bbea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=A5=E5=8F=A1?=
 <46503943+jay900604@users.noreply.github.com>
Date: Sun, 1 May 2022 14:09:09 +0800
Subject: [PATCH 061/141] Update zh_TW.json

Update TW language.
---
 src/i18n/zh_TW.json | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/i18n/zh_TW.json b/src/i18n/zh_TW.json
index ce9cf9a4..0062f872 100644
--- a/src/i18n/zh_TW.json
+++ b/src/i18n/zh_TW.json
@@ -151,6 +151,9 @@
   "podcast.episodes": "單集",
   "podcast.playEpisode": "播放單集",
   "podcast.website": "Podcast 網站",
+  "action.edit": "編輯",
+  "action.done": "完成",
+  "action.editTracklist": "編輯歌曲清單",
   "action.addToLibrary": "加入到資料庫",
   "action.addToLibrary.success": "成功加入資料庫",
   "action.addToLibrary.error": "加入資料庫時，發生錯誤",
@@ -215,10 +218,10 @@
   "settings.option.general.resumebehavior.locally.description": "Cider 將還原你在這台電腦上的最後一次操作。",
   "settings.option.general.resumebehavior.history": "歷史",
   "settings.option.general.resumebehavior.history.description": "Cider 將跨裝置將你的整個 Apple Music 歷史記錄中的最後一首歌曲排隊入列。",
-  "settings.option.general.resumetabs": "啟動時打開的選項",
-  "settings.option.general.resumetabs.description": "你可以選擇啟動 Cider 時要預設打開的左側選項欄。",
-  "settings.option.general.resumetabs.dynamic": "動態",
-  "settings.option.general.resumetabs.dynamic.description": "Cider 將打開你上次停留的左側選項欄。",
+  "settings.option.general.resumetabs": "啟動時打開的選項頁面",
+  "settings.option.general.resumetabs.description": "你可以選擇啟動 Cider 時要預設打開的頁面。",
+  "settings.option.general.resumetabs.dynamic": "自動",
+  "settings.option.general.resumetabs.dynamic.description": "Cider 將自動打開你上次停留的頁面。",
   "settings.option.general.language.main": "語言",
   "settings.option.general.language.fun": "特殊語言",
   "settings.option.general.language.unsorted": "未分類",

From e0127193df3401254fcfe7912c7129d1a5119595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=A5=E5=8F=A1?=
 <46503943+jay900604@users.noreply.github.com>
Date: Sun, 1 May 2022 14:10:13 +0800
Subject: [PATCH 062/141] Update zh_CN.json

---
 src/i18n/zh_CN.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/i18n/zh_CN.json b/src/i18n/zh_CN.json
index 8e4fb5ff..0726b1cc 100644
--- a/src/i18n/zh_CN.json
+++ b/src/i18n/zh_CN.json
@@ -166,6 +166,9 @@
   "podcast.episodes": "单集",
   "podcast.playEpisode": "播放单集",
   "podcast.website": "Podcast 网站",
+  "action.edit": "编辑",
+  "action.done": "完成",
+  "action.editTracklist": "编辑歌曲清单",
   "action.addToLibrary": "加入资料库",
   "action.addToLibrary.success": "成功加入资料库",
   "action.addToLibrary.error": "加入资料库的过程发生了错误",

From 0e2c9a33b99ce80de51b70841a61ad87f1bf061d Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sun, 1 May 2022 11:04:16 +0200
Subject: [PATCH 063/141] Make heart icon independent from explicit

---
 src/renderer/less/elements.css  | 4 ++--
 src/renderer/less/elements.less | 4 ++--
 src/renderer/style.css          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/renderer/less/elements.css b/src/renderer/less/elements.css
index 7aef758e..9eee757a 100644
--- a/src/renderer/less/elements.css
+++ b/src/renderer/less/elements.css
@@ -372,8 +372,8 @@
   background-repeat: no-repeat;
 }
 .heart-icon {
-  height: 18px;
-  width: 39px;
+  position: absolute;
+  right: 30em;
   filter: contrast(0);
   background-repeat: no-repeat;
 }
diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less
index c5fae7a8..b08a8d60 100644
--- a/src/renderer/less/elements.less
+++ b/src/renderer/less/elements.less
@@ -457,8 +457,8 @@
   }
 
   .heart-icon {
-    height: 18px;
-    width: 39px;
+    position: absolute;
+    right: 30em;
     filter: contrast(0);
     background-repeat: no-repeat;
   }
diff --git a/src/renderer/style.css b/src/renderer/style.css
index 4ef47570..6e617f33 100644
--- a/src/renderer/style.css
+++ b/src/renderer/style.css
@@ -7937,8 +7937,8 @@ fieldset:disabled .btn {
   background-repeat: no-repeat;
 }
 .cd-mediaitem-list-item .heart-icon {
-  height: 18px;
-  width: 39px;
+  position: absolute;
+  right: 30em;
   filter: contrast(0);
   background-repeat: no-repeat;
 }

From 2deaa22e719b1829b679e36dc420989c139c0b45 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sun, 1 May 2022 16:45:46 +0700
Subject: [PATCH 064/141] fix some stuffs

---
 src/main/base/browserwindow.ts |  4 ++++
 src/main/plugins/chromecast.ts | 12 ++++++++++--
 src/main/plugins/raop.ts       | 22 +++++++++++-----------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 56d847be..2089686c 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -898,6 +898,10 @@ export class BrowserWindow {
             event.returnValue = process.platform;
         });
 
+        ipcMain.on("get-port", (event) => {
+            event.returnValue = this.clientPort;
+        });
+
         ipcMain.on("is-dev", (event) => {
             event.returnValue = this.devMode;
         });
diff --git a/src/main/plugins/chromecast.ts b/src/main/plugins/chromecast.ts
index 5702fefc..0cac3506 100644
--- a/src/main/plugins/chromecast.ts
+++ b/src/main/plugins/chromecast.ts
@@ -28,7 +28,7 @@ export default class ChromecastPlugin {
     // private GCstream = new Stream.PassThrough(),
     private connectedHosts: any = {};
     private connectedPlayer: any;
-    // private port = false;
+    private ciderPort :any = 9000;
     // private server = false;
     // private  bufcount = 0;
     // private bufcount2 = 0;
@@ -148,7 +148,7 @@ export default class ChromecastPlugin {
             }
             let media = {
                 // Here you can plug an URL to any mp4, webm, mp3 or jpg file with the proper contentType.
-                contentId: 'http://' + this.getIp() + ':9000/audio.wav',
+                contentId: 'http://' + this.getIp() + ':'+ this.ciderPort +'/audio.wav',
                 contentType: 'audio/wav',
                 streamType: 'LIVE', // or LIVE
 
@@ -361,4 +361,12 @@ export default class ChromecastPlugin {
 
     }
 
+    onRendererReady(): void {
+        this._win.webContents.executeJavaScript(
+            `ipcRenderer.sendSync('get-port')`
+        ).then((result: any) => { 
+            this.ciderPort = result;       
+        });
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/plugins/raop.ts b/src/main/plugins/raop.ts
index a7de1854..77f9f8d1 100644
--- a/src/main/plugins/raop.ts
+++ b/src/main/plugins/raop.ts
@@ -156,18 +156,18 @@ export default class RAOP {
              }
             });
             
-            const browser2 = this.mdns.createBrowser(this.mdns.tcp('airplay'));
-            browser2.on('ready', browser2.discover);
+            // const browser2 = this.mdns.createBrowser(this.mdns.tcp('airplay'));
+            // browser2.on('ready', browser2.discover);
 
-            browser2.on('update', (service: any) => {
-                 if (service.addresses && service.fullname && (service.fullname.includes('_raop._tcp') ||  service.fullname.includes('_airplay._tcp'))) {
-                    // console.log(service.txt)
-                this._win.webContents.executeJavaScript(`console.log(
-                    "${service.name} ${service.host}:${service.port} ${service.addresses}"
-                )`);
-                this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt);
-             }
-            });
+            // browser2.on('update', (service: any) => {
+            //      if (service.addresses && service.fullname && (service.fullname.includes('_raop._tcp') ||  service.fullname.includes('_airplay._tcp'))) {
+            //         // console.log(service.txt)
+            //     this._win.webContents.executeJavaScript(`console.log(
+            //         "${service.name} ${service.host}:${service.port} ${service.addresses}"
+            //     )`);
+            //     this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt);
+            //  }
+            // });
     
         });
 

From 609eb9225f175599723e7bd867ac1b1b8d9b1506 Mon Sep 17 00:00:00 2001
From: Mefsaal <mefsaal@gmail.com>
Date: Sun, 1 May 2022 06:47:55 -0300
Subject: [PATCH 065/141] MacOS Localizated only MacOS strings

---
 src/main/plugins/menubar.ts | 52 +++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts
index 54092c80..14bd8b48 100644
--- a/src/main/plugins/menubar.ts
+++ b/src/main/plugins/menubar.ts
@@ -30,22 +30,27 @@ export default class Thumbar {
                 {
                     label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.settings'),
                     accelerator: utils.getStoreValue("general.keybindings.settings").join('+'),
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('settings')`)
+                    click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('settings')`),
                 },
+                ...(this.isMac ? [
                 {type: 'separator'},
-                {role: 'services', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.services')},
+                {role: 'services'},
                 {type: 'separator'},
-                {role: 'hide', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.hide')},
-                {role: 'hideOthers', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.hideothers')},
-                {role: 'unhide', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.unhide')},
+                {role: 'hide'},
+                {role: 'hideOthers'},
+                {role: 'unhide'},
+            ]: [
                 {type: 'separator'},
-                {role: 'quit', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.quit')}
-            ]
+                {role: 'quit', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.quit')},
+            ]),
+            ],  
         },
+
+
         {
             label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.view'),
             submenu: [
-                {role: 'reload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.reloads')},
+                {role: 'reload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.reload')},
                 {role: 'forceReload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.forcereload')},
                 {role: 'toggleDevTools', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggledevtools')},
                 {type: 'separator'},
@@ -60,30 +65,33 @@ export default class Thumbar {
             label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.window'),
             submenu: [
                 {role: 'minimize', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.minimize')},
+                ...(this.isMac ? [
                 {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.show'),
+                    label: 'Show',
                     click: () => utils.getWindow().show()
                 },
-                {role: 'zoom', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.zoom')},
-                ...(this.isMac ? [
+                {role: 'zoom'},
+                
                     {type: 'separator'},
-                    {role: 'front', label: utils.getLocale('front', 'menubar.options.front')},
-                    {role: 'close', label: utils.getLocale('close', 'menubar.options.close')},
-                ] : [
-                    {role: 'close', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.close')},
-                ]),
+                    {role: 'front'},
+                    {role: 'close'},
+                 
+                    {role: 'close'},
 
+                
                 {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.edit'),
+                    label: 'Edit',
                     submenu: [
-                        {role: 'undo', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.undo')},
-                        {role: 'redo', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.redo')},
+                        {role: 'undo'},
+                        {role: 'redo'},
                         {type: 'separator'},
-                        {role: 'cut', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.cut')},
-                        {role: 'copy', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.copy')},
-                        {role: 'paste', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.paste')},
+                        {role: 'cut'},
+                        {role: 'copy'},
+                        {role: 'paste'},
                     ]
                 },
+            ] : []
+            ),               
                 {type: 'separator'},
                 {
                     label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggleprivate'),

From d5e142608a4258ced1cd737b25cb648121ccead4 Mon Sep 17 00:00:00 2001
From: Mefsaal <mefsaal@gmail.com>
Date: Sun, 1 May 2022 07:00:49 -0300
Subject: [PATCH 066/141] linux dont need this

---
 src/main/plugins/menubar.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts
index 14bd8b48..4783c0a4 100644
--- a/src/main/plugins/menubar.ts
+++ b/src/main/plugins/menubar.ts
@@ -52,14 +52,17 @@ export default class Thumbar {
             submenu: [
                 {role: 'reload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.reload')},
                 {role: 'forceReload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.forcereload')},
-                {role: 'toggleDevTools', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggledevtools')},
+                ...(this.isMac ? [
+                {role: 'toggleDevTools'},
                 {type: 'separator'},
-                {role: 'resetZoom', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.resetzoom')},
-                {role: 'zoomIn', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.zoomin')},
-                {role: 'zoomOut', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.zoomout')},
+                {role: 'resetZoom'},
+                {role: 'zoomIn'},
+                {role: 'zoomOut'},
                 {type: 'separator'},
-                {role: 'togglefullscreen', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.togglefullscreen')},
-            ]
+                {role: 'togglefullscreen'},
+            
+        ]: []),
+        ],
         },
         {
             label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.window'),

From b0bf97fcb50a2f3a8e271f46ef6535fad622ce79 Mon Sep 17 00:00:00 2001
From: Mefsaal <mefsaal@gmail.com>
Date: Sun, 1 May 2022 07:28:30 -0300
Subject: [PATCH 067/141] Update Documentation

---
 src/i18n/README.md          | 19 -------------------
 src/i18n/en_US.json         | 19 -------------------
 src/i18n/es_ES.json         | 19 -------------------
 src/i18n/source/en_US.json  | 19 -------------------
 src/main/plugins/menubar.ts |  2 +-
 5 files changed, 1 insertion(+), 77 deletions(-)

diff --git a/src/i18n/README.md b/src/i18n/README.md
index cec535da..1622644a 100644
--- a/src/i18n/README.md
+++ b/src/i18n/README.md
@@ -303,31 +303,13 @@ Update 29/04/2022 00:00 UTC
 
  * `menubar.options.about`: Added for `en_US`
  * `menubar.options.settings`: Added for `en_US`
- * `menubar.options.services`: Added for `en_US`
- * `menubar.options.hide`: Added for `en_US`
- * `menubar.options.hideothers`: Added for `en_US`
- * `menubar.options.unhide`: Added for `en_US`
  * `menubar.options.quit`: Added for `en_US`
  * `menubar.options.view`: Added for `en_US`
  * `menubar.options.reload`: Added for `en_US`
  * `menubar.options.forcereload`: Added for `en_US`
  * `menubar.options.toggledevtools`: Added for `en_US`
- * `menubar.options.resetzoom`: Added for `en_US`
- * `menubar.options.zoomin`: Added for `en_US`
- * `menubar.options.zoomout`: Added for `en_US`
- * `menubar.options.togglefullscreen`: Added for `en_US`
  * `menubar.options.window`: Added for `en_US`
  * `menubar.options.minimize`: Added for `en_US`
- * `menubar.options.show`: Added for `en_US`
- * `menubar.options.zoom`: Added for `en_US`
- * `menubar.options.front`: Added for `en_US`
- * `menubar.options.close`: Added for `en_US`
- * `menubar.options.edit`: Added for `en_US`
- * `menubar.options.undo`: Added for `en_US`
- * `menubar.options.redo`: Added for `en_US`
- * `menubar.options.cut`: Added for `en_US`
- * `menubar.options.copy`: Added for `en_US`
- * `menubar.options.paste`: Added for `en_US`
  * `menubar.options.toggleprivate`: Added for `en_US`
  * `menubar.options.webremote`: Added for `en_US`
  * `menubar.options.audio`: Added for `en_US`
@@ -346,7 +328,6 @@ Update 29/04/2022 00:00 UTC
  * `menubar.options.accountsettings`: Added for `en_US`
  * `menubar.options.signout`: Added for `en_US`
  * `menubar.options.support`: Added for `en_US`
- * `menubar.options.help`: Added for `en_US`
  * `menubar.options.discord`: Added for `en_US`
  * `menubar.options.gihu`: Added for `en_US`
  * `menubar.options.report`: Added for `en_US`
diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index 9dafaf53..bd3edd6a 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -266,31 +266,13 @@
   "action.openArtworkInBrowser": "Open artwork in browser",
   "menubar.options.about": "About",
   "menubar.options.settings": "Settings",
-  "menubar.options.services": "Services",
-  "menubar.options.hide": "Hide Cider",
-  "menubar.options.hideothers": "Hide Others",
-  "menubar.options.unhide": "Show All",
   "menubar.options.quit": "Quit Cider",
   "menubar.options.view": "View ",
   "menubar.options.reload": "Reload",
   "menubar.options.forcereload": "Force Reload",
   "menubar.options.toggledevtools": "Toggle Developer Tools",
-  "menubar.options.resetzoom": "Reset Zoom",
-  "menubar.options.zoomin": "Zoom In",
-  "menubar.options.zoomout": "Zoom Out",
-  "menubar.options.togglefullscreen": "Toggle Fullscreen",
   "menubar.options.window": "Window",
   "menubar.options.minimize": "Minimize",
-  "menubar.options.show": "Show",
-  "menubar.options.zoom": "Zoom",
-  "menubar.options.front": "Front",
-  "menubar.options.close": "Close",
-  "menubar.options.edit": "Edit",
-  "menubar.options.undo": "Undo",
-  "menubar.options.redo": "Redo",
-  "menubar.options.cut": "Cut",
-  "menubar.options.copy": "Copy",
-  "menubar.options.paste": "Paste",
   "menubar.options.toggleprivate": "Toggle Private Session",
   "menubar.options.webremote": "Web Remote",
   "menubar.options.audio": "Audio Settings",
@@ -310,7 +292,6 @@
   "menubar.options.accountsettings": "Account Settings",
   "menubar.options.signout": "Sign Out",
   "menubar.options.support": "Support",
-  "menubar.options.help": "Help",
   "menubar.options.discord": "Discord",
   "menubar.options.github": "GitHub Wiki",
   "menubar.options.report": "Report a...",
diff --git a/src/i18n/es_ES.json b/src/i18n/es_ES.json
index 51701558..eb31ea60 100644
--- a/src/i18n/es_ES.json
+++ b/src/i18n/es_ES.json
@@ -266,31 +266,13 @@
   "action.openArtworkInBrowser": "Abrir Ilustración en el navegador",
   "menubar.options.about": "Acerca de",
   "menubar.options.settings": "Ajustes",
-  "menubar.options.services": "Servicios",
-  "menubar.options.hide": "Ocultar Cider",
-  "menubar.options.hideothers": "Ocultar Otros",
-  "menubar.options.unhide": "Mostrar Todos",
   "menubar.options.quit": "Salir",
   "menubar.options.view": "Ver",
   "menubar.options.reload": "Recargar",
   "menubar.options.forcereload": "Forzar Recarga",
   "menubar.options.toggledevtools": "Herramientas de Desarrollo",
-  "menubar.options.resetzoom": "Restablecer Zoom",
-  "menubar.options.zoomin": "Acercar",
-  "menubar.options.zoomout": "Alejar",
-  "menubar.options.togglefullscreen": "Pantalla Completa",
   "menubar.options.window": "Ventana",
   "menubar.options.minimize": "Minimizar",
-  "menubar.options.show": "Mostrar",
-  "menubar.options.zoom": "Zoom",
-  "menubar.options.front": "Frente",
-  "menubar.options.close": "Cerrar",
-  "menubar.options.edit": "Editar",
-  "menubar.options.undo": "Deshacer",
-  "menubar.options.redo": "Rehacer",
-  "menubar.options.cut": "Cortar",
-  "menubar.options.copy": "Copiar",
-  "menubar.options.paste": "Pegar",
   "menubar.options.toggleprivate": "Cambiar Sesión Privada",
   "menubar.options.webremote": "Web Remoto",
   "menubar.options.audio": "Configuraciones de Audio",
@@ -310,7 +292,6 @@
   "menubar.options.accountsettings": "Ajustes de Cuenta",
   "menubar.options.signout": "Cerrar Sesión",
   "menubar.options.support": "Soporte",
-  "menubar.options.help": "Ayuda",
   "menubar.options.discord": "Discord",
   "menubar.options.github": "GitHub Wiki",
   "menubar.options.report": "Reportar a...",
diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json
index 9dafaf53..bd3edd6a 100644
--- a/src/i18n/source/en_US.json
+++ b/src/i18n/source/en_US.json
@@ -266,31 +266,13 @@
   "action.openArtworkInBrowser": "Open artwork in browser",
   "menubar.options.about": "About",
   "menubar.options.settings": "Settings",
-  "menubar.options.services": "Services",
-  "menubar.options.hide": "Hide Cider",
-  "menubar.options.hideothers": "Hide Others",
-  "menubar.options.unhide": "Show All",
   "menubar.options.quit": "Quit Cider",
   "menubar.options.view": "View ",
   "menubar.options.reload": "Reload",
   "menubar.options.forcereload": "Force Reload",
   "menubar.options.toggledevtools": "Toggle Developer Tools",
-  "menubar.options.resetzoom": "Reset Zoom",
-  "menubar.options.zoomin": "Zoom In",
-  "menubar.options.zoomout": "Zoom Out",
-  "menubar.options.togglefullscreen": "Toggle Fullscreen",
   "menubar.options.window": "Window",
   "menubar.options.minimize": "Minimize",
-  "menubar.options.show": "Show",
-  "menubar.options.zoom": "Zoom",
-  "menubar.options.front": "Front",
-  "menubar.options.close": "Close",
-  "menubar.options.edit": "Edit",
-  "menubar.options.undo": "Undo",
-  "menubar.options.redo": "Redo",
-  "menubar.options.cut": "Cut",
-  "menubar.options.copy": "Copy",
-  "menubar.options.paste": "Paste",
   "menubar.options.toggleprivate": "Toggle Private Session",
   "menubar.options.webremote": "Web Remote",
   "menubar.options.audio": "Audio Settings",
@@ -310,7 +292,6 @@
   "menubar.options.accountsettings": "Account Settings",
   "menubar.options.signout": "Sign Out",
   "menubar.options.support": "Support",
-  "menubar.options.help": "Help",
   "menubar.options.discord": "Discord",
   "menubar.options.github": "GitHub Wiki",
   "menubar.options.report": "Report a...",
diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts
index 4783c0a4..a9d73428 100644
--- a/src/main/plugins/menubar.ts
+++ b/src/main/plugins/menubar.ts
@@ -194,7 +194,7 @@ export default class Thumbar {
         },
         {
             label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.support'),
-            role: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.help'),
+            role: 'help',
             submenu: [
                 {
                     label: utils.getLocale('Discord', 'menubar.options.discord'),

From c77ce5400065ba59366cef88b80dceaffb5358bc Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sun, 1 May 2022 17:40:13 +0700
Subject: [PATCH 068/141] add fail notyf

---
 src/main/plugins/raop.ts    | 3 +++
 src/renderer/main/vueapp.js | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/main/plugins/raop.ts b/src/main/plugins/raop.ts
index 77f9f8d1..be9bc577 100644
--- a/src/main/plugins/raop.ts
+++ b/src/main/plugins/raop.ts
@@ -198,6 +198,9 @@ export default class RAOP {
                     if (status == "pair_success"){
                         this._win.webContents.executeJavaScript(`app.sendAirPlaySuccess()`)
                     }
+                    if (status == "pair_failed"){
+                        this._win.webContents.executeJavaScript(`app.sendAirPlayFailed()`)
+                    }
                     if (status == 'stopped') {
                         this.airtunes.stopAll(() => {
                             console.log('end');
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 1811fa3d..052369ee 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -3837,6 +3837,9 @@ const app = new Vue({
         sendAirPlaySuccess(){
             notyf.success('Device paired successfully!');
         },
+        sendAirPlayFailed(){
+            notyf.error('Device paring failed!');
+        },
         windowFocus(val) {
             if (val) {
                 document.querySelectorAll(".animated-artwork-video").forEach(el => {

From f9f1c053d57b902cede07161c3b6248cb2c8c784 Mon Sep 17 00:00:00 2001
From: yazninja <yazlesean@gmail.com>
Date: Sun, 1 May 2022 19:31:53 +0800
Subject: [PATCH 069/141] move playIcon style to style.css

---
 src/renderer/style.css                                | 4 ++++
 src/renderer/views/components/mediaitem-list-item.ejs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/renderer/style.css b/src/renderer/style.css
index 6e617f33..8805281d 100644
--- a/src/renderer/style.css
+++ b/src/renderer/style.css
@@ -7936,6 +7936,10 @@ fieldset:disabled .btn {
   filter: contrast(0);
   background-repeat: no-repeat;
 }
+.cd-mediaitem-list-item .playIcon{
+  width: 44px;
+  margin-left: 11px;
+}
 .cd-mediaitem-list-item .heart-icon {
   position: absolute;
   right: 30em;
diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index d2b318d6..c77a50f8 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -23,7 +23,7 @@
                     <button @click="addToLibrary()" v-if="!addedToLibrary && (showIndex == false ||(showIndex == true && showIndexPlaylist != false))">
                         <div class="svg-icon addIcon" :style="{'--color': 'var(--keyColor)', '--url': 'url(./assets/feather/plus.svg)'}"></div>
                     </button>
-                    <button v-else-if='!(showArtwork == true && (showIndex == false ||(showIndex == true && showIndexPlaylist != false)))' @click="playTrack()" style="width: 44px;margin-left: -5px;">
+                    <button v-else-if='!(showArtwork == true && (showIndex == false ||(showIndex == true && showIndexPlaylist != false)))' @click="playTrack()">
                         <div class="svg-icon playIcon" :style="{'--color': 'var(--keyColor)', '--url': 'url(./assets/feather/play.svg)'}"></div>
                     </button>
                 </div>

From ae4a49669aabd09bbfdf89fbc03601786e89f81f Mon Sep 17 00:00:00 2001
From: yazninja <yazlesean@gmail.com>
Date: Sun, 1 May 2022 20:20:47 +0800
Subject: [PATCH 070/141] remove right property of heart icon

---
 src/renderer/less/elements.css  | 1 -
 src/renderer/less/elements.less | 2 +-
 src/renderer/style.css          | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/renderer/less/elements.css b/src/renderer/less/elements.css
index 9eee757a..20323ac9 100644
--- a/src/renderer/less/elements.css
+++ b/src/renderer/less/elements.css
@@ -373,7 +373,6 @@
 }
 .heart-icon {
   position: absolute;
-  right: 30em;
   filter: contrast(0);
   background-repeat: no-repeat;
 }
diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less
index b08a8d60..b2ee7753 100644
--- a/src/renderer/less/elements.less
+++ b/src/renderer/less/elements.less
@@ -458,7 +458,7 @@
 
   .heart-icon {
     position: absolute;
-    right: 30em;
+    right:0;
     filter: contrast(0);
     background-repeat: no-repeat;
   }
diff --git a/src/renderer/style.css b/src/renderer/style.css
index 8805281d..5683d8c9 100644
--- a/src/renderer/style.css
+++ b/src/renderer/style.css
@@ -7942,7 +7942,6 @@ fieldset:disabled .btn {
 }
 .cd-mediaitem-list-item .heart-icon {
   position: absolute;
-  right: 30em;
   filter: contrast(0);
   background-repeat: no-repeat;
 }

From 95e3cab7a5d02e0479ecfa467d4ba2da24b91061 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sun, 1 May 2022 21:13:36 +0700
Subject: [PATCH 071/141] test

---
 src/renderer/views/components/castmenu.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/components/castmenu.ejs b/src/renderer/views/components/castmenu.ejs
index 7ab727f3..afe4ff39 100644
--- a/src/renderer/views/components/castmenu.ejs
+++ b/src/renderer/views/components/castmenu.ejs
@@ -37,7 +37,7 @@
         <div class="md-option-container" style="margin-top: 12px;margin-bottom: 12px;">
             <div class="md-option-line">
                 <div class="md-option-segment">
-                    {{true ? 'Homepods only for now! (NO PASSWORD PLEASE!)' : 'Please add FFmpeg location in Settings -> Advanced'}}
+                    {{'EXPERIMENTAL!!! Supports Homepods / Apple TVs / Shairport for now, AirPlay on Samsung/LG/Sony devices will be added later'}}
                     <!-- {{$root.getLz('action.cast.airplay.underdevelopment')}} -->
                     <template v-if="true" v-for="(device) in devices.airplay">
                         <div class="md-option-line" style="cursor: pointer" @click="setAirPlayCast(device)">

From 59f0cd7ee29e1d4b699f1af3fc367d5b15da76d3 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sun, 1 May 2022 22:02:56 +0700
Subject: [PATCH 072/141] some cleanup

---
 src/main/plugins/raop.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/plugins/raop.ts b/src/main/plugins/raop.ts
index be9bc577..a4d70aba 100644
--- a/src/main/plugins/raop.ts
+++ b/src/main/plugins/raop.ts
@@ -89,9 +89,9 @@ export default class RAOP {
 `;
 
     private ondeviceup(name: any, host: any, port: any, addresses: any, text: any) {
-        if (this.castDevices.findIndex((item: any) => item.name === host && item.port === port && item.addresses === addresses) === -1) {
+        if (this.castDevices.findIndex((item: any) => item.name == host.replace(".local","") && item.port == port && item.addresses == addresses) === -1) {
             this.castDevices.push({
-                name: host,
+                name: host.replace(".local",""),
                 host: addresses ? addresses[0] : '',
                 port: port,
                 addresses: addresses,

From 5ee5eac35ab665ea426e6b86d59199cc42faa63a Mon Sep 17 00:00:00 2001
From: Monochromish <chillygamer7@gmail.com>
Date: Mon, 2 May 2022 06:52:07 +1000
Subject: [PATCH 073/141] Fixed the weird merging of heart and explicit icons
 and made a few changes.

In this PR:
* The Explicit and Love icon(s) don't merge and are of same size
* Added Display of unlove icon as well in case song is not loved

Screenshots:
---
 src/renderer/assets/feather/heart-fill.svg    |  2 +-
 src/renderer/assets/feather/heart.svg         |  2 +-
 src/renderer/less/elements.css                | 19 ++++++++++++++---
 src/renderer/less/elements.less               | 21 +++++++++++++++----
 .../views/components/mediaitem-list-item.ejs  |  5 +++--
 5 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/src/renderer/assets/feather/heart-fill.svg b/src/renderer/assets/feather/heart-fill.svg
index 1f790aad..4daaa2c8 100644
--- a/src/renderer/assets/feather/heart-fill.svg
+++ b/src/renderer/assets/feather/heart-fill.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-heart"><path d="M20.84 4.61a5.5 5.5 0 0 0-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 0 0-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 0 0 0-7.78z"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg"  x="0px" y="0px" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-heart"><path d="M20.84 4.61a5.5 5.5 0 0 0-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 0 0-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 0 0 0-7.78z"></path></svg>
\ No newline at end of file
diff --git a/src/renderer/assets/feather/heart.svg b/src/renderer/assets/feather/heart.svg
index a083b7e2..973edba4 100644
--- a/src/renderer/assets/feather/heart.svg
+++ b/src/renderer/assets/feather/heart.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-heart"><path d="M20.84 4.61a5.5 5.5 0 0 0-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 0 0-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 0 0 0-7.78z"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-heart"><path d="M20.84 4.61a5.5 5.5 0 0 0-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 0 0-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 0 0 0-7.78z"></path></svg>
\ No newline at end of file
diff --git a/src/renderer/less/elements.css b/src/renderer/less/elements.css
index 20323ac9..0c54721e 100644
--- a/src/renderer/less/elements.css
+++ b/src/renderer/less/elements.css
@@ -364,6 +364,21 @@
   align-items: center;
   justify-content: center;
 }
+.cd-mediaitem-list-item .heart-unfilled {
+  background-image: url("assets/feather/heart.svg");
+  height: 12px;
+  width: 36px;
+  filter: contrast(0);
+  background-repeat: no-repeat;
+}
+
+.cd-mediaitem-list-item .heart-filled {
+  background-image: url("assets/feather/heart-fill.svg");
+  height: 12px;
+  width: 36px;
+  filter: contrast(0);
+  background-repeat: no-repeat;
+}
 .cd-mediaitem-list-item .explicit-icon {
   background-image: url("assets/explicit.svg");
   height: 12px;
@@ -372,9 +387,7 @@
   background-repeat: no-repeat;
 }
 .heart-icon {
-  position: absolute;
-  filter: contrast(0);
-  background-repeat: no-repeat;
+  display: flex
 }
 @keyframes load-bar {
   10% {
diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less
index b2ee7753..27418eca 100644
--- a/src/renderer/less/elements.less
+++ b/src/renderer/less/elements.less
@@ -448,6 +448,22 @@
     justify-content: center;
   }
 
+  .heart-unfilled {
+    background-image: url("assets/feather/heart.svg");
+    height: 12px;
+    width: 36px;
+    filter: contrast(0);
+    background-repeat: no-repeat;
+  }
+
+  .heart-filled {
+    background-image: url("assets/feather/heart-fill.svg");
+    height: 12px;
+    width: 36px;
+    filter: contrast(0);
+    background-repeat: no-repeat;
+  }
+
   .explicit-icon {
     background-image: url("./assets/explicit.svg");
     height: 12px;
@@ -457,10 +473,7 @@
   }
 
   .heart-icon {
-    position: absolute;
-    right:0;
-    filter: contrast(0);
-    background-repeat: no-repeat;
+    display: flex
   }
 
   /* CSS.gg
diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index c77a50f8..a5ae3ce9 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -65,8 +65,9 @@
                     </template>
                 </div>
             </div>
-            <div class="heart-icon" v-if="isLoved">
-                <div class="svg-icon" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}"></div>
+            <div class="heart-icon">
+                <div class="heart-unfilled" v-if="isLoved == false" :style="{'--url': 'url(./assets/feather/heart.svg)'}" />
+                <div class="heart-filled" v-if="isLoved == true" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}" />
             </div>
             <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"></div>
             <template v-if="showMetaData == true" @dblclick="route()">

From 57b59d64c1ce902e61a62fe255060177330ed388 Mon Sep 17 00:00:00 2001
From: Mefsaal <mefsaal@gmail.com>
Date: Sun, 1 May 2022 18:06:53 -0300
Subject: [PATCH 074/141] im stupid

---
 src/i18n/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/README.md b/src/i18n/README.md
index 1622644a..3422daa7 100644
--- a/src/i18n/README.md
+++ b/src/i18n/README.md
@@ -329,7 +329,7 @@ Update 29/04/2022 00:00 UTC
  * `menubar.options.signout`: Added for `en_US`
  * `menubar.options.support`: Added for `en_US`
  * `menubar.options.discord`: Added for `en_US`
- * `menubar.options.gihu`: Added for `en_US`
+ * `menubar.options.github`: Added for `en_US`
  * `menubar.options.report`: Added for `en_US`
  * `menubar.options.bug`: Added for `en_US`
  * `menubar.options.feature`: Added for `en_US`

From 825d1b3bc2cb7ecdae6999228701f835c8cd503e Mon Sep 17 00:00:00 2001
From: child_duckling <19170969+quacksire@users.noreply.github.com>
Date: Sun, 1 May 2022 17:54:37 -0700
Subject: [PATCH 075/141] [connect] untested sync backend

---
 src/main/base/browserwindow.ts | 12 +++++++--
 src/main/base/store.ts         | 46 +++++++++++++++++++++++++++++++++-
 2 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 2089686c..bf63f4ea 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -37,6 +37,7 @@ export class BrowserWindow {
             platform: process.platform,
             dev: app.isPackaged,
             osRelease: os.release(),
+            updatable: !process.windowsStore || !process.mas,
             components: [
                 "pages/podcasts",
                 "pages/apple-account-settings",
@@ -1214,13 +1215,20 @@ export class BrowserWindow {
             shell.openPath(app.getPath('userData'));
         });
 
+        
+        //#region Cider Connect
         ipcMain.on('cc-auth', (_event) => {
             shell.openExternal(String(utils.getStoreValue('cc_authURL')));
         });
 
-        ipcMain.on('cc-logout', (_event) => {
+        ipcMain.on('cc-logout', (_event) => { //Make sure to update the default store
             utils.setStoreValue('connectUser', {
-                auth: null
+                "auth": null,
+                "sync": {
+                    themes: false,
+                    plugins: false,
+                    settings: false,
+                }
             });
             utils.getWindow().reload();
         });
diff --git a/src/main/base/store.ts b/src/main/base/store.ts
index 1ffbc502..44c1b710 100644
--- a/src/main/base/store.ts
+++ b/src/main/base/store.ts
@@ -1,7 +1,7 @@
 import * as ElectronStore from 'electron-store';
 import * as electron from "electron";
 import {app} from "electron";
-
+import fetch from "electron-fetch";
 export class Store {
     static cfg: ElectronStore;
 
@@ -212,6 +212,11 @@ export class Store {
         },
         "connectUser": {
             "auth": null,
+            "sync": {
+                themes: false,
+                plugins: false,
+                settings: false,
+            }
         },
     }
     private migrations: any = {
@@ -261,6 +266,7 @@ export class Store {
         return target
     }
 
+    
     /**
      * IPC Handler
      */
@@ -281,5 +287,43 @@ export class Store {
             Store.cfg.store = store
         })
     }
+    
+    
+    pushToCloud(): void {
+        if (Store.cfg.get('connectUser.auth') === null) return;
+        var syncData = Object();
+        if (Store.cfg.get('connectUser.sync.themes')) {
+            syncData.push({
+                themes: Store.cfg.store.themes
+            })
+        }
+        if (Store.cfg.get('connectUser.sync.plugins')) {
+            syncData.push({
+                plugins: Store.cfg.store.plugins
+            })
+        }
+    
+        if (Store.cfg.get('connectUser.sync.settings')) {
+            syncData.push({
+                general: Store.cfg.get('general'),
+                home: Store.cfg.get('home'),
+                libraryPrefs: Store.cfg.get('libraryPrefs'),
+                advanced: Store.cfg.get('advanced'),
+            })
+        }
+        let postBody = {
+            id: Store.cfg.get('connectUser.id'),
+            app: electron.app.getName(),
+            version: electron.app.isPackaged ? electron.app.getVersion() : 'dev',
+            syncData: syncData
+        }
 
+        fetch('https://connect.cidercollective.dev/api/v1/setttings/set', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify(postBody)
+        })
+    }
 }

From 7006ba617578c71fceab9dc7dd4797aba130be1a Mon Sep 17 00:00:00 2001
From: maikirakiwi <stella@mai.kiwi>
Date: Sun, 1 May 2022 18:17:08 -0700
Subject: [PATCH 076/141] electron18.2.0 bump

---
 package.json | 4 ++--
 winget.json  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 6cad8ece..b7347a4f 100644
--- a/package.json
+++ b/package.json
@@ -109,9 +109,9 @@
     }
   ],
   "build": {
-    "electronVersion": "18.1.0",
+    "electronVersion": "18.2.0",
     "electronDownload": {
-      "version": "18.1.0+wvcus",
+      "version": "18.2.0+wvcus",
       "mirror": "https://github.com/castlabs/electron-releases/releases/download/v"
     },
     "appId": "cider",
diff --git a/winget.json b/winget.json
index 351ef190..b184fd63 100644
--- a/winget.json
+++ b/winget.json
@@ -1,7 +1,7 @@
 {
-    "electronVersion": "18.0.4",
+    "electronVersion": "18.2.0",
     "electronDownload": {
-        "version": "18.0.4+wvcus",
+        "version": "18.2.0+wvcus",
         "mirror": "https://github.com/castlabs/electron-releases/releases/download/v"
     },
     "appId": "cider",

From 5701aea255375c55ac151a2451777b9a8447af2a Mon Sep 17 00:00:00 2001
From: child_duckling <19170969+quacksire@users.noreply.github.com>
Date: Sun, 1 May 2022 20:39:07 -0700
Subject: [PATCH 077/141] [connect] utils function

---
 src/main/base/app.ts   |  1 -
 src/main/base/store.ts |  2 +-
 src/main/base/utils.ts | 15 +++++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/base/app.ts b/src/main/base/app.ts
index 3ab49a66..9ae6b6a9 100644
--- a/src/main/base/app.ts
+++ b/src/main/base/app.ts
@@ -212,7 +212,6 @@ export class AppEvents {
      * Handles the creation of a new instance of the app
      */
     private InstanceHandler() {
-
         // Detects of an existing instance is running (So if the lock has been achieved, no existing instance has been found)
         const gotTheLock = app.requestSingleInstanceLock()
 
diff --git a/src/main/base/store.ts b/src/main/base/store.ts
index 44c1b710..fa8cbb2f 100644
--- a/src/main/base/store.ts
+++ b/src/main/base/store.ts
@@ -289,7 +289,7 @@ export class Store {
     }
     
     
-    pushToCloud(): void {
+    static pushToCloud(): void {
         if (Store.cfg.get('connectUser.auth') === null) return;
         var syncData = Object();
         if (Store.cfg.get('connectUser.sync.themes')) {
diff --git a/src/main/base/utils.ts b/src/main/base/utils.ts
index 9889c4ff..e010cfe0 100644
--- a/src/main/base/utils.ts
+++ b/src/main/base/utils.ts
@@ -80,6 +80,7 @@ export class utils {
         return Store.cfg.store
     }
 
+
     /**
      * Get the store instance
      * @returns {Store}
@@ -97,6 +98,18 @@ export class utils {
         Store.cfg.set(key, value)
     }
 
+    /**
+     * Pushes Store to Connect
+     * @return Function
+     */
+    static pushStoreToConnect(): Function {
+        return Store.pushToCloud
+    }
+
+
+
+
+
     /**
      * Gets the browser window
      */
@@ -198,4 +211,6 @@ export class utils {
         autoUpdater.logger = log
         await autoUpdater.checkForUpdatesAndNotify()
     }
+
+
 }

From 70677810414a8d4f48049d097132504be5cdc658 Mon Sep 17 00:00:00 2001
From: child_duckling <19170969+quacksire@users.noreply.github.com>
Date: Sun, 1 May 2022 20:54:06 -0700
Subject: [PATCH 078/141] [connect] cc push

---
 src/main/base/browserwindow.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index bf63f4ea..2556d2d9 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -1232,6 +1232,10 @@ export class BrowserWindow {
             });
             utils.getWindow().reload();
         });
+
+        ipcMain.on('cc-push', (_event) => {
+            utils.pushStoreToConnect();
+        })
         /* *********************************************************************************************
          * Window Events
          * **********************************************************************************************/

From 12be570a981a9e7233b0e523eb931b758bf39719 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 05:09:38 +0100
Subject: [PATCH 079/141] Renamed config var to discordrpc because this
 migration shit is giving me a headache

---
 src/main/base/store.ts                |  8 ++++----
 src/main/plugins/discordrpc.ts        | 16 ++++++++--------
 src/renderer/views/pages/settings.ejs | 22 +++++++++++-----------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/main/base/store.ts b/src/main/base/store.ts
index fa8cbb2f..6741395c 100644
--- a/src/main/base/store.ts
+++ b/src/main/base/store.ts
@@ -12,7 +12,7 @@ export class Store {
         },
         "general": {
             "close_button_hide": false,
-            "discord_rpc": {
+            "discordrpc": {
                 "enabled": false,
                 "client": "Cider",
                 "clear_on_pause": true,
@@ -221,13 +221,13 @@ export class Store {
     }
     private migrations: any = {
         '>=1.4.3': (store: ElectronStore) => {
-            if (typeof store.get('general.discord_rpc') == 'number' || typeof store.get('general.discord_rpc') == 'string') {
-                store.delete('general.discord_rpc');
+            if (typeof store.get('general.discordrpc') == 'number' || typeof store.get('general.discordrpc') == 'string') {
+                store.delete('general.discordrpc');
             }
         },
     }
     private schema: ElectronStore.Schema<any> = {
-        "general.discord_rpc": {
+        "general.discordrpc": {
             type: 'object'
         },
     }
diff --git a/src/main/plugins/discordrpc.ts b/src/main/plugins/discordrpc.ts
index 740a79b6..92f613e3 100644
--- a/src/main/plugins/discordrpc.ts
+++ b/src/main/plugins/discordrpc.ts
@@ -53,10 +53,10 @@ export default class DiscordRPC {
      * @private
      */
     private connect() {
-        if (!this._utils.getStoreValue("general.discord_rpc.enabled")) {
+        if (!this._utils.getStoreValue("general.discordrpc.enabled")) {
             return;
         }
-        const clientId = this._utils.getStoreValue("general.discord_rpc.client") === "Cider" ? '911790844204437504' : '886578863147192350';
+        const clientId = this._utils.getStoreValue("general.discordrpc.client") === "Cider" ? '911790844204437504' : '886578863147192350';
 
         // Apparently needed for ask to join, join, spectate etc.
         RPC.register(clientId)
@@ -187,7 +187,7 @@ export default class DiscordRPC {
         activity = DiscordRPC.filterActivity(activity, this._attributes)
 
         // Set the activity
-        if (!this._attributes.status && this._utils.getStoreValue("general.discord_rpc.clear_on_pause")) {
+        if (!this._attributes.status && this._utils.getStoreValue("general.discordrpc.clear_on_pause")) {
             this._client.clearActivity()
         } else if (this._activity && this._activityCache !== this._activity && this._activity.details) {
             this._client.setActivity(activity)
@@ -200,7 +200,7 @@ export default class DiscordRPC {
      * @param {object} attributes
      */
     private updateActivity(attributes: any) {
-        if (!this._utils.getStoreValue("general.discord_rpc.enabled") || this._utils.getStoreValue("general.privateEnabled")) {
+        if (!this._utils.getStoreValue("general.discordrpc.enabled") || this._utils.getStoreValue("general.privateEnabled")) {
             return
         } else if (!this._client || !this._connection) {
             this.connect()
@@ -208,15 +208,15 @@ export default class DiscordRPC {
 
         // Check if show buttons is (true) or (false)
         this._activity = {
-            details: this._utils.getStoreValue("general.discord_rpc.details_format"),
-            state: this._utils.getStoreValue("general.discord_rpc.state_format"),
+            details: this._utils.getStoreValue("general.discordrpc.details_format"),
+            state: this._utils.getStoreValue("general.discordrpc.state_format"),
             largeImageKey: attributes?.artwork?.url?.replace('{w}', '1024').replace('{h}', '1024'),
             largeImageText: attributes.albumName,
             instance: false // Whether the activity is in a game session
         }
 
         // Add the buttons if people want them
-        if (!this._utils.getStoreValue("general.discord_rpc.hide_buttons")) {
+        if (!this._utils.getStoreValue("general.discordrpc.hide_buttons")) {
             this._activity.buttons = [
                 {label: 'Listen on Cider', url: attributes.url.cider},
                 {label: 'View on Apple Music', url: attributes.url.appleMusic}
@@ -230,7 +230,7 @@ export default class DiscordRPC {
         }
 
         // If the user wants to keep the activity when paused
-        if (!this._utils.getStoreValue("general.discord_rpc.clear_on_pause")) {
+        if (!this._utils.getStoreValue("general.discordrpc.clear_on_pause")) {
             this._activity.smallImageKey = attributes.status ? 'play' : 'pause';
             this._activity.smallImageText = attributes.status ? 'Playing' : 'Paused';
         }
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index 40e7439e..c0a32127 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -1013,18 +1013,18 @@
                             </div>
                             <div class="md-option-segment md-option-segment_auto">
                                 <label>
-                                    <input type="checkbox" v-model="app.cfg.general.discord_rpc.enabled" switch/>
+                                    <input type="checkbox" v-model="app.cfg.general.discordrpc.enabled" switch/>
                                 </label>
                             </div>
                         </div>
 
-                        <div class="md-option-line" v-show="app.cfg.general.discord_rpc.enabled != false">
+                        <div class="md-option-line" v-show="app.cfg.general.discordrpc.enabled != false">
                             <div class="md-option-segment">
                                 {{$root.getLz('settings.option.connectivity.discordRPC.clientName')}}
                             </div>
                             <div class="md-option-segment md-option-segment_auto">
                                 <label>
-                                    <select class="md-select" v-model="app.cfg.general.discord_rpc.client">
+                                    <select class="md-select" v-model="app.cfg.general.discordrpc.client">
                                         <option value="Cider">{{$root.getLz('app.name')}}</option>
                                         <option value="AppleMusic">{{$root.getLz('term.appleMusic')}}
                                         </option>
@@ -1033,29 +1033,29 @@
                             </div>
                         </div>
 
-                        <div class="md-option-line" v-show="app.cfg.general.discord_rpc.enabled != false">
+                        <div class="md-option-line" v-show="app.cfg.general.discordrpc.enabled != false">
                             <div class="md-option-segment">
                                 {{$root.getLz('settings.option.connectivity.discordRPC.clearOnPause')}}
                             </div>
                             <div class="md-option-segment md-option-segment_auto">
                                 <label>
-                                    <input type="checkbox" v-model="app.cfg.general.discord_rpc.clear_on_pause" switch/>
+                                    <input type="checkbox" v-model="app.cfg.general.discordrpc.clear_on_pause" switch/>
                                 </label>
                             </div>
                         </div>
 
-                        <div class="md-option-line" v-show="app.cfg.general.discord_rpc.enabled != false">
+                        <div class="md-option-line" v-show="app.cfg.general.discordrpc.enabled != false">
                             <div class="md-option-segment">
                                 {{$root.getLz('settings.option.connectivity.discordRPC.hideButtons')}}
                             </div>
                             <div class="md-option-segment md-option-segment_auto">
                                 <label>
-                                    <input type="checkbox" v-model="app.cfg.general.discord_rpc.hide_buttons" switch/>
+                                    <input type="checkbox" v-model="app.cfg.general.discordrpc.hide_buttons" switch/>
                                 </label>
                             </div>
                         </div>
 
-                        <div class="md-option-line" v-show="app.cfg.general.discord_rpc.enabled != false">
+                        <div class="md-option-line" v-show="app.cfg.general.discordrpc.enabled != false">
                             <div class="md-option-segment">
                                 {{$root.getLz('settings.option.connectivity.discordRPC.detailsFormat')}}<br/>
                                 <small>{{$root.getLz('term.variables')}}: {artist}, {composer}, {title}, {album},
@@ -1063,12 +1063,12 @@
                             </div>
                             <div class="md-option-segment md-option-segment_auto">
                                 <label>
-                                    <input type="text" v-model="app.cfg.general.discord_rpc.details_format"/>
+                                    <input type="text" v-model="app.cfg.general.discordrpc.details_format"/>
                                 </label>
                             </div>
                         </div>
 
-                        <div class="md-option-line" v-show="app.cfg.general.discord_rpc.enabled != false">
+                        <div class="md-option-line" v-show="app.cfg.general.discordrpc.enabled != false">
                             <div class="md-option-segment">
                                 {{$root.getLz('settings.option.connectivity.discordRPC.stateFormat')}}
                                 <small>{{$root.getLz('term.variables')}}: {artist}, {composer}, {title}, {album},
@@ -1076,7 +1076,7 @@
                             </div>
                             <div class="md-option-segment md-option-segment_auto">
                                 <label>
-                                    <input type="text" v-model="app.cfg.general.discord_rpc.state_format"/>
+                                    <input type="text" v-model="app.cfg.general.discordrpc.state_format"/>
                                 </label>
                             </div>
                         </div>

From 6940c8bf7e146e7a50bf5f1705301db4aa912385 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 05:15:22 +0100
Subject: [PATCH 080/141] Fixed the fails

---
 .circleci/config.yml |  2 +-
 resources/circle.js  | 56 +++++++++++++++++++++-----------------------
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c9484eb6..91941e53 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ executors:
       - image: circleci/node:16
     working_directory: ~/Cider
 
-orbs: # adds orbs to your configuration
+orbs: # Add orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
 
 # The jobs for this project
diff --git a/resources/circle.js b/resources/circle.js
index dcf1d0ef..8a4a2ccb 100644
--- a/resources/circle.js
+++ b/resources/circle.js
@@ -1,53 +1,51 @@
-
-
 if (!process.env['CIRCLECI']) {
-    console.log(`[CIRCLECI SCRIPT] CircleCI not found... Aborting script`)
-    return
+	console.log(`[CIRCLECI SCRIPT] CircleCI not found... Aborting script`)
+	return
 }
 
 let fs = require('fs')
 
 
-var data = fs.readFileSync('package.json');
-var package = JSON.parse(data);
-
-
+const data = fs.readFileSync('package.json');
+const pkg = JSON.parse(data.toString());
 
 let channel;
 if (process.env['CIRCLE_BRANCH'] === 'lts') {
-    channel = 'latest'
+	channel = 'latest'
 } else if (process.env['CIRCLE_BRANCH'] === 'main') {
-    channel = 'beta'
+	channel = 'beta'
 } else if (process.env['CIRCLE_BRANCH'] === 'develop') {
-    channel = 'alpha'
+	channel = 'alpha'
 } else {
-    channel = process.env['CIRCLE_BRANCH'] // It won't have auto update support
+	channel = process.env['CIRCLE_BRANCH'] // It won't have auto update support
 }
 
 
+if (channel.concat('/')) {
+	channel.replace('/', '-')
+}
 
 // https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables
-var pvers = package.version.split('.')
-package.version = `${pvers[0]}.${pvers[1]}.${pvers[2]}-${channel}.${process.env['CIRCLE_BUILD_NUM']}`
+const version = pkg.version.split('.');
+pkg.version = `${version[0]}.${version[1]}.${version[2]}-${channel}.${process.env['CIRCLE_BUILD_NUM']}`
 // package.build.channel = channel
-package.publish = {
-    "provider": "github",
-    "repo": "cider-releases",
-    "owner": "ciderapp",
-    "vPrefixedTagName": true,
-    "tag": `v${package.version}`,
-    "channel": channel,
-    "releaseType": "release"
+pkg.publish = {
+	"provider": "github",
+	"repo": "cider-releases",
+	"owner": "ciderapp",
+	"vPrefixedTagName": true,
+	"tag": `v${pkg.version}`,
+	"channel": channel,
+	"releaseType": "release"
 }
 
 let {exec} = require('child_process')
-exec('echo $APP_VERSION', {env: {'APP_VERSION': package.version}}, function (error, stdout, stderr)
-{
-    console.log(stdout, stderr, error);
+exec('echo $APP_VERSION', {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) {
+	console.log(stdout, stderr, error);
 });
-fs.writeFile('package.json', JSON.stringify(package), err => {
-    // error checking
-    if(err) throw err;
-    console.log(`VERSION CHANGED TO ${package.version}`);
+fs.writeFile('package.json', JSON.stringify(pkg), err => {
+	// error checking
+	if (err) throw err;
+	console.log(`VERSION CHANGED TO ${pkg.version}`);
 });
 

From 4c2d64ef0dc9522548a0d62628c72224a6a042fe Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 05:18:01 +0100
Subject: [PATCH 081/141] shit

---
 .circleci/config.yml | 3 +--
 resources/circle.js  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 91941e53..c0038416 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,7 +15,6 @@ jobs:
     executor: cider-ci
     steps:
       - checkout
-      - run: ls -la
       - run:
           name: Set App Version
           command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
@@ -27,7 +26,7 @@ jobs:
           keys:
             - yarn-packages-{{ checksum "cider.lock" }}
       - run:
-          name: Install Dependencies
+          name: Install Node Dependencies
           command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
       - save_cache:
           name: Save Yarn Package Cache
diff --git a/resources/circle.js b/resources/circle.js
index 8a4a2ccb..e6349ff5 100644
--- a/resources/circle.js
+++ b/resources/circle.js
@@ -21,7 +21,7 @@ if (process.env['CIRCLE_BRANCH'] === 'lts') {
 }
 
 
-if (channel.concat('/')) {
+if (channel.includes('/')) {
 	channel.replace('/', '-')
 }
 

From 561ee3fe82ef908018cccc6b5b7449ce1cb87d21 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 05:22:41 +0100
Subject: [PATCH 082/141] is this gonna work

---
 resources/circle.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/resources/circle.js b/resources/circle.js
index e6349ff5..d62344b3 100644
--- a/resources/circle.js
+++ b/resources/circle.js
@@ -20,10 +20,7 @@ if (process.env['CIRCLE_BRANCH'] === 'lts') {
 	channel = process.env['CIRCLE_BRANCH'] // It won't have auto update support
 }
 
-
-if (channel.includes('/')) {
-	channel.replace('/', '-')
-}
+channel.split('/').join('-')
 
 // https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables
 const version = pkg.version.split('.');

From a417e8680f287da3fc11983c2e214ab33fb7602e Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 05:38:37 +0100
Subject: [PATCH 083/141] im a bit dumb

---
 resources/circle.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/resources/circle.js b/resources/circle.js
index d62344b3..210690fe 100644
--- a/resources/circle.js
+++ b/resources/circle.js
@@ -3,24 +3,20 @@ if (!process.env['CIRCLECI']) {
 	return
 }
 
-let fs = require('fs')
+const {readFileSync, writeFile} = require('fs')
+const pkg = JSON.parse(readFileSync('package.json').toString());
 
+let channel = process.env['CIRCLE_BRANCH'];
 
-const data = fs.readFileSync('package.json');
-const pkg = JSON.parse(data.toString());
-
-let channel;
 if (process.env['CIRCLE_BRANCH'] === 'lts') {
 	channel = 'latest'
 } else if (process.env['CIRCLE_BRANCH'] === 'main') {
 	channel = 'beta'
 } else if (process.env['CIRCLE_BRANCH'] === 'develop') {
 	channel = 'alpha'
-} else {
-	channel = process.env['CIRCLE_BRANCH'] // It won't have auto update support
 }
 
-channel.split('/').join('-')
+channel = channel.split('/').join('-')
 
 // https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables
 const version = pkg.version.split('.');
@@ -36,11 +32,13 @@ pkg.publish = {
 	"releaseType": "release"
 }
 
-let {exec} = require('child_process')
+const {exec} = require('child_process')
+
 exec('echo $APP_VERSION', {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) {
 	console.log(stdout, stderr, error);
 });
-fs.writeFile('package.json', JSON.stringify(pkg), err => {
+
+writeFile('package.json', JSON.stringify(pkg), err => {
 	// error checking
 	if (err) throw err;
 	console.log(`VERSION CHANGED TO ${pkg.version}`);

From 3518542eeec3e5485b80121b3ae0775e73943877 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 05:51:11 +0100
Subject: [PATCH 084/141] only run on main now

---
 .circleci/config.yml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c0038416..a6d9791f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -161,18 +161,33 @@ jobs:
 workflows:
   build_and_release:
     jobs:
-      - prepare-build
+      - prepare-build:
+          filters:
+            branches:
+              only: main
       - build-windows:
           requires:
             - prepare-build
+          filters:
+            branches:
+              only: main
       - build-linux:
           requires:
             - prepare-build
+          filters:
+            branches:
+              only: main
       - build-winget:
           requires:
             - prepare-build
+          filters:
+            branches:
+              only: main
       - release:
           requires:
             - build-windows
             - build-linux
             - build-winget
+          filters:
+            branches:
+              only: main

From 484a7ee045c65a88c5624559f1d10194c8dc8cfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=A5=E5=8F=A1?=
 <46503943+jay900604@users.noreply.github.com>
Date: Mon, 2 May 2022 14:11:58 +0800
Subject: [PATCH 085/141] Update zh_CN.json

Update CN language.
---
 src/i18n/zh_CN.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/i18n/zh_CN.json b/src/i18n/zh_CN.json
index 0726b1cc..ec6570d0 100644
--- a/src/i18n/zh_CN.json
+++ b/src/i18n/zh_CN.json
@@ -343,7 +343,7 @@
   "settings.notyf.visual.plugin.install.error": "插件安装失败",
   "settings.option.visual.theme.default": "默认",
   "settings.option.visual.theme.dark": "午夜黑",
-  "settings.option.visual.showPersonalInfo": "显示个人资料",
+  "settings.option.visual.showPersonalInfo": "显示个人信息",
   "settings.header.window": "窗口",
   "settings.header.window.description": "调整 Cider 的窗口设置",
   "settings.option.window.openOnStartup": "开机时，自动运行 Cider ",
@@ -368,11 +368,11 @@
   "settings.option.connectivity.discordRPC.hideButtons": "隐藏 Discord 动态上的按钮",
   "settings.option.connectivity.discordRPC.detailsFormat": "详细信息格式",
   "settings.option.connectivity.discordRPC.stateFormat": "动态格式",
-  "settings.option.connectivity.lastfmScrobble": "LastFM Scrobbling 记录",
-  "settings.option.connectivity.lastfmScrobble.delay": "LastFM Scrobble 延迟 (%)",
-  "settings.option.connectivity.lastfmScrobble.nowPlaying": "打开 LastFM 正在播放",
-  "settings.option.connectivity.lastfmScrobble.removeFeatured": "从歌名里去除合作者 (LastFM)",
-  "settings.option.connectivity.lastfmScrobble.filterLoop": "不记录单曲循环 (LastFM)",
+  "settings.option.connectivity.lastfmScrobble": "Last.FM 音乐记录",
+  "settings.option.connectivity.lastfmScrobble.delay": "Last.FM 歌曲追踪延迟 (%)",
+  "settings.option.connectivity.lastfmScrobble.nowPlaying": "打开 Last.FM 正在聆听",
+  "settings.option.connectivity.lastfmScrobble.removeFeatured": "从歌名里去除合作者 (Last.FM)",
+  "settings.option.connectivity.lastfmScrobble.filterLoop": "不记录单曲循环 (Last.FM)",
   "settings.header.debug": "Debug",
   "settings.option.debug.copy_log": "拷贝日志至剪贴板",
   "settings.option.debug.openAppData": "打开 Cider 程序文件夹",

From 010a2fdbc9e3a6d619bab7c6f75d331b26173883 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:00:19 +0100
Subject: [PATCH 086/141] test

---
 .circleci/config.yml | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a6d9791f..7738f477 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,6 +18,9 @@ jobs:
       - run:
           name: Set App Version
           command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
+      - run:
+          name: Rename Repository
+          command: sed -i 's/github:ciderapp\/Cider/github:ciderapp\/cider-releases/' package.json
       - run:
           name: Update Package Managers
           command: sudo npm update -g npm yarn
@@ -61,7 +64,7 @@ jobs:
           command: yarn circle:script
       - run:
           name: Generate Builds (Linux)
-          command: yarn electron-builder -l -p never
+          command: yarn electron-builder -l -p onTagOrDraft
           post-steps:
             - jira/notify
       - persist_to_workspace:
@@ -90,7 +93,7 @@ jobs:
           command: yarn circle:script
       - run:
           name: Generate Builds (Windows)
-          command: yarn electron-builder -w --x64 -p never
+          command: yarn electron-builder -w --x64 -p onTagOrDraft
           post-steps:
             - jira/notify
       - persist_to_workspace:
@@ -118,7 +121,7 @@ jobs:
           command: yarn circle:script
       - run:
           name: Generate Builds (Winget)
-          command: yarn electron-builder --win -c winget.json -p never
+          command: yarn electron-builder --win -c winget.json -p onTagOrDraft
           post-steps:
             - jira/notify
       - persist_to_workspace:
@@ -162,27 +165,27 @@ workflows:
   build_and_release:
     jobs:
       - prepare-build:
-          filters:
-            branches:
-              only: main
+#          filters:
+#            branches:
+#              only: main
       - build-windows:
           requires:
             - prepare-build
-          filters:
-            branches:
-              only: main
+#          filters:
+#            branches:
+#              only: main
       - build-linux:
           requires:
             - prepare-build
-          filters:
-            branches:
-              only: main
+#          filters:
+#            branches:
+#              only: main
       - build-winget:
           requires:
             - prepare-build
-          filters:
-            branches:
-              only: main
+#          filters:
+#            branches:
+#              only: main
       - release:
           requires:
             - build-windows

From e257018c5e04f75db1a777068366d641dce21878 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:00:35 +0100
Subject: [PATCH 087/141] oops

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7738f477..cb19f249 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -164,7 +164,7 @@ jobs:
 workflows:
   build_and_release:
     jobs:
-      - prepare-build:
+      - prepare-build
 #          filters:
 #            branches:
 #              only: main

From 499d40af6f8b7805f7719e95ebbd1c62731e9607 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:05:45 +0100
Subject: [PATCH 088/141] stop it now

---
 .circleci/config.yml | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cb19f249..7021cabf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,6 +28,9 @@ jobs:
           name: Restore Yarn Package Cache
           keys:
             - yarn-packages-{{ checksum "cider.lock" }}
+      - run:
+          name: Move Lockfile
+          command: mv cider.lock yarn.lock
       - run:
           name: Install Node Dependencies
           command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
@@ -165,27 +168,27 @@ workflows:
   build_and_release:
     jobs:
       - prepare-build
-#          filters:
-#            branches:
-#              only: main
+      #          filters:
+      #            branches:
+      #              only: main
       - build-windows:
           requires:
             - prepare-build
-#          filters:
-#            branches:
-#              only: main
+      #          filters:
+      #            branches:
+      #              only: main
       - build-linux:
           requires:
             - prepare-build
-#          filters:
-#            branches:
-#              only: main
+      #          filters:
+      #            branches:
+      #              only: main
       - build-winget:
           requires:
             - prepare-build
-#          filters:
-#            branches:
-#              only: main
+      #          filters:
+      #            branches:
+      #              only: main
       - release:
           requires:
             - build-windows

From f35594c287b9e482e311003f2122e4d26211a4fb Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:06:59 +0100
Subject: [PATCH 089/141] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7021cabf..7f0e5f24 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -33,7 +33,7 @@ jobs:
           command: mv cider.lock yarn.lock
       - run:
           name: Install Node Dependencies
-          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+          command: yarn install --cache-folder ~/.cache/yarn
       - save_cache:
           name: Save Yarn Package Cache
           key: yarn-packages-{{ checksum "cider.lock" }}

From 2fda5bab40c171eee407f7291f6cb8c27447f8ab Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:08:27 +0100
Subject: [PATCH 090/141] oops

---
 .circleci/config.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7f0e5f24..c0826a57 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,12 +28,9 @@ jobs:
           name: Restore Yarn Package Cache
           keys:
             - yarn-packages-{{ checksum "cider.lock" }}
-      - run:
-          name: Move Lockfile
-          command: mv cider.lock yarn.lock
       - run:
           name: Install Node Dependencies
-          command: yarn install --cache-folder ~/.cache/yarn
+          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
       - save_cache:
           name: Save Yarn Package Cache
           key: yarn-packages-{{ checksum "cider.lock" }}

From 70a0e4dd72b60ad5215bd2fb88fd49f88cef9982 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:12:58 +0100
Subject: [PATCH 091/141] oops

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c0826a57..84afba1b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -64,7 +64,7 @@ jobs:
           command: yarn circle:script
       - run:
           name: Generate Builds (Linux)
-          command: yarn electron-builder -l -p onTagOrDraft
+          command: yarn electron-builder -l -p always
           post-steps:
             - jira/notify
       - persist_to_workspace:
@@ -93,7 +93,7 @@ jobs:
           command: yarn circle:script
       - run:
           name: Generate Builds (Windows)
-          command: yarn electron-builder -w --x64 -p onTagOrDraft
+          command: yarn electron-builder -w --x64 -p always
           post-steps:
             - jira/notify
       - persist_to_workspace:
@@ -121,7 +121,7 @@ jobs:
           command: yarn circle:script
       - run:
           name: Generate Builds (Winget)
-          command: yarn electron-builder --win -c winget.json -p onTagOrDraft
+          command: yarn electron-builder --win -c winget.json -p always
           post-steps:
             - jira/notify
       - persist_to_workspace:

From 1efa3c1e6580a73d732ee64963a96cc89e27986f Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:24:16 +0100
Subject: [PATCH 092/141] test

---
 .circleci/config.yml | 3 +++
 resources/circle.js  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 84afba1b..d180b1c0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -59,6 +59,9 @@ jobs:
     steps:
       - attach_workspace:
           at: ~/Cider
+      - run:
+          name: Install Snap
+          command: sudo snap install snapcraft --classic
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script
diff --git a/resources/circle.js b/resources/circle.js
index 210690fe..80e7c8cf 100644
--- a/resources/circle.js
+++ b/resources/circle.js
@@ -20,7 +20,7 @@ channel = channel.split('/').join('-')
 
 // https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables
 const version = pkg.version.split('.');
-pkg.version = `${version[0]}.${version[1]}.${version[2]}-${channel}.${process.env['CIRCLE_BUILD_NUM']}`
+pkg.version = `${version[0]}.${version[1]}.${version[2]}-${channel}`
 // package.build.channel = channel
 pkg.publish = {
 	"provider": "github",

From f88e2420084279281122241bc7736d550b67f8f3 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:28:41 +0100
Subject: [PATCH 093/141] test

---
 .circleci/config.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d180b1c0..165e4340 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -61,7 +61,9 @@ jobs:
           at: ~/Cider
       - run:
           name: Install Snap
-          command: sudo snap install snapcraft --classic
+          command: |
+          sudo apt update
+          sudo apt install snapd
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script

From d457c573395d918242a9e77cece2e90e67c84c63 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:29:48 +0100
Subject: [PATCH 094/141] yml bad

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 165e4340..d15aafdf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -62,8 +62,8 @@ jobs:
       - run:
           name: Install Snap
           command: |
-          sudo apt update
-          sudo apt install snapd
+            sudo apt update
+            sudo apt install snapd
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script

From 42384afa1f313de8464906f0d031e628fa45f845 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:37:39 +0100
Subject: [PATCH 095/141] test

---
 .circleci/config.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d15aafdf..0abfc335 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -62,8 +62,9 @@ jobs:
       - run:
           name: Install Snap
           command: |
-            sudo apt update
-            sudo apt install snapd
+            sudo apt update && sudo apt install -y snapd
+            sudo snap install snapcraft --edge --classic
+            /snap/bin/snapcraft
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script

From ee9f65ddb63c1f18b567037f6b0073234ff224ce Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:40:43 +0100
Subject: [PATCH 096/141] test

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0abfc335..8f50e672 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -63,6 +63,8 @@ jobs:
           name: Install Snap
           command: |
             sudo apt update && sudo apt install -y snapd
+            service snapd start
+            sudo systemctl start snapd.service
             sudo snap install snapcraft --edge --classic
             /snap/bin/snapcraft
       - run:

From 5e8e8450dfdf765cebcfff0c74df14c6591ad8b0 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:43:26 +0100
Subject: [PATCH 097/141] fuk

---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8f50e672..b3e4a939 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -64,7 +64,6 @@ jobs:
           command: |
             sudo apt update && sudo apt install -y snapd
             service snapd start
-            sudo systemctl start snapd.service
             sudo snap install snapcraft --edge --classic
             /snap/bin/snapcraft
       - run:

From f5a6724308eb08902c567c66f73ba822d534baac Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:49:11 +0100
Subject: [PATCH 098/141] test

---
 .circleci/config.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b3e4a939..62abab43 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -63,9 +63,7 @@ jobs:
           name: Install Snap
           command: |
             sudo apt update && sudo apt install -y snapd
-            service snapd start
-            sudo snap install snapcraft --edge --classic
-            /snap/bin/snapcraft
+            docker run -v $(pwd):$(pwd) -t ubuntu:xenial sh -c "apt update -qq && apt install snapcraft -y && cd $(pwd) && snapcraft"
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script

From 36e5720362f382d3a9a173054b1764eba28de0d3 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:53:38 +0100
Subject: [PATCH 099/141] test

---
 .circleci/config.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 62abab43..70987eb6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -55,15 +55,17 @@ jobs:
             - license.txt
 
   build-linux:
-    executor: cider-ci
+    working_directory: ~/Cider
+    machine: true
     steps:
       - attach_workspace:
           at: ~/Cider
       - run:
-          name: Install Snap
+          name: Setup Snapcraft
           command: |
             sudo apt update && sudo apt install -y snapd
-            docker run -v $(pwd):$(pwd) -t ubuntu:xenial sh -c "apt update -qq && apt install snapcraft -y && cd $(pwd) && snapcraft"
+            sudo snap install snapcraft --edge --classic
+            /snap/bin/snapcraft
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script

From 7c90b03b244fccf445c8955b6d76db87e654a214 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:57:19 +0100
Subject: [PATCH 100/141] test

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 70987eb6..37f8d306 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -64,6 +64,8 @@ jobs:
           name: Setup Snapcraft
           command: |
             sudo apt update && sudo apt install -y snapd
+            sudo snap install core snapd
+            snap refresh core
             sudo snap install snapcraft --edge --classic
             /snap/bin/snapcraft
       - run:

From a76e795bfa7f3c7756751145e05bd903cb6b7116 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 09:00:00 +0100
Subject: [PATCH 101/141] test

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 37f8d306..5952714f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -64,9 +64,9 @@ jobs:
           name: Setup Snapcraft
           command: |
             sudo apt update && sudo apt install -y snapd
+            sudo snap install snapcraft --edge --classic
             sudo snap install core snapd
             snap refresh core
-            sudo snap install snapcraft --edge --classic
             /snap/bin/snapcraft
       - run:
           name: Fix Versioning and Add Channel

From 2c54d6c16613ed7d9bf44cfb92eb22388dbdcfcf Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 09:05:40 +0100
Subject: [PATCH 102/141] ok

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5952714f..206ddd8e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -64,9 +64,9 @@ jobs:
           name: Setup Snapcraft
           command: |
             sudo apt update && sudo apt install -y snapd
+            sudo snap install core
             sudo snap install snapcraft --edge --classic
-            sudo snap install core snapd
-            snap refresh core
+            sudo snap refresh core
             /snap/bin/snapcraft
       - run:
           name: Fix Versioning and Add Channel

From c009514c9d2e46d0d68cfb81fb31faff07cb7437 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 09:12:54 +0100
Subject: [PATCH 103/141] hmm

---
 .circleci/config.yml | 49 ++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 206ddd8e..2d7b5b75 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,9 +18,9 @@ jobs:
       - run:
           name: Set App Version
           command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
-      - run:
-          name: Rename Repository
-          command: sed -i 's/github:ciderapp\/Cider/github:ciderapp\/cider-releases/' package.json
+      #      - run:
+      #          name: Rename Repository
+      #          command: sed -i 's/github:ciderapp\/Cider/github:ciderapp\/cider-releases/' package.json
       - run:
           name: Update Package Managers
           command: sudo npm update -g npm yarn
@@ -55,25 +55,16 @@ jobs:
             - license.txt
 
   build-linux:
-    working_directory: ~/Cider
-    machine: true
+    executor: cider-ci
     steps:
       - attach_workspace:
           at: ~/Cider
-      - run:
-          name: Setup Snapcraft
-          command: |
-            sudo apt update && sudo apt install -y snapd
-            sudo snap install core
-            sudo snap install snapcraft --edge --classic
-            sudo snap refresh core
-            /snap/bin/snapcraft
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script
       - run:
           name: Generate Builds (Linux)
-          command: yarn electron-builder -l -p always
+          command: yarn electron-builder -l -p never
           post-steps:
             - jira/notify
       - persist_to_workspace:
@@ -102,7 +93,7 @@ jobs:
           command: yarn circle:script
       - run:
           name: Generate Builds (Windows)
-          command: yarn electron-builder -w --x64 -p always
+          command: yarn electron-builder -w --x64 -p never
           post-steps:
             - jira/notify
       - persist_to_workspace:
@@ -130,7 +121,7 @@ jobs:
           command: yarn circle:script
       - run:
           name: Generate Builds (Winget)
-          command: yarn electron-builder --win -c winget.json -p always
+          command: yarn electron-builder --win -c winget.json -p never
           post-steps:
             - jira/notify
       - persist_to_workspace:
@@ -173,28 +164,28 @@ jobs:
 workflows:
   build_and_release:
     jobs:
-      - prepare-build
-      #          filters:
-      #            branches:
-      #              only: main
+      - prepare-build:
+          filters:
+            branches:
+              only: main
       - build-windows:
           requires:
             - prepare-build
-      #          filters:
-      #            branches:
-      #              only: main
+          filters:
+            branches:
+              only: main
       - build-linux:
           requires:
             - prepare-build
-      #          filters:
-      #            branches:
-      #              only: main
+          filters:
+            branches:
+              only: main
       - build-winget:
           requires:
             - prepare-build
-      #          filters:
-      #            branches:
-      #              only: main
+          filters:
+            branches:
+              only: main
       - release:
           requires:
             - build-windows

From 89b5b80c1215da0b8db34d511425670c470c58b7 Mon Sep 17 00:00:00 2001
From: GamingLiamStudios <58615717+GamingLiamStudios@users.noreply.github.com>
Date: Mon, 2 May 2022 23:43:16 +1000
Subject: [PATCH 104/141] Update en_OWO.json

---
 src/i18n/en_OWO.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/i18n/en_OWO.json b/src/i18n/en_OWO.json
index 940d93fd..5e03b54d 100644
--- a/src/i18n/en_OWO.json
+++ b/src/i18n/en_OWO.json
@@ -73,6 +73,7 @@
   "term.viewAs": "View As",
   "term.viewAs.coverArt": "Cuvw Awt",
   "term.viewAs.list": "Wist",
+  "term.dynamic": "Dynyamic",
   "term.size": "Size",
   "term.size.normal": "Nyowmaw",
   "term.size.compact": "Compact",
@@ -199,6 +200,9 @@
   "podcast.episodes": "Episodes",
   "podcast.playEpisode": "Pway Episode",
   "podcast.website": "Podcast Website",
+  "action.edit": "Edit",
+  "action.done": "Donye",
+  "action.editTracklist": "Edit Twackwist",
   "action.addToLibrary": "Add to Wibwawy",
   "action.addToLibrary.success": "Added to Wibwawy",
   "action.addToLibrary.error": "Ewwow Adding to Wibwawy",
@@ -269,6 +273,10 @@
   "settings.option.general.resumebehavior.locally.description": "Cidew wiww wesume youw wast session on this machinye.",
   "settings.option.general.resumebehavior.history": "Histowy",
   "settings.option.general.resumebehavior.history.description": "Cidew wiww queue the wast song fwom youw uvwaww Appwe Music histowy, acwoss devices.",
+  "settings.option.general.resumetabs": "Open Tab on Waunch",
+  "settings.option.general.resumetabs.description": "You can choose what tab you want to open when you waunch Cidew.",
+  "settings.option.general.resumetabs.dynamic": "Dynyamic",
+  "settings.option.general.resumetabs.dynamic.description": "Cidew wiww open the tab that you wast used.",
   "settings.option.general.language.main": "Wanguages",
   "settings.option.general.language.fun": "Fun Wanguages",
   "settings.option.general.language.unsorted": "Unsowted",
@@ -280,6 +288,8 @@
   "settings.option.general.customizeSidebar": "Customize Sidebaw Items",
   "settings.option.general.customizeSidebar.customize": "Customize",
   "settings.option.general.keybindings": "Keybindings",
+  "settings.notyf.general.keybindings.update.success": "Keybind updated successfuwwy",
+  "settings.prompt.general.keybindings.update.success": "Keybind updated successfuwwy. Pwess OK to wewaunch Cidew",
   "settings.option.general.keybindings.open": "Open",
   "settings.description.search": "Seawch",
   "settings.description.albums": "Wibwawy Awbums",

From c70e9fc5b4b728f7979a215ea48319ee6fa28c02 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Mon, 2 May 2022 18:05:12 -0700
Subject: [PATCH 105/141] changed hover duration to 0s for faster response

---
 src/renderer/less/helpers.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/less/helpers.less b/src/renderer/less/helpers.less
index 245cce92..431947c4 100644
--- a/src/renderer/less/helpers.less
+++ b/src/renderer/less/helpers.less
@@ -353,7 +353,7 @@
 
       &:hover {
         &::before {
-          transition: transform .1s ease-in, opacity .1s ease-in;
+          transition: transform 0s ease-in, opacity 0s ease-in;
           opacity   : 1;
           transform : scale(1);
         }

From d1e7fdcc4af8b75c8db4df90eddfb0e4a01e7bad Mon Sep 17 00:00:00 2001
From: maikirakiwi <stella@mai.kiwi>
Date: Mon, 2 May 2022 23:46:04 -0700
Subject: [PATCH 106/141] dB SPL display

---
 src/main/base/store.ts                        |  2 ++
 src/main/plugins/raop.ts                      |  2 +-
 src/renderer/main/vueapp.js                   |  3 +++
 src/renderer/views/app/chrome-bottom.ejs      |  2 +-
 src/renderer/views/app/chrome-top.ejs         |  2 +-
 src/renderer/views/app/sidebar.ejs            |  2 +-
 .../views/components/audio-controls.ejs       |  2 +-
 src/renderer/views/components/fullscreen.ejs  |  2 +-
 src/renderer/views/pages/settings.ejs         | 24 +++++++++++++++++++
 9 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/main/base/store.ts b/src/main/base/store.ts
index 6741395c..e78c98bb 100644
--- a/src/main/base/store.ts
+++ b/src/main/base/store.ts
@@ -123,6 +123,8 @@ export class Store {
             "quality": "HIGH",
             "seamless_audio": true,
             "normalization": false,
+            "dBSPL": false,
+            "dBSPLcalibration": 90,
             "maikiwiAudio": {
                 "ciderPPE": false,
                 "ciderPPE_value": "MAIKIWI",
diff --git a/src/main/plugins/raop.ts b/src/main/plugins/raop.ts
index a4d70aba..e99c3de7 100644
--- a/src/main/plugins/raop.ts
+++ b/src/main/plugins/raop.ts
@@ -181,7 +181,7 @@ export default class RAOP {
                 this.portairplay = ipport;
                 this.device = this.airtunes.add(ipv4, {
                     port: ipport,
-                    volume: 60,
+                    volume: 50,
                     password: sepassword,
                     txt: txt
                 });
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 0356313f..d7ab7365 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -284,6 +284,9 @@ const app = new Vue({
                 }
             }
         },
+        formatVolumeTooltip() {
+            return this.cfg.audio.dBSPL ? (Number(this.cfg.audio.dBSPLcalibration) + (Math.log10(this.mk.volume) * 20)).toFixed(2) + ' dB SPL' : (Math.log10(this.mk.volume) * 20).toFixed(2) + ' dBFS'
+        },
         mainMenuVisibility(val) {
             if (val) {
                 (this.mk.isAuthorized) ? this.chrome.menuOpened = !this.chrome.menuOpened : false;
diff --git a/src/renderer/views/app/chrome-bottom.ejs b/src/renderer/views/app/chrome-bottom.ejs
index 4e88e841..e27a6e13 100644
--- a/src/renderer/views/app/chrome-bottom.ejs
+++ b/src/renderer/views/app/chrome-bottom.ejs
@@ -101,7 +101,7 @@
                     :class="{'active': this.cfg.audio.volume == 0}"></button>
             <input type="range" @wheel="volumeWheel" :step="cfg.audio.volumeStep" min="0" :max="cfg.audio.maxVolume"
                    v-model="mk.volume" v-if="typeof mk.volume != 'undefined'" @change="checkMuteChange()"
-                   v-b-tooltip.hover :title="`${(Math.log10(mk.volume) * 20).toFixed(2)} dB`">
+                   v-b-tooltip.hover :title="formatVolumeTooltip()">
         </div>
         <div class="app-chrome-item generic">
             <button class="playback-button--small miniplayer"
diff --git a/src/renderer/views/app/chrome-top.ejs b/src/renderer/views/app/chrome-top.ejs
index a64b36c0..0eac463e 100644
--- a/src/renderer/views/app/chrome-top.ejs
+++ b/src/renderer/views/app/chrome-top.ejs
@@ -134,7 +134,7 @@
                         :class="{'active': this.cfg.audio.volume == 0}"></button>
                 <input type="range" @wheel="volumeWheel" :step="cfg.audio.volumeStep" min="0" :max="cfg.audio.maxVolume"
                        v-model="mk.volume" v-if="typeof mk.volume != 'undefined'" @change="checkMuteChange()"
-                       v-b-tooltip.hover :title="`${(Math.log10(mk.volume) * 20).toFixed(2)} dB`">
+                       v-b-tooltip.hover :title="formatVolumeTooltip()">
             </div>
             <div class="app-chrome-item generic">
                 <button class="playback-button--small miniplayer"
diff --git a/src/renderer/views/app/sidebar.ejs b/src/renderer/views/app/sidebar.ejs
index 7f0b4292..17fe8fc1 100644
--- a/src/renderer/views/app/sidebar.ejs
+++ b/src/renderer/views/app/sidebar.ejs
@@ -216,7 +216,7 @@
                     <input type="range" class="" @wheel="volumeWheel" :step="cfg.audio.volumeStep" min="0"
                         :max="cfg.audio.maxVolume" v-model="mk.volume" v-if="typeof mk.volume != 'undefined'"
                         @change="checkMuteChange()" v-b-tooltip.hover
-                        :title="`${(Math.log10(mk.volume) * 20).toFixed(2)} dB`">
+                        :title="formatVolumeTooltip()">
                 </div>
             </div>
         </div>
diff --git a/src/renderer/views/components/audio-controls.ejs b/src/renderer/views/components/audio-controls.ejs
index 57a174e6..657a01d6 100644
--- a/src/renderer/views/components/audio-controls.ejs
+++ b/src/renderer/views/components/audio-controls.ejs
@@ -14,7 +14,7 @@
                     <div class="md-option-segment md-option-segment_auto percent">
                         <input type="number"
                                style="width: 100%; text-align: center; margin-right: 5px;" min="0"
-                               step="5" v-model="volume"/>
+                               step="2" v-model="volume"/>
                     </div>
                 </div>
                 <div class="md-option-line">
diff --git a/src/renderer/views/components/fullscreen.ejs b/src/renderer/views/components/fullscreen.ejs
index 065863c6..73f194af 100644
--- a/src/renderer/views/components/fullscreen.ejs
+++ b/src/renderer/views/components/fullscreen.ejs
@@ -82,7 +82,7 @@
                         <button class="volume-button--small volume" @click="app.muteButtonPressed()" :class="{'active': app.cfg.audio.volume == 0}"></button>
                         <input type="range" class="slider" @wheel="app.volumeWheel" :step="app.cfg.audio.volumeStep" min="0" :max="app.cfg.audio.maxVolume" v-model="app.mk.volume"
                                v-if="typeof app.mk.volume != 'undefined'" @change="app.checkMuteChange()"
-                               v-b-tooltip.hover :title="`${(Math.log10(app.mk.volume) * 20).toFixed(2)} dB`">
+                               v-b-tooltip.hover :title="$root.formatVolumeTooltip()">
                         </div>       
                     </div>
                     </div>
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index c0a32127..06f398fb 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -441,6 +441,30 @@
                                 </label>
                             </div>
                         </div>
+                        <div class="md-option-line" v-show="app.cfg.advanced.AudioContext && app.cfg.audio.normalization">
+                            <div class="md-option-segment">
+                                dB SPL Display
+                                <br>
+                                <small>(Advanced users only) Display dB SPL instead of dBFS on the volume slider.</small>
+                            </div>
+                            <div class="md-option-segment md-option-segment_auto">
+                                <label>
+                                    <input type="checkbox" v-model="app.cfg.audio.dBSPL" switch/>
+                                </label>
+                            </div>
+                        </div>
+                        <div class="md-option-line" v-show="app.cfg.audio.dBSPL">
+                            <div class="md-option-segment">
+                                0 dBFS Calibration
+                                <br>
+                                <small>Enter the peak Z-weighted dB SPL when Cider is at 0 dBFS.</small>
+                            </div>
+                            <div class="md-option-segment md-option-segment_auto">
+                                <label>
+                                    <input type="number" v-model="app.cfg.audio.dBSPLcalibration"/>
+                                </label>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </b-tab>

From 642f1784ecfe5beb21b5163c4125f8d8fbac221f Mon Sep 17 00:00:00 2001
From: Vasilis <vasilakis.lolipakis@gmail.com>
Date: Tue, 3 May 2022 14:12:48 +0300
Subject: [PATCH 107/141] Update Greek translations

---
 src/i18n/el_GR.json | 202 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 164 insertions(+), 38 deletions(-)

diff --git a/src/i18n/el_GR.json b/src/i18n/el_GR.json
index eda64396..c116b244 100644
--- a/src/i18n/el_GR.json
+++ b/src/i18n/el_GR.json
@@ -10,6 +10,7 @@
   "notification.updatingLibrarySongs": "Ενημέρωση βιβλιοθήκης τραγουδιών...",
   "notification.updatingLibraryAlbums": "Ενημέρωση βιβλιοθήκης άλμπουμ...",
   "notification.updatingLibraryArtists": "Ενημέρωση βιβλιοθήκης καλλιτεχνών...",
+  "term.variables": "Μεταβλητές",
   "term.appleInc": "Apple Inc.",
   "term.appleMusic": "Apple Music",
   "term.applePodcasts": "Apple Podcasts",
@@ -20,9 +21,13 @@
   "term.accountSettings": "Ρυθμίσεις λογαριασμού",
   "term.logout": "Αποσύνδεση",
   "term.login": "Σύνδεση",
+  "term.cast": "Μετάδοση",
   "term.about": "Σχετικά με",
   "term.privateSession": "Ιδιωτική περίοδος λειτουργίας",
+  "term.disablePrivateSession": "Απενεργ. ιδιωτικής περ. λειτουργίας",
   "term.queue": "Ουρά",
+  "term.lyrics": "Στίχοι",
+  "term.miniplayer": "MiniPlayer",
   "term.history": "Ιστορικό",
   "term.search": "Εύρεση",
   "term.library": "Βιβλιοθήκη",
@@ -68,6 +73,7 @@
   "term.viewAs": "Προβολή ως",
   "term.viewAs.coverArt": "Εξώφυλλο",
   "term.viewAs.list": "Λίστα",
+  "term.dynamic": "Δυναμικό",
   "term.size": "Μέγεθος",
   "term.size.normal": "Κανονικό",
   "term.size.compact": "Συμπαγή",
@@ -89,12 +95,26 @@
   "term.time.added": "Προστέθηκε",
   "term.time.released": "Κυκλοφόρησε",
   "term.time.updated": "Ενημερώθηκε",
+  "term.time.days": "μέρες",
+  "term.time.day": {
+    "one": "μέρα",
+    "other": "μέρες"
+  },
   "term.time.hours": "ώρες",
-  "term.time.hour": "ώρα",
+  "term.time.hour": {
+    "one": "ώρα",
+    "other": "ώρες"
+  },
   "term.time.minutes": "λεπτά",
-  "term.time.minute": "λεπτό",
+  "term.time.minute": {
+    "one": "λεπτό",
+    "other": "λεπτά"
+  },
   "term.time.seconds": "δευτερόλεπτα",
-  "term.time.second": "δευτερόλεπτο",
+  "term.time.second": {
+    "one": "δευτερόλεπτο",
+    "other": "δευτερόλεπτα"
+  },
   "term.fullscreenView": "Πλήρης οθόνη",
   "term.defaultView": "Κανονική οθόνη",
   "term.audioSettings": "Ρυθμίσεις ήχου",
@@ -114,7 +134,8 @@
   "term.contributors": "Συνεισφέροντες",
   "term.equalizer": "Ισοσταθμιστής",
   "term.reset": "Επαναφορά",
-  "term.tracks": {
+  "term.tracks": "τραγούδια",
+  "term.track": {
     "one": "τραγούδι",
     "other": "τραγούδια"
   },
@@ -145,6 +166,7 @@
   "term.noVideos": "Δεν βρέθηκαν βίντεο",
   "term.plugin": "Πρόσθετα",
   "term.pluginMenu": "Μενού πρόσθετων",
+  "term.pluginMenu.none": "Δεν υπάρχουν πρόσθετα",
   "term.replay": "Replay",
   "term.uniqueAlbums": "Μοναδικά άλμπουμ",
   "term.uniqueArtists": "Μοναδικοί καλλιτέχνες",
@@ -156,10 +178,12 @@
   "term.plays": "Αναπαραγωγές",
   "term.topGenres": "Κορυφαία είδη",
   "term.confirmLogout": "Θέλετε σίγουρα να αποσυνδεθείτε;",
+  "term.creditDesignedBy": "Σχεδιάστηκε από ${authorUsername}",
+  "term.discNumber": "Δίσκος ${discNumber}",
   "home.title": "Αρχική",
   "home.recentlyPlayed": "Έπαιξαν πρόσφατα",
   "home.recentlyAdded": "Πρόσφατες προσθήκες",
-  "home.artistsFeed": "Ροή των καλλιτεχνών σου",
+  "home.artistsFeed": "Ροή των καλλιτεχνών σας",
   "home.artistsFeed.noArtist": "Ακολούθησε μερικούς καλλιτέχνες πρώτα και οι τελευταίες κυκλοφορίες τους θα εμφανίζονται εδώ",
   "home.madeForYou": "Δημιουργήθηκε για εσάς",
   "home.friendsListeningTo": "Οι φίλοι σου ακούν",
@@ -176,6 +200,9 @@
   "podcast.episodes": "Επεισόδια",
   "podcast.playEpisode": "Αναπαραγωγή επεισοδίου",
   "podcast.website": "Ιστότοπος Podcast",
+  "action.edit": "Επεξεργασία",
+  "action.done": "Τέλος",
+  "action.editTracklist": "Επεξεργασία λίστας τραγουδιών",
   "action.addToLibrary": "Προσθήκη στη βιβλιοθήκη",
   "action.addToLibrary.success": "Προστέθηκε στη βιβλιοθήκη",
   "action.addToLibrary.error": "Σφάλμα Προσθήκης στη βιβλιοθήκης",
@@ -202,6 +229,8 @@
   "action.startRadio": "Έναρξη ραδιοφώνου",
   "action.goToArtist": "Μετάβαση σε καλλιτέχνη",
   "action.goToAlbum": "Μετάβαση σε άλμπουμ",
+  "action.showInPlaylist": "Εμφάνιση στη λίστα αναπαραγωγής",
+  "action.showInAppleMusic": "Εμφάνιση στο Apple Music",
   "action.moveToTop": "Μετακίνηση στη κορυφή",
   "action.share": "Κοινή χρήση",
   "action.rename": "Μετονομασία",
@@ -209,7 +238,7 @@
   "action.unlove": "Αναίρεση \"Μου αρέσει\"",
   "action.dislike": "Δεν μου αρέσει",
   "action.undoDislike": "Αναίρεση \"Δεν μου αρέσει\"",
-  "action.showWebRemoteQR": "Εμφάνιση Web Remote QR",
+  "action.showWebRemoteQR": "Web Remote",
   "action.playTracksNext": "Αναπαραγωγή ${app.selectedMediaItems.length} τραγουδιών ως επόμενων",
   "action.playTracksLater": "Αναπαραγωγή ${app.selectedMediaItems.length} τραγουδιών αργότερα",
   "action.removeTracks": "Αφαίρεση ${self.selectedItems.length} τραγουδιών από την ουρά",
@@ -218,13 +247,23 @@
   "action.showAlbum": "Εμφάνιση ολόκληρου άλμπουμ",
   "action.tray.minimize": "Ελαχιστοποίηση στη γωνία γραμμής εργασιών",
   "action.tray.quit": "Έξοδος",
-
+  "action.tray.show": "Εμφάνιση Cider",
   "action.update": "Ενημέρωση",
   "action.install": "Εγκατάσταση",
   "action.copy": "Αντιγραφή",
   "action.newpreset": "Νέα προρύθμιση...",
   "action.deletepreset": "Διαγραφή προρύθμισης",
   "action.open": "Άνοιγμα",
+  "action.relaunch.confirm": "Θέλετε να επανεκκινήσετε τον Cider;",
+  "action.cast.chromecast": "Chromecast",
+  "action.cast.todevices": "Μετάδοση σε συσκευές",
+  "action.cast.stop": "Διακοπή μετάδοσης σε όλες τις συσκευές",
+  "action.cast.airplay": "AirPlay",
+  "action.cast.airplay.underdevelopment": "Το AirPlay είναι ακόμη υπό ανάπτυξη",
+  "action.cast.scan": "Σάρωση",
+  "action.cast.scanning": "Γίνεται σάρωση...",
+  "action.createNew": "Δημιουργία νέου...",
+  "action.openArtworkInBrowser": "Άνοιγμα εξώφυλλου στον περιηγητή",
   "settings.header.general": "Γενικά",
   "settings.header.general.description": "Προσαρμογή γενικών ρυθμίσεων για το Cider.",
   "settings.option.general.language": "Γλώσσα",
@@ -234,6 +273,10 @@
   "settings.option.general.resumebehavior.locally.description": "Το Cider θα συνεχίσει την τελευταία συνεδρία σας αυτής της συσκευής.",
   "settings.option.general.resumebehavior.history": "Ιστορικό",
   "settings.option.general.resumebehavior.history.description": "Το Cider θα βάλει στην ουρά το τελευταίο τραγούδι από το συνολικό ιστορικό Apple Music, όλων των συσκευών σας.",
+  "settings.option.general.resumetabs": "Άνοιγμα καρτέλας στην εκκίνηση",
+  "settings.option.general.resumetabs.description": "Μπορείτε να επιλέξετε ποια καρτέλα θα εμφανίζεται όταν ανοίγετε τον Cider.",
+  "settings.option.general.resumetabs.dynamic": "Δυναμικό",
+  "settings.option.general.resumetabs.dynamic.description": "Ο Cider θα ανοίγει την καρτέλα που χρησιμοποιήσατε τελευταία.",
   "settings.option.general.language.main": "Γλώσσες",
   "settings.option.general.language.fun": "Γλώσσες για πλάκα",
   "settings.option.general.language.unsorted": "Αταξινόμητες",
@@ -242,10 +285,34 @@
   "settings.option.general.updateCider.branch.description": "Επιλέξτε τον κλάδο στον οποίο θα γίνεται η ενημέρωση του Cider",
   "settings.option.general.updateCider.branch.main": "Σταθερό",
   "settings.option.general.updateCider.branch.develop": "Αναπτυξιακό",
+  "settings.option.general.customizeSidebar": "Προσαρμογή στοιχείων πλευρικής μπάρας",
+  "settings.option.general.customizeSidebar.customize": "Προσαρμογή",
+  "settings.option.general.keybindings": "Συνδυασμοί πλήκτρων",
+  "settings.notyf.general.keybindings.update.success": "Ο συνδιασμός ενημερώθηκε με επιτυχία",
+  "settings.prompt.general.keybindings.update.success": "Ο συνδιασμός ενημερώθηκε με επιτυχία. Πατήστε ΟΚ για επανεκκίνηση του Cider",
+  "settings.option.general.keybindings.open": "Άνοιγμα",
+  "settings.description.search": "Αναζήτηση",
+  "settings.description.albums": "Άλμπουμ βιβλιοθήκης",
+  "settings.description.artists": "Καλλιτέχνες βιβλιοθήκης",
+  "settings.description.browse": "Περιήγηση",
+  "settings.description.private": "Εναλλαγή ιδιωτικής περιόδου λειτουργίας",
+  "settings.description.remote": "Web Remote",
+  "settings.description.audio": "Ρυθμίσεις ήχου",
+  "settings.description.plugins": "Μενού πρόσθετων",
+  "settings.description.cast": "Μετάδοση σε συσκευές",
+  "settings.description.settings": "Ρυθμίσεις",
+  "settings.description.developer": "Εργαλεία προγραμματιστή",
+  "settings.notyf.updateCider.update-not-available": "Δεν υπάρχει διαθέσιμη ενημέρωση",
+  "settings.notyf.updateCider.update-downloaded": "Έγινε λήψη της ενημέρωσης, επανεκκίνησε για εφαρμογή",
+  "settings.notyf.updateCider.update-error": "Σφάλμα ενημέρωσης του Cider",
+  "settings.notyf.updateCider.update-timeout": "Λήξη χρόνου ενημέρωσης",
   "settings.header.audio": "Ήχος",
   "settings.header.audio.description": "Προσαρμογή ρυθμίσεων ήχου για το Cider.",
   "settings.option.audio.volumeStep": "Βήματα έντασης",
   "settings.option.audio.maxVolume": "Μέγιστη ένταση",
+  "settings.option.audio.changePlaybackRate": "Αλλαγή ταχύτητας αναπαραγωγής",
+  "settings.option.audio.playbackRate": "Ταχύτητα αναπαραγωγής",
+  "settings.option.audio.playbackRate.change": "Αλλαγή",
   "settings.option.audio.quality": "Ποιότητα ήχου",
   "settings.header.audio.quality.hireslossless": "Lossless υψηλής ανάλυσης",
   "settings.header.audio.quality.hireslossless.description": "έως και 24-bit/192 kHz",
@@ -258,18 +325,34 @@
   "settings.option.audio.seamlessTransition": "Αδιάκοπη μετάβαση ήχου",
   "settings.option.audio.enableAdvancedFunctionality": "Ενεργοποίηση προηγμένης λειτουργικότητας",
   "settings.option.audio.enableAdvancedFunctionality.description": "Ενεργοποιώντας τη λειτουργικότητα AudioContext θα επιτρέψει σε επεκταμένες δυνατότητες ήχου όπως Κανονικοποίηση Έντασης Ήχου, Ισοσταθμιστές και Οπτικοποιητές, ωστόσο σε κάποια συστήματα μπορεί να προκαλέσει τραύλισμα ήχου.",
+  "settings.warn.audio.enableAdvancedFunctionality.lowcores": "Η συσκευή σου ίσως να μη μπορέσει να χειρηστεί αυτές τις δυνατότητες. Σίγουρα θέλετε να συνεχίσετε;",
   "settings.option.audio.audioLab": "Cider Audio Lab",
-  "settings.option.audio.audioLab.description": "Περιέχει μια ποικιλία από τροποποιήσεις ήχου που έγιναν από την ομάδα προγραμματιστών του Cider",
+  "settings.option.audio.audioLab.description": "Μια ποικιλία τροποποιήσεων ήχου από την ομάδα προγραμματιστών του Cider.",
+  "settings.option.audio.audioLab.subheader": "Σχεδιάστηκε από τους προγραμματιστές του Cider",
   "settings.warn.audioLab.withoutAF": "Το AudioContext (προηγμένη λειτουργικότητα) απαιτείται για την ενεργοποίηση του Cider Audio Laboratory.",
-  "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity": "Ένταση Analog Warmth",
-  "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.description": "Αλλάζει την ένταση της επεξεργασίας του Analog Warmth Module.",
+  "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "Αναλογική ζεστασιά",
+  "settings.option.audio.enableAdvancedFunctionality.analogWarmth.description": "Προσομοιώνει την αναλογική ζεστασιά του Korg Nutube 6P1",
+  "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity": "Ένταση αναλογικής ζεστασιάς",
+  "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.description": "Αλλάζει την ένταση της επεξεργασίας της αναλογικής ζεστασιάς.",
+  "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.smooth": "Λείο",
+  "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.warm": "Θερμό",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer": "Ατμόσφαιρα ήχου",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer.description": "Εφαρμόζει μια διαφορετική ατμόσφαιρα στον ήχο.",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode": "Λειτουργία ατμόσφαιρας ήχου",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.description": "Αλλάζει τη λειτουργία ατμόσφαιρας ήχου.",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural1": "Φυσική (Κανονικό)",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural2": "Φυσική (Υψηλό)",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural3": "Φυσική (Υψηλότερο)",
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Επεξεργαστής ήχου Cider (CAP)",
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "Βελτιώνει την αντιληπτή ποιότητα ήχου χρησιμοποιώντας αλγορίθμους.",
   "settings.warn.audio.enableAdvancedFunctionality.ciderPPE.compatibility": "Το CAP δεν είναι συμβατό με τη Χωρικοποίηση Ήχου. Παρακαλούμε απενεργοποιήστε τη Χωρικοποίηση Ήχου για να συνεχίσετε.",
   "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength": "Ένταση CAP",
   "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description": "Αλλάζει την ένταση της επεξεργασίας του ήχου. (Η επιθετική επεξεργασία μπορεί να αποφέρει ανεπιθύμητα αποτελέσματα)",
   "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard": "Κανονική",
   "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "Επιθετική",
-  "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "Κανονικοποίηση Έντασης Ήχου",
-  "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "Κανονικοποιεί την ένταση για μεμονωμένα κομμάτια για μια πιο ομοιόμορφη εμπειρία ακρόασης.",
+  "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "Κανονικοποίηση έντασης ήχου",
+  "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "Κανονικοποιεί την ένταση για μεμονωμένα κομμάτια για μια πιο ομοιόμορφη εμπειρία ακρόασης. (Δεν λειτουργεί σε κομμάτια που ανέβηκαν από χρήστες)",
+  "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "Διαχειρίζεται από το Audio Lab",
   "settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "Χωρικοποίηση Ήχου",
   "settings.option.audio.enableAdvancedFunctionality.audioSpatialization.description": "Πιο τρισδιάστατος και χωρικοποιημένος ήχος (σημείωση: Αυτό δεν είναι Dolby Atmos)",
   "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization": "Χωρικοποίηση Cider",
@@ -281,15 +364,16 @@
   "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "Η Χωρικοποίηση δεν είναι συμβατή με το CAP. Παρακαλούμε απενεργοποιήστε το CAP για να συνεχίσετε.",
   "settings.header.visual": "Οπτικά",
   "settings.header.visual.description": "Προσαρμογή οπτικών ρυθμίσεων για το Cider.",
-  "settings.option.visual.windowBackgroundStyle": "Στυλ Φόντου Παραθύρου",
+  "settings.option.visual.windowStyle": "Στυλ παραθύρου",
+  "settings.option.visual.windowBackgroundStyle": "Στυλ φόντου παραθύρου",
   "settings.header.visual.windowBackgroundStyle.none": "Κανένα",
   "settings.header.visual.windowBackgroundStyle.artwork": "Εξώφυλλο",
   "settings.header.visual.windowBackgroundStyle.image": "Εικόνα",
-  "settings.option.visual.animatedArtwork": "Κινούμενο Εξώφυλλο",
+  "settings.option.visual.animatedArtwork": "Κινούμενο εξώφυλλο",
   "settings.header.visual.animatedArtwork.always": "Πάντα",
   "settings.header.visual.animatedArtwork.limited": "Περιορισμός σε σελίδες και ειδικές καταχωρήσεις",
   "settings.header.visual.animatedArtwork.disable": "Απενεργοποιημένο παντού",
-  "settings.option.visual.animatedArtworkQuality": "Ποιότητα Κινούμενου Εξωφύλλου",
+  "settings.option.visual.animatedArtworkQuality": "Ποιότητα κινούμενου εξωφύλλου",
   "settings.header.visual.animatedArtworkQuality.low": "Χαμηλή",
   "settings.header.visual.animatedArtworkQuality.medium": "Μέτρια",
   "settings.header.visual.animatedArtworkQuality.high": "Υψηλή",
@@ -300,30 +384,52 @@
   "settings.option.visual.hardwareAcceleration.description": "Απαιτεί επανεκκίνηση",
   "settings.header.visual.hardwareAcceleration.default": "Προεπιλογή",
   "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU",
+  "settings.option.visual.uiscale": "Κλίμακα διεπαφής χρήστη",
   "settings.header.visual.theme": "Θέμα",
   "settings.option.visual.theme.github.download": "Εγκατάσταση από σύνδεσμο GitHub",
+  "settings.option.visual.theme.github.openfolder": "Άνοιγμα φακέλου θεμάτων",
   "settings.option.visual.theme.github.explore": "Εξερεύνηση θεμάτων GitHub",
   "settings.header.visual.theme.github.page": "Θέματα από το GitHub",
   "settings.option.visual.theme.github.install.confirm": "Θέλετε σίγουρα να εγκαταστήσετε το θέμα {{ repo }};",
   "settings.prompt.visual.theme.github.URL": "Εισάγετε τον σύνδεσμο του θέματος που θέλετε να εγκαταστήσετε",
   "settings.notyf.visual.theme.install.success": "Το θέμα εγκαταστάθηκε με επιτυχία",
   "settings.notyf.visual.theme.install.error": "Αποτυχία εγκατάστασης του θέματος",
+  "settings.header.visual.plugin": "Πρόσθετο",
+  "settings.option.visual.plugin.github.download": "Εγκατάσταση από σύνδεσμο GitHub",
+  "settings.option.visual.plugin.github.explore": "Εξερεύνηση πρόσθετων GitHub",
+  "settings.header.visual.plugin.github.page": "Πρόσθετα από το GitHub",
+  "settings.option.visual.plugin.github.install.confirm": "Θέλετε σίγουρα να εγκαταστήσετε το πρόσθετο {{ repo }};",
+  "settings.prompt.visual.plugin.github.URL": "Εισάγετε τον σύνδεσμο του πρόσθετου που θέλετε να εγκαταστήσετε",
+  "settings.prompt.visual.plugin.github.success": "Το πρόσθετο εγκαταστάθηκε με επιτυχία, πατήστε ΟΚ για επανεκκίνηση του Cider",
+  "settings.notyf.visual.plugin.install.success": "Το πρόσθετο εγκαταστάθηκε με επιτυχία",
+  "settings.notyf.visual.plugin.install.error": "Αποτυχία εγκατάστασης του πρόσθετου",
   "settings.option.visual.theme.default": "Cider",
   "settings.option.visual.theme.dark": "Σκοτεινό",
   "settings.option.visual.showPersonalInfo": "Εμφάνιση προσωπικών στοιχείων",
+  "settings.header.window": "Παράθυρο",
+  "settings.header.window.description": "Προσαρμογή ρυθμίσεων παραθύρου για το Cider.",
+  "settings.option.window.openOnStartup": "Άνοιγμα του Cider στην εκκίνηση",
+  "settings.option.window.openOnStartup.hidden": "Άνοιγμα κρυμμένο",
+  "settings.option.window.useNativeTitleBar": "Χρήση γραμμής τίτλου του συστήμστος",
+  "settings.option.window.windowControlStyle": "Στυλ ελέγχου παραθύρου",
+  "settings.option.window.windowControlStyle.right": "Δεξιά",
+  "settings.option.window.windowControlStyle.left": "Αριστερά",
   "settings.header.lyrics": "Στίχοι",
   "settings.header.lyrics.description": "Προσαρμογή ρυθμίσεων στίχων για το Cider.",
-  "settings.option.lyrics.enableMusixmatch": "Ενεργοποίηση Στίχων Musixmatch",
-  "settings.option.lyrics.enableMusixmatchKaraoke": "Ενεργοποίηση Λειτουργίας Καραόκε (Musixmatch μόνο)",
-  "settings.option.lyrics.musixmatchPreferredLanguage": "Προτιμώμενη Γλώσσα Μετάφρασης Musixmatch",
-  "settings.option.lyrics.enableYoutubeLyrics": "Ενεργοποίηση Στίχων Youtube για Μουσικά Βίντεο",
-  "settings.header.connectivity": "Σύνδεση",
-  "settings.header.connectivity.description": "Προσαρμογή ρυθμίσεων σύνδεσης για το Cider.",
+  "settings.option.lyrics.enableMusixmatch": "Ενεργοποίηση στίχων Musixmatch",
+  "settings.option.lyrics.enableMusixmatchKaraoke": "Ενεργοποίηση λειτουργίας καραόκε (Musixmatch μόνο)",
+  "settings.option.lyrics.musixmatchPreferredLanguage": "Προτιμώμενη γλώσσα μετάφρασης Musixmatch",
+  "settings.option.lyrics.enableYoutubeLyrics": "Ενεργοποίηση στίχων Youtube για μουσικά βίντεο",
+  "settings.option.lyrics.enableQQLyrics": "Ενεργοποίηση στίχων QQ",
+  "settings.header.connectivity": "Συνδεσιμότητα",
+  "settings.header.connectivity.description": "Προσαρμογή ρυθμίσεων συνδεσιμότητας για το Cider.",
+  "settings.option.connectivity.playbackNotifications": "Ειδοποιήσεις αναπαραγωγής",
   "settings.option.connectivity.discordRPC": "Discord Rich Presence",
-  "settings.option.connectivity.playbackNotifications": "Ειδοποιήσεις Αναπαραγωγής",
-  "settings.header.connectivity.discordRPC.cider": "Εμφάνιση ως 'Cider'",
-  "settings.header.connectivity.discordRPC.appleMusic": "Εμφάνιση ως 'Apple Music'",
+  "settings.option.connectivity.discordRPC.clientName": "Τίτλος",
   "settings.option.connectivity.discordRPC.clearOnPause": "Εκκαθάριση του Discord Rich Presence στην Παύση",
+  "settings.option.connectivity.discordRPC.hideButtons": "Απόκρυψη κουμπιών του Discord Rich Presence",
+  "settings.option.connectivity.discordRPC.detailsFormat": "Δομή λεπτομεριών",
+  "settings.option.connectivity.discordRPC.stateFormat": "Δομή κατάστασης",
   "settings.option.connectivity.lastfmScrobble": "LastFM Scrobbling",
   "settings.option.connectivity.lastfmScrobble.delay": "Καθυστέρηση LastFM Scrobble (%)",
   "settings.option.connectivity.lastfmScrobble.nowPlaying": "Ενεργοποίηση LastFM \"Now Playing\"",
@@ -334,32 +440,52 @@
   "settings.option.debug.openAppData": "Άνοιγμα του φακέλου Cider",
   "settings.header.experimental": "Πειραματικές",
   "settings.header.experimental.description": "Προσαρμογή πειραματικών ρυθμίσεων για το Cider.",
-  "settings.option.experimental.compactUI": "Συμπαγής Διεπαφή",
-  "settings.option.experimental.closeButtonBehaviour": "Συμπεριφορά Κουμπιού Εξόδου",
-  "settings.option.experimental.closeButtonBehaviour.quit": "Έξοδος του Cider",
-  "settings.option.experimental.closeButtonBehaviour.minimizeTaskbar": "Ελαχιστοποίηση στη γραμμή εργασιών",
-  "settings.option.experimental.closeButtonBehaviour.minimizeTray": "Ελαχιστοποίηση στη γωνία γραμμής εργασιών",
+  "settings.option.experimental.reinstallwidevine": "Επανεγκατάσταση του WidevineCDM",
+  "settings.option.experimental.reinstallwidevine.confirm": "Θέλετε σίγουρα να επανεγκαταστήσετε το Widevine;",
+  "settings.option.experimental.unknownPlugin": "Άγνωστες πηγές",
+  "settings.option.experimental.unknownPlugin.description": "Να επιτρέπεται η εγκατάσταση πρόσθετων από repo εκτός του Cider Plugin Repository",
+  "settings.option.experimental.compactUI": "Συμπαγής διεπαφή",
+  "settings.option.window.close_button_hide": "Απόκρυψη εφαρμογής με το πάτημα του κουμπιού κλεισίματος",
+  "settings.option.experimental.inline_playlists": "Ενσωμάτωση λιστών αναπαραγωγής και άλμπουμ",
+  "settings.option.advanced.playlistTrackMapping": "Χαρτογράφηση κομματιών λίστών αναπαραγωγής",
+  "settings.option.advanced.playlistTrackMapping.description": "Ενεργοποιεί τη βαθιά σάρωση των λιστών αναπαραγωγής για να προσδιορίσει ποια κομμάτια βρίσκονται σε ποιες λίστες αναπαραγωγής. Οι χρόνοι δημιουργίας της προσωρινής μνήμης των λιστών αναπαραγωγής μπορεί να αυξηθούν σημαντικά.",
+  "settings.option.visual.transparent": "Διαφανές πλαίσιο",
+  "settings.option.visual.transparent.description": "(χρειάζεται υποστήριξη θέματος, απαιτεί επανεκκίνηση)",
+  "settings.header.advanced": "Για προχωρημένους",
+  "settings.header.connect": "Συγχρονισμός",
+  "settings.option.connect.link_account": "Ενεργοποίηση συγχρονισμού με Cider Connect",
+  "settings.option.connect.link_account.description": "Η σύνδεση του λογαριασμού σας Discord με το Cider Connect σάς επιτρέπει να αποθηκεύετε δεδομένα χρήστη, συμπεριλαμβανομένων των Ρυθμίσεων, των EQ, και άλλα. (Υπό ανάπτυξη)",
   "spatial.notTurnedOn": "Η Χωρικοποίηση Ήχου είναι απενεργοποιημένη. Για χρήση, παρακαλούμε ενεργοποιήστε την πρώτα.",
-  "spatial.spatialProperties": "Χωρικές Ιδιότητες",
+  "spatial.spatialProperties": "Χωρικές ιδιότητες",
   "spatial.width": "Πλάτος",
   "spatial.height": "Ύψος",
   "spatial.depth": "Βάθος",
   "spatial.gain": "Απολαβή",
-  "spatial.roomMaterials": "Υλικά Δωματίου",
-  "spatial.roomDimensions": "Διαστάσεις Δωματίου",
-  "spatial.roomPositions": "Θέσεις Δωματίου",
-  "spatial.setDimensions": "Ορισμός Διαστάσεων",
-  "spatial.setPositions": "Ορισμός Θέσεων",
+  "spatial.roomMaterials": "Υλικά δωματίου",
+  "spatial.roomDimensions": "Διαστάσεις δωματίου",
+  "spatial.roomPositions": "Θέσεις δωματίου",
+  "spatial.setDimensions": "Ορισμός διαστάσεων",
+  "spatial.setPositions": "Ορισμός θέσεων",
   "spatial.up": "Πάνω",
   "spatial.front": "Πρόσοψη",
   "spatial.left": "Αριστερά",
   "spatial.right": "Δεξιά",
-  "spatial.back": "Πίσω Όψη",
+  "spatial.back": "Πίσω όψη",
   "spatial.down": "Κάτω",
   "spatial.listener": "Ακροατής",
-  "spatial.audioSource": "Πηγή Ήχου",
+  "spatial.audioSource": "Πηγή ήχου",
   "settings.header.unfinished": "Ημιτελής",
   "remote.web.title": "Cider Remote",
   "remote.web.description": "Σαρώστε τον κωδικό QR για σύζευξη του Cider με το κινητό σας",
+  "share.platform.twitter.tweet": "Ακούστε το {{song}} στο Apple Music.\n\n{{url}}\n\n#AppleMusic #Cider",
+  "share.platform.twitter": "Twitter",
+  "share.platform.facebook": "Facebook",
+  "share.platform.reddit": "Reddit",
+  "share.platform.telegram": "Telegram",
+  "share.platform.whatsapp": "WhatsApp",
+  "share.platform.messenger": "Messenger",
+  "share.platform.email": "Email",
+  "share.platform.songLink": "Αντιγραφή με song.link",
+  "share.platform.clipboard": "Αντιγραφή συνδέσμου",
   "about.thanks": "Μεγάλα ευχαριστώ στην Ομάδα Cider Collective και σε όλους τους συνεισφέροντές μας."
-}
\ No newline at end of file
+}

From 5da7926eb50dbccb4a41235b229e3a2f48dd9e2f Mon Sep 17 00:00:00 2001
From: Vasilis <vasilakis.lolipakis@gmail.com>
Date: Tue, 3 May 2022 14:27:13 +0300
Subject: [PATCH 108/141] Correction

---
 src/i18n/el_GR.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/el_GR.json b/src/i18n/el_GR.json
index c116b244..2c7843c6 100644
--- a/src/i18n/el_GR.json
+++ b/src/i18n/el_GR.json
@@ -262,7 +262,7 @@
   "action.cast.airplay.underdevelopment": "Το AirPlay είναι ακόμη υπό ανάπτυξη",
   "action.cast.scan": "Σάρωση",
   "action.cast.scanning": "Γίνεται σάρωση...",
-  "action.createNew": "Δημιουργία νέου...",
+  "action.createNew": "Δημιουργία νέας...",
   "action.openArtworkInBrowser": "Άνοιγμα εξώφυλλου στον περιηγητή",
   "settings.header.general": "Γενικά",
   "settings.header.general.description": "Προσαρμογή γενικών ρυθμίσεων για το Cider.",
@@ -419,14 +419,14 @@
   "settings.option.lyrics.enableMusixmatch": "Ενεργοποίηση στίχων Musixmatch",
   "settings.option.lyrics.enableMusixmatchKaraoke": "Ενεργοποίηση λειτουργίας καραόκε (Musixmatch μόνο)",
   "settings.option.lyrics.musixmatchPreferredLanguage": "Προτιμώμενη γλώσσα μετάφρασης Musixmatch",
-  "settings.option.lyrics.enableYoutubeLyrics": "Ενεργοποίηση στίχων Youtube για μουσικά βίντεο",
+  "settings.option.lyrics.enableYoutubeLyrics": "Ενεργοποίηση στίχων YouTube για μουσικά βίντεο",
   "settings.option.lyrics.enableQQLyrics": "Ενεργοποίηση στίχων QQ",
   "settings.header.connectivity": "Συνδεσιμότητα",
   "settings.header.connectivity.description": "Προσαρμογή ρυθμίσεων συνδεσιμότητας για το Cider.",
   "settings.option.connectivity.playbackNotifications": "Ειδοποιήσεις αναπαραγωγής",
   "settings.option.connectivity.discordRPC": "Discord Rich Presence",
   "settings.option.connectivity.discordRPC.clientName": "Τίτλος",
-  "settings.option.connectivity.discordRPC.clearOnPause": "Εκκαθάριση του Discord Rich Presence στην Παύση",
+  "settings.option.connectivity.discordRPC.clearOnPause": "Εκκαθάριση του Discord Rich Presence στην παύση",
   "settings.option.connectivity.discordRPC.hideButtons": "Απόκρυψη κουμπιών του Discord Rich Presence",
   "settings.option.connectivity.discordRPC.detailsFormat": "Δομή λεπτομεριών",
   "settings.option.connectivity.discordRPC.stateFormat": "Δομή κατάστασης",

From d98e45b015211de55abead53a93ca39c1948fa12 Mon Sep 17 00:00:00 2001
From: Pedro Galhardo <pedromgalhardo@tecnico.ulisboa.pt>
Date: Wed, 4 May 2022 01:35:08 +0100
Subject: [PATCH 109/141] macOS: fix back button padding (#985)

---
 src/renderer/style.css  | 1 +
 src/renderer/style.less | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/renderer/style.css b/src/renderer/style.css
index 5683d8c9..3448d228 100644
--- a/src/renderer/style.css
+++ b/src/renderer/style.css
@@ -12944,6 +12944,7 @@ body[platform='darwin'] #window-controls-container {
 }
 body[platform='darwin'] .app-chrome .app-chrome-item > .app-mainmenu {
   opacity: 0;
+  width: 52px;
   pointer-events: none;
   -webkit-app-region: drag;
 }
diff --git a/src/renderer/style.less b/src/renderer/style.less
index 3900c772..b24ce657 100644
--- a/src/renderer/style.less
+++ b/src/renderer/style.less
@@ -3289,6 +3289,7 @@ body[platform='darwin'] {
 
   .app-chrome .app-chrome-item > .app-mainmenu {
     opacity: 0;
+    width: 52px;
     pointer-events: none;
     -webkit-app-region: drag;
   }

From a536e544a50418ef48c62de22a3c43ba9979f55c Mon Sep 17 00:00:00 2001
From: cryptofyre <cryptofyre@cryptofyre.org>
Date: Tue, 3 May 2022 21:01:26 -0500
Subject: [PATCH 110/141] Fixed queue duplication bug.

---
 src/main/base/browserwindow.ts | 2 +-
 src/renderer/main/vueapp.js    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 2556d2d9..244a2e25 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -1279,7 +1279,7 @@ export class BrowserWindow {
                 BrowserWindow.win.webContents.executeJavaScript(` 
                 window.localStorage.setItem("currentTrack", JSON.stringify(app.mk.nowPlayingItem));
                 window.localStorage.setItem("currentTime", JSON.stringify(app.mk.currentPlaybackTime));
-                window.localStorage.setItem("currentQueue", JSON.stringify(app.mk.queue.items));
+                window.localStorage.setItem("currentQueue", JSON.stringify(app.mk.queue._unplayedQueueItems));
                 ipcRenderer.send('stopGCast','');`)
                 BrowserWindow.win.destroy();
             }
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index d7ab7365..12e37e89 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -706,6 +706,7 @@ const app = new Vue({
                         let lastItem = window.localStorage.getItem("currentTrack")
                         let time = window.localStorage.getItem("currentTime")
                         let queue = window.localStorage.getItem("currentQueue")
+                        app.mk.queue.position = 0; // Reset queue position.
                         if (lastItem != null) {
                             lastItem = JSON.parse(lastItem)
                             let kind = lastItem.attributes.playParams.kind;
@@ -725,7 +726,7 @@ const app = new Vue({
                                         if (queue != null) {
                                             queue = JSON.parse(queue)
                                             if (queue && queue.length > 0) {
-                                                let ids = queue.map(e => (e.playParams ? e.playParams.id : (e.attributes.playParams ? e.attributes.playParams.id : '')))
+                                                let ids = queue.map(e => (e.playParams ? e.playParams.id : (e.item.attributes.playParams ? e.item.attributes.playParams.id : '')))
                                                 let i = 0;
                                                 if (ids.length > 0) {
                                                     for (let id of ids) {

From 7c9bb139e07b6a1e39d6f0f3b1cf48664401a100 Mon Sep 17 00:00:00 2001
From: yazninja <yazlesean@gmail.com>
Date: Wed, 4 May 2022 13:03:31 +0800
Subject: [PATCH 111/141] make heart icon in left side

---
 src/renderer/less/elements.less | 16 +++++++++-------
 src/renderer/less/pages.less    |  1 +
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less
index 27418eca..f44413a1 100644
--- a/src/renderer/less/elements.less
+++ b/src/renderer/less/elements.less
@@ -449,19 +449,19 @@
   }
 
   .heart-unfilled {
-    background-image: url("assets/feather/heart.svg");
+    -webkit-mask-image: url("assets/feather/heart.svg");
     height: 12px;
-    width: 36px;
-    filter: contrast(0);
+    width: 12px;
     background-repeat: no-repeat;
+    background-color: #999;
   }
 
   .heart-filled {
-    background-image: url("assets/feather/heart-fill.svg");
+    -webkit-mask-image: url("assets/feather/heart-fill.svg");
     height: 12px;
-    width: 36px;
-    filter: contrast(0);
+    width: 12px;
     background-repeat: no-repeat;
+    background-color: #999;
   }
 
   .explicit-icon {
@@ -473,7 +473,9 @@
   }
 
   .heart-icon {
-    display: flex
+    display: flex;
+    position: absolute;
+    left: -25px;
   }
 
   /* CSS.gg
diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less
index 2e03391e..ad59e235 100644
--- a/src/renderer/less/pages.less
+++ b/src/renderer/less/pages.less
@@ -542,6 +542,7 @@
             overflow-y: overlay;
             overflow-x:hidden;
             padding: var(--contentInnerPadding);
+            padding-inline: 40px;
             -webkit-mask-image: linear-gradient(180deg, transparent, white 20px);
             .well {
               margin:0px;

From a2ee309596e139f1d39ab2ee2bdbd9cedef20b09 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 4 May 2022 06:32:50 +0100
Subject: [PATCH 112/141] Swapped to discord-auto-rpc, experience should be
 seamless now for discordrpc.

---
 package.json                   |   4 +-
 src/main/plugins/discordrpc.ts | 314 ++++++++++++++-------------------
 2 files changed, 134 insertions(+), 184 deletions(-)

diff --git a/package.json b/package.json
index b7347a4f..f5b6cf47 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "airtunes2": "git+https://github.com/vapormusic/node_airtunes2.git#hap",
     "castv2-client": "^1.2.0",
     "chokidar": "^3.5.3",
-    "discord-rpc": "^4.0.1",
+    "discord-auto-rpc": "^1.0.16",
     "dns-js": "git+https://github.com/ciderapp/node-dns-js.git",
     "ejs": "^3.1.6",
     "electron-fetch": "^1.7.4",
@@ -82,7 +82,7 @@
     "electron-builder-notarize-pkg": "^1.2.0",
     "electron-webpack": "^2.8.2",
     "musickit-typescript": "^1.2.4",
-    "typescript": "^4.6.3",
+    "typescript": "^4.6.4",
     "vue-devtools": "^5.1.4",
     "webpack": "~5.72.0"
   },
diff --git a/src/main/plugins/discordrpc.ts b/src/main/plugins/discordrpc.ts
index 92f613e3..c943eb68 100644
--- a/src/main/plugins/discordrpc.ts
+++ b/src/main/plugins/discordrpc.ts
@@ -1,30 +1,29 @@
-import * as RPC from 'discord-rpc'
+import {AutoClient} from 'discord-auto-rpc'
 import {ipcMain} from "electron";
 import fetch from 'electron-fetch'
 
 export default class DiscordRPC {
 
-    /**
-     * Private variables for interaction in plugins
-     */
-    private _utils: any;
-    private _app: any;
-    private _attributes: any;
-    private _connection: boolean = false;
-
     /**
      * Base Plugin Details (Eventually implemented into a GUI in settings)
      */
     public name: string = 'Discord Rich Presence';
     public description: string = 'Discord RPC plugin for Cider';
-    public version: string = '1.0.0';
+    public version: string = '1.1.0';
     public author: string = 'vapormusic/Core (Cider Collective)';
 
+    /**
+     * Private variables for interaction in plugins
+     */
+    private _utils: any;
+    private _attributes: any;
+    private ready: boolean = false;
+
     /**
      * Plugin Initialization
      */
     private _client: any = null;
-    private _activity: RPC.Presence = {
+    private _activityCache: any = {
         details: '',
         state: '',
         largeImageKey: '',
@@ -34,15 +33,72 @@ export default class DiscordRPC {
         instance: false
     };
 
-    private _activityCache: RPC.Presence = {
-        details: '',
-        state: '',
-        largeImageKey: '',
-        largeImageText: '',
-        smallImageKey: '',
-        smallImageText: '',
-        instance: false
-    };
+    /*******************************************************************************************
+     * Public Methods
+     * ****************************************************************************************/
+
+    /**
+     * Runs on plugin load (Currently run on application start)
+     */
+    constructor(utils: any) {
+        this._utils = utils;
+        console.debug(`[Plugin][${this.name}] Loading Complete.`);
+    }
+
+    /**
+     * Runs on app ready
+     */
+    onReady(_win: any): void {
+        const self = this
+        this.connect();
+        console.debug(`[Plugin][${this.name}] Ready.`);
+        ipcMain.on('updateRPCImage', (_event, imageurl) => {
+            if (!this._utils.getStoreValue("general.privateEnabled")) {
+                fetch('https://api.cider.sh/v1/images', {
+
+                    method: 'POST',
+                    body: JSON.stringify({url: imageurl}),
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'User-Agent': _win.webContents.getUserAgent()
+                    },
+                })
+                    .then(res => res.json())
+                    .then(function (json) {
+                        self._attributes["artwork"]["url"] = json.url
+                        self.setActivity(self._attributes)
+                    })
+            }
+        })
+    }
+
+    /**
+     * Runs on app stop
+     */
+    onBeforeQuit(): void {
+        console.debug(`[Plugin][${this.name}] Stopped.`);
+    }
+
+    /**
+     * Runs on playback State Change
+     * @param attributes Music Attributes (attributes.status = current state)
+     */
+    onPlaybackStateDidChange(attributes: object): void {
+        this._attributes = attributes
+        this.setActivity(attributes)
+
+    }
+
+    /**
+     * Runs on song change
+     * @param attributes Music Attributes
+     */
+    onNowPlayingItemDidChange(attributes: object): void {
+        this._attributes = attributes
+        this.setActivity(attributes)
+
+    }
+
 
     /*******************************************************************************************
      * Private Methods
@@ -58,58 +114,86 @@ export default class DiscordRPC {
         }
         const clientId = this._utils.getStoreValue("general.discordrpc.client") === "Cider" ? '911790844204437504' : '886578863147192350';
 
-        // Apparently needed for ask to join, join, spectate etc.
-        RPC.register(clientId)
-
         // Create the client
-        this._client = new RPC.Client({transport: "ipc"});
+        this._client = new AutoClient({transport: "ipc"});
 
         // Runs on Ready
-        this._client.on('ready', () => {
+        this._client.once('ready', () => {
             console.info(`[DiscordRPC][connect] Successfully Connected to Discord. Authed for user: ${this._client.user.id}.`);
+
+            if (this._activityCache && this._activityCache.details && this._activityCache.state) {
+                console.info(`[DiscordRPC][connect] Restoring activity cache.`);
+                this._client.setActivity(this._activityCache)
+            }
         })
 
-        // Handles Errors
-        this._client.on('error', (err: any) => {
-            console.error(`[DiscordRPC] ${err}`);
-            this.disconnect()
-        });
-
-        // If Discord is closed, allow reconnecting
-        this._client.transport.once('close', () => {
-            console.info(`[DiscordRPC] Connection closed`);
-            this.disconnect()
-        });
-
         // Login to Discord
-        this._client.login({clientId})
+        this._client.endlessLogin({clientId: clientId})
             .then(() => {
-                this._connection = true;
+                this.ready = true
             })
             .catch((e: any) => console.error(`[DiscordRPC][connect] ${e}`));
     }
 
     /**
-     * Disconnects from Discord RPC
+     * Sets the activity
+     * @param attributes Music Attributes
      */
-    private disconnect() {
+    private setActivity(attributes: any) {
         if (!this._client) {
             return
         }
 
-        this._client.destroy().then(() => {
-            this._connection = false;
-            console.log('[DiscordRPC][disconnect] Disconnected from discord.')
-        }).catch((e: any) => console.error(`[DiscordRPC][disconnect] ${e}`));
+        // Check if show buttons is (true) or (false)
+        let activity: Object = {
+            details: this._utils.getStoreValue("general.discordrpc.details_format"),
+            state: this._utils.getStoreValue("general.discordrpc.state_format"),
+            largeImageKey: attributes?.artwork?.url?.replace('{w}', '1024').replace('{h}', '1024'),
+            largeImageText: attributes.albumName,
+            instance: false // Whether the activity is in a game session
+        }
 
-        // Clean up, allow creating a new connection
-        this._client = null;
+        // Filter the activity
+        activity = this.filterActivity(activity, attributes)
+
+        if (!this.ready) {
+            this._activityCache = activity
+            return
+        }
+
+        // Set the activity
+        if (!attributes.status && this._utils.getStoreValue("general.discordrpc.clear_on_pause")) {
+            this._client.clearActivity()
+        } else if (activity && this._activityCache !== activity) {
+            this._client.setActivity(activity)
+        }
+        this._activityCache = activity;
     }
 
     /**
      * Filter the Discord activity object
      */
-    private static filterActivity(activity: any, attributes: any): Object {
+    private filterActivity(activity: any, attributes: any): Object {
+
+        // Add the buttons if people want them
+        if (!this._utils.getStoreValue("general.discordrpc.hide_buttons")) {
+            activity.buttons = [
+                {label: 'Listen on Cider', url: attributes.url.cider},
+                {label: 'View on Apple Music', url: attributes.url.appleMusic}
+            ] //To change attributes.url => preload/cider-preload.js
+        }
+
+        // Add the timestamp if its playing
+        if (attributes.status) {
+            activity.startTimestamp = Date.now() - (attributes?.durationInMillis - attributes?.remainingTime)
+            activity.endTimestamp = attributes.endTime
+        }
+
+        // If the user wants to keep the activity when paused
+        if (!this._utils.getStoreValue("general.discordrpc.clear_on_pause")) {
+            activity.smallImageKey = attributes.status ? 'play' : 'pause';
+            activity.smallImageText = attributes.status ? 'Playing' : 'Paused';
+        }
 
         /**
          * Works with:
@@ -173,138 +257,4 @@ export default class DiscordRPC {
         }
         return activity
     }
-
-    /**
-     * Sets the activity
-     * @param {activity} activity
-     */
-    private setActivity(activity: any) {
-        if (!this._connection || !this._client || !activity) {
-            return
-        }
-
-        // Filter the activity
-        activity = DiscordRPC.filterActivity(activity, this._attributes)
-
-        // Set the activity
-        if (!this._attributes.status && this._utils.getStoreValue("general.discordrpc.clear_on_pause")) {
-            this._client.clearActivity()
-        } else if (this._activity && this._activityCache !== this._activity && this._activity.details) {
-            this._client.setActivity(activity)
-            this._activityCache = this._activity;
-        }
-    }
-
-    /**
-     * Sets the activity of the client
-     * @param {object} attributes
-     */
-    private updateActivity(attributes: any) {
-        if (!this._utils.getStoreValue("general.discordrpc.enabled") || this._utils.getStoreValue("general.privateEnabled")) {
-            return
-        } else if (!this._client || !this._connection) {
-            this.connect()
-        }
-
-        // Check if show buttons is (true) or (false)
-        this._activity = {
-            details: this._utils.getStoreValue("general.discordrpc.details_format"),
-            state: this._utils.getStoreValue("general.discordrpc.state_format"),
-            largeImageKey: attributes?.artwork?.url?.replace('{w}', '1024').replace('{h}', '1024'),
-            largeImageText: attributes.albumName,
-            instance: false // Whether the activity is in a game session
-        }
-
-        // Add the buttons if people want them
-        if (!this._utils.getStoreValue("general.discordrpc.hide_buttons")) {
-            this._activity.buttons = [
-                {label: 'Listen on Cider', url: attributes.url.cider},
-                {label: 'View on Apple Music', url: attributes.url.appleMusic}
-            ] //To change attributes.url => preload/cider-preload.js
-        }
-
-        // Add the timestamp if its playing
-        if (attributes.status) {
-            this._activity.startTimestamp = Date.now() - (attributes?.durationInMillis - attributes?.remainingTime)
-            this._activity.endTimestamp = attributes.endTime
-        }
-
-        // If the user wants to keep the activity when paused
-        if (!this._utils.getStoreValue("general.discordrpc.clear_on_pause")) {
-            this._activity.smallImageKey = attributes.status ? 'play' : 'pause';
-            this._activity.smallImageText = attributes.status ? 'Playing' : 'Paused';
-        }
-
-        this.setActivity(this._activity)
-    }
-
-    /*******************************************************************************************
-     * Public Methods
-     * ****************************************************************************************/
-
-    /**
-     * Runs on plugin load (Currently run on application start)
-     */
-    constructor(utils: { getStore: () => any; getApp: () => any; }) {
-        this._utils = utils;
-        console.debug(`[Plugin][${this.name}] Loading Complete.`);
-        this._app = utils.getApp();
-    }
-
-    /**
-     * Runs on app ready
-     */
-    onReady(_win: any): void {
-        let self = this
-        this.connect();
-        console.debug(`[Plugin][${this.name}] Ready.`);
-        ipcMain.on('updateRPCImage', (_event, imageurl) => {
-            if (!this._utils.getStoreValue("general.privateEnabled")) {
-                fetch('https://api.cider.sh/v1/images', {
-
-                    method: 'POST',
-                    body: JSON.stringify({url: imageurl}),
-                    headers: {
-                        'Content-Type': 'application/json',
-                        'User-Agent': _win.webContents.getUserAgent()
-                    },
-                })
-                    .then(res => res.json())
-                    .then(function (json) {
-                        self._attributes["artwork"]["url"] = json.url
-                        self.updateActivity(self._attributes)
-                    })
-            }
-        })
-    }
-
-    /**
-     * Runs on app stop
-     */
-    onBeforeQuit(): void {
-        if (this._client) {
-            this.disconnect()
-        }
-        console.debug(`[Plugin][${this.name}] Stopped.`);
-    }
-
-    /**
-     * Runs on playback State Change
-     * @param attributes Music Attributes (attributes.status = current state)
-     */
-    onPlaybackStateDidChange(attributes: object): void {
-        this._attributes = attributes
-        this.updateActivity(attributes)
-
-    }
-
-    /**
-     * Runs on song change
-     * @param attributes Music Attributes
-     */
-    onNowPlayingItemDidChange(attributes: object): void {
-        this._attributes = attributes
-        this.updateActivity(attributes)
-
-    }
 }

From b3934b3d98bea71577ad22151344d23613180f10 Mon Sep 17 00:00:00 2001
From: yazninja <yazlesean@gmail.com>
Date: Wed, 4 May 2022 16:37:54 +0800
Subject: [PATCH 113/141] fix heart icon position

---
 src/renderer/less/elements.less |  8 ++++++--
 src/renderer/less/pages.less    | 12 +++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less
index f44413a1..11412567 100644
--- a/src/renderer/less/elements.less
+++ b/src/renderer/less/elements.less
@@ -359,7 +359,11 @@
   align-items: center;
   border-radius: var(--mediaItemRadius);
   position: relative;
-
+  &:hover{
+    .heart-icon{
+      display: none;
+    }
+  }
   .popular {
     background-image: url(assets/star.svg);
     background-repeat: no-repeat;
@@ -475,7 +479,7 @@
   .heart-icon {
     display: flex;
     position: absolute;
-    left: -25px;
+    left: 20px;
   }
 
   /* CSS.gg
diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less
index ad59e235..e4854c3d 100644
--- a/src/renderer/less/pages.less
+++ b/src/renderer/less/pages.less
@@ -497,7 +497,17 @@
   flex-direction: column;
   height: 100%;
   overflow: hidden;
-
+  .cd-mediaitem-list-item{
+    &:hover{
+      .heart-icon{
+        display:flex;
+      }
+    }
+    .heart-icon{
+      left: -25px;
+    }
+  }
+  
   .editTracksBtn {
     position: absolute;
     top: 20px;

From 6b59db98fc6ff582df03ce6e70d34b009d036f3f Mon Sep 17 00:00:00 2001
From: yazninja <yazlesean@gmail.com>
Date: Wed, 4 May 2022 16:38:13 +0800
Subject: [PATCH 114/141] Shift -> Alt

---
 src/renderer/views/pages/settings.ejs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index 06f398fb..fbb41d51 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -1653,10 +1653,10 @@
                 app.cfg.general.keybindings.browse = [app.platform == "darwin" ? "Command" : "Control", "B"];
                 app.cfg.general.keybindings.togglePrivateSession = [app.platform == "darwin" ? "Command" : "Control", "P"];
                 app.cfg.general.keybindings.webRemote = [app.platform == "darwin" ? "Command" : "Control", "W"];
-                app.cfg.general.keybindings.audioSettings = [app.platform == "darwin" ? "Option" : "Shift", "A"];
-                app.cfg.general.keybindings.pluginMenu = [app.platform == "darwin" ? "Option" : "Shift", "P"];
-                app.cfg.general.keybindings.castToDevices = [app.platform == "darwin" ? "Option" : "Shift", "C"];
-                app.cfg.general.keybindings.settings = [app.platform == "darwin" ? "Option" : "Shift", "S"];
+                app.cfg.general.keybindings.audioSettings = [app.platform == "darwin" ? "Option" : "Alt", "A"];
+                app.cfg.general.keybindings.pluginMenu = [app.platform == "darwin" ? "Option" : "Alt", "P"];
+                app.cfg.general.keybindings.castToDevices = [app.platform == "darwin" ? "Option" : "Alt", "C"];
+                app.cfg.general.keybindings.settings = [app.platform == "darwin" ? "Option" : "Alt", "S"];
                 app.cfg.general.keybindings.openDeveloperTools = [app.platform == "darwin" ? "Command" : "Control", app.platform == "darwin" ? "Option" : "Shift", "I"];
                 notyf.success(app.getLz('settings.notyf.general.keybindings.update.success'));
                 bootbox.confirm(app.getLz("settings.prompt.general.keybindings.update.success"), (ok) => {

From 0abc06da18c67d0dba5c7378aaef535f17b5d959 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Wed, 4 May 2022 13:33:55 -0700
Subject: [PATCH 115/141] replaced style editor in settings with manage styles

---
 src/main/base/browserwindow.ts                |  49 +--
 src/renderer/less/pages.less                  | 169 ++++++----
 src/renderer/views/pages/installed-themes.ejs | 291 ++++++++++++++++++
 src/renderer/views/pages/settings.ejs         | 110 +------
 4 files changed, 427 insertions(+), 192 deletions(-)
 create mode 100644 src/renderer/views/pages/installed-themes.ejs

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 244a2e25..6f3d6994 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -1,18 +1,18 @@
-import {join} from "path";
-import {app, BrowserWindow as bw, ipcMain, ShareMenu, shell} from "electron";
+import { join } from "path";
+import { app, BrowserWindow as bw, ipcMain, ShareMenu, shell } from "electron";
 import * as windowStateKeeper from "electron-window-state";
 import * as express from "express";
 import * as getPort from "get-port";
-import {search} from "youtube-search-without-api-key";
-import {existsSync, rmSync, mkdirSync, readdirSync, readFileSync, writeFileSync, statSync} from "fs";
-import {Stream} from "stream";
-import {networkInterfaces} from "os";
+import { search } from "youtube-search-without-api-key";
+import { existsSync, rmSync, mkdirSync, readdirSync, readFileSync, writeFileSync, statSync } from "fs";
+import { Stream } from "stream";
+import { networkInterfaces } from "os";
 import * as mm from 'music-metadata';
 import fetch from 'electron-fetch'
-import {wsapi} from "./wsapi";
-import {utils} from './utils';
-import {Plugins} from "./plugins";
-import {watch} from "chokidar";
+import { wsapi } from "./wsapi";
+import { utils } from './utils';
+import { Plugins } from "./plugins";
+import { watch } from "chokidar";
 import * as os from "os";
 import wallpaper from "wallpaper";
 import * as AdmZip from "adm-zip";
@@ -46,6 +46,7 @@ export class BrowserWindow {
                 "pages/library-artists",
                 "pages/browse",
                 "pages/settings",
+                "pages/installed-themes",
                 "pages/listen_now",
                 "pages/home",
                 "pages/artist-feed",
@@ -178,6 +179,10 @@ export class BrowserWindow {
                     page: "settings",
                     component: `<cider-settings></cider-settings>`,
                     condition: `page == 'settings'`
+                }, {
+                    page: "installed-themes",
+                    component: `<installed-themes></installed-themes>`,
+                    condition: `page == 'installed-themes'`
                 }, {
                     page: "search",
                     component: `<cider-search :search="search"></cider-search>`,
@@ -241,7 +246,7 @@ export class BrowserWindow {
         show: false,
         // backgroundColor: "#1E1E1E",
         titleBarStyle: 'hidden',
-        trafficLightPosition: {x: 15, y: 20},
+        trafficLightPosition: { x: 15, y: 20 },
         webPreferences: {
             experimentalFeatures: true,
             nodeIntegration: true,
@@ -301,7 +306,7 @@ export class BrowserWindow {
      * @yields {object} Electron browser window
      */
     async createWindow(): Promise<Electron.BrowserWindow> {
-        this.clientPort = await getPort({port: 9000});
+        this.clientPort = await getPort({ port: 9000 });
         BrowserWindow.verifyFiles();
         this.StartWatcher(utils.getPath('themes'));
 
@@ -561,7 +566,7 @@ export class BrowserWindow {
         remote.use(express.static(join(utils.getPath('srcPath'), "./web-remote/")))
         remote.set("views", join(utils.getPath('srcPath'), "./web-remote/views"));
         remote.set("view engine", "ejs");
-        getPort({port: 6942}).then((port: number) => {
+        getPort({ port: 6942 }).then((port: number) => {
             this.remotePort = port;
             // Start Remote Discovery
             this.broadcastRemote()
@@ -634,7 +639,7 @@ export class BrowserWindow {
                     'KHTML, like Gecko) Mobile/17D50 UCBrowser/12.8.2.1268 Mobile AliApp(TUnionSDK/0.1.20.3) '
                     details.requestHeaders['Referer'] = "https://y.qq.com/portal/player.html"
                 }
-                callback({requestHeaders: details.requestHeaders});
+                callback({ requestHeaders: details.requestHeaders });
             }
         );
 
@@ -702,7 +707,7 @@ export class BrowserWindow {
             // remove WidevineCDM from appdata folder
             const widevineCdmPath = join(app.getPath("userData"), "./WidevineCdm");
             if (existsSync(widevineCdmPath)) {
-                rmSync(widevineCdmPath, {recursive: true, force: true})
+                rmSync(widevineCdmPath, { recursive: true, force: true })
             }
             // reinstall WidevineCDM
             app.relaunch()
@@ -978,7 +983,7 @@ export class BrowserWindow {
 
         //Fullscreen
         ipcMain.on('detachDT', (_event, _) => {
-            BrowserWindow.win.webContents.openDevTools({mode: 'detach'});
+            BrowserWindow.win.webContents.openDevTools({ mode: 'detach' });
         })
 
         ipcMain.handle('relaunchApp', (_event, _) => {
@@ -1176,8 +1181,8 @@ export class BrowserWindow {
                     console.log('sc', SoundCheckTag)
                     BrowserWindow.win.webContents.send('SoundCheckTag', SoundCheckTag)
                 }).catch(err => {
-                console.log(err)
-            });
+                    console.log(err)
+                });
         });
 
         ipcMain.on('check-for-update', async (_event) => {
@@ -1215,7 +1220,7 @@ export class BrowserWindow {
             shell.openPath(app.getPath('userData'));
         });
 
-        
+
         //#region Cider Connect
         ipcMain.on('cc-auth', (_event) => {
             shell.openExternal(String(utils.getStoreValue('cc_authURL')));
@@ -1310,10 +1315,10 @@ export class BrowserWindow {
         // Set window Handler
         BrowserWindow.win.webContents.setWindowOpenHandler((x: any) => {
             if (x.url.includes("apple") || x.url.includes("localhost")) {
-                return {action: "allow"};
+                return { action: "allow" };
             }
             shell.openExternal(x.url).catch(console.error);
-            return {action: "deny"};
+            return { action: "deny" };
         });
     }
 
@@ -1369,7 +1374,7 @@ export class BrowserWindow {
             "CtlN": "Cider",
             "iV": "196623"
         };
-        let server2 = mdns.createAdvertisement(x, `${await getPort({port: 3839})}`, {
+        let server2 = mdns.createAdvertisement(x, `${await getPort({ port: 3839 })}`, {
             name: encoded,
             txt: txt_record
         });
diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less
index e4854c3d..6325faa1 100644
--- a/src/renderer/less/pages.less
+++ b/src/renderer/less/pages.less
@@ -488,74 +488,79 @@
 
 /* Album / Playlist Page */
 .playlist-page {
-  --bgColor   : transparent;
-  padding     : 0px;
+  --bgColor     : transparent;
+  padding       : 0px;
   //background: linear-gradient(180deg, var(--bgColor) 32px, var(--bgColor) 18px, transparent 60px, transparent 100%);
-  top         : 0;
-  padding-top : var(--navigationBarHeight);
-  display:flex;
+  top           : 0;
+  padding-top   : var(--navigationBarHeight);
+  display       : flex;
   flex-direction: column;
-  height: 100%;
-  overflow: hidden;
-  .cd-mediaitem-list-item{
-    &:hover{
-      .heart-icon{
-        display:flex;
+  height        : 100%;
+  overflow      : hidden;
+
+  .cd-mediaitem-list-item {
+    &:hover {
+      .heart-icon {
+        display: flex;
       }
     }
-    .heart-icon{
+
+    .heart-icon {
       left: -25px;
     }
   }
-  
+
   .editTracksBtn {
     position: absolute;
-    top: 20px;
-    right: 20px;
-    z-index: 1;
+    top     : 20px;
+    right   : 20px;
+    z-index : 1;
 
     >span {
       display: flex;
-      gap: 8px;
+      gap    : 8px;
     }
   }
 
   .mediaContainer {
     transition: width 0.5s ease-in-out, height 0.5s ease-in-out;
-    width: 260px;height:260px;
+    width     : 260px;
+    height    : 260px;
   }
 
   .playlist-body {
-    padding   : 32px;
+    padding         : 32px;
     // margin-top: -75px;
-    overflow-y:overlay;
-    height:100%;
-    padding:0px;
+    overflow-y      : overlay;
+    height          : 100%;
+    padding         : 0px;
     background-color: var(--color1);
 
     &.scrollbody {
       .tabs {
-        display: flex;
+        display  : flex;
         flex-flow: column;
-        height: 100%;
+        height   : 100%;
 
         .nav-link {
-          text-transform:capitalize;
+          text-transform: capitalize;
         }
 
         .tab-content {
-          height: 100%;
+          height  : 100%;
           overflow: hidden;
-          margin:0px;
+          margin  : 0px;
+
           .tab-pane {
-            height: 100%;
-            overflow-y: overlay;
-            overflow-x:hidden;
-            padding: var(--contentInnerPadding);
-            padding-inline: 40px;
+            height            : 100%;
+            overflow-y        : overlay;
+            overflow-x        : hidden;
+            padding           : var(--contentInnerPadding);
+            padding-inline    : 40px;
             -webkit-mask-image: linear-gradient(180deg, transparent, white 20px);
+
             .well {
-              margin:0px;
+              margin: 0px;
             }
           }
         }
@@ -574,7 +579,7 @@
     background     : rgba(0, 0, 0, 0.25);
     top            : var(--navigationBarHeight);
     transition     : opacity 0.1s var(--appleEase);
-    display: none;
+    display        : none;
   }
 
   .playlist-display {
@@ -660,14 +665,14 @@
         }
 
         .playlist-desc {
-          transition: height .2s ease-in-out, opacity .2s ease-in-out;
+          transition  : height .2s ease-in-out, opacity .2s ease-in-out;
           box-sizing  : border-box;
           font-size   : 14px;
           flex-shrink : unset;
           margin-right: 5px;
           max-height  : 100px;
           position    : relative;
-          height            : 4vh;
+          height      : 4vh;
 
           .content {
             height            : 4vh;
@@ -761,11 +766,11 @@
   }
 
   .playlist-time {
-    font-size: 0.9em;
-    margin   : 6px;
-    opacity  : 0.7;
+    font-size : 0.9em;
+    margin    : 6px;
+    opacity   : 0.7;
     transition: height .2s ease-in-out, opacity .2s ease-in-out;
-    height: 0.9em;
+    height    : 0.9em;
   }
 
   &.inline-playlist {
@@ -813,8 +818,8 @@
 
   .pilldim {
     .nav-pills {
-      width: max-content;
-      margin: 0 auto;
+      width     : max-content;
+      margin    : 0 auto;
       margin-top: 16px;
     }
   }
@@ -824,26 +829,24 @@
       transition: min-height 0.5s ease-in-out;
       min-height: 200px;
 
-      .playlistInfo {
-
-      }
+      .playlistInfo {}
 
       .mediaContainer {
         transition: width 0.5s ease-in-out, height 0.5s ease-in-out;
-        width: 128px!important;
-        height: 128px!important;
+        width     : 128px !important;
+        height    : 128px !important;
       }
 
       .playlist-time {
         transition: height .2s ease-in-out, opacity .2s ease-in-out;
-        height: 0px;
-        opacity: 0;
+        height    : 0px;
+        opacity   : 0;
       }
 
       .playlist-desc {
         transition: height .2s ease-in-out, opacity .2s ease-in-out;
-        height: 0px!important;
-        opacity: 0;
+        height    : 0px !important;
+        opacity   : 0;
       }
     }
   }
@@ -931,7 +934,7 @@
     pointer-events : none;
 
     .header-content {
-      z-index   : 1;
+      z-index      : 1;
       // margin-top: -16px;
     }
 
@@ -1123,9 +1126,46 @@
 
 /* Artist Page End */
 
-// Settings page
-.settings-page {
-  padding: 0px;
+
+.installed-themes-page {
+
+  .themeContextMenu {
+    background: transparent;
+    color     : var(--keyColor);
+    border    : 0px;
+  }
+
+  .repo-header {
+    font-size      : 16px;
+    position       : sticky;
+    top            : 0;
+    left           : 0;
+    right          : 0;
+    width          : 100%;
+    height         : 50px;
+    z-index        : 1;
+    background     : rgba(36, 36, 36, 0.5);
+    display        : flex;
+    justify-content: center;
+    align-items    : center;
+    backdrop-filter: var(--glassFilter);
+    overflow       : hidden;
+    border-bottom  : 1px solid rgb(0 0 0 / 18%);
+    border-top     : 1px solid rgb(135 135 135 / 18%);
+  }
+
+  .style-editor-container {
+    height    : 100%;
+    flex      : 1;
+    background: var(--color2);
+    padding   : 0px;
+    overflow-y: overlay;
+
+    .list-group-item {
+      border-radius: 0px;
+    }
+  }
+
 
   .stylestack-editor {
     width: 100%;
@@ -1136,17 +1176,17 @@
     }
 
     .themeLabel {
-      display:flex;
+      display    : flex;
       align-items: center;
     }
 
     .removeItem {
-      border: 0px;
-      background: transparent;
-      height: 32px;
+      border     : 0px;
+      background : transparent;
+      height     : 32px;
       font-weight: bold;
-      color: var(--textColor);
-      cursor: pointer;
+      color      : var(--textColor);
+      cursor     : pointer;
     }
 
     .stylesDropdown {
@@ -1156,7 +1196,11 @@
       }
     }
   }
+}
 
+// Settings page
+.settings-page {
+  padding: 0px;
 
   .nav {
     width : 90%;
@@ -1174,8 +1218,9 @@
 
   .settings-option-body-webview {
     height: 100%;
-    width: 100%;
+    width : 100%;
   }
+
   .settings-option-body {
     margin: 16px;
   }
diff --git a/src/renderer/views/pages/installed-themes.ejs b/src/renderer/views/pages/installed-themes.ejs
new file mode 100644
index 00000000..20ef4a5d
--- /dev/null
+++ b/src/renderer/views/pages/installed-themes.ejs
@@ -0,0 +1,291 @@
+<script type="text/x-template" id="installed-themes">
+    <div class="content-inner github-themes-page installed-themes-page">
+        <div class="gh-header">
+            <div class="row">
+                <div class="col nopadding">
+                    <h1 class="header-text">
+                        Manage Styles    
+                    </h1>
+                </div>
+                <div class="col-auto flex-center">
+                    <button class="md-btn md-btn-small md-btn-block" @click="openThemesFolder()">
+                        {{$root.getLz('settings.option.visual.theme.github.openfolder')}}
+                    </button>
+                </div>
+                <div class="col-auto nopadding flex-center">
+                    <button class="md-btn md-btn-small md-btn-block" @click="installThemeURL()">
+                        {{$root.getLz('settings.option.visual.theme.github.download')}}
+                    </button>
+                </div>
+            </div>
+        </div>
+        <div class="gh-content">
+            <div class="repos-list">
+                <div class="repo-header">
+                    <h4>Available</h4>
+                </div>
+                <ul class="list-group list-group-flush">
+                    <li @click="addStyle(theme.file)" 
+                    @contextmenu="contextMenu"
+                    class="list-group-item list-group-item-dark"
+                        v-for="theme in themes" :value="theme.file"
+                        v-if="!$root.cfg.visual.styles.includes(theme.file)">
+                        
+                        <b-row>
+                            <b-col class="themeLabel">{{theme.name}}</b-col>
+                            <b-col sm="auto">
+                                <button @click.stop="contextMenu" class="themeContextMenu codicon codicon-list-unordered"></button>
+                            </b-col>
+                        </b-row>
+                    </li>
+                </ul>
+            </div>
+
+            <div class="style-editor-container">
+                <div class="repo-header">
+                    <h4>Applied</h4>
+                </div>
+                <stylestack-editor ref="stackEditor"  v-if="themes.length != 0" :themes="themes"/>
+            </div>
+            </transition>
+        </div>
+    </div>
+</script>
+
+<script>
+    // do not translate
+    Vue.component('stylestack-editor', {
+        /*html*/
+        template: `
+            <div class="stylestack-editor" >
+                <draggable class="list-group" v-model="$root.cfg.visual.styles" @end="$root.reloadStyles()">
+                    <b-list-group-item variant="dark" v-for="theme in $root.cfg.visual.styles" :key="theme">
+                        <b-row>
+                            <b-col class="themeLabel">{{getThemeName(theme)}}</b-col>
+                            <b-col sm="auto">
+                                <button class="removeItem codicon codicon-close" @click="remove(theme)"></button>
+                            </b-col>
+                        </b-row>
+                        </b-list-group-item>
+                </draggable>    
+            </div>
+        `,
+        props: {
+            themes: {
+                type: Array,
+                default: [],
+                required: true
+            }
+        },
+        data: function () {
+            return {
+                selected: null,
+                newTheme: null,
+                themeList: []
+            }
+        },
+        mounted() {
+            console.log(this.themes)
+            this.themeList = [...this.themes]
+            this.themeList.unshift({
+                name: "Acrylic Grain",
+                file: "grain.less"
+            })
+            this.themeList.unshift({
+                name: "Sweetener",
+                file: "sweetener.less"
+            })
+            this.themeList.unshift({
+                name: "Reduce Visuals",
+                file: "reduce_visuals.less"
+            })
+            this.themeList.unshift({
+                name: "Inline Drawer",
+                file: "inline_drawer.less"
+            })
+        },
+        methods: {
+
+            gitHubExplore() {
+                this.$root.appRoute("themes-github")
+            },
+            getThemeName(filename) {
+                try {
+                    return this.themeList.find(theme => theme.file === filename).name;
+                } catch (e) {
+                    return filename;
+                }
+            },
+            moveUp() {
+                const styles = this.$root.cfg.visual.styles
+                const index = styles.indexOf(this.selected)
+                if (index > 0) {
+                    styles.splice(index, 1)
+                    styles.splice(index - 1, 0, this.selected)
+                }
+                this.$root.reloadStyles()
+            },
+            moveDown() {
+                const styles = this.$root.cfg.visual.styles
+                const index = styles.indexOf(this.selected)
+                if (index < styles.length - 1) {
+                    styles.splice(index, 1)
+                    styles.splice(index + 1, 0, this.selected)
+                }
+                this.$root.reloadStyles()
+            },
+            remove(style) {
+                const styles = this.$root.cfg.visual.styles
+                const index = styles.indexOf(style)
+                styles.splice(index, 1)
+                this.$root.reloadStyles()
+            },
+            addStyle(style) {
+                const styles = this.$root.cfg.visual.styles
+                styles.push(style)
+                this.$root.reloadStyles()
+            }
+        }
+    })
+</script>
+
+<script>
+    Vue.component('installed-themes', {
+        template: "#installed-themes",
+        props: [],
+        data: function () {
+            return {
+                repos: [],
+                openRepo: {
+                    id: -1,
+                    name: '',
+                    description: '',
+                    html_url: '',
+                    stargazers_count: 0,
+                    owner: {
+                        avatar_url: ''
+                    },
+                    readme: ""
+                },
+                themesInstalled: [],
+                themes: []
+            }
+        },
+        mounted() {
+            this.themes = ipcRenderer.sendSync("get-themes")
+            // this.getRepos();
+            this.getInstalledThemes();
+            // app.checkForThemeUpdates()
+        },
+        methods: {
+            contextMenu(event) {
+                let menu = {
+                    items: [{
+                        name: "Uninstall",
+                        action: () => {
+                            
+                        }
+                    },
+                    {
+                        name: "View Info",
+                        action: () => {
+                            
+                        }
+                    }
+                    ]
+                }
+                this.$root.showMenuPanel(menu, event)
+            },
+            openThemesFolder() {
+                ipcRenderer.invoke("open-path", "themes")
+            },
+            getInstalledThemes() {
+                let self = this
+                const themes = ipcRenderer.sendSync("get-themes")
+                // for each theme, get the github_repo property and push it to the themesInstalled array, if not blank
+                themes.forEach(theme => {
+                    if (theme.github_repo !== "" && typeof theme.commit != "") {
+                        self.themesInstalled.push(theme.github_repo.toLowerCase())
+                    }
+                })
+            },
+            addStyle(filename) {
+                this.$refs.stackEditor.addStyle(filename)
+            },
+            showRepo(repo) {
+                const self = this
+                const readmeUrl = `https://raw.githubusercontent.com/${repo.full_name}/main/README.md`;
+                var requestOptions = {
+                    method: 'GET',
+                    redirect: 'follow'
+                };
+
+                fetch(readmeUrl, requestOptions)
+                    .then(response => response.text())
+                    .then(result => {
+                        self.openRepo = repo
+                        self.openRepo.readme = self.convertReadMe(result);
+                    })
+                    .catch(error => {
+                        self.openRepo = repo
+                        self.openRepo.readme = `This repository doesn't have a README.md file.`;
+                        console.log('error', error)
+                    });
+            },
+            convertReadMe(text) {
+                return marked.parse(text)
+            },
+            installThemeRepo(repo) {
+                let self = this
+                let msg = app.stringTemplateParser(app.getLz('settings.option.visual.theme.github.install.confirm'), {
+                    repo: repo.full_name
+                });
+                bootbox.confirm(msg, (res) => {
+                    if (res) {
+                        ipcRenderer.once("theme-installed", (event, arg) => {
+                            if (arg.success) {
+                                self.themes = ipcRenderer.sendSync("get-themes")
+                                self.getInstalledThemes()
+                                notyf.success(app.getLz('settings.notyf.visual.theme.install.success'));
+                            } else {
+                                notyf.error(app.getLz('settings.notyf.visual.theme.install.error'));
+                            }
+                        });
+                        ipcRenderer.invoke("get-github-theme", repo.html_url)
+                    }
+                })
+            },
+            installThemeURL() {
+                let self = this
+                bootbox.prompt(app.getLz('settings.prompt.visual.theme.github.URL'), (result) => {
+                    if (result) {
+                        ipcRenderer.once("theme-installed", (event, arg) => {
+                            if (arg.success) {
+                                self.themes = ipcRenderer.sendSync("get-themes")
+                                notyf.success(app.getLz('settings.notyf.visual.theme.install.success'));
+                            } else {
+                                notyf.error(app.getLz('settings.notyf.visual.theme.install.error'));
+                            }
+                        });
+                        ipcRenderer.invoke("get-github-theme", result)
+                    }
+                });
+            },
+            getRepos() {
+                let self = this
+                var requestOptions = {
+                    method: 'GET',
+                    redirect: 'follow'
+                };
+
+                fetch("https://api.github.com/search/repositories?q=topic:cidermusictheme fork:true", requestOptions)
+                    .then(response => response.text())
+                    .then(result => {
+                        let items = JSON.parse(result).items
+                        self.repos = items
+                    })
+                    .catch(error => console.log('error', error));
+            }
+        }
+    })
+</script>
\ No newline at end of file
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index fbb41d51..69c76380 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -1224,8 +1224,8 @@
                                 <small>Mix and match various theme components to get Cider looking exactly how you
                                     want.</small>
                             </div>
-                            <div class="md-option-segment">
-                                <stylestack-editor :themes="themes"/>
+                            <div class="md-option-segment md-option-segment_auto">
+                                <button class="md-btn" @click="app.appRoute('installed-themes')">Manage Styles</button>
                             </div>
                         </div>
 
@@ -1436,112 +1436,6 @@
     </div>
 </script>
 
-<script>
-    // do not translate
-    Vue.component('stylestack-editor', {
-        /*html*/
-        template: `
-            <div class="stylestack-editor">
-                <draggable class="list-group" v-model="$root.cfg.visual.styles" @end="$root.reloadStyles()">
-                    <b-list-group-item variant="dark" v-for="theme in $root.cfg.visual.styles" :key="theme">
-                        <b-row>
-                            <b-col class="themeLabel">{{getThemeName(theme)}}</b-col>
-                            <b-col sm="auto">
-                                <button class="removeItem codicon codicon-close" @click="remove(theme)"></button>
-                            </b-col>
-                        </b-row>
-                        </b-list-group-item>
-                        <b-list-group-item slot="footer" style="-webkit-user-drag: none" variant="dark">
-                            <b-row>
-                                <b-col>
-                                    <b-dropdown class="stylesDropdown" variant="primary" text="Add Style...">
-                                        <b-dropdown-item v-for="theme in themeList" @click="addStyle(theme.file)">{{theme.name}}</b-dropdown-item>
-                                    </b-dropdown>
-                                </b-col>
-                                <b-col>
-                                    <b-btn @click="gitHubExplore()">{{$root.getLz('settings.option.visual.theme.github.explore')}}</b-btn>    
-                                </b-col>
-                            </b-row>
-                        </b-list-group-item>
-                </draggable>    
-            </div>
-        `,
-        props: {
-            themes: {
-                type: Array,
-                default: []
-            }
-        },
-        data: function () {
-            return {
-                selected: null,
-                newTheme: null,
-                themeList: []
-            }
-        },
-        mounted() {
-            this.themeList = [...this.themes]
-            this.themeList.unshift({
-                name: "Acrylic Grain",
-                file: "grain.less"
-            })
-            this.themeList.unshift({
-                name: "Sweetener",
-                file: "sweetener.less"
-            })
-            this.themeList.unshift({
-                name: "Reduce Visuals",
-                file: "reduce_visuals.less"
-            })
-            this.themeList.unshift({
-                name: "Inline Drawer",
-                file: "inline_drawer.less"
-            })
-        },
-        methods: {
-            gitHubExplore() {
-                this.$root.appRoute("themes-github")
-            },
-            getThemeName(filename) {
-                try {
-                    return this.themeList.find(theme => theme.file === filename).name;
-                } catch (e) {
-                    return filename;
-                }
-            },
-            moveUp() {
-                const styles = this.$root.cfg.visual.styles
-                const index = styles.indexOf(this.selected)
-                if (index > 0) {
-                    styles.splice(index, 1)
-                    styles.splice(index - 1, 0, this.selected)
-                }
-                this.$root.reloadStyles()
-            },
-            moveDown() {
-                const styles = this.$root.cfg.visual.styles
-                const index = styles.indexOf(this.selected)
-                if (index < styles.length - 1) {
-                    styles.splice(index, 1)
-                    styles.splice(index + 1, 0, this.selected)
-                }
-                this.$root.reloadStyles()
-            },
-            remove(style) {
-                const styles = this.$root.cfg.visual.styles
-                const index = styles.indexOf(style)
-                styles.splice(index, 1)
-                this.$root.reloadStyles()
-            },
-            addStyle(style) {
-                const styles = this.$root.cfg.visual.styles
-                styles.push(style)
-                this.$root.reloadStyles()
-            }
-        }
-    })
-</script>
-
 <script>
     Vue.component('cider-settings', {
         template: "#cider-settings",

From deae018a9e1df20bc632a38f575eda5be440948c Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Wed, 4 May 2022 14:25:50 -0700
Subject: [PATCH 116/141] added uninstall theme

---
 src/main/base/browserwindow.ts                | 47 +++++++++-
 src/renderer/views/pages/installed-themes.ejs | 94 ++++++++++++-------
 2 files changed, 106 insertions(+), 35 deletions(-)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 6f3d6994..b920b66e 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -4,7 +4,7 @@ import * as windowStateKeeper from "electron-window-state";
 import * as express from "express";
 import * as getPort from "get-port";
 import { search } from "youtube-search-without-api-key";
-import { existsSync, rmSync, mkdirSync, readdirSync, readFileSync, writeFileSync, statSync } from "fs";
+import { existsSync, rmSync, mkdirSync, readdirSync, readFileSync, writeFileSync, statSync, unlinkSync, rmdirSync, lstatSync } from "fs";
 import { Stream } from "stream";
 import { networkInterfaces } from "os";
 import * as mm from 'music-metadata';
@@ -261,8 +261,10 @@ export class BrowserWindow {
         },
     };
 
+    public static watcher: any;
+
     StartWatcher(path: string) {
-        const watcher = watch(path, {
+        BrowserWindow.watcher = watch(path, {
             ignored: /[\/\\]\./,
             persistent: true
         });
@@ -272,7 +274,7 @@ export class BrowserWindow {
         }
 
         // Declare the listeners of the watcher
-        watcher
+        BrowserWindow.watcher
             .on('add', function (path: string) {
                 // console.log('File', path, 'has been added');
             })
@@ -299,6 +301,10 @@ export class BrowserWindow {
             });
     }
 
+    async StopWatcher() {
+        await BrowserWindow.watcher.close();
+    }
+
     /**
      * Creates the browser window
      * @generator
@@ -703,6 +709,41 @@ export class BrowserWindow {
             };
         })
 
+        ipcMain.handle("uninstall-theme", async (event, path) => {
+            await this.StopWatcher()
+            const themesDir = utils.getPath("themes")
+            // validate the path is in the themes directory
+            try {
+                if (path.startsWith(themesDir)) {
+                    // if path is directory, delete it
+                    if (lstatSync(path).isDirectory()) {
+                        await rmdirSync(path, { recursive: true });
+                    }else{
+                        // if path is file, delete it
+                        await unlinkSync(path);
+                    }
+                    // return the path
+                    BrowserWindow.win.webContents.send("theme-uninstalled", {
+                        path: path,
+                        status: 0
+                    });
+                }else{
+                    BrowserWindow.win.webContents.send("theme-uninstalled", {
+                        path: path,
+                        status: 1
+                    });
+                }
+            }catch(e: any) {
+                BrowserWindow.win.webContents.send("theme-uninstalled", {
+                    path: path,
+                    message: e.message,
+                    status: 2
+                });
+            }
+
+            this.StartWatcher(utils.getPath('themes'))
+        })
+
         ipcMain.handle("reinstall-widevine-cdm", () => {
             // remove WidevineCDM from appdata folder
             const widevineCdmPath = join(app.getPath("userData"), "./WidevineCdm");
diff --git a/src/renderer/views/pages/installed-themes.ejs b/src/renderer/views/pages/installed-themes.ejs
index 20ef4a5d..5a23eb05 100644
--- a/src/renderer/views/pages/installed-themes.ejs
+++ b/src/renderer/views/pages/installed-themes.ejs
@@ -26,7 +26,7 @@
                 </div>
                 <ul class="list-group list-group-flush">
                     <li @click="addStyle(theme.file)" 
-                    @contextmenu="contextMenu"
+                    @contextmenu="contextMenu($event, theme)"
                     class="list-group-item list-group-item-dark"
                         v-for="theme in themes" :value="theme.file"
                         v-if="!$root.cfg.visual.styles.includes(theme.file)">
@@ -34,7 +34,7 @@
                         <b-row>
                             <b-col class="themeLabel">{{theme.name}}</b-col>
                             <b-col sm="auto">
-                                <button @click.stop="contextMenu" class="themeContextMenu codicon codicon-list-unordered"></button>
+                                <button @click.stop="contextMenu($event, theme)" class="themeContextMenu codicon codicon-list-unordered"></button>
                             </b-col>
                         </b-row>
                     </li>
@@ -87,25 +87,24 @@
         mounted() {
             console.log(this.themes)
             this.themeList = [...this.themes]
-            this.themeList.unshift({
-                name: "Acrylic Grain",
-                file: "grain.less"
-            })
-            this.themeList.unshift({
-                name: "Sweetener",
-                file: "sweetener.less"
-            })
-            this.themeList.unshift({
-                name: "Reduce Visuals",
-                file: "reduce_visuals.less"
-            })
-            this.themeList.unshift({
-                name: "Inline Drawer",
-                file: "inline_drawer.less"
-            })
+            // this.themeList.unshift({
+            //     name: "Acrylic Grain",
+            //     file: "grain.less"
+            // })
+            // this.themeList.unshift({
+            //     name: "Sweetener",
+            //     file: "sweetener.less"
+            // })
+            // this.themeList.unshift({
+            //     name: "Reduce Visuals",
+            //     file: "reduce_visuals.less"
+            // })
+            // this.themeList.unshift({
+            //     name: "Inline Drawer",
+            //     file: "inline_drawer.less"
+            // })
         },
         methods: {
-
             gitHubExplore() {
                 this.$root.appRoute("themes-github")
             },
@@ -174,25 +173,56 @@
         mounted() {
             this.themes = ipcRenderer.sendSync("get-themes")
             // this.getRepos();
-            this.getInstalledThemes();
+            this.getThemesList();
             // app.checkForThemeUpdates()
         },
         methods: {
-            contextMenu(event) {
+            getThemesList() {
+                let themes = ipcRenderer.sendSync("get-themes")
+                themes.unshift({
+                    name: "Acrylic Grain",
+                    file: "grain.less"
+                })
+                themes.unshift({
+                    name: "Sweetener",
+                    file: "sweetener.less"
+                })
+                themes.unshift({
+                    name: "Reduce Visuals",
+                    file: "reduce_visuals.less"
+                })
+                themes.unshift({
+                    name: "Inline Drawer",
+                    file: "inline_drawer.less"
+                })
+                this.themes = themes
+            },
+            contextMenu(event, theme) {
+                let self = this
                 let menu = {
-                    items: [{
-                        name: "Uninstall",
-                        action: () => {
-                            
-                        }
-                    },
-                    {
-                        name: "View Info",
-                        action: () => {
-                            
+                    items: {
+                        "uninstall": {
+                            name: "Uninstall",
+                            disabled: true,
+                            action: () => {
+                                console.debug(theme)
+                                ipcRenderer.once("theme-uninstalled", (event, args) => {
+                                    console.debug(event, args)
+                                    self.getThemesList()
+                                })
+                                ipcRenderer.invoke("uninstall-theme", theme.path)
+                            }
+                        },
+                        "viewInfo": {
+                            name: "View Info",
+                            action: () => {
+
+                            }
                         }
                     }
-                    ]
+                }
+                if (theme.path) {
+                    menu.items.uninstall.disabled = false
                 }
                 this.$root.showMenuPanel(menu, event)
             },

From 019886ecb0df58e19f8e6e47d84634f8999aaf26 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Wed, 4 May 2022 14:59:46 -0700
Subject: [PATCH 117/141] disabled themes, replaced with styles

---
 src/i18n/en_US.json                           |  6 +++
 src/i18n/source/en_US.json                    |  5 +++
 src/main/base/browserwindow.ts                |  9 ++++
 src/renderer/less/pages.less                  | 17 +++++++
 src/renderer/main/vueapp.js                   |  4 +-
 src/renderer/views/pages/installed-themes.ejs | 45 +++++++++++++------
 src/renderer/views/pages/settings.ejs         | 29 +-----------
 src/renderer/views/pages/themes-github.ejs    | 16 +++----
 8 files changed, 77 insertions(+), 54 deletions(-)

diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index 78413968..7d85fa35 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -73,6 +73,7 @@
   "term.viewAs": "View As",
   "term.viewAs.coverArt": "Cover Art",
   "term.viewAs.list": "List",
+  "term.dynamic": "Dynamic",
   "term.size": "Size",
   "term.size.normal": "Normal",
   "term.size.compact": "Compact",
@@ -391,6 +392,11 @@
   "settings.header.visual.theme.github.page": "Themes from GitHub",
   "settings.option.visual.theme.github.install.confirm": "Are you sure you want to install {{ repo }}?",
   "settings.prompt.visual.theme.github.URL": "Enter the URL of the theme you want to install",
+  "settings.prompt.visual.theme.uninstallTheme": "Are you sure you want to uninstall {{ theme }}?",
+  "settings.option.visual.theme.checkForUpdates": "Check for updates",
+  "settings.option.visual.theme.manageStyles": "Manage Styles",
+  "settings.option.visual.theme.uninstall": "Uninstall",
+  "settings.option.visual.theme.viewInfo": "View Info",
   "settings.notyf.visual.theme.install.success": "Theme installed successfully",
   "settings.notyf.visual.theme.install.error": "Theme installation failed",
   "settings.header.visual.plugin": "Plugin",
diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json
index 71d7a3d8..7d85fa35 100644
--- a/src/i18n/source/en_US.json
+++ b/src/i18n/source/en_US.json
@@ -392,6 +392,11 @@
   "settings.header.visual.theme.github.page": "Themes from GitHub",
   "settings.option.visual.theme.github.install.confirm": "Are you sure you want to install {{ repo }}?",
   "settings.prompt.visual.theme.github.URL": "Enter the URL of the theme you want to install",
+  "settings.prompt.visual.theme.uninstallTheme": "Are you sure you want to uninstall {{ theme }}?",
+  "settings.option.visual.theme.checkForUpdates": "Check for updates",
+  "settings.option.visual.theme.manageStyles": "Manage Styles",
+  "settings.option.visual.theme.uninstall": "Uninstall",
+  "settings.option.visual.theme.viewInfo": "View Info",
   "settings.notyf.visual.theme.install.success": "Theme installed successfully",
   "settings.notyf.visual.theme.install.error": "Theme installation failed",
   "settings.header.visual.plugin": "Plugin",
diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index b920b66e..790b662f 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -715,6 +715,15 @@ export class BrowserWindow {
             // validate the path is in the themes directory
             try {
                 if (path.startsWith(themesDir)) {
+                    // get last dir in path, can be either / or \ and may have a trailing slash
+                    const themeName = path.split(/[\\\/]/).pop()
+                    if(themeName == "Themes" || themeName == "themes") {
+                        BrowserWindow.win.webContents.send("theme-uninstalled", {
+                            path: path,
+                            status: 3
+                        });
+                        return
+                    }
                     // if path is directory, delete it
                     if (lstatSync(path).isDirectory()) {
                         await rmdirSync(path, { recursive: true });
diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less
index 6325faa1..652574a6 100644
--- a/src/renderer/less/pages.less
+++ b/src/renderer/less/pages.less
@@ -1180,6 +1180,23 @@
       align-items: center;
     }
 
+    .handle {
+      height: 100%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+
+    .list-group-item {
+
+      &:hover {
+        cursor: grab;
+      }
+      &:active {
+        cursor: grabbing;
+      }
+    }
+
     .removeItem {
       border     : 0px;
       background : transparent;
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 12e37e89..e957839d 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -596,9 +596,7 @@ const app = new Vue({
         },
         async init() {
             let self = this
-            if (this.cfg.visual.theme != "default.less" && this.cfg.visual.theme != "") {
-                this.setTheme(this.cfg.visual.theme)
-            }
+
             if (this.cfg.visual.styles.length != 0) {
                 await this.reloadStyles()
             }
diff --git a/src/renderer/views/pages/installed-themes.ejs b/src/renderer/views/pages/installed-themes.ejs
index 5a23eb05..007e98ee 100644
--- a/src/renderer/views/pages/installed-themes.ejs
+++ b/src/renderer/views/pages/installed-themes.ejs
@@ -4,19 +4,25 @@
             <div class="row">
                 <div class="col nopadding">
                     <h1 class="header-text">
-                        Manage Styles    
+                        {{ $root.getLz("settings.option.visual.theme.manageStyles") }}    
                     </h1>
                 </div>
-                <div class="col-auto flex-center">
+                <div class="col-auto nopadding flex-center">
+                    <button class="md-btn md-btn-small md-btn-block" @click="$root.appRoute('themes-github')">
+                        {{$root.getLz('settings.option.visual.theme.github.explore')}}
+                    </button>
+                </div>
+                <div class="col-auto  flex-center">
+                    <button class="md-btn md-btn-small md-btn-block" @click="$root.checkForThemeUpdates()">
+                        {{ $root.getLz('settings.option.visual.theme.checkForUpdates') }}
+                    </button>
+                </div>
+                <div class="col-auto nopadding flex-center">
                     <button class="md-btn md-btn-small md-btn-block" @click="openThemesFolder()">
                         {{$root.getLz('settings.option.visual.theme.github.openfolder')}}
                     </button>
                 </div>
-                <div class="col-auto nopadding flex-center">
-                    <button class="md-btn md-btn-small md-btn-block" @click="installThemeURL()">
-                        {{$root.getLz('settings.option.visual.theme.github.download')}}
-                    </button>
-                </div>
+
             </div>
         </div>
         <div class="gh-content">
@@ -61,6 +67,9 @@
                 <draggable class="list-group" v-model="$root.cfg.visual.styles" @end="$root.reloadStyles()">
                     <b-list-group-item variant="dark" v-for="theme in $root.cfg.visual.styles" :key="theme">
                         <b-row>
+                            <b-col sm="auto">
+                                <div class="handle codicon codicon-grabber"></div>
+                            </b-col>
                             <b-col class="themeLabel">{{getThemeName(theme)}}</b-col>
                             <b-col sm="auto">
                                 <button class="removeItem codicon codicon-close" @click="remove(theme)"></button>
@@ -202,19 +211,27 @@
                 let menu = {
                     items: {
                         "uninstall": {
-                            name: "Uninstall",
+                            name: app.getLz("settings.option.visual.theme.uninstall"),
                             disabled: true,
                             action: () => {
-                                console.debug(theme)
-                                ipcRenderer.once("theme-uninstalled", (event, args) => {
-                                    console.debug(event, args)
-                                    self.getThemesList()
+                                bootbox.confirm(app.stringTemplateParser(app.getLz("settings.prompt.visual.theme.uninstallTheme"), {
+                                    theme: theme.name ?? theme.file
+                                }), (res) => {
+                                    if (res) {
+                                        console.debug(theme)
+                                        ipcRenderer.once("theme-uninstalled", (event, args) => {
+                                            console.debug(event, args)
+                                            self.getThemesList()
+                                        })
+                                        ipcRenderer.invoke("uninstall-theme", theme.path)
+                                    }
                                 })
-                                ipcRenderer.invoke("uninstall-theme", theme.path)
+
                             }
                         },
                         "viewInfo": {
-                            name: "View Info",
+                            name: app.getLz("settings.option.visual.theme.viewInfo"),
+                            disabled: true,
                             action: () => {
 
                             }
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index 69c76380..8e9bc841 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -480,20 +480,8 @@
                                 {{$root.getLz('settings.header.visual.theme')}}
                             </div>
                             <div class="md-option-segment md-option-segment_auto">
-                                <label>
-                                    <select class="md-select" @change="$root.setTheme($root.cfg.visual.theme)"
-                                            v-model="$root.cfg.visual.theme">
-                                        <option value="default.less">
-                                            {{$root.getLz('settings.option.visual.theme.default')}}
-                                        </option>
-                                        <option value="dark.less">{{$root.getLz('settings.option.visual.theme.dark')}}
-                                        </option>
-                                        <option v-for="theme in themes" :value="theme.file">{{ theme.name }}</option>
-                                    </select>
-                                </label>
-                                <button class="md-btn md-btn-small md-btn-block" @click="gitHubExplore()"
-                                        style="margin-top: 8px">
-                                    {{$root.getLz('settings.option.visual.theme.github.explore')}}
+                                <button class="md-btn md-btn-block" @click="$root.appRoute('installed-themes')">
+                                    {{$root.getLz('settings.option.visual.theme.manageStyles')}}
                                 </button>
                             </div>
                         </div>
@@ -1216,19 +1204,6 @@
                                 </button>
                             </div>
                         </div>
-
-                        <div class="md-option-line">
-                            <!-- Do not translate -->
-                            <div class="md-option-segment">
-                                Style Editor<br>
-                                <small>Mix and match various theme components to get Cider looking exactly how you
-                                    want.</small>
-                            </div>
-                            <div class="md-option-segment md-option-segment_auto">
-                                <button class="md-btn" @click="app.appRoute('installed-themes')">Manage Styles</button>
-                            </div>
-                        </div>
-
                         <div class="md-option-line">
                             <div class="md-option-segment">
                                 {{$root.getLz('settings.option.experimental.unknownPlugin')}}
diff --git a/src/renderer/views/pages/themes-github.ejs b/src/renderer/views/pages/themes-github.ejs
index 1c67defa..2eda6cf0 100644
--- a/src/renderer/views/pages/themes-github.ejs
+++ b/src/renderer/views/pages/themes-github.ejs
@@ -5,17 +5,14 @@
                 <div class="col nopadding">
                     <h1 class="header-text">{{$root.getLz('settings.header.visual.theme.github.page')}}</h1>
                 </div>
-                <div class="col-auto flex-center">
-                    <select class="md-select" @change="$root.setTheme($root.cfg.visual.theme)"
-                            v-model="$root.cfg.visual.theme">
-                        <option value="default.less">{{$root.getLz('settings.option.visual.theme.default')}}</option>
-                        <option value="dark.less">{{$root.getLz('settings.option.visual.theme.dark')}}</option>
-                        <option v-for="theme in themes" :value="theme.file">{{ theme.name }}</option>
-                    </select>
+                <div class="col-auto nopadding flex-center">
+                    <button class="md-btn md-btn-small md-btn-block" @click="$root.appRoute('installed-themes')">
+                        {{$root.getLz('settings.option.visual.theme.manageStyles')}}
+                    </button>
                 </div>
                 <div class="col-auto flex-center">
-                    <button class="md-btn md-btn-small md-btn-block" @click="openThemesFolder()">
-                        {{$root.getLz('settings.option.visual.theme.github.openfolder')}}
+                    <button class="md-btn md-btn-small md-btn-block" @click="$root.checkForThemeUpdates()">
+                        Check for updates
                     </button>
                 </div>
                 <div class="col-auto nopadding flex-center">
@@ -106,7 +103,6 @@
             this.themes = ipcRenderer.sendSync("get-themes")
             this.getRepos();
             this.getInstalledThemes();
-            app.checkForThemeUpdates()
         },
         methods: {
             openThemesFolder() {

From c3fdd6eae43feaf73fe7c61f6cc0dc59218a68d3 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Wed, 4 May 2022 16:05:59 -0700
Subject: [PATCH 118/141] added support for packed themes

---
 src/main/base/browserwindow.ts                |  8 +-
 src/renderer/less/pages.less                  | 10 +++
 src/renderer/views/pages/installed-themes.ejs | 81 ++++++++++++-------
 3 files changed, 67 insertions(+), 32 deletions(-)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 790b662f..4b6f5b69 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -868,7 +868,7 @@ export class BrowserWindow {
                     } else if (statSync(join(utils.getPath("themes"), file)).isDirectory()) {
                         let subFiles = readdirSync(join(utils.getPath("themes"), file));
                         for (let subFile of subFiles) {
-                            if (subFile.endsWith(".less")) {
+                            if (subFile.endsWith("index.less")) {
                                 themes.push(join(file, subFile));
                             }
                         }
@@ -894,7 +894,8 @@ export class BrowserWindow {
                             path: themePath,
                             file: theme,
                             github_repo: themeJson.github_repo || "",
-                            commit: themeJson.commit || ""
+                            commit: themeJson.commit || "",
+                            pack: themeJson.pack || false,
                         });
                     } else {
                         themeObjects.push({
@@ -903,7 +904,8 @@ export class BrowserWindow {
                             path: themePath,
                             file: theme,
                             github_repo: "",
-                            commit: ""
+                            commit: "",
+                            pack: false
                         });
                     }
                 }
diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less
index 652574a6..b98b560a 100644
--- a/src/renderer/less/pages.less
+++ b/src/renderer/less/pages.less
@@ -1135,6 +1135,16 @@
     border    : 0px;
   }
 
+  .list-group-item {
+    &.addon {
+      background: rgb(86 86 86 / 20%);
+    }
+    &.applied {
+      background: var(--keyColor-disabled);
+      pointer-events: none;
+    }
+  }
+
   .repo-header {
     font-size      : 16px;
     position       : sticky;
diff --git a/src/renderer/views/pages/installed-themes.ejs b/src/renderer/views/pages/installed-themes.ejs
index 007e98ee..2b1d0610 100644
--- a/src/renderer/views/pages/installed-themes.ejs
+++ b/src/renderer/views/pages/installed-themes.ejs
@@ -31,19 +31,52 @@
                     <h4>Available</h4>
                 </div>
                 <ul class="list-group list-group-flush">
-                    <li @click="addStyle(theme.file)" 
-                    @contextmenu="contextMenu($event, theme)"
-                    class="list-group-item list-group-item-dark"
-                        v-for="theme in themes" :value="theme.file"
-                        v-if="!$root.cfg.visual.styles.includes(theme.file)">
+                    <template v-for="theme in themes">
+                        <li @click="addStyle(theme.file)" 
+                        @contextmenu="contextMenu($event, theme)"
+                        class="list-group-item list-group-item-dark"
+                        :class="{'applied': $root.cfg.visual.styles.includes(theme.file)}">
+                            
+                            <b-row>
+                                <b-col class="themeLabel">{{theme.name}}</b-col>
+                                <template v-if="$root.cfg.visual.styles.includes(theme.file)">
+                                    <b-col sm="auto">
+                                        <button class="themeContextMenu codicon codicon-check"></button>
+                                    </b-col>
+                                </template>
+                                <template v-else>
+                                    <b-col sm="auto" v-if="theme.pack">
+                                        <button class="themeContextMenu codicon codicon-package"></button>
+                                    </b-col>
+                                    <b-col sm="auto">
+                                        <button @click.stop="contextMenu($event, theme)" class="themeContextMenu codicon codicon-list-unordered"></button>
+                                    </b-col>
+                                </template>
+
+                            </b-row>
+                        </li>
+                        <li @click="addStyle(packEntry.file)" 
+                        @contextmenu="contextMenu($event, theme)"
+                        class="list-group-item list-group-item-dark addon"
+                        v-for="packEntry in theme.pack"
+                        :class="{'applied': $root.cfg.visual.styles.includes(packEntry.file)}"
+                        v-if="theme.pack">
                         
                         <b-row>
-                            <b-col class="themeLabel">{{theme.name}}</b-col>
-                            <b-col sm="auto">
-                                <button @click.stop="contextMenu($event, theme)" class="themeContextMenu codicon codicon-list-unordered"></button>
-                            </b-col>
+                            <b-col class="themeLabel">{{packEntry.name}}</b-col>
+                            <template v-if="$root.cfg.visual.styles.includes(packEntry.file)">
+                                <b-col sm="auto">
+                                    <button class="themeContextMenu codicon codicon-check"></button>
+                                </b-col>
+                            </template>
+                            <template v-else>
+                                <b-col sm="auto">
+                                    <button class="themeContextMenu codicon codicon-diff-added"></button>
+                                </b-col>
+                            </template>
                         </b-row>
                     </li>
+                    </template>
                 </ul>
             </div>
 
@@ -53,7 +86,6 @@
                 </div>
                 <stylestack-editor ref="stackEditor"  v-if="themes.length != 0" :themes="themes"/>
             </div>
-            </transition>
         </div>
     </div>
 </script>
@@ -96,22 +128,15 @@
         mounted() {
             console.log(this.themes)
             this.themeList = [...this.themes]
-            // this.themeList.unshift({
-            //     name: "Acrylic Grain",
-            //     file: "grain.less"
-            // })
-            // this.themeList.unshift({
-            //     name: "Sweetener",
-            //     file: "sweetener.less"
-            // })
-            // this.themeList.unshift({
-            //     name: "Reduce Visuals",
-            //     file: "reduce_visuals.less"
-            // })
-            // this.themeList.unshift({
-            //     name: "Inline Drawer",
-            //     file: "inline_drawer.less"
-            // })
+
+            this.themeList.forEach(theme => {
+                if (theme.pack) {
+                    theme.pack.forEach(packEntry => {
+                        packEntry.file = theme.file.replace('index.less', '') + packEntry.file
+                        this.themeList.push(packEntry)
+                    })
+                }
+            })
         },
         methods: {
             gitHubExplore() {
@@ -180,13 +205,11 @@
             }
         },
         mounted() {
-            this.themes = ipcRenderer.sendSync("get-themes")
-            // this.getRepos();
             this.getThemesList();
-            // app.checkForThemeUpdates()
         },
         methods: {
             getThemesList() {
+                let self = this
                 let themes = ipcRenderer.sendSync("get-themes")
                 themes.unshift({
                     name: "Acrylic Grain",

From 0422b085daee3ef183cab2e4cf3d96b0efec9c95 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Wed, 4 May 2022 16:22:16 -0700
Subject: [PATCH 119/141] readded dark

---
 src/renderer/views/pages/installed-themes.ejs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/renderer/views/pages/installed-themes.ejs b/src/renderer/views/pages/installed-themes.ejs
index 2b1d0610..7cc5809e 100644
--- a/src/renderer/views/pages/installed-themes.ejs
+++ b/src/renderer/views/pages/installed-themes.ejs
@@ -227,6 +227,10 @@
                     name: "Inline Drawer",
                     file: "inline_drawer.less"
                 })
+                themes.unshift({
+                    name: "Dark",
+                    file: "dark.less"
+                })
                 this.themes = themes
             },
             contextMenu(event, theme) {

From ce0de5719a08f59466891d9a8103d500d19619cd Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Wed, 4 May 2022 23:52:36 -0700
Subject: [PATCH 120/141] keeps package icon when active

---
 src/renderer/views/pages/installed-themes.ejs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/renderer/views/pages/installed-themes.ejs b/src/renderer/views/pages/installed-themes.ejs
index 7cc5809e..6b12f6aa 100644
--- a/src/renderer/views/pages/installed-themes.ejs
+++ b/src/renderer/views/pages/installed-themes.ejs
@@ -40,6 +40,9 @@
                             <b-row>
                                 <b-col class="themeLabel">{{theme.name}}</b-col>
                                 <template v-if="$root.cfg.visual.styles.includes(theme.file)">
+                                    <b-col sm="auto" v-if="theme.pack">
+                                        <button class="themeContextMenu codicon codicon-package"></button>
+                                    </b-col>
                                     <b-col sm="auto">
                                         <button class="themeContextMenu codicon codicon-check"></button>
                                     </b-col>

From 1d8dfb3ace604e0b8ad18ce26b8f5a45d8300177 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Thu, 5 May 2022 08:45:51 +0100
Subject: [PATCH 121/141] Just gonna swap these before anyone else notices

---
 src/main/base/store.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/base/store.ts b/src/main/base/store.ts
index e78c98bb..de8590a5 100644
--- a/src/main/base/store.ts
+++ b/src/main/base/store.ts
@@ -52,11 +52,11 @@ export class Store {
             "keybindings": {
                 "search": [
                     process.platform == "darwin" ? "Command" : "Control",
-                    "S"
+                    "F"
                 ],
                 "albums": [
                     process.platform == "darwin" ? "Command" : "Control",
-                    "F"
+                    "S"
                 ],
                 "artists": [
                     process.platform == "darwin" ? "Command" : "Control",

From e3bbfd19043e232b7114c9ac0eb57be9dbc832bc Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Thu, 5 May 2022 04:14:12 -0700
Subject: [PATCH 122/141] try catch for potentially bad json

---
 src/main/base/browserwindow.ts | 87 ++++++++++++++++++++--------------
 1 file changed, 51 insertions(+), 36 deletions(-)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 4b6f5b69..8ec13a9d 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -1,18 +1,29 @@
-import { join } from "path";
-import { app, BrowserWindow as bw, ipcMain, ShareMenu, shell } from "electron";
+import {join} from "path";
+import {app, BrowserWindow as bw, ipcMain, ShareMenu, shell} from "electron";
 import * as windowStateKeeper from "electron-window-state";
 import * as express from "express";
 import * as getPort from "get-port";
-import { search } from "youtube-search-without-api-key";
-import { existsSync, rmSync, mkdirSync, readdirSync, readFileSync, writeFileSync, statSync, unlinkSync, rmdirSync, lstatSync } from "fs";
-import { Stream } from "stream";
-import { networkInterfaces } from "os";
+import {search} from "youtube-search-without-api-key";
+import {
+    existsSync,
+    rmSync,
+    mkdirSync,
+    readdirSync,
+    readFileSync,
+    writeFileSync,
+    statSync,
+    unlinkSync,
+    rmdirSync,
+    lstatSync
+} from "fs";
+import {Stream} from "stream";
+import {networkInterfaces} from "os";
 import * as mm from 'music-metadata';
 import fetch from 'electron-fetch'
-import { wsapi } from "./wsapi";
-import { utils } from './utils';
-import { Plugins } from "./plugins";
-import { watch } from "chokidar";
+import {wsapi} from "./wsapi";
+import {utils} from './utils';
+import {Plugins} from "./plugins";
+import {watch} from "chokidar";
 import * as os from "os";
 import wallpaper from "wallpaper";
 import * as AdmZip from "adm-zip";
@@ -246,7 +257,7 @@ export class BrowserWindow {
         show: false,
         // backgroundColor: "#1E1E1E",
         titleBarStyle: 'hidden',
-        trafficLightPosition: { x: 15, y: 20 },
+        trafficLightPosition: {x: 15, y: 20},
         webPreferences: {
             experimentalFeatures: true,
             nodeIntegration: true,
@@ -312,7 +323,7 @@ export class BrowserWindow {
      * @yields {object} Electron browser window
      */
     async createWindow(): Promise<Electron.BrowserWindow> {
-        this.clientPort = await getPort({ port: 9000 });
+        this.clientPort = await getPort({port: 9000});
         BrowserWindow.verifyFiles();
         this.StartWatcher(utils.getPath('themes'));
 
@@ -572,7 +583,7 @@ export class BrowserWindow {
         remote.use(express.static(join(utils.getPath('srcPath'), "./web-remote/")))
         remote.set("views", join(utils.getPath('srcPath'), "./web-remote/views"));
         remote.set("view engine", "ejs");
-        getPort({ port: 6942 }).then((port: number) => {
+        getPort({port: 6942}).then((port: number) => {
             this.remotePort = port;
             // Start Remote Discovery
             this.broadcastRemote()
@@ -645,7 +656,7 @@ export class BrowserWindow {
                     'KHTML, like Gecko) Mobile/17D50 UCBrowser/12.8.2.1268 Mobile AliApp(TUnionSDK/0.1.20.3) '
                     details.requestHeaders['Referer'] = "https://y.qq.com/portal/player.html"
                 }
-                callback({ requestHeaders: details.requestHeaders });
+                callback({requestHeaders: details.requestHeaders});
             }
         );
 
@@ -717,7 +728,7 @@ export class BrowserWindow {
                 if (path.startsWith(themesDir)) {
                     // get last dir in path, can be either / or \ and may have a trailing slash
                     const themeName = path.split(/[\\\/]/).pop()
-                    if(themeName == "Themes" || themeName == "themes") {
+                    if (themeName == "Themes" || themeName == "themes") {
                         BrowserWindow.win.webContents.send("theme-uninstalled", {
                             path: path,
                             status: 3
@@ -726,8 +737,8 @@ export class BrowserWindow {
                     }
                     // if path is directory, delete it
                     if (lstatSync(path).isDirectory()) {
-                        await rmdirSync(path, { recursive: true });
-                    }else{
+                        await rmdirSync(path, {recursive: true});
+                    } else {
                         // if path is file, delete it
                         await unlinkSync(path);
                     }
@@ -736,13 +747,13 @@ export class BrowserWindow {
                         path: path,
                         status: 0
                     });
-                }else{
+                } else {
                     BrowserWindow.win.webContents.send("theme-uninstalled", {
                         path: path,
                         status: 1
                     });
                 }
-            }catch(e: any) {
+            } catch (e: any) {
                 BrowserWindow.win.webContents.send("theme-uninstalled", {
                     path: path,
                     message: e.message,
@@ -757,7 +768,7 @@ export class BrowserWindow {
             // remove WidevineCDM from appdata folder
             const widevineCdmPath = join(app.getPath("userData"), "./WidevineCdm");
             if (existsSync(widevineCdmPath)) {
-                rmSync(widevineCdmPath, { recursive: true, force: true })
+                rmSync(widevineCdmPath, {recursive: true, force: true})
             }
             // reinstall WidevineCDM
             app.relaunch()
@@ -887,16 +898,20 @@ export class BrowserWindow {
                         themePath = themePath.slice(0, -10);
                     }
                     if (existsSync(join(themePath, "theme.json"))) {
-                        let themeJson = JSON.parse(readFileSync(join(themePath, "theme.json"), "utf8"));
-                        themeObjects.push({
-                            name: themeJson.name || themeName,
-                            description: themeJson.description || themeDescription,
-                            path: themePath,
-                            file: theme,
-                            github_repo: themeJson.github_repo || "",
-                            commit: themeJson.commit || "",
-                            pack: themeJson.pack || false,
-                        });
+                        try {
+                            let themeJson = JSON.parse(readFileSync(join(themePath, "theme.json"), "utf8"));
+                            themeObjects.push({
+                                name: themeJson.name || themeName,
+                                description: themeJson.description || themeDescription,
+                                path: themePath,
+                                file: theme,
+                                github_repo: themeJson.github_repo || "",
+                                commit: themeJson.commit || "",
+                                pack: themeJson.pack || false,
+                            });
+                        } catch (e) {
+                            console.error(e);
+                        }
                     } else {
                         themeObjects.push({
                             name: themeName,
@@ -1035,7 +1050,7 @@ export class BrowserWindow {
 
         //Fullscreen
         ipcMain.on('detachDT', (_event, _) => {
-            BrowserWindow.win.webContents.openDevTools({ mode: 'detach' });
+            BrowserWindow.win.webContents.openDevTools({mode: 'detach'});
         })
 
         ipcMain.handle('relaunchApp', (_event, _) => {
@@ -1233,8 +1248,8 @@ export class BrowserWindow {
                     console.log('sc', SoundCheckTag)
                     BrowserWindow.win.webContents.send('SoundCheckTag', SoundCheckTag)
                 }).catch(err => {
-                    console.log(err)
-                });
+                console.log(err)
+            });
         });
 
         ipcMain.on('check-for-update', async (_event) => {
@@ -1367,10 +1382,10 @@ export class BrowserWindow {
         // Set window Handler
         BrowserWindow.win.webContents.setWindowOpenHandler((x: any) => {
             if (x.url.includes("apple") || x.url.includes("localhost")) {
-                return { action: "allow" };
+                return {action: "allow"};
             }
             shell.openExternal(x.url).catch(console.error);
-            return { action: "deny" };
+            return {action: "deny"};
         });
     }
 
@@ -1426,7 +1441,7 @@ export class BrowserWindow {
             "CtlN": "Cider",
             "iV": "196623"
         };
-        let server2 = mdns.createAdvertisement(x, `${await getPort({ port: 3839 })}`, {
+        let server2 = mdns.createAdvertisement(x, `${await getPort({port: 3839})}`, {
             name: encoded,
             txt: txt_record
         });

From 5693f234dbdcb4cc865656e4ae58973076785947 Mon Sep 17 00:00:00 2001
From: UnbreakCode <unbreakcode@gmail.com>
Date: Thu, 5 May 2022 17:40:00 +0200
Subject: [PATCH 123/141] show hours on replay page

---
 src/renderer/views/pages/replay.ejs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/renderer/views/pages/replay.ejs b/src/renderer/views/pages/replay.ejs
index 9acc591a..ba14dd64 100644
--- a/src/renderer/views/pages/replay.ejs
+++ b/src/renderer/views/pages/replay.ejs
@@ -22,7 +22,7 @@
             <hr>
             <div class="row">
                 <div class="col">
-                    <h4>{{ loaded.attributes.listenTimeInMinutes }} {{$root.getLz('term.time.minutes')}}</h4>
+                    <h4>{{ convertToHours(loaded.attributes.listenTimeInMinutes) }} {{$root.getLz('term.time.hours')}}</h4>
                     <h4>{{ loaded.attributes.uniqueAlbumCount }} {{$root.getLz('term.uniqueAlbums')}}</h4>
                     <h4>{{ loaded.attributes.uniqueArtistCount }} {{$root.getLz('term.uniqueArtists')}}</h4>
                     <h4>{{ loaded.attributes.uniqueSongCount }} {{$root.getLz('term.uniqueSongs')}}</h4>
@@ -40,7 +40,7 @@
                             <mediaitem-square :item="artistData.relationships.artist.data[0]"></mediaitem-square>
                         </div>
                         <div class="card-footer">
-                            {{ artistData.attributes.listenTimeInMinutes }} {{$root.getLz('term.time.minutes', {'count': artistData.attributes.listenTimeInMinutes})}}<br>
+                            {{ convertToHours(artistData.attributes.listenTimeInMinutes) }} {{$root.getLz('term.time.hours', {'count': convertToHours(artistData.attributes.listenTimeInMinutes) })}}<br>
                             {{$root.getLz('term.listenedTo')}} {{ artistData.attributes.playCount }} {{$root.getLz('term.times')}}
                         </div>
                     </div>
@@ -55,7 +55,7 @@
                             <mediaitem-square :item="albumData.relationships.album.data[0]"></mediaitem-square>
                         </div>
                         <div class="card-footer">
-                            {{ albumData.attributes.listenTimeInMinutes }} {{$root.getLz('term.time.minutes', {'count': albumData.attributes.listenTimeInMinutes})}}<br>
+                            {{ convertToHours(albumData.attributes.listenTimeInMinutes) }} {{$root.getLz('term.time.hours', {'count': convertToHours(albumData.attributes.listenTimeInMinutes)})}}<br>
                             {{ albumData.attributes.playCount }} {{$root.getLz('term.plays')}}
                         </div>
                     </div>
@@ -151,6 +151,9 @@
                 let playlist = await app.mk.api.v3.music(replayData.relationships.playlist.data[0].href, {extend: "editorialArtwork,editorialVideo"})
                 replayData.playlist = playlist.data.data[0]
                 this.loaded = replayData
+            },
+            convertToHours(minutes) {
+                return Math.floor(minutes / 60)
             }
         }
     });

From 25227371011e7958076abe3d181fc445176e0e24 Mon Sep 17 00:00:00 2001
From: yazninja <yazlesean@gmail.com>
Date: Fri, 6 May 2022 01:17:51 +0800
Subject: [PATCH 124/141] prevent overlap between visualizer and heart

---
 src/renderer/views/components/mediaitem-list-item.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index a5ae3ce9..4e7e7753 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -65,7 +65,7 @@
                     </template>
                 </div>
             </div>
-            <div class="heart-icon">
+            <div class="heart-icon" v-if="!(app.mk.isPlaying && (((app.mk.nowPlayingItem._songId ?? (app.mk.nowPlayingItem.songId ?? app.mk.nowPlayingItem.id ))  == itemId) || (app.mk.nowPlayingItem.id == item.id)))">
                 <div class="heart-unfilled" v-if="isLoved == false" :style="{'--url': 'url(./assets/feather/heart.svg)'}" />
                 <div class="heart-filled" v-if="isLoved == true" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}" />
             </div>

From 37e8981a351bc84dc222aa531663b199a8ce6e91 Mon Sep 17 00:00:00 2001
From: cryptofyre <cryptofyre@cryptofyre.org>
Date: Thu, 5 May 2022 18:35:03 -0500
Subject: [PATCH 125/141] Bump Electron to 18.2.1

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index f5b6cf47..9c22e95d 100644
--- a/package.json
+++ b/package.json
@@ -109,9 +109,9 @@
     }
   ],
   "build": {
-    "electronVersion": "18.2.0",
+    "electronVersion": "18.2.1",
     "electronDownload": {
-      "version": "18.2.0+wvcus",
+      "version": "18.2.1+wvcus",
       "mirror": "https://github.com/castlabs/electron-releases/releases/download/v"
     },
     "appId": "cider",

From 898c0b08fa9bef18f58f0211a990ea1c2adce37c Mon Sep 17 00:00:00 2001
From: ace-beattie <acebeattie@gmail.com>
Date: Thu, 5 May 2022 20:46:49 -0600
Subject: [PATCH 126/141] Move to original location on miniplayer close.

---
 src/main/base/browserwindow.ts | 5 +++++
 src/renderer/main/vueapp.js    | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 8ec13a9d..99300827 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -1043,6 +1043,11 @@ export class BrowserWindow {
             BrowserWindow.win.setResizable(!lock);
         });
 
+        // Move window
+        ipcMain.on("windowmove", (_event, x, y) => {
+            BrowserWindow.win.setBounds({x, y});
+        });
+
         //Fullscreen
         ipcMain.on('setFullScreen', (_event, flag) => {
             BrowserWindow.win.setFullScreen(flag)
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index e957839d..ebb778aa 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -148,6 +148,8 @@ const app = new Vue({
         },
         tmpHeight: '',
         tmpWidth: '',
+        tmpX: '',
+        tmpY: '',
         tmpVar: [],
         notification: false,
         chrome: {
@@ -4109,6 +4111,8 @@ const app = new Vue({
             if (flag) {
                 this.tmpWidth = window.innerWidth;
                 this.tmpHeight = window.innerHeight;
+                this.tmpX = window.screenX;
+                this.tmpY = window.screenY;
                 ipcRenderer.send('unmaximize');
                 ipcRenderer.send('windowmin', 250, 250)
                 ipcRenderer.send('windowresize', 300, 300, false)
@@ -4116,6 +4120,7 @@ const app = new Vue({
             } else {
                 ipcRenderer.send('windowmin', 844, 410)
                 ipcRenderer.send('windowresize', this.tmpWidth, this.tmpHeight, false)
+                ipcRenderer.send('windowmove', this.tmpX, this.tmpY)
                 ipcRenderer.send('windowontop', false)
                 //this.cfg.visual.miniplayer_top_toggle = true;
                 app.appMode = 'player';

From 769bd8c7ed9421dc629bd2728a53be34867638f1 Mon Sep 17 00:00:00 2001
From: ace-beattie <acebeattie@gmail.com>
Date: Thu, 5 May 2022 21:02:52 -0600
Subject: [PATCH 127/141] Remember miniplayer location

---
 src/renderer/main/vueapp.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index ebb778aa..421499ca 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -150,6 +150,8 @@ const app = new Vue({
         tmpWidth: '',
         tmpX: '',
         tmpY: '',
+        miniTmpX: '',
+        miniTmpY: '',
         tmpVar: [],
         notification: false,
         chrome: {
@@ -4115,9 +4117,12 @@ const app = new Vue({
                 this.tmpY = window.screenY;
                 ipcRenderer.send('unmaximize');
                 ipcRenderer.send('windowmin', 250, 250)
+                ipcRenderer.send('windowmove', this.miniTmpX, this.miniTmpY)
                 ipcRenderer.send('windowresize', 300, 300, false)
                 app.appMode = 'mini';
             } else {
+                this.miniTmpX = window.screenX;
+                this.miniTmpY = window.screenY;
                 ipcRenderer.send('windowmin', 844, 410)
                 ipcRenderer.send('windowresize', this.tmpWidth, this.tmpHeight, false)
                 ipcRenderer.send('windowmove', this.tmpX, this.tmpY)

From ca059d6236a318e97576e7995cb59428ea03947b Mon Sep 17 00:00:00 2001
From: ace-beattie <acebeattie@gmail.com>
Date: Thu, 5 May 2022 21:06:46 -0600
Subject: [PATCH 128/141] Guard miniTmpX/Y aren't empty for initial setting of
 miniplayer

---
 src/renderer/main/vueapp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 421499ca..40192c9a 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -4117,7 +4117,7 @@ const app = new Vue({
                 this.tmpY = window.screenY;
                 ipcRenderer.send('unmaximize');
                 ipcRenderer.send('windowmin', 250, 250)
-                ipcRenderer.send('windowmove', this.miniTmpX, this.miniTmpY)
+                if (this.miniTmpX !== '' && this.miniTmpY !== '') ipcRenderer.send('windowmove', this.miniTmpX, this.miniTmpY)
                 ipcRenderer.send('windowresize', 300, 300, false)
                 app.appMode = 'mini';
             } else {

From e0596729a95d2c2dd4ab742fb2a01ee619e46c9e Mon Sep 17 00:00:00 2001
From: yazninja <yazlesean@gmail.com>
Date: Fri, 6 May 2022 13:12:39 +0800
Subject: [PATCH 129/141] remove unfilled heart

---
 src/renderer/views/components/mediaitem-list-item.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index 4e7e7753..abd2909d 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -66,7 +66,7 @@
                 </div>
             </div>
             <div class="heart-icon" v-if="!(app.mk.isPlaying && (((app.mk.nowPlayingItem._songId ?? (app.mk.nowPlayingItem.songId ?? app.mk.nowPlayingItem.id ))  == itemId) || (app.mk.nowPlayingItem.id == item.id)))">
-                <div class="heart-unfilled" v-if="isLoved == false" :style="{'--url': 'url(./assets/feather/heart.svg)'}" />
+                <!-- <div class="heart-unfilled" v-if="isLoved == false" :style="{'--url': 'url(./assets/feather/heart.svg)'}" /> -->
                 <div class="heart-filled" v-if="isLoved == true" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}" />
             </div>
             <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"></div>

From ec9f7ed48d9212ca8ebd197cd6127f922eff0b67 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Thu, 5 May 2022 22:34:59 -0700
Subject: [PATCH 130/141] fixes queue shuffling

---
 src/renderer/main/vueapp.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 40192c9a..016e9b30 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -839,6 +839,14 @@ const app = new Vue({
                 ipcRenderer.send('wsapi-updatePlaybackState', wsapi.getAttributes());
             })
 
+            this.mk.addEventListener(MusicKit.Events.queueItemsDidChange, ()=>{
+                if (self.$refs.queue) {
+                    setTimeout(()=>{
+                        self.$refs.queue.updateQueue();
+                    }, 100)
+                }
+            })
+
             this.mk.addEventListener(MusicKit.Events.nowPlayingItemDidChange, (a) => {
                 if (self.$refs.queue) {
                     self.$refs.queue.updateQueue();

From a79a96b94696cef1c886b32c467a97b6252f83a1 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Fri, 6 May 2022 00:26:27 -0700
Subject: [PATCH 131/141] recursive playlist listings

---
 src/renderer/main/vueapp.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 016e9b30..3b39a419 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -1162,8 +1162,10 @@ const app = new Vue({
 
             async function deepScan(parent = "p.playlistsroot") {
                 console.debug(`scanning ${parent}`)
-                const playlistData = await app.mk.api.v3.music(`/v1/me/library/playlist-folders/${parent}/children/`)
-                await asyncForEach(playlistData.data.data, async (playlist) => {
+                // const playlistData = await app.mk.api.v3.music(`/v1/me/library/playlist-folders/${parent}/children/`)
+                const playlistData = await MusicKitTools.v3Continuous({href: `/v1/me/library/playlist-folders/${parent}/children/`})
+                console.log(playlistData)
+                await asyncForEach(playlistData, async (playlist) => {
                     playlist.parent = parent
                     if (
                         playlist.type != "library-playlist-folders" &&

From dff0aee3703949402406f7f05ea601d57377021a Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 7 May 2022 09:04:22 +0700
Subject: [PATCH 132/141] use notyf instead of just hiding cast button

---
 src/i18n/en_US.json                | 1 +
 src/renderer/main/vueapp.js        | 1 +
 src/renderer/views/app/sidebar.ejs | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index 7d85fa35..14fad310 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -330,6 +330,7 @@
   "settings.option.audio.audioLab.description": "An assortment of in-house developed audio effects for Cider.",
   "settings.option.audio.audioLab.subheader":  "Designed by Cider Acoustic Technologies in California",
   "settings.warn.audioLab.withoutAF": "AudioContext (Advanced Functionality) is required to enable Cider Audio Laboratory.",
+  "settings.warn.enableAdvancedFunctionality": "AudioContext (Advanced Functionality) is required to enable this feature.",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "Analog Warmth",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmth.description": "Simulates the analog warmth modelled after the Korg Nutube 6P1",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity": "Analog Warmth intensity",
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 3b39a419..8218881d 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -235,6 +235,7 @@ const app = new Vue({
             pages: [],
         },
         moreinfodata: [],
+        notyf: notyf
     },
     watch: {
         cfg: {
diff --git a/src/renderer/views/app/sidebar.ejs b/src/renderer/views/app/sidebar.ejs
index 17fe8fc1..979db2f5 100644
--- a/src/renderer/views/app/sidebar.ejs
+++ b/src/renderer/views/app/sidebar.ejs
@@ -142,13 +142,13 @@
                     </span>
                     <span class="usermenu-item-name">{{$root.getLz('action.showWebRemoteQR')}}</span>
                 </button>
-                <button class="usermenu-item" v-if="cfg.advanced.AudioContext" @click="modals.castMenu = true">
+                <button class="usermenu-item" @click="cfg.advanced.AudioContext ? modals.castMenu = true : $root.notyf.error($root.getLz('settings.warn.enableAdvancedFunctionality'))">
                     <span class="usermenu-item-icon">
                         <%- include("../svg/cast.svg") %>
                     </span>
                     <span class="usermenu-item-name">{{$root.getLz('term.cast')}}</span>
                 </button>
-                <button class="usermenu-item" v-if="cfg.advanced.AudioContext" @click="modals.audioSettings = true">
+                <button class="usermenu-item" @click="cfg.advanced.AudioContext ? modals.audioSettings = true : $root.notyf.error($root.getLz('settings.warn.enableAdvancedFunctionality'))">
                     <span class="usermenu-item-icon">
                         <%- include("../svg/headphones.svg") %>
                     </span>

From c0c12bc2bad242bbf41636f06b48ff79c64d1f2c Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 7 May 2022 05:24:55 +0100
Subject: [PATCH 133/141] Radio improvement, needs optimisation.

---
 src/i18n/README.md                            |  4 ++-
 src/i18n/en_US.json                           |  2 ++
 src/i18n/source/en_US.json                    |  2 ++
 src/main/base/browserwindow.ts                |  7 ++++
 src/renderer/main/vueapp.js                   | 33 +++++++++++++++++--
 src/renderer/views/app/app-content.ejs        |  9 -----
 src/renderer/views/app/sidebar.ejs            |  4 +--
 src/renderer/views/components/radio-child.ejs | 31 +++++++++++++++++
 src/renderer/views/pages/radio.ejs            | 23 +++++++++++++
 9 files changed, 100 insertions(+), 15 deletions(-)
 create mode 100644 src/renderer/views/components/radio-child.ejs

diff --git a/src/i18n/README.md b/src/i18n/README.md
index 4246957d..4be8ed71 100644
--- a/src/i18n/README.md
+++ b/src/i18n/README.md
@@ -298,4 +298,6 @@ Update 28/04/2022 21:45 UTC
 * `settings.option.general.resumetabs.dynamic`: Added for `en_US`
 * `settings.option.general.resumetabs.dynamic.description`: Added for `en_US`
 
-
+Update 07/05/2022 04:00 UTC
+* `term.personalStations`: Added for `en_US`
+  `term.amLive`: Added for `en_US`
diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index 7d85fa35..faf2275f 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -121,6 +121,8 @@
   "term.audioControls": "Volume Controls",
   "term.clearAll": "Clear All",
   "term.recentStations": "Recent Stations",
+  "term.personalStations": "Personal Stations",
+  "term.amLive": "Apple Music Live",
   "term.language": "Language",
   "term.funLanguages": "Fun",
   "term.noLyrics": "Loading... / Lyrics not found./ Instrumental.",
diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json
index 7d85fa35..faf2275f 100644
--- a/src/i18n/source/en_US.json
+++ b/src/i18n/source/en_US.json
@@ -121,6 +121,8 @@
   "term.audioControls": "Volume Controls",
   "term.clearAll": "Clear All",
   "term.recentStations": "Recent Stations",
+  "term.personalStations": "Personal Stations",
+  "term.amLive": "Apple Music Live",
   "term.language": "Language",
   "term.funLanguages": "Fun",
   "term.noLyrics": "Loading... / Lyrics not found./ Instrumental.",
diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 99300827..680f176d 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -59,6 +59,7 @@ export class BrowserWindow {
                 "pages/settings",
                 "pages/installed-themes",
                 "pages/listen_now",
+                "pages/radio",
                 "pages/home",
                 "pages/artist-feed",
                 "pages/cider-playlist",
@@ -112,6 +113,7 @@ export class BrowserWindow {
                 "components/artist-chip",
                 "components/hello-world",
                 "components/inline-collection-list",
+                "components/radio-child",
             ],
             appRoutes: [
                 {
@@ -186,6 +188,11 @@ export class BrowserWindow {
                     component: `<cider-listen-now :data="listennow"></cider-listen-now>`,
                     condition: `page == 'listen_now'`,
                     onEnter: ``
+                }, {
+                    page: "radio",
+                    component: `<cider-radio :data="radio"></cider-radio>`,
+                    condition: `page == 'radio'`,
+                    onEnter: ``
                 }, {
                     page: "settings",
                     component: `<cider-settings></cider-settings>`,
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 3b39a419..a99b0b44 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -42,7 +42,9 @@ const app = new Vue({
         listennow: [],
         madeforyou: [],
         radio: {
-            personal: []
+            personal: {},
+            recent: {},
+            amlive: {},
         },
         mklang: 'en',
         webview: {
@@ -321,6 +323,7 @@ const app = new Vue({
             try {
                 this.listennow.timestamp = 0;
                 this.browsepage.timestamp = 0;
+                this.radio.timestamp = 0;
             } catch (e) { }
         },
         /**
@@ -2531,15 +2534,39 @@ const app = new Vue({
             }
         },
         async getRadioStations(attempt = 0) {
+            if (this.radio.timestamp > Date.now() - 120000) {
+                return
+            }
             if (attempt > 3) {
                 return
             }
             try {
-                this.radio.personal = (await app.mk.api.v3.music(`/v1/me/recent/radio-stations`, {
+                this.radio.personal.title = app.getLz('term.personal')
+                this.radio.recent.title = app.getLz('term.recentStations')
+                this.radio.amlive.title = app.getLz('term.amLive')
+
+                app.mk.api.v3.music(`/v1/catalog/${app.mk.api.v3.storefrontId}/stations`, {
+                    "filter[identity]": "personal",
+                }).then(res => {
+                     this.radio.personal.data = res.data.data
+                })
+
+                app.mk.api.v3.music(`/v1/me/recent/radio-stations`, {
                     "platform": "web",
                     "art[url]": "f",
                     l: this.mklang
-                })).data.data;
+                }).then(res => {
+                    this.radio.recent.data = res.data.data
+                })
+
+                app.mk.api.v3.music(`/v1/catalog/${app.mk.api.v3.storefrontId}/stations`, {
+                    "filter[featured]": "apple-music-live-radio",
+                }).then(res => {
+                    this.radio.amlive.data = res.data.data
+                })
+
+                this.radio.timestamp = Date.now()
+                console.debug(this.radio)
             } catch (e) {
                 console.log(e)
                 this.getRadioStations(attempt + 1)
diff --git a/src/renderer/views/app/app-content.ejs b/src/renderer/views/app/app-content.ejs
index dfa1cb33..1134fe9f 100644
--- a/src/renderer/views/app/app-content.ejs
+++ b/src/renderer/views/app/app-content.ejs
@@ -25,15 +25,6 @@
         </transition>
     <% } %>
 
-    <transition v-on:enter="getRadioStations()" :name="chrome.desiredPageTransition">
-        <template v-if="page == 'radio'" @created="console.log('radio')">
-            <div class="content-inner">
-                <h1 class="header-text">{{$root.getLz('term.radio')}}</h1>
-                <h3>{{$root.getLz('term.recentStations')}}</h3>
-                <mediaitem-square :item="item" v-for="item in radio.personal"></mediaitem-square>
-            </div>
-        </template>
-    </transition>
     <!-- Library - Recently Added -->
     <transition :name="chrome.desiredPageTransition" v-on:enter="getLibraryAlbumsFull(null, 0); searchLibraryAlbums(0);">
         <%- include('../pages/library-recentlyadded') %>');
diff --git a/src/renderer/views/app/sidebar.ejs b/src/renderer/views/app/sidebar.ejs
index 17fe8fc1..44355433 100644
--- a/src/renderer/views/app/sidebar.ejs
+++ b/src/renderer/views/app/sidebar.ejs
@@ -39,8 +39,8 @@
             <sidebar-library-item :name="$root.getLz('term.browse')" svg-icon="./assets/feather/globe.svg"
                 page="browse">
             </sidebar-library-item>
-            <sidebar-library-item :name="$root.getLz('term.radio')" svg-icon="./assets/feather/radio.svg" page="radio">
-            </sidebar-library-item>
+            <sidebar-library-item :name="$root.getLz('term.radio')" svg-icon="./assets/feather/radio.svg"
+                page="radio"></sidebar-library-item>
         </template>
 
         <div class="app-sidebar-header-text" 
diff --git a/src/renderer/views/components/radio-child.ejs b/src/renderer/views/components/radio-child.ejs
new file mode 100644
index 00000000..3fa7d9b0
--- /dev/null
+++ b/src/renderer/views/components/radio-child.ejs
@@ -0,0 +1,31 @@
+<script type="text/x-template" id="radio-child">
+    <div>
+        <div class="row">
+            <div class="col">
+                <h3>{{ item.title }}</h3>
+            </div>
+        </div>
+        <mediaitem-square :item="station" v-for="station in item.data"></mediaitem-square>
+
+        <!--        <mediaitem-scroller-horizontal-sp-->
+        <!--                :withReason="index==0"-->
+        <!--                :items="recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-sp>-->
+    </div>
+</script>
+<script>
+	Vue.component('radio-child', {
+		template: "#radio-child",
+		props: ["item"],
+		data: function () {
+			return {
+				isVisible: true,
+				app: this.$root
+			}
+		},
+		methods: {
+			visibilityChanged: function (isVisible, entry) {
+				// this.isVisible = isVisible
+			},
+		}
+	})
+</script>
\ No newline at end of file
diff --git a/src/renderer/views/pages/radio.ejs b/src/renderer/views/pages/radio.ejs
index e69de29b..f993f117 100644
--- a/src/renderer/views/pages/radio.ejs
+++ b/src/renderer/views/pages/radio.ejs
@@ -0,0 +1,23 @@
+<script type="text/x-template" id="cider-radio">
+    <div class="content-inner">
+        <h1 class="header-text">{{app.getLz('term.radio')}}</h1>
+        <template v-for="item in data">
+            <radio-child :item="item"></radio-child>
+        </template>
+    </div>
+</script>
+
+<script>
+	Vue.component('cider-radio', {
+		template: "#cider-radio",
+		props: ["data"],
+		data: function () {
+			return {
+				app: this.$root
+			}
+		},
+		mounted() {
+			this.$root.getRadioStations()
+		}
+	})
+</script>
\ No newline at end of file

From 81e58868cf369bfc0437f95e2cb7cac5e48d8b96 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 7 May 2022 05:38:48 +0100
Subject: [PATCH 134/141] Nope

---
 src/renderer/main/vueapp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index fa4751c5..f0e271bb 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -2542,7 +2542,7 @@ const app = new Vue({
                 return
             }
             try {
-                this.radio.personal.title = app.getLz('term.personal')
+                this.radio.personal.title = app.getLz('term.personalStations')
                 this.radio.recent.title = app.getLz('term.recentStations')
                 this.radio.amlive.title = app.getLz('term.amLive')
 

From baf234085e0edfaa8f69c1d88eaae15fbdcba231 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 7 May 2022 06:41:39 +0100
Subject: [PATCH 135/141] Revert "Radio improvement, needs optimisation."

This reverts commit c0c12bc2bad242bbf41636f06b48ff79c64d1f2c.
---
 src/i18n/README.md                            |  4 +--
 src/i18n/en_US.json                           |  2 --
 src/i18n/source/en_US.json                    |  2 --
 src/main/base/browserwindow.ts                |  7 ----
 src/renderer/main/vueapp.js                   | 33 ++-----------------
 src/renderer/views/app/app-content.ejs        |  9 +++++
 src/renderer/views/app/sidebar.ejs            |  4 +--
 src/renderer/views/components/radio-child.ejs | 31 -----------------
 src/renderer/views/pages/radio.ejs            | 23 -------------
 9 files changed, 15 insertions(+), 100 deletions(-)
 delete mode 100644 src/renderer/views/components/radio-child.ejs

diff --git a/src/i18n/README.md b/src/i18n/README.md
index c43468ec..3422daa7 100644
--- a/src/i18n/README.md
+++ b/src/i18n/README.md
@@ -337,6 +337,4 @@ Update 29/04/2022 00:00 UTC
  * `menubar.options.license`: Added for `en_US`
  * `menubar.options.conf`: Added for `en_US` 
 
-Update 07/05/2022 04:00 UTC
-* `term.personalStations`: Added for `en_US`
-  `term.amLive`: Added for `en_US`
+
diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index 9536fb79..8f1b77dc 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -121,8 +121,6 @@
   "term.audioControls": "Volume Controls",
   "term.clearAll": "Clear All",
   "term.recentStations": "Recent Stations",
-  "term.personalStations": "Personal Stations",
-  "term.amLive": "Apple Music Live",
   "term.language": "Language",
   "term.funLanguages": "Fun",
   "term.noLyrics": "Loading... / Lyrics not found./ Instrumental.",
diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json
index 5d91201c..c76a5c01 100644
--- a/src/i18n/source/en_US.json
+++ b/src/i18n/source/en_US.json
@@ -121,8 +121,6 @@
   "term.audioControls": "Volume Controls",
   "term.clearAll": "Clear All",
   "term.recentStations": "Recent Stations",
-  "term.personalStations": "Personal Stations",
-  "term.amLive": "Apple Music Live",
   "term.language": "Language",
   "term.funLanguages": "Fun",
   "term.noLyrics": "Loading... / Lyrics not found./ Instrumental.",
diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 680f176d..99300827 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -59,7 +59,6 @@ export class BrowserWindow {
                 "pages/settings",
                 "pages/installed-themes",
                 "pages/listen_now",
-                "pages/radio",
                 "pages/home",
                 "pages/artist-feed",
                 "pages/cider-playlist",
@@ -113,7 +112,6 @@ export class BrowserWindow {
                 "components/artist-chip",
                 "components/hello-world",
                 "components/inline-collection-list",
-                "components/radio-child",
             ],
             appRoutes: [
                 {
@@ -188,11 +186,6 @@ export class BrowserWindow {
                     component: `<cider-listen-now :data="listennow"></cider-listen-now>`,
                     condition: `page == 'listen_now'`,
                     onEnter: ``
-                }, {
-                    page: "radio",
-                    component: `<cider-radio :data="radio"></cider-radio>`,
-                    condition: `page == 'radio'`,
-                    onEnter: ``
                 }, {
                     page: "settings",
                     component: `<cider-settings></cider-settings>`,
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index f0e271bb..8218881d 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -42,9 +42,7 @@ const app = new Vue({
         listennow: [],
         madeforyou: [],
         radio: {
-            personal: {},
-            recent: {},
-            amlive: {},
+            personal: []
         },
         mklang: 'en',
         webview: {
@@ -324,7 +322,6 @@ const app = new Vue({
             try {
                 this.listennow.timestamp = 0;
                 this.browsepage.timestamp = 0;
-                this.radio.timestamp = 0;
             } catch (e) { }
         },
         /**
@@ -2535,39 +2532,15 @@ const app = new Vue({
             }
         },
         async getRadioStations(attempt = 0) {
-            if (this.radio.timestamp > Date.now() - 120000) {
-                return
-            }
             if (attempt > 3) {
                 return
             }
             try {
-                this.radio.personal.title = app.getLz('term.personalStations')
-                this.radio.recent.title = app.getLz('term.recentStations')
-                this.radio.amlive.title = app.getLz('term.amLive')
-
-                app.mk.api.v3.music(`/v1/catalog/${app.mk.api.v3.storefrontId}/stations`, {
-                    "filter[identity]": "personal",
-                }).then(res => {
-                     this.radio.personal.data = res.data.data
-                })
-
-                app.mk.api.v3.music(`/v1/me/recent/radio-stations`, {
+                this.radio.personal = (await app.mk.api.v3.music(`/v1/me/recent/radio-stations`, {
                     "platform": "web",
                     "art[url]": "f",
                     l: this.mklang
-                }).then(res => {
-                    this.radio.recent.data = res.data.data
-                })
-
-                app.mk.api.v3.music(`/v1/catalog/${app.mk.api.v3.storefrontId}/stations`, {
-                    "filter[featured]": "apple-music-live-radio",
-                }).then(res => {
-                    this.radio.amlive.data = res.data.data
-                })
-
-                this.radio.timestamp = Date.now()
-                console.debug(this.radio)
+                })).data.data;
             } catch (e) {
                 console.log(e)
                 this.getRadioStations(attempt + 1)
diff --git a/src/renderer/views/app/app-content.ejs b/src/renderer/views/app/app-content.ejs
index 1134fe9f..dfa1cb33 100644
--- a/src/renderer/views/app/app-content.ejs
+++ b/src/renderer/views/app/app-content.ejs
@@ -25,6 +25,15 @@
         </transition>
     <% } %>
 
+    <transition v-on:enter="getRadioStations()" :name="chrome.desiredPageTransition">
+        <template v-if="page == 'radio'" @created="console.log('radio')">
+            <div class="content-inner">
+                <h1 class="header-text">{{$root.getLz('term.radio')}}</h1>
+                <h3>{{$root.getLz('term.recentStations')}}</h3>
+                <mediaitem-square :item="item" v-for="item in radio.personal"></mediaitem-square>
+            </div>
+        </template>
+    </transition>
     <!-- Library - Recently Added -->
     <transition :name="chrome.desiredPageTransition" v-on:enter="getLibraryAlbumsFull(null, 0); searchLibraryAlbums(0);">
         <%- include('../pages/library-recentlyadded') %>');
diff --git a/src/renderer/views/app/sidebar.ejs b/src/renderer/views/app/sidebar.ejs
index ead0d4aa..979db2f5 100644
--- a/src/renderer/views/app/sidebar.ejs
+++ b/src/renderer/views/app/sidebar.ejs
@@ -39,8 +39,8 @@
             <sidebar-library-item :name="$root.getLz('term.browse')" svg-icon="./assets/feather/globe.svg"
                 page="browse">
             </sidebar-library-item>
-            <sidebar-library-item :name="$root.getLz('term.radio')" svg-icon="./assets/feather/radio.svg"
-                page="radio"></sidebar-library-item>
+            <sidebar-library-item :name="$root.getLz('term.radio')" svg-icon="./assets/feather/radio.svg" page="radio">
+            </sidebar-library-item>
         </template>
 
         <div class="app-sidebar-header-text" 
diff --git a/src/renderer/views/components/radio-child.ejs b/src/renderer/views/components/radio-child.ejs
deleted file mode 100644
index 3fa7d9b0..00000000
--- a/src/renderer/views/components/radio-child.ejs
+++ /dev/null
@@ -1,31 +0,0 @@
-<script type="text/x-template" id="radio-child">
-    <div>
-        <div class="row">
-            <div class="col">
-                <h3>{{ item.title }}</h3>
-            </div>
-        </div>
-        <mediaitem-square :item="station" v-for="station in item.data"></mediaitem-square>
-
-        <!--        <mediaitem-scroller-horizontal-sp-->
-        <!--                :withReason="index==0"-->
-        <!--                :items="recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-sp>-->
-    </div>
-</script>
-<script>
-	Vue.component('radio-child', {
-		template: "#radio-child",
-		props: ["item"],
-		data: function () {
-			return {
-				isVisible: true,
-				app: this.$root
-			}
-		},
-		methods: {
-			visibilityChanged: function (isVisible, entry) {
-				// this.isVisible = isVisible
-			},
-		}
-	})
-</script>
\ No newline at end of file
diff --git a/src/renderer/views/pages/radio.ejs b/src/renderer/views/pages/radio.ejs
index f993f117..e69de29b 100644
--- a/src/renderer/views/pages/radio.ejs
+++ b/src/renderer/views/pages/radio.ejs
@@ -1,23 +0,0 @@
-<script type="text/x-template" id="cider-radio">
-    <div class="content-inner">
-        <h1 class="header-text">{{app.getLz('term.radio')}}</h1>
-        <template v-for="item in data">
-            <radio-child :item="item"></radio-child>
-        </template>
-    </div>
-</script>
-
-<script>
-	Vue.component('cider-radio', {
-		template: "#cider-radio",
-		props: ["data"],
-		data: function () {
-			return {
-				app: this.$root
-			}
-		},
-		mounted() {
-			this.$root.getRadioStations()
-		}
-	})
-</script>
\ No newline at end of file

From 9e66fd3d681cde38a367bda658a076bd3e0a7f13 Mon Sep 17 00:00:00 2001
From: cryptofyre <cryptofyre@cryptofyre.org>
Date: Sat, 7 May 2022 10:39:10 -0500
Subject: [PATCH 136/141] Restore window position.

---
 src/main/base/browserwindow.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 680f176d..2374e25b 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -342,6 +342,8 @@ export class BrowserWindow {
         });
         this.options.width = windowState.width;
         this.options.height = windowState.height;
+        this.options.x = windowState.x;
+        this.options.y = windowState.y;
 
         switch (process.platform) {
             default:

From 130816a1f08b36f83adcef9afa549bd41a8f49ad Mon Sep 17 00:00:00 2001
From: yazninja <yazlesean@gmail.com>
Date: Sun, 8 May 2022 10:33:17 +0800
Subject: [PATCH 137/141] fix instrumental qq lyrics

---
 src/renderer/views/components/lyrics-view.ejs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/renderer/views/components/lyrics-view.ejs b/src/renderer/views/components/lyrics-view.ejs
index 26001890..c4e795b6 100644
--- a/src/renderer/views/components/lyrics-view.ejs
+++ b/src/renderer/views/components/lyrics-view.ejs
@@ -1,6 +1,6 @@
 <script type="text/x-template" id="lyrics-view">
     <div ref="lyricsview" class="md-body lyric-body">
-        <template v-if="lyrics && lyrics != [] && lyrics.length > 0">
+        <template v-if="lyrics && lyrics != [] && lyrics.length > 0 && !qqInstrumental(lyrics)">
             <template v-for="(lyric, index) in lyrics" v-if="lyric && lyric.line && lyric.line != 'lrcInstrumental'">
                 <h3 class="lyric-line" @click="seekTo(lyric.startTime)" :class="{unsynced : lyric.startTime == 9999999}"
                     v-bind:line-index="index.toString()">
@@ -183,6 +183,14 @@
                 }
                 else return []
             },
+            qqInstrumental(lyrics) {
+                for(lyric of lyrics){
+                    if (lyric.line.includes("纯音乐") && lyric.line.includes("欣赏")){
+                        return true
+                    }
+                }
+                return false
+            },
             checkIfScrollIsStatic : setInterval(() => {
             try {
                 if (position === this.$refs.lyricsview.scrollTop) {

From 40c8f404223cce0f1de20c3d275206b0d9a82093 Mon Sep 17 00:00:00 2001
From: Gabriel Davila <56521591+mefsaal@users.noreply.github.com>
Date: Sun, 8 May 2022 00:09:31 -0300
Subject: [PATCH 138/141] Update es_ES (#1001)

---
 src/i18n/es_ES.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/i18n/es_ES.json b/src/i18n/es_ES.json
index eb31ea60..a4d7c64a 100644
--- a/src/i18n/es_ES.json
+++ b/src/i18n/es_ES.json
@@ -428,6 +428,11 @@
   "settings.header.visual.theme.github.page": "Temas de GitHub",
   "settings.option.visual.theme.github.install.confirm": "¿Está seguro de que desea instalar {{ repo }}?",
   "settings.prompt.visual.theme.github.URL": "Introduce la URL del tema que quieres instalar",
+  "settings.prompt.visual.theme.uninstallTheme": "¿Estas seguro que lo quieres desinstalar {{ theme }}?",
+  "settings.option.visual.theme.checkForUpdates": "Buscar actualizaciones",
+  "settings.option.visual.theme.manageStyles": "Gestionar Estilos",
+  "settings.option.visual.theme.uninstall": "Desinstalar",
+  "settings.option.visual.theme.viewInfo": "Ver Información",
   "settings.notyf.visual.theme.install.success": "Tema Instalado Correctamente",
   "settings.notyf.visual.theme.install.error": "La Instalación del Tema Falló",
   "settings.header.visual.plugin": "Plugin",

From 3f0302ccc0c9d44893a0b8be4f27f083a799c0a8 Mon Sep 17 00:00:00 2001
From: Ace Beattie <acebeattie@gmail.com>
Date: Sat, 7 May 2022 21:11:51 -0600
Subject: [PATCH 139/141] Fix refreshPlaylist using outdated cache (#1000)

---
 src/renderer/main/vueapp.js | 46 +++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 8218881d..9ddb2f88 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -1134,28 +1134,31 @@ const app = new Vue({
                 }
             })
         },
-        async refreshPlaylists(localOnly = false) {
+        async refreshPlaylists(localOnly = false, useCachedPlaylists = true) {
             let self = this
             let trackMap = this.cfg.advanced.playlistTrackMapping
             let newListing = []
             let trackMapping = {}
-            const cachedPlaylist = await CiderCache.getCache("library-playlists")
-            const cachedTrackMapping = await CiderCache.getCache("library-playlists-tracks")
+            
+            if (useCachedPlaylists) {
+                const cachedPlaylist = await CiderCache.getCache("library-playlists")
+                const cachedTrackMapping = await CiderCache.getCache("library-playlists-tracks")
 
-            if (cachedPlaylist) {
-                console.debug("using cached playlists")
-                this.playlists.listing = cachedPlaylist
-                self.sortPlaylists()
-            } else {
-                console.debug("playlist has no cache")
-            }
+                if (cachedPlaylist) {
+                    console.debug("using cached playlists")
+                    this.playlists.listing = cachedPlaylist
+                    self.sortPlaylists()
+                } else {
+                    console.debug("playlist has no cache")
+                }
 
-            if (cachedTrackMapping) {
-                console.debug("using cached track mapping")
-                this.playlists.trackMapping = cachedTrackMapping
-            }
-            if (localOnly) {
-                return
+                if (cachedTrackMapping) {
+                    console.debug("using cached track mapping")
+                    this.playlists.trackMapping = cachedTrackMapping
+                }
+                if (localOnly) {
+                    return
+                }
             }
 
             this.library.backgroundNotification.message = "Building playlist cache..."
@@ -1260,7 +1263,7 @@ const app = new Vue({
                 }
             }
             ).then(res => {
-                self.refreshPlaylists()
+                self.refreshPlaylists(false, false)
             })
         },
         async editPlaylist(id, name = app.getLz('term.newPlaylist')) {
@@ -1275,7 +1278,7 @@ const app = new Vue({
                 }
             }
             ).then(res => {
-                self.refreshPlaylists()
+                self.refreshPlaylists(false, false)
             })
         },
         copyToClipboard(str) {
@@ -1319,7 +1322,7 @@ const app = new Vue({
                 })
                 self.sortPlaylists()
                 setTimeout(() => {
-                    app.refreshPlaylists()
+                    app.refreshPlaylists(false, false)
                 }, 8000)
             })
         },
@@ -1336,6 +1339,9 @@ const app = new Vue({
                     if (found) {
                         self.playlists.listing.splice(self.playlists.listing.indexOf(found), 1)
                     }
+                    setTimeout(() => {
+                        app.refreshPlaylists(false, false);
+                    }, 8000);
                 })
             }
         },
@@ -2581,7 +2587,7 @@ const app = new Vue({
                 })
                 self.sortPlaylists()
                 setTimeout(() => {
-                    app.refreshPlaylists()
+                    app.refreshPlaylists(false, false)
                 }, 13000)
             })
         },

From c8a43fc97246fa9e7e00990e713d315b47744248 Mon Sep 17 00:00:00 2001
From: Gabriel Davila <56521591+mefsaal@users.noreply.github.com>
Date: Sun, 8 May 2022 01:37:23 -0300
Subject: [PATCH 140/141] Localization strings (#1002)

* Update es_ES

* Localization updates

* Documentation

* Localization updates

* Documentation

* Xd
---
 src/i18n/README.md                            | 4 ++++
 src/i18n/en_US.json                           | 2 ++
 src/i18n/es_ES.json                           | 3 +++
 src/i18n/source/en_US.json                    | 3 +++
 src/renderer/views/pages/installed-themes.ejs | 4 ++--
 src/renderer/views/pages/themes-github.ejs    | 2 +-
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/i18n/README.md b/src/i18n/README.md
index 3422daa7..b81a8498 100644
--- a/src/i18n/README.md
+++ b/src/i18n/README.md
@@ -338,3 +338,7 @@ Update 29/04/2022 00:00 UTC
  * `menubar.options.conf`: Added for `en_US` 
 
 
+Update 08/05/2022 00:29 UTC
+
+* `settings.option.visual.theme.github.available`: Added for `en_US`,
+* `settings.option.visual.theme.github.applied`: Added for `en_US`,
diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index 8f1b77dc..2b1e581b 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -434,6 +434,8 @@
   "settings.option.visual.theme.manageStyles": "Manage Styles",
   "settings.option.visual.theme.uninstall": "Uninstall",
   "settings.option.visual.theme.viewInfo": "View Info",
+  "settings.option.visual.theme.github.available": "Available",
+  "settings.option.visual.theme.github.applied": "Applied",
   "settings.notyf.visual.theme.install.success": "Theme installed successfully",
   "settings.notyf.visual.theme.install.error": "Theme installation failed",
   "settings.header.visual.plugin": "Plugin",
diff --git a/src/i18n/es_ES.json b/src/i18n/es_ES.json
index a4d7c64a..808004fd 100644
--- a/src/i18n/es_ES.json
+++ b/src/i18n/es_ES.json
@@ -366,6 +366,7 @@
   "settings.option.audio.audioLab.description": "Una variedad de efectos de audio desarrollados internamente para Cider.",
   "settings.option.audio.audioLab.subheader":  "Designed by Cider Acoustic Technologies in California",
   "settings.warn.audioLab.withoutAF": "Se requiere AudioContext (funcionalidad avanzada) para habilitar Laboratorio de audio de Cider.",
+  "settings.warn.enableAdvancedFunctionality": "AudioContext (funcionalidad avanzada) es necesaria para habilitar esta característica.",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "Calidez analógica",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmth.description": "Simula la calidez analógica inspirada en el Korg Nutube 6P1",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity": "Intensidad de calidez analógica",
@@ -433,6 +434,8 @@
   "settings.option.visual.theme.manageStyles": "Gestionar Estilos",
   "settings.option.visual.theme.uninstall": "Desinstalar",
   "settings.option.visual.theme.viewInfo": "Ver Información",
+  "settings.option.visual.theme.github.available": "Disponible",
+  "settings.option.visual.theme.github.applied": "Aplicado",
   "settings.notyf.visual.theme.install.success": "Tema Instalado Correctamente",
   "settings.notyf.visual.theme.install.error": "La Instalación del Tema Falló",
   "settings.header.visual.plugin": "Plugin",
diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json
index c76a5c01..2b1e581b 100644
--- a/src/i18n/source/en_US.json
+++ b/src/i18n/source/en_US.json
@@ -366,6 +366,7 @@
   "settings.option.audio.audioLab.description": "An assortment of in-house developed audio effects for Cider.",
   "settings.option.audio.audioLab.subheader":  "Designed by Cider Acoustic Technologies in California",
   "settings.warn.audioLab.withoutAF": "AudioContext (Advanced Functionality) is required to enable Cider Audio Laboratory.",
+  "settings.warn.enableAdvancedFunctionality": "AudioContext (Advanced Functionality) is required to enable this feature.",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "Analog Warmth",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmth.description": "Simulates the analog warmth modelled after the Korg Nutube 6P1",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity": "Analog Warmth intensity",
@@ -433,6 +434,8 @@
   "settings.option.visual.theme.manageStyles": "Manage Styles",
   "settings.option.visual.theme.uninstall": "Uninstall",
   "settings.option.visual.theme.viewInfo": "View Info",
+  "settings.option.visual.theme.github.available": "Available",
+  "settings.option.visual.theme.github.applied": "Applied",
   "settings.notyf.visual.theme.install.success": "Theme installed successfully",
   "settings.notyf.visual.theme.install.error": "Theme installation failed",
   "settings.header.visual.plugin": "Plugin",
diff --git a/src/renderer/views/pages/installed-themes.ejs b/src/renderer/views/pages/installed-themes.ejs
index 6b12f6aa..487a1baa 100644
--- a/src/renderer/views/pages/installed-themes.ejs
+++ b/src/renderer/views/pages/installed-themes.ejs
@@ -28,7 +28,7 @@
         <div class="gh-content">
             <div class="repos-list">
                 <div class="repo-header">
-                    <h4>Available</h4>
+                    <h4>{{$root.getLz('settings.option.visual.theme.github.available')}}</h4>
                 </div>
                 <ul class="list-group list-group-flush">
                     <template v-for="theme in themes">
@@ -85,7 +85,7 @@
 
             <div class="style-editor-container">
                 <div class="repo-header">
-                    <h4>Applied</h4>
+                    <h4>{{ $root.getLz("settings.option.visual.theme.github.applied") }} </h4>
                 </div>
                 <stylestack-editor ref="stackEditor"  v-if="themes.length != 0" :themes="themes"/>
             </div>
diff --git a/src/renderer/views/pages/themes-github.ejs b/src/renderer/views/pages/themes-github.ejs
index 2eda6cf0..635ba9d3 100644
--- a/src/renderer/views/pages/themes-github.ejs
+++ b/src/renderer/views/pages/themes-github.ejs
@@ -12,7 +12,7 @@
                 </div>
                 <div class="col-auto flex-center">
                     <button class="md-btn md-btn-small md-btn-block" @click="$root.checkForThemeUpdates()">
-                        Check for updates
+                        {{ $root.getLz('settings.option.visual.theme.checkForUpdates') }}
                     </button>
                 </div>
                 <div class="col-auto nopadding flex-center">

From 82ba0bd717e5e32784cc9474505eb17e1d89057c Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sun, 8 May 2022 13:41:47 +0200
Subject: [PATCH 141/141] Update hu_HU.json

---
 src/i18n/hu_HU.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/i18n/hu_HU.json b/src/i18n/hu_HU.json
index 55706b2c..8108143d 100644
--- a/src/i18n/hu_HU.json
+++ b/src/i18n/hu_HU.json
@@ -378,6 +378,8 @@
   "settings.header.visual.theme.github.page": "Témák a GitHub-ról",
   "settings.option.visual.theme.github.install.confirm": "Biztosan szeretnéd telepíteni a(z) {{ repo }} témát?",
   "settings.prompt.visual.theme.github.URL": "Add meg a telepítendő téma URL-jét",
+  "settings.option.visual.theme.github.available": "Elérhető",
+  "settings.option.visual.theme.github.applied": "Alkalmazva",
   "settings.notyf.visual.theme.install.success": "Téma sikeresen telepítve",
   "settings.notyf.visual.theme.install.error": "Sikertelen volt a téma telepítése",
   "settings.header.visual.plugin": "Plugin",