diff --git a/PrimaryFormParts/PrimaryForm.cs b/PrimaryFormParts/PrimaryForm.cs
index 94db3cf..3a76b01 100644
--- a/PrimaryFormParts/PrimaryForm.cs
+++ b/PrimaryFormParts/PrimaryForm.cs
@@ -153,14 +153,6 @@ namespace DualScreenDemo
         private static Bitmap resizedMouseOverImageForLanguageQuery;
         private static Bitmap resizedMouseDownImageForLanguageQuery;
 
-        private static Bitmap normalStateImage6_1;
-        private static Bitmap mouseOverImage6_1;
-        private static Bitmap mouseDownImage6_1;
-
-        private static Bitmap resizedNormalStateImageFor6_1;
-        private static Bitmap resizedMouseOverImageFor6_1;
-        private static Bitmap resizedMouseDownImageFor6_1;
-
         private static Bitmap normalStateImageCategoryQuery;
         private static Bitmap mouseOverImageCategoryQuery;
         private static Bitmap mouseDownImageCategoryQuery;
@@ -169,22 +161,6 @@ namespace DualScreenDemo
         private static Bitmap resizedMouseOverImageForCategoryQuery;
         private static Bitmap resizedMouseDownImageForCategoryQuery;
 
-        private static Bitmap normalStateImage7_1;
-        private static Bitmap mouseOverImage7_1;
-        private static Bitmap mouseDownImage7_1;
-
-        private static Bitmap resizedNormalStateImageFor7_1;
-        private static Bitmap resizedMouseOverImageFor7_1;
-        private static Bitmap resizedMouseDownImageFor7_1;
-
-        private static Bitmap normalStateImage7_1_1;
-        private static Bitmap mouseOverImage7_1_1;
-        private static Bitmap mouseDownImage7_1_1;
-
-        private static Bitmap resizedNormalStateImageFor7_1_1;
-        private static Bitmap resizedMouseOverImageFor7_1_1;
-        private static Bitmap resizedMouseDownImageFor7_1_1;
-
         
         private static Bitmap normalStateImageForPromotionsAndMenu;
         private static Bitmap resizedNormalStateImageForPromotionsAndMenu;
@@ -2702,15 +2678,6 @@ public class MultiPagePanel : Panel
             mouseDownImageLanguageQuery = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\語別查詢_已按.jpg"));
             resizedMouseDownImageForLanguageQuery = ResizeImage(mouseDownImageLanguageQuery, targetWidth, targetHeight);
 
-            
-            normalStateImage6_1 = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\6-1.png"));
-            resizedNormalStateImageFor6_1 = ResizeImage(normalStateImage6_1, targetWidth, targetHeight);
-
-            mouseOverImage6_1 = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\6-1.mouseover.png"));
-            resizedMouseOverImageFor6_1 = ResizeImage(mouseOverImage6_1, targetWidth, targetHeight);
-
-            mouseDownImage6_1 = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\6-1.mousedown.png"));
-            resizedMouseDownImageFor6_1 = ResizeImage(mouseDownImage6_1, targetWidth, targetHeight);
 
             normalStateImageCategoryQuery = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\類別查詢_未按.jpg"));
             resizedNormalStateImageForCategoryQuery = ResizeImage(normalStateImageCategoryQuery, targetWidth, targetHeight);
@@ -2721,25 +2688,6 @@ public class MultiPagePanel : Panel
             mouseDownImageCategoryQuery = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\類別查詢_已按.jpg"));
             resizedMouseDownImageForCategoryQuery = ResizeImage(mouseDownImageCategoryQuery, targetWidth, targetHeight);
 
-            
-            normalStateImage7_1 = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\7-1.png"));
-            resizedNormalStateImageFor7_1 = ResizeImage(normalStateImage7_1, targetWidth, targetHeight);
-
-            mouseOverImage7_1 = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\7-1.mouseover.png"));
-            resizedMouseOverImageFor7_1 = ResizeImage(mouseOverImage7_1, targetWidth, targetHeight);
-
-            mouseDownImage7_1 = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\7-1.mousedown.png"));
-            resizedMouseDownImageFor7_1 = ResizeImage(mouseDownImage7_1, targetWidth, targetHeight);
-
-            
-            normalStateImage7_1_1 = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\7-1-1.png"));
-            resizedNormalStateImageFor7_1_1 = ResizeImage(normalStateImage7_1_1, targetWidth, targetHeight);
-
-            mouseOverImage7_1_1 = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\7-1-1.mouseover.png"));
-            resizedMouseOverImageFor7_1_1 = ResizeImage(mouseOverImage7_1_1, targetWidth, targetHeight);
-
-            mouseDownImage7_1_1 = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\7-1-1.mousedown.png"));
-            resizedMouseDownImageFor7_1_1 = ResizeImage(mouseDownImage7_1_1, targetWidth, targetHeight);
 
             normalStateImageForPromotionsAndMenu = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\555021.jpg"));
             resizedNormalStateImageForPromotionsAndMenu = ResizeImage(normalStateImageForPromotionsAndMenu, targetWidth, targetHeight);
diff --git a/TCPServer.cs b/TCPServer.cs
index c99b606..30eae15 100644
--- a/TCPServer.cs
+++ b/TCPServer.cs
@@ -150,7 +150,7 @@ namespace DualScreenDemo
                                                         DateTime.Now, closePath, "", "", "", "", 
                                                         "", "", "", "", "", "", "", 1
                                                     );
-
+                                                    VideoPlayerForm.publicPlaylist = new List<SongData>();
                                                     VideoPlayerForm.playingSongList = new List<SongData>();
                                                     
                                                     if (VideoPlayerForm.Instance.currentPlayingSong != null)
@@ -159,13 +159,17 @@ namespace DualScreenDemo
                                                     }
                                                     
                                                     VideoPlayerForm.playingSongList.Add(closeSong);
+                                                    VideoPlayerForm.publicPlaylist.Add(closeSong);
+
                                                     PrimaryForm.userRequestedSongs = new List<SongData>();
 
                                                     if (IsFormReady(OverlayForm.MainForm))
                                                     {
                                                         OverlayForm.MainForm.nextSongLabel.Visible = false;
                                                     }
-                                                    
+
+                                                    VideoPlayerForm.Instance.PlayNextSong();
+
                                                     Console.WriteLine("已設置新的播放列表，包含當前歌曲和 CLOSE.MPG");
                                                 }
                                                 else
@@ -186,7 +190,9 @@ namespace DualScreenDemo
                                     {
                                         PrimaryForm.Instance.HideSendOffScreen();
                                     });
-
+                                    VideoPlayerForm.publicPlaylist = new List<SongData>();
+                                    VideoPlayerForm.playingSongList = new List<SongData>();
+                                    VideoPlayerForm.Instance.PlayPublicPlaylist();
                                     UpdateStateFile(stateFilePath, "OPEN");
                                     continue;
                                 }