diff --git a/src/renderer/index.js b/src/renderer/index.js
index 489a05c4..39144597 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -1202,72 +1202,74 @@ const app = new Vue({
                 app.mk.setStationQueue({artist: 'a-' + id}).then(() => {
                     app.mk.play()
                 })
-            } else if (kind.includes("playlist") && (id.startsWith("p.") || id.startsWith("pl."))){
-                /* Randomize array in-place using Durstenfeld shuffle algorithm */
-                function shuffleArray(array) {
-                    for (var i = array.length - 1; i > 0; i--) {
-                        var j = Math.floor(Math.random() * (i + 1));
-                        var temp = array[i];
-                        array[i] = array[j];
-                        array[j] = temp;
-                    }
-                }
-                app.mk.clearQueue().then(function () { {
-                    app.mk.setQueue({[truekind]: [item.attributes.playParams.id ?? item.id]}).then(function () {
-                           app.mk.play().then(function (){
-                               app.mk.clearQueue().then(function (){
-                                var playlistId = id
-                                const params = {
-                                    include: "tracks",
-                                    platform: "web",
-                                    "include[library-playlists]": "catalog,tracks",
-                                    "fields[playlists]": "curatorName,playlistType,name,artwork,url",
-                                    "include[library-songs]": "catalog,artists,albums",
-                                    "fields[catalog]": "artistUrl,albumUrl",
-                                    "fields[songs]": "artistUrl,albumUrl"
-                                }
-                                var playlistId = ''
+            } 
+        //     else if (kind.includes("playlist") && (id.startsWith("p.") || id.startsWith("pl."))){
+        //         /* Randomize array in-place using Durstenfeld shuffle algorithm */
+        //         function shuffleArray(array) {
+        //             for (var i = array.length - 1; i > 0; i--) {
+        //                 var j = Math.floor(Math.random() * (i + 1));
+        //                 var temp = array[i];
+        //                 array[i] = array[j];
+        //                 array[j] = temp;
+        //             }
+        //         }
+        //         app.mk.clearQueue().then(function () { {
+        //             app.mk.setQueue({[truekind]: [item.attributes.playParams.id ?? item.id]}).then(function () {
+        //                    app.mk.play().then(function (){
+        //                        app.mk.clearQueue().then(function (){
+        //                         var playlistId = id
+        //                         const params = {
+        //                             include: "tracks",
+        //                             platform: "web",
+        //                             "include[library-playlists]": "catalog,tracks",
+        //                             "fields[playlists]": "curatorName,playlistType,name,artwork,url",
+        //                             "include[library-songs]": "catalog,artists,albums",
+        //                             "fields[catalog]": "artistUrl,albumUrl",
+        //                             "fields[songs]": "artistUrl,albumUrl"
+        //                         }
+        //                         var playlistId = ''
 
-                                try {
-                                    function getPlaylist(id, params, isLibrary){
-                                        if (isLibrary){
-                                            return  app.mk.api.library.playlist(id, params)
-                                        } else {  return app.mk.api.playlist(id, params)}
-                                    }
-                                    getPlaylist(id, params, isLibrary).then(res => {
-                                        let query = res.relationships.tracks.data.map(item => new MusicKit.MediaItem(item));
-                                        if (app.mk.shuffleMode == 1){shuffleArray(query); console.log('shf')}
-                                        app.mk.queue.append(query)
-                                        if (!res.relationships.tracks.next) {
-                                            return
-                                        } else {
-                                            getPlaylistTracks(res.relationships.tracks.next)
-                                        }
+        //                         try {
+        //                             function getPlaylist(id, params, isLibrary){
+        //                                 if (isLibrary){
+        //                                     return  app.mk.api.library.playlist(id, params)
+        //                                 } else {  return app.mk.api.playlist(id, params)}
+        //                             }
+        //                             getPlaylist(id, params, isLibrary).then(res => {
+        //                                 let query = res.relationships.tracks.data.map(item => new MusicKit.MediaItem(item));
+        //                                 if (app.mk.shuffleMode == 1){shuffleArray(query); console.log('shf')}
+        //                                 app.mk.queue.append(query)
+        //                                 if (!res.relationships.tracks.next) {
+        //                                     return
+        //                                 } else {
+        //                                     getPlaylistTracks(res.relationships.tracks.next)
+        //                                 }
 
-                                        function getPlaylistTracks(next) {
-                                            app.apiCall(app.musicBaseUrl + next, res => {
-                                                if (res.id != playlistId) {
-                                                    return
-                                                }
-                                                let query = res.data.map(item => new MusicKit.MediaItem(item))
-                                                if (app.mk.shuffleMode == 1){shuffleArray(query); console.log('shf')}
-                                                app.mk.queue.append(query)
+        //                                 function getPlaylistTracks(next) {
+        //                                     app.apiCall(app.musicBaseUrl + next, res => {
+        //                                         if (res.id != playlistId) {
+        //                                             return
+        //                                         }
+        //                                         let query = res.data.map(item => new MusicKit.MediaItem(item))
+        //                                         if (app.mk.shuffleMode == 1){shuffleArray(query); console.log('shf')}
+        //                                         app.mk.queue.append(query)
 
-                                                if (res.next) {
-                                                    getPlaylistTracks(res.next)
-                                                }
-                                            })
-                                        }
-                                            })
-                                } catch (e) {}
+        //                                         if (res.next) {
+        //                                             getPlaylistTracks(res.next)
+        //                                         }
+        //                                     })
+        //                                 }
+        //                                     })
+        //                         } catch (e) {}
 
 
-                               })
-                           })
-                        })
-                    }
-                })
-        } else {
+        //                        })
+        //                    })
+        //                 })
+        //             }
+        //         })
+        // } 
+        else {
                 app.playMediaItemById((id), (kind), (isLibrary), item.attributes.url ?? '')
             }
         })
@@ -2371,10 +2373,7 @@ const app = new Vue({
                         }
                     })
                 } else {
-                    try {
-                        app.mk.stop()
-                    } catch (e) {
-                    }
+                    app.mk.stop().then(() => {
                     if (truekind == "playlists" && (id.startsWith("p.") || id.startsWith("pl.u"))){
                         app.mk.playNext({[item.attributes.playParams.kind ?? item.type]: item.attributes.playParams.id ?? item.id}).then(function () {
                             app.mk.changeToMediaAtIndex(app.mk.queue._itemIDs.indexOf(item.id) ?? 1)
@@ -2412,7 +2411,7 @@ const app = new Vue({
                             app.mk.play()
                         }
                     })}
-                }
+                })}
             } catch (err) {
                 console.log(err)
                 try {
diff --git a/src/renderer/views/components/fullscreen.ejs b/src/renderer/views/components/fullscreen.ejs
index 4c2cfd4c..1d0a3539 100644
--- a/src/renderer/views/components/fullscreen.ejs
+++ b/src/renderer/views/components/fullscreen.ejs
@@ -1,5 +1,5 @@
 <script type="text/x-template" id="fullscreen-view">
-    <div class="fullscreen-view">
+    <div class="fullscreen-view" tabindex="0">
         <div class="background">
             <div class="bgArtworkMaterial">
                 <div class="bg-artwork-container">
@@ -140,10 +140,19 @@
                 tabMode: "lyrics",
             }
         },
+        beforeMount() {
+            window.addEventListener('keyup', this.onEscapeKeyUp);
+        },
+        beforeDestroy() {
+            window.removeEventListener('keyup', this.onEscapeKeyUp)
+        },
         methods: {
-            sayHello: function () {
-                alert('Hello world!');
-            }
+            onEscapeKeyUp(event) {
+                if (event.which === 27) {
+                    app.fullscreen(false);
+                    console.log('js')
+                }
+            },
         }
     });
 </script>
\ 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 fb2bbdee..409763bb 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -415,73 +415,75 @@
                 app.mk.stop().then(() => {       
                 if (parent != null && childIndex != null) {
                     app.queueParentandplayChild(parent, childIndex, item);
-                } else if (kind.includes("playlist") && (id.startsWith("p.") || id.startsWith("pl."))){
-                        function shuffleArray(array) {
-                            for (var i = array.length - 1; i > 0; i--) {
-                                var j = Math.floor(Math.random() * (i + 1));
-                                var temp = array[i];
-                                array[i] = array[j];
-                                array[j] = temp;
-                            }
-                        }
-                        app.mk.clearQueue().then(function () {
-                                app.mk.setQueue({[truekind]: [item.attributes.playParams.id ?? item.id]}).then(function () {
-                                   app.mk.play().then(function (){
-                                       app.mk.clearQueue().then(function (){
-                                        var playlistId = id
-                                        const params = {
-                                            // include: "tracks",
-                                            // platform: "web",
-                                            // "include[library-playlists]": "catalog,tracks",
-                                            // "fields[playlists]": "curatorName,playlistType,name,artwork,url",
-                                            // "include[library-songs]": "catalog,artists,albums",
-                                            // "fields[catalog]": "artistUrl,albumUrl",
-                                            // "fields[songs]": "artistUrl,albumUrl, playParams"
-                                        }
-                                        // var playlistId = ''
-                                        function getPlaylist(id, params, isLibrary){
-                                            if (isLibrary){
-                                                return  app.mk.api.library.playlist(id, params)
-                                            } else {  return app.mk.api.playlist(id, params)}
-                                        }
-                                        try {
+                } 
+                // else if (kind.includes("playlist") && (id.startsWith("p.") || id.startsWith("pl."))){
+                //         function shuffleArray(array) {
+                //             for (var i = array.length - 1; i > 0; i--) {
+                //                 var j = Math.floor(Math.random() * (i + 1));
+                //                 var temp = array[i];
+                //                 array[i] = array[j];
+                //                 array[j] = temp;
+                //             }
+                //         }
+                //         app.mk.clearQueue().then(function () {
+                //                 app.mk.setQueue({[truekind]: [item.attributes.playParams.id ?? item.id]}).then(function () {
+                //                    app.mk.play().then(function (){
+                //                        app.mk.clearQueue().then(function (){
+                //                         var playlistId = id
+                //                         const params = {
+                //                             // include: "tracks",
+                //                             // platform: "web",
+                //                             // "include[library-playlists]": "catalog,tracks",
+                //                             // "fields[playlists]": "curatorName,playlistType,name,artwork,url",
+                //                             // "include[library-songs]": "catalog,artists,albums",
+                //                             // "fields[catalog]": "artistUrl,albumUrl",
+                //                             // "fields[songs]": "artistUrl,albumUrl, playParams"
+                //                         }
+                //                         // var playlistId = ''
+                //                         function getPlaylist(id, params, isLibrary){
+                //                             if (isLibrary){
+                //                                 return  app.mk.api.library.playlist(id, params)
+                //                             } else {  return app.mk.api.playlist(id, params)}
+                //                         }
+                //                         try {
 
-                                            getPlaylist(id, params, isLibrary).then(res => {
-                                                let query = res.relationships.tracks.data.map(item => new MusicKit.MediaItem(item));
-                                                if (app.mk.shuffleMode == 1){shuffleArray(query); }
-                                                console.log(query)
-                                                app.mk.queue.append(query)
-                                                if (!res.relationships.tracks.next) {
-                                                    return
-                                                } else {
-                                                    getPlaylistTracks(res.relationships.tracks.next)
-                                                }
+                //                             getPlaylist(id, params, isLibrary).then(res => {
+                //                                 let query = res.relationships.tracks.data.map(item => new MusicKit.MediaItem(item));
+                //                                 if (app.mk.shuffleMode == 1){shuffleArray(query); }
+                //                                 console.log(query)
+                //                                 app.mk.queue.append(query)
+                //                                 if (!res.relationships.tracks.next) {
+                //                                     return
+                //                                 } else {
+                //                                     getPlaylistTracks(res.relationships.tracks.next)
+                //                                 }
 
-                                                function getPlaylistTracks(next) {
-                                                    app.apiCall(app.musicBaseUrl + next, res => {
-                                                        // if (res.id != playlistId || next.includes(playlistId)) {
-                                                        //     return
-                                                        // }
-                                                        console.log('nextres', res)
-                                                        let query = res.data.map(item => new MusicKit.MediaItem(item))
-                                                        if (app.mk.shuffleMode == 1){shuffleArray(query); console.log('shf')}
-                                                        app.mk.queue.append(query)
+                //                                 function getPlaylistTracks(next) {
+                //                                     app.apiCall(app.musicBaseUrl + next, res => {
+                //                                         // if (res.id != playlistId || next.includes(playlistId)) {
+                //                                         //     return
+                //                                         // }
+                //                                         console.log('nextres', res)
+                //                                         let query = res.data.map(item => new MusicKit.MediaItem(item))
+                //                                         if (app.mk.shuffleMode == 1){shuffleArray(query); console.log('shf')}
+                //                                         app.mk.queue.append(query)
                                                         
-                                                        if (res.next) {
-                                                            getPlaylistTracks(res.next)
-                                                        } 
-                                                    })
-                                                }
-                                            })
-                                        } catch (e) {}
+                //                                         if (res.next) {
+                //                                             getPlaylistTracks(res.next)
+                //                                         } 
+                //                                     })
+                //                                 }
+                //                             })
+                //                         } catch (e) {}
                                        
 
-                                       })
-                                   })
-                                })
+                //                        })
+                //                    })
+                //                 })
                             
-                        })                   
-                } else {
+                //         })                   
+                // } 
+                else {
                     app.playMediaItemById(item.attributes.playParams.id ?? item.id, item.attributes.playParams.kind ?? item.type, item.attributes.playParams.isLibrary ?? false, item.attributes.url)
                 }})
             }
diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs
index 7317625f..0250a153 100644
--- a/src/renderer/views/pages/cider-playlist.ejs
+++ b/src/renderer/views/pages/cider-playlist.ejs
@@ -63,7 +63,7 @@
                             Play
                         </button>
                         <button class="wr-btn" style="min-width: 120px;"
-                                @click="shufflePlay()">
+                                @click="app.mk.shuffleMode = 1; app.mk.stop().then(function() {app.playMediaItemById(data.attributes.playParams.id ?? data.id, data.attributes.playParams.kind ?? data.type, data.attributes.playParams.isLibrary ?? false, data.attributes.url)})">
                             Shuffle
                         </button>
                         <button class="wr-btn" style="min-width: 120px;" v-if="inLibrary!=null"
@@ -323,72 +323,35 @@
                         array[j] = temp;
                     }
                 }
-                var id =  this.data.attributes.playParams.id ?? this.data.id 
-                let kind = this.data.attributes.playParams.kind ?? this.data.type ?? '';
-                let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-                let isLibrary = this.data.attributes.playParams ? (this.data.attributes.playParams.isLibrary ?? false) : false;
-                app.mk.stop().then(function() {
-                app.mk.clearQueue().then(function () {
-                    app.mk.setQueue({ [truekind] : [id] }).then(function () {
+                //var id = this.data.attributes.playParams.id ?? this.data.id;
+                //console.log("1")
+                var kind = this.data.attributes.playParams.kind ?? this.data.type ?? '';
+                //console.log("1")
+                var truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
+               // console.log("1")
+               // var isLibrary = this.data.attributes.playParams ? (this.data.attributes.playParams.isLibrary ?? false) : false;
+                console.log("1")
+                app.mk.stop().then(function () {
+                    console.log("2")
+                    app.mk.setQueue({ [truekind]: [id] }).then(function () {
                         app.mk.play().then(function () {
-                            app.mk.clearQueue().then(function () {
-                                const params = {
-                                    // include: "tracks",
-                                    // platform: "web",
-                                    // "include[library-playlists]": "catalog,tracks",
-                                    // "fields[playlists]": "curatorName,playlistType,name,artwork,url",
-                                    // "include[library-songs]": "catalog,artists,albums",
-                                    // "fields[catalog]": "artistUrl,albumUrl",
-                                    // "fields[songs]": "artistUrl,albumUrl, playParams"
-                                }
-                                function getList(kind, id, params, isLibrary) {
-                                    if (kind.includes("album")){
-                                        if (isLibrary) {
-                                        return app.mk.api.library.album(id, params)
-                                    } else { return app.mk.api.album(id, params) }
-                                    } else {
-                                    if (isLibrary) {
-                                        return app.mk.api.library.playlist(id, params)
-                                    } else { return app.mk.api.playlist(id, params) }}
-                                }
-                                try {
-
-                                    getList(kind, id, params, isLibrary).then(res => {
-                                        console.log(res)
-                                        let query = res.relationships.tracks.data.map(item => new MusicKit.MediaItem(item));
-                                        if (app.mk.shuffleMode == 1) { shuffleArray(query); console.log('shf') }
+                            if (!kind.includes("album"))
+                                app.mk.clearQueue().then(function () {
+                                    try {
+                                        let query = (this.data ?? app.showingPlaylist).relationships.tracks.data.map(item => new MusicKit.MediaItem(item));
+                                        if (app.mk.shuffleMode == 1) { shuffleArray(query) }
                                         app.mk.queue.append(query)
-                                        if (!res.relationships.tracks.next) {
-                                            return
-                                        } else {
-                                            getPlaylistTracks(res.relationships.tracks.next)
-                                        }
-
-                                        function getPlaylistTracks(next) {
-                                            app.apiCall(app.musicBaseUrl + next, res => {
-                                                // if (res.id != playlistId) {
-                                                //     return
-                                                // }
-                                                let query = res.data.map(item => new MusicKit.MediaItem(item))
-                                                if (app.mk.shuffleMode == 1) { shuffleArray(query); console.log('shf') }
-                                                app.mk.queue.append(query)
-
-                                                if (res.next) {
-                                                    getPlaylistTracks(res.next)
-                                                }
-                                            })
-                                        }
-                                    })
-                                } catch (e) {console.log(e) }
+                                    } catch (e) { console.log(e) }
 
 
-                            })
+                                })
                         })
                     })
 
-                })
 
-            })}
+
+                })
+            }
 
         }
     })