diff --git a/Output/Languages/en.xml b/Output/Languages/en.xml
index 4f77e60c..843c0905 100644
--- a/Output/Languages/en.xml
+++ b/Output/Languages/en.xml
@@ -112,6 +112,7 @@
   <string name="TR_SCREENMAIN_BUTTON_PROFILES">Profiles</string>
   <string name="TR_SCREENMAIN_TEXT_NOPROFILES">No profiles found!</string>
   <string name="TR_SCREENMAIN_BUTTON_STATISTICS">Statistics</string>
+  <string name="TR_SCREENMAIN_BUTTON_JUKEBOX">Jukebox</string>
   <string name="TR_SCREENSTATISTICS_TITLE">Statistics</string>
   <string name="TR_SCREENSTATISTICS_HINT">Navigate = Select a tile • Enter = Open details • ESC = Back to main menu</string>
   <string name="TR_SCREENSTATISTICS_DETAILHINT">Left/Right = Change view • Up/Down = Scroll • ESC = Back to statistics</string>
@@ -150,6 +151,32 @@
   <string name="TR_SCREENSTATISTICS_COL_SCORE">Score</string>
   <string name="TR_SCREENSTATISTICS_COL_SONGS">Songs</string>
   <string name="TR_SCREENSTATISTICS_COL_AVERAGE">Average</string>
+  <string name="TR_SCREENJUKEBOX_TITLE">Jukebox</string>
+  <string name="TR_SCREENJUKEBOX_SOURCE">Source</string>
+  <string name="TR_SCREENJUKEBOX_PLAYLIST">Playlist</string>
+  <string name="TR_SCREENJUKEBOX_SORTING">Sorting</string>
+  <string name="TR_SCREENJUKEBOX_CATEGORY">Category</string>
+  <string name="TR_SCREENJUKEBOX_ORDER">Order</string>
+  <string name="TR_SCREENJUKEBOX_SECTION">Section</string>
+  <string name="TR_SCREENJUKEBOX_LYRICS">Lyrics</string>
+  <string name="TR_SCREENJUKEBOX_AUDIOMODE">Audio mode</string>
+  <string name="TR_SCREENJUKEBOX_VIDEO">Video</string>
+  <string name="TR_SCREENJUKEBOX_NUMSONGS">%d songs</string>
+  <string name="TR_SCREENJUKEBOX_NOSONGS">No songs found</string>
+  <string name="TR_JUKEBOX_ORDER_RANDOM">Random</string>
+  <string name="TR_JUKEBOX_ORDER_SORTED">In order</string>
+  <string name="TR_JUKEBOX_SECTION_FULL">Full song</string>
+  <string name="TR_JUKEBOX_SECTION_MEDLEY">Medley part</string>
+  <string name="TR_JUKEBOX_SECTION_30">30 seconds</string>
+  <string name="TR_JUKEBOX_SECTION_60">60 seconds</string>
+  <string name="TR_JUKEBOX_SECTION_90">90 seconds</string>
+  <string name="TR_SCREENJUKEBOXPLAYER_SKIPINTRO">Skip intro</string>
+  <string name="TR_SCREENJUKEBOXPLAYER_SING">Sing now</string>
+  <string name="TR_SCREENJUKEBOXPLAYER_QUEUE">Queue</string>
+  <string name="TR_SCREENJUKEBOXPLAYER_SEARCH">Type to search</string>
+  <string name="TR_SCREENJUKEBOXPLAYER_QUEUEHELP">Enter: Play next, Enter again: Play now</string>
+  <string name="TR_SCREENJUKEBOXPLAYER_QUEUEHELP2">Del: Remove | Shift+Up/Down: Move</string>
+  <string name="TR_SCREENJUKEBOXPLAYER_NUMSONGS">%d songs</string>
   <string name="TR_SCREENPARTY_TITLE">Party-Mode Selection</string>
   <string name="TR_SCREENPARTY_MODES">Party-mode</string>
   <string name="TR_SCREENPARTY_DESCRIPTION">Description</string>
diff --git a/Output/Themes/Changelog/Changelog_ScreenJukebox.txt b/Output/Themes/Changelog/Changelog_ScreenJukebox.txt
new file mode 100644
index 00000000..938f03ad
--- /dev/null
+++ b/Output/Themes/Changelog/Changelog_ScreenJukebox.txt
@@ -0,0 +1,6 @@
+ScreenJukebox
+
+++++++++++
+Version 1:
+
+New screen: jukebox settings (source, order, section, lyrics, audio mode and video) before the playback starts
diff --git a/Output/Themes/Changelog/Changelog_ScreenJukeboxPlayer.txt b/Output/Themes/Changelog/Changelog_ScreenJukeboxPlayer.txt
new file mode 100644
index 00000000..8691b967
--- /dev/null
+++ b/Output/Themes/Changelog/Changelog_ScreenJukeboxPlayer.txt
@@ -0,0 +1,7 @@
+ScreenJukeboxPlayer
+
+++++++++++
+Version 1:
+
+New screen: jukebox playback with video, lyrics, song info, control bar and queue
+New texture QueueRow for <StaticQueueRow> and <StaticQueueRowPlaying> (rounded row in the size ratio of the queue rows)
diff --git a/Output/Themes/Changelog/Changelog_ScreenMain.txt b/Output/Themes/Changelog/Changelog_ScreenMain.txt
index 2aa4d369..f197682d 100644
--- a/Output/Themes/Changelog/Changelog_ScreenMain.txt
+++ b/Output/Themes/Changelog/Changelog_ScreenMain.txt
@@ -1,5 +1,17 @@
 ScreenMain
 
+++++++++++
+Version 6:
+(2026 Oct 22)
+
+Add:
+<ButtonJukebox>
+
+Change:
+ButtonSing, ButtonParty and ButtonJukebox share the upper row
+LogoMain is centered horizontally
+ButtonJukebox is locked without a profile like ButtonSing and ButtonParty, the warning covers the whole upper row
+
 ++++++++++
 Version 5:
 (2026 Oct 17)
diff --git a/Output/Themes/Vocaluxe 2024/01_Standard.xml b/Output/Themes/Vocaluxe 2024/01_Standard.xml
index b87dce56..270ff459 100644
--- a/Output/Themes/Vocaluxe 2024/01_Standard.xml	
+++ b/Output/Themes/Vocaluxe 2024/01_Standard.xml	
@@ -397,6 +397,8 @@
     <SaveIcon>SaveIcon.png</SaveIcon>
     <SingIcon>SingIcon.png</SingIcon>
     <ListIcon>ListIcon.png</ListIcon>
+    <LyricsIcon>LyricsIcon.png</LyricsIcon>
+    <QueueRow>QueueRow.png</QueueRow>
     <Minus>MinusIcon.png</Minus>
     <Plus>PlusIcon.png</Plus>
     <VolUp>VolUp.png</VolUp>
diff --git a/Output/Themes/Vocaluxe 2024/02.xml b/Output/Themes/Vocaluxe 2024/02.xml
index be678c65..0808a147 100644
--- a/Output/Themes/Vocaluxe 2024/02.xml	
+++ b/Output/Themes/Vocaluxe 2024/02.xml	
@@ -397,6 +397,8 @@
     <SaveIcon>SaveIcon.png</SaveIcon>
     <SingIcon>SingIcon.png</SingIcon>
     <ListIcon>ListIcon.png</ListIcon>
+    <LyricsIcon>LyricsIcon.png</LyricsIcon>
+    <QueueRow>QueueRow.png</QueueRow>
     <Minus>MinusIcon.png</Minus>
     <Plus>PlusIcon.png</Plus>
     <VolUp>VolUp.png</VolUp>
diff --git a/Output/Themes/Vocaluxe 2024/03.xml b/Output/Themes/Vocaluxe 2024/03.xml
index 2dc9f158..f11d5049 100644
--- a/Output/Themes/Vocaluxe 2024/03.xml	
+++ b/Output/Themes/Vocaluxe 2024/03.xml	
@@ -397,6 +397,8 @@
     <SaveIcon>SaveIcon.png</SaveIcon>
     <SingIcon>SingIcon.png</SingIcon>
     <ListIcon>ListIcon.png</ListIcon>
+    <LyricsIcon>LyricsIcon.png</LyricsIcon>
+    <QueueRow>QueueRow.png</QueueRow>
     <Minus>MinusIcon.png</Minus>
     <Plus>PlusIcon.png</Plus>
     <VolUp>VolUp.png</VolUp>
diff --git a/Output/Themes/Vocaluxe 2024/04.xml b/Output/Themes/Vocaluxe 2024/04.xml
index 0cc61b58..485c1996 100644
--- a/Output/Themes/Vocaluxe 2024/04.xml	
+++ b/Output/Themes/Vocaluxe 2024/04.xml	
@@ -397,6 +397,8 @@
     <SaveIcon>SaveIcon.png</SaveIcon>
     <SingIcon>SingIcon.png</SingIcon>
     <ListIcon>ListIcon.png</ListIcon>
+    <LyricsIcon>LyricsIcon.png</LyricsIcon>
+    <QueueRow>QueueRow.png</QueueRow>
     <Minus>MinusIcon.png</Minus>
     <Plus>PlusIcon.png</Plus>
     <VolUp>VolUp.png</VolUp>
diff --git a/Output/Themes/Vocaluxe 2024/05.xml b/Output/Themes/Vocaluxe 2024/05.xml
index 715c3b0f..33561669 100644
--- a/Output/Themes/Vocaluxe 2024/05.xml	
+++ b/Output/Themes/Vocaluxe 2024/05.xml	
@@ -397,6 +397,8 @@
     <SaveIcon>SaveIcon.png</SaveIcon>
     <SingIcon>SingIcon.png</SingIcon>
     <ListIcon>ListIcon.png</ListIcon>
+    <LyricsIcon>LyricsIcon.png</LyricsIcon>
+    <QueueRow>QueueRow.png</QueueRow>
     <Minus>MinusIcon.png</Minus>
     <Plus>PlusIcon.png</Plus>
     <VolUp>VolUp.png</VolUp>
diff --git a/Output/Themes/Vocaluxe 2024/06.xml b/Output/Themes/Vocaluxe 2024/06.xml
index aba50e6b..7dae9e6a 100644
--- a/Output/Themes/Vocaluxe 2024/06.xml	
+++ b/Output/Themes/Vocaluxe 2024/06.xml	
@@ -397,6 +397,8 @@
     <SaveIcon>SaveIcon.png</SaveIcon>
     <SingIcon>SingIcon.png</SingIcon>
     <ListIcon>ListIcon.png</ListIcon>
+    <LyricsIcon>LyricsIcon.png</LyricsIcon>
+    <QueueRow>QueueRow.png</QueueRow>
     <Minus>MinusIcon.png</Minus>
     <Plus>PlusIcon.png</Plus>
     <VolUp>VolUp.png</VolUp>
diff --git a/Output/Themes/Vocaluxe 2024/LyricsIcon.png b/Output/Themes/Vocaluxe 2024/LyricsIcon.png
new file mode 100644
index 00000000..92f33bd7
Binary files /dev/null and b/Output/Themes/Vocaluxe 2024/LyricsIcon.png differ
diff --git a/Output/Themes/Vocaluxe 2024/QueueRow.png b/Output/Themes/Vocaluxe 2024/QueueRow.png
new file mode 100644
index 00000000..ee6fc66e
Binary files /dev/null and b/Output/Themes/Vocaluxe 2024/QueueRow.png differ
diff --git a/Output/Themes/Vocaluxe 2024/Screens/ScreenJukebox.xml b/Output/Themes/Vocaluxe 2024/Screens/ScreenJukebox.xml
new file mode 100644
index 00000000..f3664457
--- /dev/null
+++ b/Output/Themes/Vocaluxe 2024/Screens/ScreenJukebox.xml	
@@ -0,0 +1,645 @@
+<?xml version='1.0' encoding='utf-8'?>
+<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Informations>
+    <ScreenName>ScreenJukebox</ScreenName>
+    <ScreenVersion>1</ScreenVersion>
+  </Informations>
+  <Backgrounds>
+    <Background Name="Background1">
+      <Type>Video</Type>
+      <SlideShowTextures />
+      <Video>BG_Video</Video>
+      <Skin>BG_Options</Skin>
+      <Color Name="BackgroundColor" />
+    </Background>
+  </Backgrounds>
+  <Statics>
+    <Static Name="StaticMenuBar">
+      <Skin />
+      <Color Name="BackgroundColorAlpha" />
+      <Rect>
+        <X>0</X>
+        <Y>60</Y>
+        <W>1920</W>
+        <H>67.5</H>
+        <Z>1</Z>
+      </Rect>
+    </Static>
+  </Statics>
+  <Texts>
+    <Text Name="TextTitle">
+      <X>960</X>
+      <Y>75</Y>
+      <Z>0</Z>
+      <H>40.5</H>
+      <MaxW>0</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Center</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text>TR_SCREENJUKEBOX_TITLE</Text>
+    </Text>
+    <Text Name="TextSource">
+      <X>112.5</X>
+      <Y>160.5</Y>
+      <Z>0</Z>
+      <H>40.5</H>
+      <MaxW>0</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text>TR_SCREENJUKEBOX_SOURCE</Text>
+    </Text>
+    <Text Name="TextPlaylist">
+      <X>112.5</X>
+      <Y>250.5</Y>
+      <Z>0</Z>
+      <H>40.5</H>
+      <MaxW>0</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text>TR_SCREENJUKEBOX_PLAYLIST</Text>
+    </Text>
+    <Text Name="TextSorting">
+      <X>112.5</X>
+      <Y>250.5</Y>
+      <Z>0</Z>
+      <H>40.5</H>
+      <MaxW>0</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text>TR_SCREENJUKEBOX_SORTING</Text>
+    </Text>
+    <Text Name="TextCategory">
+      <X>112.5</X>
+      <Y>340.5</Y>
+      <Z>0</Z>
+      <H>40.5</H>
+      <MaxW>0</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text>TR_SCREENJUKEBOX_CATEGORY</Text>
+    </Text>
+    <Text Name="TextOrder">
+      <X>112.5</X>
+      <Y>430.5</Y>
+      <Z>0</Z>
+      <H>40.5</H>
+      <MaxW>0</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text>TR_SCREENJUKEBOX_ORDER</Text>
+    </Text>
+    <Text Name="TextSection">
+      <X>112.5</X>
+      <Y>520.5</Y>
+      <Z>0</Z>
+      <H>40.5</H>
+      <MaxW>0</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text>TR_SCREENJUKEBOX_SECTION</Text>
+    </Text>
+    <Text Name="TextLyrics">
+      <X>112.5</X>
+      <Y>610.5</Y>
+      <Z>0</Z>
+      <H>40.5</H>
+      <MaxW>0</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text>TR_SCREENJUKEBOX_LYRICS</Text>
+    </Text>
+    <Text Name="TextAudioMode">
+      <X>112.5</X>
+      <Y>700.5</Y>
+      <Z>0</Z>
+      <H>40.5</H>
+      <MaxW>0</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text>TR_SCREENJUKEBOX_AUDIOMODE</Text>
+    </Text>
+    <Text Name="TextVideo">
+      <X>112.5</X>
+      <Y>790.5</Y>
+      <Z>0</Z>
+      <H>40.5</H>
+      <MaxW>0</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text>TR_SCREENJUKEBOX_VIDEO</Text>
+    </Text>
+    <Text Name="TextInfo">
+      <X>960</X>
+      <Y>918</Y>
+      <Z>0</Z>
+      <H>40.5</H>
+      <MaxW>0</MaxW>
+      <Color Name="TextColorAlpha" />
+      <SelColor Name="TextSelColor" />
+      <Align>Center</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text />
+    </Text>
+  </Texts>
+  <Buttons>
+    <Button Name="ButtonBack">
+      <Skin>Button</Skin>
+      <SkinSelected>Button</SkinSelected>
+      <Rect>
+        <X>82.5</X>
+        <Y>900</Y>
+        <W>225</W>
+        <H>75</H>
+        <Z>0</Z>
+      </Rect>
+      <Color Name="ButtonColor" />
+      <SelColor Name="ButtonSelColor" />
+      <Text Name="Text">
+        <X>112.5</X>
+        <Y>18</Y>
+        <Z>0</Z>
+        <H>40.5</H>
+        <MaxW>213</MaxW>
+        <Color Name="ButtonTextColor" />
+        <SelColor Name="ButtonTextSelColor" />
+        <Align>Center</Align>
+        <ResizeAlign>Center</ResizeAlign>
+        <Style>Bold</Style>
+        <Font>Outline</Font>
+        <Text>TR_BUTTON_BACK</Text>
+      </Text>
+      <Reflection>
+        <Height>39</Height>
+        <Space>15</Space>
+      </Reflection>
+      <SelReflection>
+        <Height>39</Height>
+        <Space>15</Space>
+      </SelReflection>
+    </Button>
+    <Button Name="ButtonStart">
+      <Skin>Button</Skin>
+      <SkinSelected>Button</SkinSelected>
+      <Rect>
+        <X>1612.5</X>
+        <Y>900</Y>
+        <W>225</W>
+        <H>75</H>
+        <Z>0</Z>
+      </Rect>
+      <Color Name="ButtonColor" />
+      <SelColor Name="ButtonSelColor" />
+      <Text Name="Text">
+        <X>112.5</X>
+        <Y>18</Y>
+        <Z>0</Z>
+        <H>40.5</H>
+        <MaxW>213</MaxW>
+        <Color Name="ButtonTextColor" />
+        <SelColor Name="ButtonTextSelColor" />
+        <Align>Center</Align>
+        <ResizeAlign>Center</ResizeAlign>
+        <Style>Bold</Style>
+        <Font>Outline</Font>
+        <Text>TR_BUTTON_START</Text>
+      </Text>
+      <Reflection>
+        <Height>39</Height>
+        <Space>15</Space>
+      </Reflection>
+      <SelReflection>
+        <Height>39</Height>
+        <Space>15</Space>
+      </SelReflection>
+    </Button>
+  </Buttons>
+  <SongMenus />
+  <Lyrics />
+  <SelectSlides>
+    <SelectSlide Name="SelectSlideSource">
+      <Skin />
+      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
+      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
+      <SkinSelected>SelectSlide</SkinSelected>
+      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
+      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
+      <Rect>
+        <X>750</X>
+        <Y>150</Y>
+        <W>1072.5</W>
+        <H>75</H>
+        <Z>0</Z>
+      </Rect>
+      <RectArrowLeft>
+        <X>757.5</X>
+        <Y>157.5</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>0</Z>
+      </RectArrowLeft>
+      <RectArrowRight>
+        <X>1755</X>
+        <Y>157.5</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>0</Z>
+      </RectArrowRight>
+      <Color Name="SelectSlideColor" />
+      <SelColor Name="SelectSlideSelColor" />
+      <ArrowColor Name="ArrowColor" />
+      <ArrowSelColor Name="ArrowSelColor" />
+      <TextColor Name="TextColorAlpha" />
+      <TextSelColor Name="TextSelColor" />
+      <TextH>40.5</TextH>
+      <TextRelativeX>75</TextRelativeX>
+      <TextRelativeY>0</TextRelativeY>
+      <TextMaxW>300</TextMaxW>
+      <TextFont>Outline</TextFont>
+      <TextStyle>Bold</TextStyle>
+      <NumVisible>3</NumVisible>
+    </SelectSlide>
+    <SelectSlide Name="SelectSlidePlaylist">
+      <Skin />
+      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
+      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
+      <SkinSelected>SelectSlide</SkinSelected>
+      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
+      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
+      <Rect>
+        <X>750</X>
+        <Y>240</Y>
+        <W>1072.5</W>
+        <H>75</H>
+        <Z>0</Z>
+      </Rect>
+      <RectArrowLeft>
+        <X>757.5</X>
+        <Y>247.5</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>0</Z>
+      </RectArrowLeft>
+      <RectArrowRight>
+        <X>1755</X>
+        <Y>247.5</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>0</Z>
+      </RectArrowRight>
+      <Color Name="SelectSlideColor" />
+      <SelColor Name="SelectSlideSelColor" />
+      <ArrowColor Name="ArrowColor" />
+      <ArrowSelColor Name="ArrowSelColor" />
+      <TextColor Name="TextColorAlpha" />
+      <TextSelColor Name="TextSelColor" />
+      <TextH>40.5</TextH>
+      <TextRelativeX>75</TextRelativeX>
+      <TextRelativeY>0</TextRelativeY>
+      <TextMaxW>900</TextMaxW>
+      <TextFont>Outline</TextFont>
+      <TextStyle>Bold</TextStyle>
+      <NumVisible>1</NumVisible>
+    </SelectSlide>
+    <SelectSlide Name="SelectSlideSorting">
+      <Skin />
+      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
+      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
+      <SkinSelected>SelectSlide</SkinSelected>
+      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
+      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
+      <Rect>
+        <X>750</X>
+        <Y>240</Y>
+        <W>1072.5</W>
+        <H>75</H>
+        <Z>0</Z>
+      </Rect>
+      <RectArrowLeft>
+        <X>757.5</X>
+        <Y>247.5</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>0</Z>
+      </RectArrowLeft>
+      <RectArrowRight>
+        <X>1755</X>
+        <Y>247.5</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>0</Z>
+      </RectArrowRight>
+      <Color Name="SelectSlideColor" />
+      <SelColor Name="SelectSlideSelColor" />
+      <ArrowColor Name="ArrowColor" />
+      <ArrowSelColor Name="ArrowSelColor" />
+      <TextColor Name="TextColorAlpha" />
+      <TextSelColor Name="TextSelColor" />
+      <TextH>40.5</TextH>
+      <TextRelativeX>75</TextRelativeX>
+      <TextRelativeY>0</TextRelativeY>
+      <TextMaxW>900</TextMaxW>
+      <TextFont>Outline</TextFont>
+      <TextStyle>Bold</TextStyle>
+      <NumVisible>1</NumVisible>
+    </SelectSlide>
+    <SelectSlide Name="SelectSlideCategory">
+      <Skin />
+      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
+      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
+      <SkinSelected>SelectSlide</SkinSelected>
+      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
+      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
+      <Rect>
+        <X>750</X>
+        <Y>330</Y>
+        <W>1072.5</W>
+        <H>75</H>
+        <Z>0</Z>
+      </Rect>
+      <RectArrowLeft>
+        <X>757.5</X>
+        <Y>337.5</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>0</Z>
+      </RectArrowLeft>
+      <RectArrowRight>
+        <X>1755</X>
+        <Y>337.5</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>0</Z>
+      </RectArrowRight>
+      <Color Name="SelectSlideColor" />
+      <SelColor Name="SelectSlideSelColor" />
+      <ArrowColor Name="ArrowColor" />
+      <ArrowSelColor Name="ArrowSelColor" />
+      <TextColor Name="TextColorAlpha" />
+      <TextSelColor Name="TextSelColor" />
+      <TextH>40.5</TextH>
+      <TextRelativeX>75</TextRelativeX>
+      <TextRelativeY>0</TextRelativeY>
+      <TextMaxW>900</TextMaxW>
+      <TextFont>Outline</TextFont>
+      <TextStyle>Bold</TextStyle>
+      <NumVisible>1</NumVisible>
+    </SelectSlide>
+    <SelectSlide Name="SelectSlideOrder">
+      <Skin />
+      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
+      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
+      <SkinSelected>SelectSlide</SkinSelected>
+      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
+      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
+      <Rect>
+        <X>750</X>
+        <Y>420</Y>
+        <W>1072.5</W>
+        <H>75</H>
+        <Z>0</Z>
+      </Rect>
+      <RectArrowLeft>
+        <X>757.5</X>
+        <Y>427.5</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>0</Z>
+      </RectArrowLeft>
+      <RectArrowRight>
+        <X>1755</X>
+        <Y>427.5</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>0</Z>
+      </RectArrowRight>
+      <Color Name="SelectSlideColor" />
+      <SelColor Name="SelectSlideSelColor" />
+      <ArrowColor Name="ArrowColor" />
+      <ArrowSelColor Name="ArrowSelColor" />
+      <TextColor Name="TextColorAlpha" />
+      <TextSelColor Name="TextSelColor" />
+      <TextH>40.5</TextH>
+      <TextRelativeX>75</TextRelativeX>
+      <TextRelativeY>0</TextRelativeY>
+      <TextMaxW>300</TextMaxW>
+      <TextFont>Outline</TextFont>
+      <TextStyle>Bold</TextStyle>
+      <NumVisible>3</NumVisible>
+    </SelectSlide>
+    <SelectSlide Name="SelectSlideSection">
+      <Skin />
+      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
+      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
+      <SkinSelected>SelectSlide</SkinSelected>
+      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
+      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
+      <Rect>
+        <X>750</X>
+        <Y>510</Y>
+        <W>1072.5</W>
+        <H>75</H>
+        <Z>0</Z>
+      </Rect>
+      <RectArrowLeft>
+        <X>757.5</X>
+        <Y>517.5</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>0</Z>
+      </RectArrowLeft>
+      <RectArrowRight>
+        <X>1755</X>
+        <Y>517.5</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>0</Z>
+      </RectArrowRight>
+      <Color Name="SelectSlideColor" />
+      <SelColor Name="SelectSlideSelColor" />
+      <ArrowColor Name="ArrowColor" />
+      <ArrowSelColor Name="ArrowSelColor" />
+      <TextColor Name="TextColorAlpha" />
+      <TextSelColor Name="TextSelColor" />
+      <TextH>40.5</TextH>
+      <TextRelativeX>75</TextRelativeX>
+      <TextRelativeY>0</TextRelativeY>
+      <TextMaxW>300</TextMaxW>
+      <TextFont>Outline</TextFont>
+      <TextStyle>Bold</TextStyle>
+      <NumVisible>3</NumVisible>
+    </SelectSlide>
+    <SelectSlide Name="SelectSlideLyrics">
+      <Skin />
+      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
+      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
+      <SkinSelected>SelectSlide</SkinSelected>
+      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
+      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
+      <Rect>
+        <X>750</X>
+        <Y>600</Y>
+        <W>1072.5</W>
+        <H>75</H>
+        <Z>0</Z>
+      </Rect>
+      <RectArrowLeft>
+        <X>757.5</X>
+        <Y>607.5</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>0</Z>
+      </RectArrowLeft>
+      <RectArrowRight>
+        <X>1755</X>
+        <Y>607.5</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>0</Z>
+      </RectArrowRight>
+      <Color Name="SelectSlideColor" />
+      <SelColor Name="SelectSlideSelColor" />
+      <ArrowColor Name="ArrowColor" />
+      <ArrowSelColor Name="ArrowSelColor" />
+      <TextColor Name="TextColorAlpha" />
+      <TextSelColor Name="TextSelColor" />
+      <TextH>40.5</TextH>
+      <TextRelativeX>75</TextRelativeX>
+      <TextRelativeY>0</TextRelativeY>
+      <TextMaxW>300</TextMaxW>
+      <TextFont>Outline</TextFont>
+      <TextStyle>Bold</TextStyle>
+      <NumVisible>3</NumVisible>
+    </SelectSlide>
+    <SelectSlide Name="SelectSlideAudioMode">
+      <Skin />
+      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
+      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
+      <SkinSelected>SelectSlide</SkinSelected>
+      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
+      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
+      <Rect>
+        <X>750</X>
+        <Y>690</Y>
+        <W>1072.5</W>
+        <H>75</H>
+        <Z>0</Z>
+      </Rect>
+      <RectArrowLeft>
+        <X>757.5</X>
+        <Y>697.5</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>0</Z>
+      </RectArrowLeft>
+      <RectArrowRight>
+        <X>1755</X>
+        <Y>697.5</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>0</Z>
+      </RectArrowRight>
+      <Color Name="SelectSlideColor" />
+      <SelColor Name="SelectSlideSelColor" />
+      <ArrowColor Name="ArrowColor" />
+      <ArrowSelColor Name="ArrowSelColor" />
+      <TextColor Name="TextColorAlpha" />
+      <TextSelColor Name="TextSelColor" />
+      <TextH>40.5</TextH>
+      <TextRelativeX>75</TextRelativeX>
+      <TextRelativeY>0</TextRelativeY>
+      <TextMaxW>300</TextMaxW>
+      <TextFont>Outline</TextFont>
+      <TextStyle>Bold</TextStyle>
+      <NumVisible>3</NumVisible>
+    </SelectSlide>
+    <SelectSlide Name="SelectSlideVideo">
+      <Skin />
+      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
+      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
+      <SkinSelected>SelectSlide</SkinSelected>
+      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
+      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
+      <Rect>
+        <X>750</X>
+        <Y>780</Y>
+        <W>1072.5</W>
+        <H>75</H>
+        <Z>0</Z>
+      </Rect>
+      <RectArrowLeft>
+        <X>757.5</X>
+        <Y>787.5</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>0</Z>
+      </RectArrowLeft>
+      <RectArrowRight>
+        <X>1755</X>
+        <Y>787.5</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>0</Z>
+      </RectArrowRight>
+      <Color Name="SelectSlideColor" />
+      <SelColor Name="SelectSlideSelColor" />
+      <ArrowColor Name="ArrowColor" />
+      <ArrowSelColor Name="ArrowSelColor" />
+      <TextColor Name="TextColorAlpha" />
+      <TextSelColor Name="TextSelColor" />
+      <TextH>40.5</TextH>
+      <TextRelativeX>75</TextRelativeX>
+      <TextRelativeY>0</TextRelativeY>
+      <TextMaxW>300</TextMaxW>
+      <TextFont>Outline</TextFont>
+      <TextStyle>Bold</TextStyle>
+      <NumVisible>3</NumVisible>
+    </SelectSlide>
+  </SelectSlides>
+  <SingNotes />
+  <NameSelections />
+  <Equalizers />
+  <Playlists />
+  <ParticleEffects />
+  <ScreenSettings />
+</Screen>
diff --git a/Output/Themes/Vocaluxe 2024/Screens/ScreenJukeboxPlayer.xml b/Output/Themes/Vocaluxe 2024/Screens/ScreenJukeboxPlayer.xml
new file mode 100644
index 00000000..2126f9f1
--- /dev/null
+++ b/Output/Themes/Vocaluxe 2024/Screens/ScreenJukeboxPlayer.xml	
@@ -0,0 +1,695 @@
+<?xml version='1.0' encoding='utf-8'?>
+<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Informations>
+    <ScreenName>ScreenJukeboxPlayer</ScreenName>
+    <ScreenVersion>1</ScreenVersion>
+  </Informations>
+  <Backgrounds>
+    <Background Name="Background1">
+      <Type>Video</Type>
+      <SlideShowTextures />
+      <Video>BG_Video</Video>
+      <Skin>BG_Default</Skin>
+      <Color Name="BackgroundColor" />
+    </Background>
+  </Backgrounds>
+  <Statics>
+    <Static Name="StaticInfoBG">
+      <Skin>CoverTextBackground</Skin>
+      <Color Name="StaticColorAlpha" />
+      <Rect>
+        <X>60</X>
+        <Y>60</Y>
+        <W>760</W>
+        <H>190</H>
+        <Z>-0.5</Z>
+      </Rect>
+    </Static>
+    <Static Name="StaticInfoCover">
+      <Skin />
+      <Color Name="White" />
+      <Rect>
+        <X>80</X>
+        <Y>80</Y>
+        <W>150</W>
+        <H>150</H>
+        <Z>-0.6</Z>
+      </Rect>
+    </Static>
+    <Static Name="StaticLyrics">
+      <Skin />
+      <Color Name="BackgroundColorAlpha" />
+      <Rect>
+        <X>0</X>
+        <Y>915</Y>
+        <W>1920</W>
+        <H>135</H>
+        <Z>-0.75</Z>
+      </Rect>
+    </Static>
+    <Static Name="StaticBarBG">
+      <Skin>SongMenu</Skin>
+      <Color Name="StaticColorAlpha" />
+      <Rect>
+        <X>60</X>
+        <Y>900</Y>
+        <W>1800</W>
+        <H>150</H>
+        <Z>-0.5</Z>
+      </Rect>
+    </Static>
+    <Static Name="StaticTimeBarBG">
+      <Skin />
+      <Color Name="ArrowColor" />
+      <Rect>
+        <X>190</X>
+        <Y>930</Y>
+        <W>1540</W>
+        <H>10</H>
+        <Z>-0.6</Z>
+      </Rect>
+    </Static>
+    <Static Name="StaticTimeBarFill">
+      <Skin />
+      <Color Name="ButtonSelColor" />
+      <Rect>
+        <X>190</X>
+        <Y>930</Y>
+        <W>1540</W>
+        <H>10</H>
+        <Z>-0.65</Z>
+      </Rect>
+    </Static>
+    <Static Name="StaticQueueBG">
+      <Skin>CoverTextBackground</Skin>
+      <Color Name="StaticColorAlpha" />
+      <Rect>
+        <X>1180</X>
+        <Y>60</Y>
+        <W>680</W>
+        <H>688</H>
+        <Z>-0.5</Z>
+      </Rect>
+    </Static>
+    <Static Name="StaticQueueSearch">
+      <Skin>SearchBar</Skin>
+      <Color Name="White" />
+      <Rect>
+        <X>1210</X>
+        <Y>140</Y>
+        <W>504</W>
+        <H>70</H>
+        <Z>-0.6</Z>
+      </Rect>
+    </Static>
+    <Static Name="StaticQueueRow">
+      <Skin>QueueRow</Skin>
+      <Color Name="ButtonSelColor" />
+      <Rect>
+        <X>1205</X>
+        <Y>232</Y>
+        <W>630</W>
+        <H>60</H>
+        <Z>-0.6</Z>
+      </Rect>
+    </Static>
+    <Static Name="StaticQueueRowPlaying">
+      <Skin>QueueRow</Skin>
+      <Color Name="ButtonColor" />
+      <Rect>
+        <X>1205</X>
+        <Y>232</Y>
+        <W>630</W>
+        <H>60</H>
+        <Z>-0.55</Z>
+      </Rect>
+    </Static>
+    <Static Name="StaticQueuePlaying">
+      <Skin>PlayIcon</Skin>
+      <Color Name="ButtonSelColor" />
+      <Rect>
+        <X>1212</X>
+        <Y>250</Y>
+        <W>24</W>
+        <H>24</H>
+        <Z>-0.7</Z>
+      </Rect>
+    </Static>
+    <Static Name="StaticQueueCover">
+      <Skin />
+      <Color Name="White" />
+      <Rect>
+        <X>1245</X>
+        <Y>237</Y>
+        <W>50</W>
+        <H>50</H>
+        <Z>-0.7</Z>
+      </Rect>
+    </Static>
+    <Static Name="StaticAudioModeNormal">
+      <Skin>VocalsIcon</Skin>
+      <Color Name="TextColor" />
+      <Rect>
+        <X>0</X>
+        <Y>0</Y>
+        <W>54</W>
+        <H>54</H>
+        <Z>-0.7</Z>
+      </Rect>
+    </Static>
+    <Static Name="StaticAudioModeInstrumental">
+      <Skin>InstrumentalIcon</Skin>
+      <Color Name="TextColor" />
+      <Rect>
+        <X>0</X>
+        <Y>0</Y>
+        <W>54</W>
+        <H>54</H>
+        <Z>-0.7</Z>
+      </Rect>
+    </Static>
+    <Static Name="StaticAudioModeIcon">
+      <Skin>VocalsIcon</Skin>
+      <Color Name="ButtonTextColor" />
+      <Rect>
+        <X>710</X>
+        <Y>970</Y>
+        <W>54</W>
+        <H>54</H>
+        <Z>-0.75</Z>
+      </Rect>
+    </Static>
+  </Statics>
+  <Texts>
+    <Text Name="TextInfoTitle">
+      <X>260</X>
+      <Y>92</Y>
+      <Z>-0.8</Z>
+      <H>52</H>
+      <MaxW>540</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text />
+    </Text>
+    <Text Name="TextInfoArtist">
+      <X>260</X>
+      <Y>150</Y>
+      <Z>-0.8</Z>
+      <H>40</H>
+      <MaxW>540</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Normal</Style>
+      <Font>Outline</Font>
+      <Text />
+    </Text>
+    <Text Name="TextInfoPosition">
+      <X>260</X>
+      <Y>200</Y>
+      <Z>-0.8</Z>
+      <H>30</H>
+      <MaxW>540</MaxW>
+      <Color Name="TextColorAlpha" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Normal</Style>
+      <Font>Outline</Font>
+      <Text />
+    </Text>
+    <Text Name="TextTimeElapsed">
+      <X>100</X>
+      <Y>918</Y>
+      <Z>-0.8</Z>
+      <H>32</H>
+      <MaxW>0</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text />
+    </Text>
+    <Text Name="TextTimeTotal">
+      <X>1820</X>
+      <Y>918</Y>
+      <Z>-0.8</Z>
+      <H>32</H>
+      <MaxW>0</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Right</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text />
+    </Text>
+    <Text Name="TextQueueTitle">
+      <X>1215</X>
+      <Y>82</Y>
+      <Z>-0.8</Z>
+      <H>44</H>
+      <MaxW>420</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text />
+    </Text>
+    <Text Name="TextQueueCount">
+      <X>1825</X>
+      <Y>90</Y>
+      <Z>-0.8</Z>
+      <H>32</H>
+      <MaxW>200</MaxW>
+      <Color Name="TextColorAlpha" />
+      <SelColor Name="TextSelColor" />
+      <Align>Right</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Normal</Style>
+      <Font>Outline</Font>
+      <Text />
+    </Text>
+    <Text Name="TextQueueSearch">
+      <X>1290</X>
+      <Y>158</Y>
+      <Z>-0.8</Z>
+      <H>34</H>
+      <MaxW>520</MaxW>
+      <Color Name="TextColorAlpha" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Normal</Style>
+      <Font>Outline</Font>
+      <Text />
+    </Text>
+    <Text Name="TextQueueHelp">
+      <X>1520</X>
+      <Y>690</Y>
+      <Z>-0.8</Z>
+      <H>22</H>
+      <MaxW>640</MaxW>
+      <Color Name="TextColorAlpha" />
+      <SelColor Name="TextSelColor" />
+      <Align>Center</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Normal</Style>
+      <Font>Outline</Font>
+      <Text />
+    </Text>
+    <Text Name="TextQueueHelp2">
+      <X>1520</X>
+      <Y>716</Y>
+      <Z>-0.8</Z>
+      <H>22</H>
+      <MaxW>640</MaxW>
+      <Color Name="TextColorAlpha" />
+      <SelColor Name="TextSelColor" />
+      <Align>Center</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Normal</Style>
+      <Font>Outline</Font>
+      <Text />
+    </Text>
+    <Text Name="TextQueueEntryTitle">
+      <X>1315</X>
+      <Y>236</Y>
+      <Z>-0.8</Z>
+      <H>28</H>
+      <MaxW>500</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text />
+    </Text>
+    <Text Name="TextQueueEntryArtist">
+      <X>1315</X>
+      <Y>264</Y>
+      <Z>-0.8</Z>
+      <H>22</H>
+      <MaxW>500</MaxW>
+      <Color Name="TextColorAlpha" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Normal</Style>
+      <Font>Outline</Font>
+      <Text />
+    </Text>
+  </Texts>
+  <Buttons>
+    <Button Name="ButtonPrevious">
+      <Skin>PreviousIcon</Skin>
+      <SkinSelected>PreviousIcon</SkinSelected>
+      <Rect>
+        <X>110</X>
+        <Y>970</Y>
+        <W>54</W>
+        <H>54</H>
+        <Z>-0.7</Z>
+      </Rect>
+      <Color Name="TextColor" />
+      <SelColor Name="ButtonSelColor" />
+      <Text Name="Text">
+        <X>0</X>
+        <Y>0</Y>
+        <Z>-0.7</Z>
+        <H>30</H>
+        <MaxW>0</MaxW>
+        <Color Name="TextColor" />
+        <SelColor Name="ButtonTextSelColor" />
+        <Align>Center</Align>
+        <ResizeAlign>Center</ResizeAlign>
+        <Style>Bold</Style>
+        <Font>Outline</Font>
+        <Text />
+      </Text>
+    </Button>
+    <Button Name="ButtonPlay">
+      <Skin>PlayIcon</Skin>
+      <SkinSelected>PlayIcon</SkinSelected>
+      <Rect>
+        <X>201</X>
+        <Y>966</Y>
+        <W>62</W>
+        <H>62</H>
+        <Z>-0.7</Z>
+      </Rect>
+      <Color Name="TextColor" />
+      <SelColor Name="ButtonSelColor" />
+      <Text Name="Text">
+        <X>0</X>
+        <Y>0</Y>
+        <Z>-0.7</Z>
+        <H>30</H>
+        <MaxW>0</MaxW>
+        <Color Name="TextColor" />
+        <SelColor Name="ButtonTextSelColor" />
+        <Align>Center</Align>
+        <ResizeAlign>Center</ResizeAlign>
+        <Style>Bold</Style>
+        <Font>Outline</Font>
+        <Text />
+      </Text>
+    </Button>
+    <Button Name="ButtonPause">
+      <Skin>PauseIcon</Skin>
+      <SkinSelected>PauseIcon</SkinSelected>
+      <Rect>
+        <X>201</X>
+        <Y>966</Y>
+        <W>62</W>
+        <H>62</H>
+        <Z>-0.7</Z>
+      </Rect>
+      <Color Name="TextColor" />
+      <SelColor Name="ButtonSelColor" />
+      <Text Name="Text">
+        <X>0</X>
+        <Y>0</Y>
+        <Z>-0.7</Z>
+        <H>30</H>
+        <MaxW>0</MaxW>
+        <Color Name="TextColor" />
+        <SelColor Name="ButtonTextSelColor" />
+        <Align>Center</Align>
+        <ResizeAlign>Center</ResizeAlign>
+        <Style>Bold</Style>
+        <Font>Outline</Font>
+        <Text />
+      </Text>
+    </Button>
+    <Button Name="ButtonNext">
+      <Skin>NextIcon</Skin>
+      <SkinSelected>NextIcon</SkinSelected>
+      <Rect>
+        <X>300</X>
+        <Y>970</Y>
+        <W>54</W>
+        <H>54</H>
+        <Z>-0.7</Z>
+      </Rect>
+      <Color Name="TextColor" />
+      <SelColor Name="ButtonSelColor" />
+      <Text Name="Text">
+        <X>0</X>
+        <Y>0</Y>
+        <Z>-0.7</Z>
+        <H>30</H>
+        <MaxW>0</MaxW>
+        <Color Name="TextColor" />
+        <SelColor Name="ButtonTextSelColor" />
+        <Align>Center</Align>
+        <ResizeAlign>Center</ResizeAlign>
+        <Style>Bold</Style>
+        <Font>Outline</Font>
+        <Text />
+      </Text>
+    </Button>
+    <Button Name="ButtonSkipIntro">
+      <Skin>Button</Skin>
+      <SkinSelected>Button</SkinSelected>
+      <Rect>
+        <X>420</X>
+        <Y>966</Y>
+        <W>260</W>
+        <H>62</H>
+        <Z>-0.7</Z>
+      </Rect>
+      <Color Name="ButtonColor" />
+      <SelColor Name="ButtonSelColor" />
+      <Text Name="Text">
+        <X>130</X>
+        <Y>14</Y>
+        <Z>-0.7</Z>
+        <H>34</H>
+        <MaxW>240</MaxW>
+        <Color Name="ButtonTextColor" />
+        <SelColor Name="ButtonTextSelColor" />
+        <Align>Center</Align>
+        <ResizeAlign>Center</ResizeAlign>
+        <Style>Bold</Style>
+        <Font>Outline</Font>
+        <Text>TR_SCREENJUKEBOXPLAYER_SKIPINTRO</Text>
+      </Text>
+    </Button>
+    <Button Name="ButtonShuffle">
+      <Skin>Random</Skin>
+      <SkinSelected>Random</SkinSelected>
+      <Rect>
+        <X>1100.5</X>
+        <Y>970</Y>
+        <W>54</W>
+        <H>54</H>
+        <Z>-0.7</Z>
+      </Rect>
+      <Color Name="TextColor" />
+      <SelColor Name="ButtonSelColor" />
+      <Text Name="Text">
+        <X>0</X>
+        <Y>0</Y>
+        <Z>-0.7</Z>
+        <H>30</H>
+        <MaxW>0</MaxW>
+        <Color Name="TextColor" />
+        <SelColor Name="ButtonTextSelColor" />
+        <Align>Center</Align>
+        <ResizeAlign>Center</ResizeAlign>
+        <Style>Bold</Style>
+        <Font>Outline</Font>
+        <Text />
+      </Text>
+    </Button>
+    <Button Name="ButtonRepeat">
+      <Skin>RepeatIcon</Skin>
+      <SkinSelected>RepeatIcon</SkinSelected>
+      <Rect>
+        <X>1195.5</X>
+        <Y>970</Y>
+        <W>54</W>
+        <H>54</H>
+        <Z>-0.7</Z>
+      </Rect>
+      <Color Name="TextColor" />
+      <SelColor Name="ButtonSelColor" />
+      <Text Name="Text">
+        <X>0</X>
+        <Y>0</Y>
+        <Z>-0.7</Z>
+        <H>30</H>
+        <MaxW>0</MaxW>
+        <Color Name="TextColor" />
+        <SelColor Name="ButtonTextSelColor" />
+        <Align>Center</Align>
+        <ResizeAlign>Center</ResizeAlign>
+        <Style>Bold</Style>
+        <Font>Outline</Font>
+        <Text />
+      </Text>
+    </Button>
+    <Button Name="ButtonLyrics">
+      <Skin>LyricsIcon</Skin>
+      <SkinSelected>LyricsIcon</SkinSelected>
+      <Rect>
+        <X>1290.5</X>
+        <Y>970</Y>
+        <W>54</W>
+        <H>54</H>
+        <Z>-0.7</Z>
+      </Rect>
+      <Color Name="TextColor" />
+      <SelColor Name="ButtonSelColor" />
+      <Text Name="Text">
+        <X>0</X>
+        <Y>0</Y>
+        <Z>-0.7</Z>
+        <H>30</H>
+        <MaxW>0</MaxW>
+        <Color Name="TextColor" />
+        <SelColor Name="ButtonTextSelColor" />
+        <Align>Center</Align>
+        <ResizeAlign>Center</ResizeAlign>
+        <Style>Bold</Style>
+        <Font>Outline</Font>
+        <Text />
+      </Text>
+    </Button>
+    <Button Name="ButtonAudioMode">
+      <Skin>Button</Skin>
+      <SkinSelected>Button</SkinSelected>
+      <Rect>
+        <X>700</X>
+        <Y>966</Y>
+        <W>260</W>
+        <H>62</H>
+        <Z>-0.7</Z>
+      </Rect>
+      <Color Name="ButtonColor" />
+      <SelColor Name="ButtonSelColor" />
+      <Text Name="Text">
+        <X>157</X>
+        <Y>14</Y>
+        <Z>-0.7</Z>
+        <H>34</H>
+        <MaxW>176</MaxW>
+        <Color Name="ButtonTextColor" />
+        <SelColor Name="ButtonTextSelColor" />
+        <Align>Center</Align>
+        <ResizeAlign>Center</ResizeAlign>
+        <Style>Bold</Style>
+        <Font>Outline</Font>
+        <Text>TR_AUDIOMODE_NORMAL</Text>
+      </Text>
+    </Button>
+    <Button Name="ButtonQueue">
+      <Skin>ListIcon</Skin>
+      <SkinSelected>ListIcon</SkinSelected>
+      <Rect>
+        <X>1385.5</X>
+        <Y>970</Y>
+        <W>54</W>
+        <H>54</H>
+        <Z>-0.7</Z>
+      </Rect>
+      <Color Name="TextColor" />
+      <SelColor Name="ButtonSelColor" />
+      <Text Name="Text">
+        <X>0</X>
+        <Y>0</Y>
+        <Z>-0.7</Z>
+        <H>30</H>
+        <MaxW>0</MaxW>
+        <Color Name="TextColor" />
+        <SelColor Name="ButtonTextSelColor" />
+        <Align>Center</Align>
+        <ResizeAlign>Center</ResizeAlign>
+        <Style>Bold</Style>
+        <Font>Outline</Font>
+        <Text />
+      </Text>
+    </Button>
+    <Button Name="ButtonSing">
+      <Skin>Button</Skin>
+      <SkinSelected>Button</SkinSelected>
+      <Rect>
+        <X>1580</X>
+        <Y>966</Y>
+        <W>260</W>
+        <H>62</H>
+        <Z>-0.7</Z>
+      </Rect>
+      <Color Name="ButtonColor" />
+      <SelColor Name="ButtonSelColor" />
+      <Text Name="Text">
+        <X>130</X>
+        <Y>14</Y>
+        <Z>-0.7</Z>
+        <H>34</H>
+        <MaxW>240</MaxW>
+        <Color Name="ButtonTextColor" />
+        <SelColor Name="ButtonTextSelColor" />
+        <Align>Center</Align>
+        <ResizeAlign>Center</ResizeAlign>
+        <Style>Bold</Style>
+        <Font>Outline</Font>
+        <Text>TR_SCREENJUKEBOXPLAYER_SING</Text>
+      </Text>
+    </Button>
+  </Buttons>
+  <SongMenus />
+  <Lyrics>
+    <Lyric Name="LyricMain">
+      <Rect>
+        <X>955.5</X>
+        <Y>930</Y>
+        <W>1800</W>
+        <H>63</H>
+        <Z>-1</Z>
+      </Rect>
+      <Color Name="LyricMainColor" />
+      <ProcessedColor Name="LyricProcessedColor" />
+    </Lyric>
+    <Lyric Name="LyricSub">
+      <Rect>
+        <X>955.5</X>
+        <Y>993</Y>
+        <W>1800</W>
+        <H>52.5</H>
+        <Z>-1</Z>
+      </Rect>
+      <Color Name="LyricSubColor" />
+      <ProcessedColor Name="LyricProcessedColor" />
+    </Lyric>
+    <Lyric Name="LyricMainBar">
+      <Rect>
+        <X>955.5</X>
+        <Y>780</Y>
+        <W>1800</W>
+        <H>63</H>
+        <Z>-1</Z>
+      </Rect>
+      <Color Name="LyricMainColor" />
+      <ProcessedColor Name="LyricProcessedColor" />
+    </Lyric>
+  </Lyrics>
+  <SelectSlides />
+  <SingNotes />
+  <NameSelections />
+  <Equalizers />
+  <Playlists />
+  <ParticleEffects />
+  <ScreenSettings />
+</Screen>
diff --git a/Output/Themes/Vocaluxe 2024/Screens/ScreenMain.xml b/Output/Themes/Vocaluxe 2024/Screens/ScreenMain.xml
index f9852a1b..0e213474 100644
--- a/Output/Themes/Vocaluxe 2024/Screens/ScreenMain.xml	
+++ b/Output/Themes/Vocaluxe 2024/Screens/ScreenMain.xml	
@@ -2,7 +2,7 @@
 <Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Informations>
     <ScreenName>ScreenMain</ScreenName>
-    <ScreenVersion>5</ScreenVersion>
+    <ScreenVersion>6</ScreenVersion>
   </Informations>
   <Backgrounds>
     <Background Name="Background1">
@@ -18,7 +18,7 @@
 		<Skin>LogoMain</Skin>
 		<Color Name="White" />
 		<Rect>
-			<X>435</X>
+			<X>405</X>
 			<Y>265.5</Y>
 			<W>1110</W>
 			<H>202.5</H>
@@ -85,18 +85,18 @@
       <Rect>
         <X>420</X>
         <Y>750</Y>
-        <W>510</W>
+        <W>320</W>
         <H>110</H>
         <Z>0</Z>
       </Rect>
       <Color Name="ButtonColor" />
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
-        <X>255</X>
+        <X>160</X>
         <Y>26</Y>
         <Z>0</Z>
         <H>58</H>
-        <MaxW>490</MaxW>
+        <MaxW>300</MaxW>
         <Color Name="ButtonTextColor" />
         <SelColor Name="ButtonTextSelColor" />
         <Align>Center</Align>
@@ -110,20 +110,20 @@
       <Skin>Button</Skin>
       <SkinSelected>Button</SkinSelected>
       <Rect>
-        <X>990</X>
+        <X>800</X>
         <Y>750</Y>
-        <W>510</W>
+        <W>320</W>
         <H>110</H>
         <Z>0</Z>
       </Rect>
       <Color Name="ButtonColor" />
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
-        <X>255</X>
+        <X>160</X>
         <Y>26</Y>
         <Z>0</Z>
         <H>58</H>
-        <MaxW>490</MaxW>
+        <MaxW>300</MaxW>
         <Color Name="ButtonTextColor" />
         <SelColor Name="ButtonTextSelColor" />
         <Align>Center</Align>
@@ -133,6 +133,33 @@
         <Text>TR_SCREENMAIN_BUTTON_PARTY</Text>
       </Text>
     </Button>
+    <Button Name="ButtonJukebox">
+      <Skin>Button</Skin>
+      <SkinSelected>Button</SkinSelected>
+      <Rect>
+        <X>1180</X>
+        <Y>750</Y>
+        <W>320</W>
+        <H>110</H>
+        <Z>0</Z>
+      </Rect>
+      <Color Name="ButtonColor" />
+      <SelColor Name="ButtonSelColor" />
+      <Text Name="Text">
+        <X>160</X>
+        <Y>26</Y>
+        <Z>0</Z>
+        <H>58</H>
+        <MaxW>300</MaxW>
+        <Color Name="ButtonTextColor" />
+        <SelColor Name="ButtonTextSelColor" />
+        <Align>Center</Align>
+        <ResizeAlign>Center</ResizeAlign>
+        <Style>Bold</Style>
+        <Font>Outline</Font>
+        <Text>TR_SCREENMAIN_BUTTON_JUKEBOX</Text>
+      </Text>
+    </Button>
     <Button Name="ButtonStatistics">
       <Skin>Button</Skin>
       <SkinSelected>Button</SkinSelected>
diff --git a/Vocaluxe/Base/CGraphics.cs b/Vocaluxe/Base/CGraphics.cs
index 5a587bc6..176b3d67 100644
--- a/Vocaluxe/Base/CGraphics.cs
+++ b/Vocaluxe/Base/CGraphics.cs
@@ -87,6 +87,8 @@ namespace Vocaluxe.Base
                 _Screens.Add(new CScreenParty());
                 _Screens.Add(new CScreenStatistics());
                 _Screens.Add(new CScreenStatisticsDetail());
+                _Screens.Add(new CScreenJukebox());
+                _Screens.Add(new CScreenJukeboxPlayer());
 
                 Debug.Assert(_Screens.Count == (int)EScreen.CountEntry, "Screen list and screens enum do not match");
 
diff --git a/Vocaluxe/Base/CJukebox.cs b/Vocaluxe/Base/CJukebox.cs
new file mode 100644
index 00000000..164de416
--- /dev/null
+++ b/Vocaluxe/Base/CJukebox.cs
@@ -0,0 +1,404 @@
+#region license
+// This file is part of Vocaluxe.
+//
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using VocaluxeLib;
+using VocaluxeLib.Songs;
+
+namespace Vocaluxe.Base
+{
+    public enum EJukeboxOrder
+    {
+        TR_JUKEBOX_ORDER_RANDOM,
+        TR_JUKEBOX_ORDER_SORTED
+    }
+
+    public enum EJukeboxSection
+    {
+        TR_JUKEBOX_SECTION_FULL,
+        TR_JUKEBOX_SECTION_MEDLEY,
+        TR_JUKEBOX_SECTION_30,
+        TR_JUKEBOX_SECTION_60,
+        TR_JUKEBOX_SECTION_90
+    }
+
+    public class CJukeboxEntry
+    {
+        public readonly int SongId;
+        public readonly int OriginalIndex;
+
+        public CJukeboxEntry(int songId, int originalIndex)
+        {
+            SongId = songId;
+            OriginalIndex = originalIndex;
+        }
+
+        public CSong Song
+        {
+            get { return CSongs.GetSong(SongId); }
+        }
+    }
+
+    static class CJukebox
+    {
+        private static readonly List<CJukeboxEntry> _Queue = new List<CJukeboxEntry>();
+
+        public static ESongSource Source { get; set; } = ESongSource.TR_SONGSOURCE_ALLSONGS;
+        public static int PlaylistId { get; set; } = -1;
+        public static ESongSorting Sorting { get; set; } = ESongSorting.TR_CONFIG_GENRE;
+        public static int Category { get; set; }
+        public static EJukeboxOrder Order { get; set; } = EJukeboxOrder.TR_JUKEBOX_ORDER_RANDOM;
+        public static EJukeboxSection Section { get; set; } = EJukeboxSection.TR_JUKEBOX_SECTION_FULL;
+        public static bool ShowLyrics { get; set; } = true;
+        public static bool ShowVideo { get; set; } = true;
+        public static EAudioMode AudioMode { get; set; } = EAudioMode.TR_AUDIOMODE_NORMAL;
+
+        public static bool Shuffle { get; private set; }
+        public static bool Repeat { get; set; }
+        public static int Current { get; private set; }
+        public static bool SingRequested { get; private set; }
+        public static bool ResumeAfterSinging { get; private set; }
+
+        public static IList<CJukeboxEntry> Queue
+        {
+            get { return _Queue.AsReadOnly(); }
+        }
+
+        public static CJukeboxEntry CurrentEntry
+        {
+            get { return Current >= 0 && Current < _Queue.Count ? _Queue[Current] : null; }
+        }
+
+        public static CJukeboxEntry NextEntry
+        {
+            get
+            {
+                var next = _GetNextIndex();
+                return next >= 0 ? _Queue[next] : null;
+            }
+        }
+
+        public static List<int> GetSongIds()
+        {
+            var ids = new List<int>();
+            switch (Source)
+            {
+                case ESongSource.TR_SONGSOURCE_PLAYLIST:
+                    if (PlaylistId >= 0)
+                    {
+                        for (var i = 0; i < CPlaylists.GetSongCount(PlaylistId); i++)
+                        {
+                            ids.Add(CPlaylists.GetSong(PlaylistId, i).SongId);
+                        }
+                    }
+
+                    break;
+
+                case ESongSource.TR_SONGSOURCE_CATEGORY:
+                    if (Category >= 0 && Category < CSongs.NumCategories)
+                    {
+                        ids.AddRange(CSongs.GetCategoryByIndex(Category).Songs.Select(pointer => pointer.SongId));
+                    }
+
+                    break;
+
+                default:
+                    ids.AddRange(CSongs.AllSongs.OrderBy(song => song.Artist, StringComparer.CurrentCultureIgnoreCase)
+                                       .ThenBy(song => song.Title, StringComparer.CurrentCultureIgnoreCase)
+                                       .Select(song => song.Id));
+                    break;
+            }
+
+            return ids.Where(id => CSongs.GetSong(id) != null).ToList();
+        }
+
+        public static bool Start()
+        {
+            _Queue.Clear();
+            var ids = GetSongIds();
+            for (var i = 0; i < ids.Count; i++)
+            {
+                _Queue.Add(new CJukeboxEntry(ids[i], i));
+            }
+
+            Shuffle = Order == EJukeboxOrder.TR_JUKEBOX_ORDER_RANDOM;
+            if (Shuffle)
+            {
+                _ShuffleRange(0);
+            }
+
+            Current = 0;
+            Repeat = false;
+            SingRequested = false;
+            ResumeAfterSinging = false;
+            return _Queue.Count > 0;
+        }
+
+        public static void SetShuffle(bool shuffle)
+        {
+            if (Shuffle == shuffle)
+            {
+                return;
+            }
+
+            Shuffle = shuffle;
+            if (shuffle)
+            {
+                _ShuffleRange(Current + 1);
+            }
+            else
+            {
+                var upcoming = _Queue.Skip(Current + 1).OrderBy(entry => entry.OriginalIndex).ToList();
+                _Queue.RemoveRange(Current + 1, upcoming.Count);
+                _Queue.AddRange(upcoming);
+            }
+        }
+
+        public static bool Next()
+        {
+            var next = _GetNextIndex();
+            if (next < 0)
+            {
+                return false;
+            }
+
+            if (next <= Current && Shuffle)
+            {
+                var current = _Queue[Current];
+                _ShuffleRange(0);
+                if (_Queue.Count > 1 && _Queue[0] == current)
+                {
+                    _Queue.RemoveAt(0);
+                    _Queue.Add(current);
+                }
+
+                next = 0;
+            }
+
+            Current = next;
+            return true;
+        }
+
+        public static bool Previous()
+        {
+            if (Current <= 0)
+            {
+                return false;
+            }
+
+            Current--;
+            return true;
+        }
+
+        public static void Play(int index)
+        {
+            if (index >= 0 && index < _Queue.Count)
+            {
+                Current = index;
+            }
+        }
+
+        public static void PlayNext(int index)
+        {
+            if (index < 0 || index >= _Queue.Count || index == Current)
+            {
+                return;
+            }
+
+            var entry = _Queue[index];
+            _Queue.RemoveAt(index);
+            if (index < Current)
+            {
+                Current--;
+            }
+
+            _Queue.Insert(Current + 1, entry);
+        }
+
+        public static void Remove(int index)
+        {
+            if (index < 0 || index >= _Queue.Count || index == Current)
+            {
+                return;
+            }
+
+            _Queue.RemoveAt(index);
+            if (index < Current)
+            {
+                Current--;
+            }
+        }
+
+        public static bool Move(int index, int direction)
+        {
+            var target = index + direction;
+            if (index < 0 || index >= _Queue.Count || target < 0 || target >= _Queue.Count)
+            {
+                return false;
+            }
+
+            var entry = _Queue[index];
+            _Queue[index] = _Queue[target];
+            _Queue[target] = entry;
+            if (Current == index)
+            {
+                Current = target;
+            }
+            else if (Current == target)
+            {
+                Current = index;
+            }
+
+            return true;
+        }
+
+        public static void RequestSinging()
+        {
+            SingRequested = true;
+            ResumeAfterSinging = true;
+        }
+
+        public static bool ReturnAfterSinging()
+        {
+            if (!SingRequested)
+            {
+                return false;
+            }
+
+            SingRequested = false;
+            CGraphics.FadeTo(EScreen.JukeboxPlayer);
+            return true;
+        }
+
+        public static bool TakeResume()
+        {
+            var resume = ResumeAfterSinging;
+            ResumeAfterSinging = false;
+            return resume;
+        }
+
+        public static EAudioMode GetAudioMode(CJukeboxEntry entry)
+        {
+            var song = entry == null ? null : entry.Song;
+            return song != null && song.HasInstrumental() && AudioMode == EAudioMode.TR_AUDIOMODE_INSTRUMENTAL
+                       ? EAudioMode.TR_AUDIOMODE_INSTRUMENTAL
+                       : EAudioMode.TR_AUDIOMODE_NORMAL;
+        }
+
+        public static void GetSection(CSong song, float length, out float start, out float end)
+        {
+            start = 0f;
+            end = length;
+            if (song == null)
+            {
+                return;
+            }
+
+            switch (Section)
+            {
+                case EJukeboxSection.TR_JUKEBOX_SECTION_MEDLEY:
+                    if (song.Medley.Source != EDataSource.None)
+                    {
+                        start = Math.Max(0f, CGame.GetTimeFromBeats(song.Medley.StartBeat, song.Bpm) + song.Gap - song.Medley.FadeInTime);
+                        end = Math.Min(length, CGame.GetTimeFromBeats(song.Medley.EndBeat, song.Bpm) + song.Gap + song.Medley.FadeOutTime);
+                    }
+
+                    break;
+
+                case EJukeboxSection.TR_JUKEBOX_SECTION_30:
+                case EJukeboxSection.TR_JUKEBOX_SECTION_60:
+                case EJukeboxSection.TR_JUKEBOX_SECTION_90:
+                    var duration = _GetSectionDuration();
+                    start = song.Preview.Source != EDataSource.None ? song.Preview.StartTime : Math.Max(0f, GetFirstNoteTime(song) - 5f);
+                    if (length > 0f && start + duration > length)
+                    {
+                        start = Math.Max(0f, length - duration);
+                    }
+
+                    end = length > 0f ? Math.Min(length, start + duration) : start + duration;
+                    break;
+            }
+
+            if (end <= start)
+            {
+                start = 0f;
+                end = length;
+            }
+        }
+
+        public static float GetFirstNoteTime(CSong song)
+        {
+            if (song == null)
+            {
+                return 0f;
+            }
+
+            var firstBeat = int.MaxValue;
+            for (var voice = 0; voice < song.Notes.VoiceCount; voice++)
+            {
+                var lines = song.Notes.GetVoice(voice).Lines;
+                if (lines.Length > 0)
+                {
+                    firstBeat = Math.Min(firstBeat, lines[0].FirstNoteBeat);
+                }
+            }
+
+            return firstBeat == int.MaxValue ? 0f : CGame.GetTimeFromBeats(firstBeat, song.Bpm) + song.Gap;
+        }
+
+        private static float _GetSectionDuration()
+        {
+            switch (Section)
+            {
+                case EJukeboxSection.TR_JUKEBOX_SECTION_30:
+                    return 30f;
+                case EJukeboxSection.TR_JUKEBOX_SECTION_60:
+                    return 60f;
+                default:
+                    return 90f;
+            }
+        }
+
+        private static int _GetNextIndex()
+        {
+            if (_Queue.Count == 0)
+            {
+                return -1;
+            }
+
+            if (Current + 1 < _Queue.Count)
+            {
+                return Current + 1;
+            }
+
+            return Repeat ? 0 : -1;
+        }
+
+        private static void _ShuffleRange(int start)
+        {
+            for (var n = _Queue.Count - 1; n > start; n--)
+            {
+                var k = CGame.Rand.Next(start, n + 1);
+                var entry = _Queue[k];
+                _Queue[k] = _Queue[n];
+                _Queue[n] = entry;
+            }
+        }
+    }
+}
diff --git a/Vocaluxe/Screens/CScreenHighscore.cs b/Vocaluxe/Screens/CScreenHighscore.cs
index e866546a..0f9109d8 100644
--- a/Vocaluxe/Screens/CScreenHighscore.cs
+++ b/Vocaluxe/Screens/CScreenHighscore.cs
@@ -510,7 +510,10 @@ namespace Vocaluxe.Screens
                 _HighscoreStream = -1;
             }
 
-            CParty.LeavingHighscore();
+            if (!CJukebox.ReturnAfterSinging())
+            {
+                CParty.LeavingHighscore();
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/Vocaluxe/Screens/CScreenJukebox.cs b/Vocaluxe/Screens/CScreenJukebox.cs
new file mode 100644
index 00000000..9f3e55ef
--- /dev/null
+++ b/Vocaluxe/Screens/CScreenJukebox.cs
@@ -0,0 +1,320 @@
+#region license
+// This file is part of Vocaluxe.
+//
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+using Vocaluxe.Base;
+using VocaluxeLib;
+using VocaluxeLib.Menu;
+
+namespace Vocaluxe.Screens
+{
+    public class CScreenJukebox : CMenu
+    {
+        protected override int _ScreenVersion
+        {
+            get { return 1; }
+        }
+
+        private const string _SelectSlideSource = "SelectSlideSource";
+        private const string _SelectSlidePlaylist = "SelectSlidePlaylist";
+        private const string _SelectSlideSorting = "SelectSlideSorting";
+        private const string _SelectSlideCategory = "SelectSlideCategory";
+        private const string _SelectSlideOrder = "SelectSlideOrder";
+        private const string _SelectSlideSection = "SelectSlideSection";
+        private const string _SelectSlideLyrics = "SelectSlideLyrics";
+        private const string _SelectSlideAudioMode = "SelectSlideAudioMode";
+        private const string _SelectSlideVideo = "SelectSlideVideo";
+
+        private const string _TextSource = "TextSource";
+        private const string _TextPlaylist = "TextPlaylist";
+        private const string _TextSorting = "TextSorting";
+        private const string _TextCategory = "TextCategory";
+        private const string _TextOrder = "TextOrder";
+        private const string _TextSection = "TextSection";
+        private const string _TextLyrics = "TextLyrics";
+        private const string _TextAudioMode = "TextAudioMode";
+        private const string _TextVideo = "TextVideo";
+        private const string _TextInfo = "TextInfo";
+
+        private const string _ButtonBack = "ButtonBack";
+        private const string _ButtonStart = "ButtonStart";
+
+        private static readonly ESongSource[] _Sources = { ESongSource.TR_SONGSOURCE_ALLSONGS, ESongSource.TR_SONGSOURCE_CATEGORY, ESongSource.TR_SONGSOURCE_PLAYLIST };
+        private static readonly EAudioMode[] _AudioModes = { EAudioMode.TR_AUDIOMODE_NORMAL, EAudioMode.TR_AUDIOMODE_INSTRUMENTAL };
+
+        private readonly string[,] _Rows =
+        {
+            { _TextSource, _SelectSlideSource }, { _TextPlaylist, _SelectSlidePlaylist }, { _TextSorting, _SelectSlideSorting },
+            { _TextCategory, _SelectSlideCategory }, { _TextOrder, _SelectSlideOrder }, { _TextSection, _SelectSlideSection },
+            { _TextLyrics, _SelectSlideLyrics }, { _TextAudioMode, _SelectSlideAudioMode }, { _TextVideo, _SelectSlideVideo }
+        };
+
+        private readonly List<float> _RowSlots = new List<float>();
+        private float _TextOffsetY;
+        private List<int> _PlaylistIds = new List<int>();
+        private ESongSorting[] _Sortings;
+
+        public override void Init()
+        {
+            base.Init();
+
+            _ThemeSelectSlides = new string[]
+            {
+                _SelectSlideSource, _SelectSlidePlaylist, _SelectSlideSorting, _SelectSlideCategory, _SelectSlideOrder, _SelectSlideSection, _SelectSlideLyrics,
+                _SelectSlideAudioMode, _SelectSlideVideo
+            };
+            _ThemeTexts = new string[]
+                { _TextSource, _TextPlaylist, _TextSorting, _TextCategory, _TextOrder, _TextSection, _TextLyrics, _TextAudioMode, _TextVideo, _TextInfo };
+            _ThemeButtons = new string[] { _ButtonBack, _ButtonStart };
+
+            _Sortings = ((ESongSorting[])Enum.GetValues(typeof(ESongSorting))).Where(sorting => sorting != ESongSorting.TR_CONFIG_NONE).ToArray();
+        }
+
+        public override void LoadTheme(string xmlPath)
+        {
+            base.LoadTheme(xmlPath);
+
+            _RowSlots.Clear();
+            for (var i = 0; i < _Rows.GetLength(0); i++)
+            {
+                var y = _SelectSlides[_Rows[i, 1]].Y;
+                if (!_RowSlots.Contains(y))
+                {
+                    _RowSlots.Add(y);
+                }
+            }
+
+            _RowSlots.Sort();
+            _TextOffsetY = _Texts[_TextSource].Y - _SelectSlides[_SelectSlideSource].Y;
+
+            _SelectSlides[_SelectSlideSource].Clear();
+            foreach (var source in _Sources)
+            {
+                _SelectSlides[_SelectSlideSource].AddValue(source.ToString());
+            }
+
+            _SelectSlides[_SelectSlideSorting].Clear();
+            foreach (var sorting in _Sortings)
+            {
+                _SelectSlides[_SelectSlideSorting].AddValue(sorting.ToString());
+            }
+
+            _SelectSlides[_SelectSlideOrder].SetValues<EJukeboxOrder>((int)CJukebox.Order);
+            _SelectSlides[_SelectSlideSection].SetValues<EJukeboxSection>((int)CJukebox.Section);
+            _SelectSlides[_SelectSlideLyrics].SetValues<EOffOn>(CJukebox.ShowLyrics ? (int)EOffOn.TR_CONFIG_ON : (int)EOffOn.TR_CONFIG_OFF);
+            _SelectSlides[_SelectSlideVideo].SetValues<EOffOn>(CJukebox.ShowVideo ? (int)EOffOn.TR_CONFIG_ON : (int)EOffOn.TR_CONFIG_OFF);
+
+            _SelectSlides[_SelectSlideAudioMode].Clear();
+            foreach (var audioMode in _AudioModes)
+            {
+                _SelectSlides[_SelectSlideAudioMode].AddValue(audioMode.ToString());
+            }
+        }
+
+        public override void OnShow()
+        {
+            base.OnShow();
+
+            CSongs.Sort(CJukebox.Sorting, EOffOn.TR_CONFIG_ON, CConfig.Config.Game.IgnoreArticles, string.Empty, EDuetOptions.All, -1);
+
+            _FillPlaylists();
+            _FillCategories();
+
+            _SelectSlides[_SelectSlideSource].Selection = Math.Max(0, Array.IndexOf(_Sources, CJukebox.Source));
+            _SelectSlides[_SelectSlideSorting].Selection = Math.Max(0, Array.IndexOf(_Sortings, CJukebox.Sorting));
+            _SelectSlides[_SelectSlideAudioMode].Selection = Math.Max(0, Array.IndexOf(_AudioModes, CJukebox.AudioMode));
+            _SelectSlides[_SelectSlideOrder].Selection = (int)CJukebox.Order;
+            _SelectSlides[_SelectSlideSection].Selection = (int)CJukebox.Section;
+            _SelectSlides[_SelectSlideLyrics].Selection = CJukebox.ShowLyrics ? (int)EOffOn.TR_CONFIG_ON : (int)EOffOn.TR_CONFIG_OFF;
+            _SelectSlides[_SelectSlideVideo].Selection = CJukebox.ShowVideo ? (int)EOffOn.TR_CONFIG_ON : (int)EOffOn.TR_CONFIG_OFF;
+
+            _UpdateLayout();
+            _SelectElement(_Buttons[_ButtonStart].Visible ? _Buttons[_ButtonStart] : _Buttons[_ButtonBack]);
+        }
+
+        public override bool HandleInput(SKeyEvent keyEvent)
+        {
+            base.HandleInput(keyEvent);
+
+            if (keyEvent.KeyPressed)
+            {
+                return true;
+            }
+
+            switch (keyEvent.Key)
+            {
+                case Keys.Escape:
+                case Keys.Back:
+                    CGraphics.FadeTo(EScreen.Main);
+                    break;
+
+                case Keys.Enter:
+                    if (_Buttons[_ButtonBack].Selected)
+                    {
+                        CGraphics.FadeTo(EScreen.Main);
+                    }
+                    else if (_Buttons[_ButtonStart].Selected)
+                    {
+                        _Start();
+                    }
+
+                    break;
+
+                case Keys.Left:
+                case Keys.Right:
+                    _ReadSelection();
+                    break;
+            }
+
+            return true;
+        }
+
+        public override bool HandleMouse(SMouseEvent mouseEvent)
+        {
+            base.HandleMouse(mouseEvent);
+
+            if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
+            {
+                if (_Buttons[_ButtonBack].Selected)
+                {
+                    CGraphics.FadeTo(EScreen.Main);
+                }
+                else if (_Buttons[_ButtonStart].Selected)
+                {
+                    _Start();
+                }
+                else
+                {
+                    _ReadSelection();
+                }
+            }
+            else if (mouseEvent.RB)
+            {
+                CGraphics.FadeTo(EScreen.Main);
+            }
+
+            return true;
+        }
+
+        public override bool UpdateGame()
+        {
+            return true;
+        }
+
+        private void _Start()
+        {
+            _ReadSelection();
+            if (CJukebox.Start())
+            {
+                CGraphics.FadeTo(EScreen.JukeboxPlayer);
+            }
+        }
+
+        private void _ReadSelection()
+        {
+            CJukebox.Source = _Sources[Math.Max(0, _SelectSlides[_SelectSlideSource].Selection)];
+
+            var playlist = _SelectSlides[_SelectSlidePlaylist].Selection;
+            CJukebox.PlaylistId = playlist >= 0 && playlist < _PlaylistIds.Count ? _PlaylistIds[playlist] : -1;
+
+            var sorting = _Sortings[Math.Max(0, _SelectSlides[_SelectSlideSorting].Selection)];
+            if (sorting != CJukebox.Sorting)
+            {
+                CJukebox.Sorting = sorting;
+                CJukebox.Category = 0;
+                CSongs.Sort(CJukebox.Sorting, EOffOn.TR_CONFIG_ON, CConfig.Config.Game.IgnoreArticles, string.Empty, EDuetOptions.All, -1);
+                _FillCategories();
+            }
+            else
+            {
+                CJukebox.Category = Math.Max(0, _SelectSlides[_SelectSlideCategory].Selection);
+            }
+
+            CJukebox.Order = (EJukeboxOrder)_SelectSlides[_SelectSlideOrder].Selection;
+            CJukebox.Section = (EJukeboxSection)_SelectSlides[_SelectSlideSection].Selection;
+            CJukebox.ShowLyrics = _SelectSlides[_SelectSlideLyrics].Selection == (int)EOffOn.TR_CONFIG_ON;
+            CJukebox.ShowVideo = _SelectSlides[_SelectSlideVideo].Selection == (int)EOffOn.TR_CONFIG_ON;
+            CJukebox.AudioMode = _AudioModes[Math.Max(0, _SelectSlides[_SelectSlideAudioMode].Selection)];
+
+            _UpdateLayout();
+        }
+
+        private void _FillPlaylists()
+        {
+            _SelectSlides[_SelectSlidePlaylist].Clear();
+            _PlaylistIds = CPlaylists.Ids;
+            var names = CPlaylists.Names;
+            for (var i = 0; i < _PlaylistIds.Count; i++)
+            {
+                _SelectSlides[_SelectSlidePlaylist].AddValue(names[i] + " (" + CPlaylists.GetSongCount(_PlaylistIds[i]) + ")", null, i);
+            }
+
+            var selection = _PlaylistIds.IndexOf(CJukebox.PlaylistId);
+            _SelectSlides[_SelectSlidePlaylist].Selection = Math.Max(0, selection);
+            CJukebox.PlaylistId = _PlaylistIds.Count > 0 ? _PlaylistIds[Math.Max(0, selection)] : -1;
+        }
+
+        private void _FillCategories()
+        {
+            _SelectSlides[_SelectSlideCategory].Clear();
+            for (var i = 0; i < CSongs.NumCategories; i++)
+            {
+                var category = CSongs.GetCategoryByIndex(i);
+                _SelectSlides[_SelectSlideCategory].AddValue(category.Name + " (" + category.Songs.Count + ")", null, i);
+            }
+
+            if (CJukebox.Category >= CSongs.NumCategories)
+            {
+                CJukebox.Category = 0;
+            }
+
+            _SelectSlides[_SelectSlideCategory].Selection = CJukebox.Category;
+        }
+
+        private void _UpdateLayout()
+        {
+            _SelectSlides[_SelectSlidePlaylist].Visible = CJukebox.Source == ESongSource.TR_SONGSOURCE_PLAYLIST;
+            _SelectSlides[_SelectSlideSorting].Visible = CJukebox.Source == ESongSource.TR_SONGSOURCE_CATEGORY;
+            _SelectSlides[_SelectSlideCategory].Visible = CJukebox.Source == ESongSource.TR_SONGSOURCE_CATEGORY;
+
+            var slot = 0;
+            for (var i = 0; i < _Rows.GetLength(0); i++)
+            {
+                var slide = _SelectSlides[_Rows[i, 1]];
+                var text = _Texts[_Rows[i, 0]];
+                text.Visible = slide.Visible;
+                if (!slide.Visible || slot >= _RowSlots.Count)
+                {
+                    continue;
+                }
+
+                slide.Y = _RowSlots[slot];
+                text.Y = _RowSlots[slot] + _TextOffsetY;
+                slot++;
+            }
+
+            var numSongs = CJukebox.GetSongIds().Count;
+            _Texts[_TextInfo].Text = numSongs > 0
+                                         ? CLanguage.Translate("TR_SCREENJUKEBOX_NUMSONGS").Replace("%d", numSongs.ToString())
+                                         : CLanguage.Translate("TR_SCREENJUKEBOX_NOSONGS");
+            _Buttons[_ButtonStart].Visible = numSongs > 0;
+        }
+    }
+}
diff --git a/Vocaluxe/Screens/CScreenJukeboxPlayer.cs b/Vocaluxe/Screens/CScreenJukeboxPlayer.cs
new file mode 100644
index 00000000..15fd6b60
--- /dev/null
+++ b/Vocaluxe/Screens/CScreenJukeboxPlayer.cs
@@ -0,0 +1,1373 @@
+#region license
+// This file is part of Vocaluxe.
+//
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Windows.Forms;
+using Vocaluxe.Base;
+using VocaluxeLib;
+using VocaluxeLib.Draw;
+using VocaluxeLib.Menu;
+using VocaluxeLib.Songs;
+using VocaluxeLib.Utils.Player;
+
+namespace Vocaluxe.Screens
+{
+    public class CScreenJukeboxPlayer : CMenu
+    {
+        protected override int _ScreenVersion
+        {
+            get { return 1; }
+        }
+
+        private sealed class CTrack
+        {
+            public CJukeboxEntry Entry;
+            public CSongPlayer Player;
+            public EAudioMode AudioMode;
+            public float Start;
+            public float End;
+            public CTextureRef Background;
+            public bool FadeInBackground = true;
+            public readonly Stopwatch FadeTimer = new Stopwatch();
+            public readonly Stopwatch ShowTimer = new Stopwatch();
+        }
+
+        private sealed class CQueueRow
+        {
+            public CStatic Highlight;
+            public CStatic Playing;
+            public CStatic PlayingIcon;
+            public CStatic Cover;
+            public CText Title;
+            public CText Artist;
+        }
+
+        private const string _StaticInfoBG = "StaticInfoBG";
+        private const string _StaticInfoCover = "StaticInfoCover";
+        private const string _StaticLyrics = "StaticLyrics";
+        private const string _StaticBarBG = "StaticBarBG";
+        private const string _StaticTimeBarBG = "StaticTimeBarBG";
+        private const string _StaticTimeBarFill = "StaticTimeBarFill";
+        private const string _StaticQueueBG = "StaticQueueBG";
+        private const string _StaticQueueSearch = "StaticQueueSearch";
+        private const string _StaticQueueRow = "StaticQueueRow";
+        private const string _StaticQueueRowPlaying = "StaticQueueRowPlaying";
+        private const string _StaticQueuePlaying = "StaticQueuePlaying";
+        private const string _StaticQueueCover = "StaticQueueCover";
+        private const string _StaticAudioModeNormal = "StaticAudioModeNormal";
+        private const string _StaticAudioModeInstrumental = "StaticAudioModeInstrumental";
+        private const string _StaticAudioModeIcon = "StaticAudioModeIcon";
+
+        private const string _TextInfoTitle = "TextInfoTitle";
+        private const string _TextInfoArtist = "TextInfoArtist";
+        private const string _TextInfoPosition = "TextInfoPosition";
+        private const string _TextTimeElapsed = "TextTimeElapsed";
+        private const string _TextTimeTotal = "TextTimeTotal";
+        private const string _TextQueueTitle = "TextQueueTitle";
+        private const string _TextQueueCount = "TextQueueCount";
+        private const string _TextQueueSearch = "TextQueueSearch";
+        private const string _TextQueueHelp = "TextQueueHelp";
+        private const string _TextQueueHelp2 = "TextQueueHelp2";
+        private const string _TextQueueEntryTitle = "TextQueueEntryTitle";
+        private const string _TextQueueEntryArtist = "TextQueueEntryArtist";
+
+        private const string _LyricMain = "LyricMain";
+        private const string _LyricSub = "LyricSub";
+        private const string _LyricMainBar = "LyricMainBar";
+
+        private const string _ButtonPrevious = "ButtonPrevious";
+        private const string _ButtonPlay = "ButtonPlay";
+        private const string _ButtonPause = "ButtonPause";
+        private const string _ButtonNext = "ButtonNext";
+        private const string _ButtonSkipIntro = "ButtonSkipIntro";
+        private const string _ButtonShuffle = "ButtonShuffle";
+        private const string _ButtonRepeat = "ButtonRepeat";
+        private const string _ButtonLyrics = "ButtonLyrics";
+        private const string _ButtonAudioMode = "ButtonAudioMode";
+        private const string _ButtonQueue = "ButtonQueue";
+        private const string _ButtonSing = "ButtonSing";
+
+        private const int _MaxQueueRows = 12;
+        private const float _QueueRowSpacing = 4f;
+        private const float _QueueHelpSpacing = 10f;
+        private const float _HideDelay = 5f;
+        private const float _InfoDuration = 6f;
+        private const float _UiFadeSpeed = 4f;
+        private const float _PreloadTime = 10f;
+        private const float _SkipIntroLeadTime = 3f;
+        private const float _RestartThreshold = 3f;
+        private const float _DimmedAlpha = 0.35f;
+        private const float _BackgroundFadeTime = 3f;
+
+        private readonly Stopwatch _InputTimer = new Stopwatch();
+        private readonly Stopwatch _InfoTimer = new Stopwatch();
+        private readonly Stopwatch _FrameTimer = new Stopwatch();
+        private readonly List<CTrack> _FadingTracks = new List<CTrack>();
+        private readonly List<CQueueRow> _QueueRows = new List<CQueueRow>();
+        private readonly List<int> _Filtered = new List<int>();
+        private readonly List<IMenuElement> _InfoElements = new List<IMenuElement>();
+        private readonly List<IMenuElement> _BarElements = new List<IMenuElement>();
+        private readonly List<IMenuElement> _QueueElements = new List<IMenuElement>();
+        private readonly List<IMenuElement> _LyricElements = new List<IMenuElement>();
+        private readonly Dictionary<string, SColorF> _ButtonColors = new Dictionary<string, SColorF>();
+
+        private CTrack _Current;
+        private CTrack _Preloaded;
+        private bool _PreloadTried;
+        private bool _Paused;
+        private bool _Leaving;
+        private bool _QueueOpen;
+        private int _QueueSelected;
+        private int _QueueScroll;
+        private string _Search = string.Empty;
+        private int _CurrentLine = -1;
+        private float _UiAlpha = 1f;
+        private float _InfoAlpha = 1f;
+        private float _LyricBarOffset;
+        private float _TimeBarWidth;
+        private int _VisibleRows = 1;
+        private float _QueueRowTop;
+        private float _QueueRowStep;
+        private float _QueuePanelMargin;
+        private float _QueueHelpOffset;
+        private float _QueueHelp2Offset;
+
+        public override EMusicType CurrentMusicType
+        {
+            get { return EMusicType.Game; }
+        }
+
+        public override void Init()
+        {
+            base.Init();
+
+            _ThemeStatics = new string[]
+            {
+                _StaticInfoBG, _StaticInfoCover, _StaticLyrics, _StaticBarBG, _StaticTimeBarBG, _StaticTimeBarFill, _StaticQueueBG, _StaticQueueSearch, _StaticQueueRow,
+                _StaticQueueRowPlaying, _StaticQueuePlaying, _StaticQueueCover, _StaticAudioModeNormal, _StaticAudioModeInstrumental,
+                _StaticAudioModeIcon
+            };
+            _ThemeTexts = new string[]
+            {
+                _TextInfoTitle, _TextInfoArtist, _TextInfoPosition, _TextTimeElapsed, _TextTimeTotal, _TextQueueTitle, _TextQueueCount, _TextQueueSearch,
+                _TextQueueHelp, _TextQueueHelp2, _TextQueueEntryTitle, _TextQueueEntryArtist
+            };
+            _ThemeLyrics = new string[] { _LyricMain, _LyricSub, _LyricMainBar };
+            _ThemeButtons = new string[]
+            {
+                _ButtonPrevious, _ButtonPlay, _ButtonPause, _ButtonNext, _ButtonSkipIntro, _ButtonShuffle, _ButtonRepeat, _ButtonLyrics, _ButtonAudioMode, _ButtonQueue,
+                _ButtonSing
+            };
+        }
+
+        public override void LoadTheme(string xmlPath)
+        {
+            base.LoadTheme(xmlPath);
+
+            _LyricBarOffset = _Lyrics[_LyricMainBar].Y - _Lyrics[_LyricMain].Y;
+            _Lyrics[_LyricMainBar].Visible = false;
+            _TimeBarWidth = _Statics[_StaticTimeBarBG].W;
+
+            _Statics[_StaticAudioModeNormal].Visible = false;
+            _Statics[_StaticAudioModeInstrumental].Visible = false;
+
+            _ButtonColors.Clear();
+            foreach (var name in new[] { _ButtonSkipIntro, _ButtonShuffle, _ButtonRepeat, _ButtonLyrics, _ButtonAudioMode })
+            {
+                _ButtonColors[name] = _Buttons[name].Color;
+            }
+
+            _CreateQueueRows();
+
+            var panel = _Statics[_StaticQueueBG].Rect;
+            var panelBottom = panel.Y + panel.H;
+            _QueuePanelMargin = _Statics[_StaticLyrics].Y + _LyricBarOffset - panelBottom;
+            _QueueHelpOffset = panelBottom - _Texts[_TextQueueHelp].Y;
+            _QueueHelp2Offset = panelBottom - _Texts[_TextQueueHelp2].Y;
+
+            _LyricElements.Clear();
+            _LyricElements.AddRange(new IMenuElement[] { _Statics[_StaticLyrics], _Lyrics[_LyricMain], _Lyrics[_LyricSub] });
+
+            _InfoElements.Clear();
+            _InfoElements.AddRange(new IMenuElement[]
+                { _Statics[_StaticInfoBG], _Statics[_StaticInfoCover], _Texts[_TextInfoTitle], _Texts[_TextInfoArtist], _Texts[_TextInfoPosition] });
+
+            _BarElements.Clear();
+            _BarElements.AddRange(new IMenuElement[]
+            {
+                _Statics[_StaticBarBG], _Statics[_StaticTimeBarBG], _Statics[_StaticTimeBarFill], _Texts[_TextTimeElapsed], _Texts[_TextTimeTotal], _Statics[_StaticAudioModeIcon]
+            });
+            foreach (var button in _ThemeButtons)
+            {
+                _BarElements.Add(_Buttons[button]);
+            }
+
+            _QueueElements.Clear();
+            _QueueElements.AddRange(new IMenuElement[]
+            {
+                _Statics[_StaticQueueBG], _Statics[_StaticQueueSearch], _Texts[_TextQueueTitle], _Texts[_TextQueueCount], _Texts[_TextQueueSearch], _Texts[_TextQueueHelp],
+                _Texts[_TextQueueHelp2]
+            });
+            foreach (var row in _QueueRows)
+            {
+                _QueueElements.AddRange(new IMenuElement[] { row.Highlight, row.Playing, row.PlayingIcon, row.Cover, row.Title, row.Artist });
+            }
+
+            _Texts[_TextQueueTitle].Text = "TR_SCREENJUKEBOXPLAYER_QUEUE";
+            _Texts[_TextQueueHelp].Text = "TR_SCREENJUKEBOXPLAYER_QUEUEHELP";
+            _Texts[_TextQueueHelp2].Text = "TR_SCREENJUKEBOXPLAYER_QUEUEHELP2";
+            _UpdateQueueLayout();
+        }
+
+        public override void OnShow()
+        {
+            base.OnShow();
+
+            _Leaving = false;
+            _Paused = false;
+            _QueueOpen = false;
+            _Search = string.Empty;
+            _UiAlpha = 1f;
+            _InfoAlpha = 1f;
+            _CurrentLine = -1;
+            _InputTimer.Restart();
+            _InfoTimer.Restart();
+            _FrameTimer.Restart();
+
+            _Lyrics[_LyricMain].LyricStyle = CConfig.Config.Theme.LyricStyle;
+            _Lyrics[_LyricSub].LyricStyle = CConfig.Config.Theme.LyricStyle;
+            _Lyrics[_LyricMain].Clear();
+            _Lyrics[_LyricSub].Clear();
+
+            if (CJukebox.TakeResume())
+            {
+                CBackgroundMusic.StopPreview();
+                if (!CJukebox.Next())
+                {
+                    CJukebox.Play(0);
+                }
+            }
+
+            _UpdateFilter();
+            _UpdateControls();
+            _SelectElement(_Buttons[_ButtonPause]);
+        }
+
+        public override void OnClose()
+        {
+            base.OnClose();
+            _DisposeAll();
+        }
+
+        public override bool HandleInput(SKeyEvent keyEvent)
+        {
+            if (_Leaving)
+            {
+                return true;
+            }
+
+            var hidden = _UiAlpha < 0.5f && _IsUiIdle();
+            _InputTimer.Restart();
+            if (hidden)
+            {
+                return true;
+            }
+
+            if (_QueueOpen)
+            {
+                _HandleQueueInput(keyEvent);
+                return true;
+            }
+
+            base.HandleInput(keyEvent);
+
+            if (keyEvent.KeyPressed)
+            {
+                return true;
+            }
+
+            switch (keyEvent.Key)
+            {
+                case Keys.Escape:
+                case Keys.Back:
+                    _Leave();
+                    break;
+
+                case Keys.Space:
+                    _TogglePause();
+                    break;
+
+                case Keys.Enter:
+                    _HandleButton();
+                    break;
+            }
+
+            return true;
+        }
+
+        public override bool HandleMouse(SMouseEvent mouseEvent)
+        {
+            if (_Leaving)
+            {
+                return true;
+            }
+
+            var hidden = _UiAlpha < 0.5f && _IsUiIdle();
+            _InputTimer.Restart();
+            if (hidden)
+            {
+                return true;
+            }
+
+            if (_QueueOpen && _HandleQueueMouse(mouseEvent))
+            {
+                return true;
+            }
+
+            base.HandleMouse(mouseEvent);
+
+            if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
+            {
+                _HandleButton();
+            }
+            else if (mouseEvent.RB)
+            {
+                if (_QueueOpen)
+                {
+                    _ToggleQueue();
+                }
+                else
+                {
+                    _Leave();
+                }
+            }
+
+            return true;
+        }
+
+        public override bool UpdateGame()
+        {
+            var delta = (float)_FrameTimer.Elapsed.TotalSeconds;
+            _FrameTimer.Restart();
+
+            if (_Leaving)
+            {
+                return true;
+            }
+
+            if (_Current == null && !_StartTrack(CJukebox.CurrentEntry))
+            {
+                _PlayNextEntry(true);
+                return true;
+            }
+
+            _UpdatePlayback();
+            _UpdateFadingTracks();
+            _UpdateLyrics();
+            _UpdateQueueLayout();
+            _UpdateUi(delta);
+            _UpdateControls();
+            return true;
+        }
+
+        public override void Draw()
+        {
+            var hasBackground = _DrawBackground();
+            foreach (var background in _Backgrounds)
+            {
+                background.Visible = !hasBackground;
+            }
+
+            var groups = new[] { _LyricElements, _InfoElements, _BarElements, _QueueElements };
+            var alphas = new[] { 1f, _InfoAlpha, _UiAlpha, _QueueOpen ? _UiAlpha : 0f };
+            var offsets = new[] { _LyricBarOffset * _UiAlpha, 0f, 0f, 0f };
+            var visible = new List<IMenuElement>[groups.Length];
+            for (var i = 0; i < groups.Length; i++)
+            {
+                visible[i] = groups[i].Where(e => e.Visible).ToList();
+                foreach (var element in visible[i])
+                {
+                    element.Visible = false;
+                }
+            }
+
+            base.Draw();
+
+            for (var i = 0; i < groups.Length; i++)
+            {
+                if (alphas[i] > 0f)
+                {
+                    CDraw.PushTransform(1f, 0f, 0f, offsets[i], alphas[i]);
+                    foreach (var element in visible[i].OrderByDescending(e => e.MaxRect.Z))
+                    {
+                        element.Visible = true;
+                        element.Draw();
+                    }
+
+                    CDraw.PopTransform();
+                }
+
+                foreach (var element in visible[i])
+                {
+                    element.Visible = true;
+                }
+            }
+        }
+
+        private bool _DrawBackground()
+        {
+            var drawn = false;
+            foreach (var track in _FadingTracks.Concat(new[] { _Current }).Where(t => t != null))
+            {
+                CTextureRef texture = null;
+                if (CJukebox.ShowVideo && track.Player.SongHasVideo)
+                {
+                    texture = track.Player.GetVideoTexture();
+                }
+
+                var alpha = 1f;
+                if (texture == null && track.Background != null)
+                {
+                    texture = track.Background;
+                    if (track.FadeInBackground)
+                    {
+                        alpha = Math.Min(1f, (float)track.ShowTimer.Elapsed.TotalSeconds / _BackgroundFadeTime);
+                    }
+                }
+
+                if (texture == null)
+                {
+                    continue;
+                }
+
+                var color = texture.Color;
+                color.A *= alpha;
+                var bounds = CSettings.RenderRect;
+                var aspect = texture.OrigAspect <= 1.5 || texture.OrigAspect >= 1.9 ? EAspect.LetterBox : EAspect.Crop;
+                CDraw.DrawTexture(texture, CHelper.FitInBounds(bounds, texture.OrigAspect, aspect), color, bounds);
+                drawn = true;
+            }
+
+            return drawn;
+        }
+
+        private void _CreateQueueRows()
+        {
+            foreach (var row in _QueueRows)
+            {
+                _RemoveQueueRow(row);
+            }
+
+            _QueueRows.Clear();
+            var template = _Statics[_StaticQueueRow].Rect;
+            var step = template.H + _QueueRowSpacing;
+            _QueueRowTop = template.Y;
+            _QueueRowStep = step;
+            for (var i = 0; i < _MaxQueueRows; i++)
+            {
+                var row = new CQueueRow
+                {
+                    Highlight = GetNewStatic(_Statics[_StaticQueueRow]),
+                    Playing = GetNewStatic(_Statics[_StaticQueueRowPlaying]),
+                    PlayingIcon = GetNewStatic(_Statics[_StaticQueuePlaying]),
+                    Cover = GetNewStatic(_Statics[_StaticQueueCover]),
+                    Title = GetNewText(_Texts[_TextQueueEntryTitle]),
+                    Artist = GetNewText(_Texts[_TextQueueEntryArtist])
+                };
+                var offset = i * step;
+                row.Highlight.Y += offset;
+                row.Playing.Y += offset;
+                row.PlayingIcon.Y += offset;
+                row.Cover.Y += offset;
+                row.Title.Y += offset;
+                row.Artist.Y += offset;
+                _AddStatic(row.Highlight);
+                _AddStatic(row.Playing);
+                _AddStatic(row.PlayingIcon);
+                _AddStatic(row.Cover);
+                _AddText(row.Title);
+                _AddText(row.Artist);
+                _QueueRows.Add(row);
+            }
+
+            _Statics[_StaticQueueRow].Visible = false;
+            _Statics[_StaticQueueRowPlaying].Visible = false;
+            _Statics[_StaticQueuePlaying].Visible = false;
+            _Statics[_StaticQueueCover].Visible = false;
+            _Texts[_TextQueueEntryTitle].Visible = false;
+            _Texts[_TextQueueEntryArtist].Visible = false;
+        }
+
+        private static void _RemoveQueueRow(CQueueRow row)
+        {
+            row.Highlight.Visible = false;
+            row.Playing.Visible = false;
+            row.PlayingIcon.Visible = false;
+            row.Cover.Visible = false;
+            row.Title.Visible = false;
+            row.Artist.Visible = false;
+        }
+
+        private CTrack _LoadTrack(CJukeboxEntry entry)
+        {
+            var song = entry == null ? null : entry.Song;
+            if (song == null)
+            {
+                return null;
+            }
+
+            var track = new CTrack { Entry = entry, Player = new CSongPlayer(), AudioMode = CJukebox.GetAudioMode(entry) };
+            var file = track.AudioMode == EAudioMode.TR_AUDIOMODE_INSTRUMENTAL ? song.GetInstrumental() : song.GetMP3();
+            track.Player.Load(song, file, CJukebox.ShowVideo);
+            if (!track.Player.SoundLoaded)
+            {
+                track.Player.Close();
+                return null;
+            }
+
+            CJukebox.GetSection(song, track.Player.Length, out track.Start, out track.End);
+            if (track.Start > 0f)
+            {
+                track.Player.SetPosition(track.Start);
+            }
+
+            if ((!CJukebox.ShowVideo || !track.Player.SongHasVideo) && song.BackgroundFileNames.Count > 0)
+            {
+                track.Background = CDraw.AddTexture(Path.Combine(song.Folder, song.BackgroundFileNames[0]));
+            }
+
+            return track;
+        }
+
+        private bool _StartTrack(CJukeboxEntry entry)
+        {
+            var track = _Preloaded != null && _Preloaded.Entry == entry ? _Preloaded : _LoadTrack(entry);
+            if (_Preloaded != null && _Preloaded != track)
+            {
+                _DisposeTrack(_Preloaded);
+            }
+
+            _Preloaded = null;
+            _PreloadTried = false;
+
+            if (_Current != null)
+            {
+                _FadeOut(_Current);
+            }
+
+            _Current = track;
+            if (track == null)
+            {
+                return false;
+            }
+
+            _Paused = false;
+            track.Player.Play();
+            track.ShowTimer.Restart();
+            _CurrentLine = -1;
+            _Lyrics[_LyricMain].Clear();
+            _Lyrics[_LyricSub].Clear();
+            _InfoTimer.Restart();
+            _UpdateSongInfo();
+            _UpdateFilter();
+            return true;
+        }
+
+        private void _PlayNextEntry(bool automatic)
+        {
+            var attempts = CJukebox.Queue.Count;
+            while (attempts-- > 0)
+            {
+                if (!CJukebox.Next())
+                {
+                    if (automatic)
+                    {
+                        _Leave();
+                    }
+
+                    return;
+                }
+
+                if (_StartTrack(CJukebox.CurrentEntry))
+                {
+                    return;
+                }
+            }
+
+            _Leave();
+        }
+
+        private void _PlayPrevious()
+        {
+            if (_Current == null)
+            {
+                return;
+            }
+
+            if (_Current.Player.Position - _Current.Start > _RestartThreshold || !CJukebox.Previous())
+            {
+                _Current.Player.SetPosition(_Current.Start);
+                _CurrentLine = -1;
+                return;
+            }
+
+            _StartTrack(CJukebox.CurrentEntry);
+        }
+
+        private void _UpdatePlayback()
+        {
+            if (_Current == null || _Paused)
+            {
+                return;
+            }
+
+            var player = _Current.Player;
+            var position = player.Position;
+            var end = _Current.End > 0f ? _Current.End : player.Length;
+            var fadeTime = CBase.Settings.GetSoundPlayerFadeTime();
+
+            if (_Preloaded == null && !_PreloadTried && end - position < _PreloadTime && CJukebox.Current + 1 < CJukebox.Queue.Count)
+            {
+                _PreloadTried = true;
+                _Preloaded = _LoadTrack(CJukebox.NextEntry);
+            }
+
+            if ((end > 0f && position >= end - fadeTime) || player.IsFinished)
+            {
+                _PlayNextEntry(true);
+            }
+        }
+
+        private void _UpdateFadingTracks()
+        {
+            var fadeTime = CBase.Settings.GetSoundPlayerFadeTime();
+            foreach (var track in _FadingTracks.Where(t => t.FadeTimer.Elapsed.TotalSeconds > fadeTime + 0.5f).ToList())
+            {
+                _FadingTracks.Remove(track);
+                _DisposeTrack(track);
+            }
+        }
+
+        private void _FadeOut(CTrack track)
+        {
+            track.Player.Pause();
+            track.FadeTimer.Restart();
+            _FadingTracks.Add(track);
+        }
+
+        private static void _DisposeTrack(CTrack track)
+        {
+            track.Player.Close();
+            if (track.Background != null)
+            {
+                CDraw.RemoveTexture(ref track.Background);
+            }
+        }
+
+        private void _DisposeAll()
+        {
+            foreach (var track in _FadingTracks)
+            {
+                _DisposeTrack(track);
+            }
+
+            _FadingTracks.Clear();
+            if (_Preloaded != null)
+            {
+                _DisposeTrack(_Preloaded);
+                _Preloaded = null;
+            }
+
+            if (_Current != null)
+            {
+                _DisposeTrack(_Current);
+                _Current = null;
+            }
+        }
+
+        private void _ResetPreload()
+        {
+            if (_Preloaded != null)
+            {
+                _DisposeTrack(_Preloaded);
+                _Preloaded = null;
+            }
+
+            _PreloadTried = false;
+        }
+
+        private void _Leave()
+        {
+            if (_Leaving)
+            {
+                return;
+            }
+
+            _Leaving = true;
+            _DisposeAll();
+            CGraphics.FadeTo(EScreen.Jukebox);
+        }
+
+        private void _TogglePause()
+        {
+            if (_Current == null)
+            {
+                return;
+            }
+
+            _Paused = !_Paused;
+            if (_Paused)
+            {
+                _Current.Player.Pause();
+                _SelectElement(_Buttons[_ButtonPlay]);
+            }
+            else
+            {
+                _Current.Player.Play();
+                _SelectElement(_Buttons[_ButtonPause]);
+            }
+
+            _UpdateControls();
+        }
+
+        private void _SkipIntro()
+        {
+            if (!_CanSkipIntro())
+            {
+                return;
+            }
+
+            _Current.Player.SetPosition(CJukebox.GetFirstNoteTime(_Current.Entry.Song) - _SkipIntroLeadTime);
+            _CurrentLine = -1;
+        }
+
+        private bool _CanSkipIntro()
+        {
+            if (_Current == null)
+            {
+                return false;
+            }
+
+            var target = CJukebox.GetFirstNoteTime(_Current.Entry.Song) - _SkipIntroLeadTime;
+            return _Current.Player.Position < target - 1f && (_Current.End <= 0f || target < _Current.End - CBase.Settings.GetSoundPlayerFadeTime());
+        }
+
+        private void _ToggleAudioMode()
+        {
+            if (_Current == null || !_Current.Entry.Song.HasInstrumental())
+            {
+                return;
+            }
+
+            CJukebox.AudioMode = _Current.AudioMode == EAudioMode.TR_AUDIOMODE_INSTRUMENTAL ? EAudioMode.TR_AUDIOMODE_NORMAL : EAudioMode.TR_AUDIOMODE_INSTRUMENTAL;
+            _ResetPreload();
+
+            var position = _Current.Player.Position;
+            var track = _LoadTrack(_Current.Entry);
+            if (track == null)
+            {
+                return;
+            }
+
+            track.Player.SetPosition(position);
+            track.FadeInBackground = false;
+            track.ShowTimer.Restart();
+            _FadeOut(_Current);
+            _Current = track;
+            if (!_Paused)
+            {
+                track.Player.Play();
+            }
+        }
+
+        private void _SingNow()
+        {
+            var entry = CJukebox.CurrentEntry;
+            var song = entry == null ? null : entry.Song;
+            if (song == null)
+            {
+                return;
+            }
+
+            var position = _Current != null ? _Current.Player.Position : -1f;
+            _Leaving = true;
+            CJukebox.RequestSinging();
+            _DisposeAll();
+
+            CParty.SetNormalGameMode();
+            CGame.Reset();
+            CGame.ClearSongs();
+            var gameMode = song.IsGameModeAvailable(EGameMode.TR_GAMEMODE_DUET) ? EGameMode.TR_GAMEMODE_DUET : EGameMode.TR_GAMEMODE_NORMAL;
+            CGame.AddSong(entry.SongId, gameMode);
+            CBackgroundMusic.LoadPreview(song, position);
+            CGame.GotoNameSelection();
+        }
+
+        private void _HandleButton()
+        {
+            if (_Buttons[_ButtonPrevious].Selected)
+            {
+                _PlayPrevious();
+            }
+            else if (_Buttons[_ButtonPlay].Selected || _Buttons[_ButtonPause].Selected)
+            {
+                _TogglePause();
+            }
+            else if (_Buttons[_ButtonNext].Selected)
+            {
+                _PlayNextEntry(false);
+            }
+            else if (_Buttons[_ButtonSkipIntro].Selected)
+            {
+                _SkipIntro();
+            }
+            else if (_Buttons[_ButtonShuffle].Selected)
+            {
+                CJukebox.SetShuffle(!CJukebox.Shuffle);
+                _ResetPreload();
+                _UpdateFilter();
+            }
+            else if (_Buttons[_ButtonRepeat].Selected)
+            {
+                CJukebox.Repeat = !CJukebox.Repeat;
+                _ResetPreload();
+            }
+            else if (_Buttons[_ButtonLyrics].Selected)
+            {
+                CJukebox.ShowLyrics = !CJukebox.ShowLyrics;
+                _CurrentLine = -1;
+            }
+            else if (_Buttons[_ButtonAudioMode].Selected)
+            {
+                _ToggleAudioMode();
+            }
+            else if (_Buttons[_ButtonQueue].Selected)
+            {
+                _ToggleQueue();
+            }
+            else if (_Buttons[_ButtonSing].Selected)
+            {
+                _SingNow();
+            }
+
+            _UpdateControls();
+        }
+
+        private void _ToggleQueue()
+        {
+            _QueueOpen = !_QueueOpen;
+            _Search = string.Empty;
+            _UpdateFilter();
+            if (_QueueOpen)
+            {
+                _QueueSelected = Math.Max(0, _Filtered.IndexOf(CJukebox.Current));
+                _QueueScroll = _QueueSelected;
+                _ClampQueueScroll();
+            }
+            else
+            {
+                _SelectElement(_Buttons[_ButtonQueue]);
+            }
+
+            _UpdateQueueRows();
+        }
+
+        private void _HandleQueueInput(SKeyEvent keyEvent)
+        {
+            if (keyEvent.KeyPressed)
+            {
+                if (!Char.IsControl(keyEvent.Unicode) && keyEvent.Mod != EModifier.Ctrl)
+                {
+                    _SetSearch(_Search + keyEvent.Unicode);
+                }
+
+                return;
+            }
+
+            switch (keyEvent.Key)
+            {
+                case Keys.Up:
+                case Keys.Down:
+                    var direction = keyEvent.Key == Keys.Up ? -1 : 1;
+                    var entry = _GetSelectedEntry();
+                    if (keyEvent.ModShift && _Search.Length == 0 && entry != null && CJukebox.Move(_Filtered[_QueueSelected], direction))
+                    {
+                        _ResetPreload();
+                        _UpdateFilter();
+                        _SelectEntry(entry);
+                    }
+                    else
+                    {
+                        _SelectQueueRow(_QueueSelected + direction);
+                    }
+
+                    break;
+
+                case Keys.PageUp:
+                    _SelectQueueRow(_QueueSelected - _VisibleRows);
+                    break;
+
+                case Keys.PageDown:
+                    _SelectQueueRow(_QueueSelected + _VisibleRows);
+                    break;
+
+                case Keys.Enter:
+                    _ActivateSelected();
+                    break;
+
+                case Keys.Delete:
+                    if (_QueueSelected < _Filtered.Count)
+                    {
+                        CJukebox.Remove(_Filtered[_QueueSelected]);
+                        _ResetPreload();
+                        _UpdateFilter();
+                        _SelectQueueRow(_QueueSelected);
+                    }
+
+                    break;
+
+                case Keys.Back:
+                    if (_Search.Length > 0)
+                    {
+                        _SetSearch(_Search.Remove(_Search.Length - 1));
+                    }
+                    else
+                    {
+                        _ToggleQueue();
+                    }
+
+                    break;
+
+                case Keys.Escape:
+                    if (_Search.Length > 0)
+                    {
+                        _SetSearch(string.Empty);
+                    }
+                    else
+                    {
+                        _ToggleQueue();
+                    }
+
+                    break;
+
+                case Keys.Tab:
+                    _ToggleQueue();
+                    break;
+            }
+        }
+
+        private bool _HandleQueueMouse(SMouseEvent mouseEvent)
+        {
+            if (mouseEvent.Wheel != 0 && CHelper.IsInBounds(_Statics[_StaticQueueBG].Rect, mouseEvent))
+            {
+                _QueueScroll += mouseEvent.Wheel;
+                _ClampQueueScroll();
+                _UpdateQueueRows();
+                return true;
+            }
+
+            if (!mouseEvent.LB && !mouseEvent.LD)
+            {
+                return false;
+            }
+
+            for (var i = 0; i < _VisibleRows; i++)
+            {
+                var index = _QueueScroll + i;
+                if (index >= _Filtered.Count || !CHelper.IsInBounds(_QueueRows[i].Highlight.Rect, mouseEvent))
+                {
+                    continue;
+                }
+
+                if (mouseEvent.LD)
+                {
+                    _PlayNow(CJukebox.Queue[_Filtered[index]]);
+                }
+                else if (index == _QueueSelected)
+                {
+                    _ActivateSelected();
+                }
+                else
+                {
+                    _SelectQueueRow(index);
+                }
+
+                return true;
+            }
+
+            return CHelper.IsInBounds(_Statics[_StaticQueueBG].Rect, mouseEvent);
+        }
+
+        private CJukeboxEntry _GetSelectedEntry()
+        {
+            return _QueueSelected < _Filtered.Count ? CJukebox.Queue[_Filtered[_QueueSelected]] : null;
+        }
+
+        private void _SelectEntry(CJukeboxEntry entry)
+        {
+            var queue = CJukebox.Queue;
+            var row = _Filtered.FindIndex(i => queue[i] == entry);
+            if (row >= 0)
+            {
+                _SelectQueueRow(row);
+            }
+        }
+
+        private void _ActivateSelected()
+        {
+            var entry = _GetSelectedEntry();
+            if (entry == null || entry == CJukebox.CurrentEntry)
+            {
+                return;
+            }
+
+            if (entry == CJukebox.NextEntry)
+            {
+                _PlayNow(entry);
+                return;
+            }
+
+            CJukebox.PlayNext(CJukebox.Queue.IndexOf(entry));
+            _ResetPreload();
+            _UpdateFilter();
+            _SelectEntry(entry);
+        }
+
+        private void _PlayNow(CJukeboxEntry entry)
+        {
+            var index = CJukebox.Queue.IndexOf(entry);
+            if (index < 0 || index == CJukebox.Current)
+            {
+                return;
+            }
+
+            CJukebox.Play(index);
+            _ResetPreload();
+            _StartTrack(CJukebox.CurrentEntry);
+            _SelectEntry(entry);
+        }
+
+        private void _UpdateQueueLayout()
+        {
+            var limit = _Statics[_StaticLyrics].Visible ? _Statics[_StaticLyrics].Y + _LyricBarOffset : _Statics[_StaticBarBG].Y;
+            var panelBottom = limit - _QueuePanelMargin;
+            var panel = _Statics[_StaticQueueBG];
+            panel.H = panelBottom - panel.Y;
+            _Texts[_TextQueueHelp].Y = panelBottom - _QueueHelpOffset;
+            _Texts[_TextQueueHelp2].Y = panelBottom - _QueueHelp2Offset;
+
+            var rowsBottom = _Texts[_TextQueueHelp].Y - _QueueHelpSpacing;
+            var rows = Math.Max(1, Math.Min(_QueueRows.Count, (int)((rowsBottom - _QueueRowTop + _QueueRowSpacing) / _QueueRowStep)));
+            if (rows != _VisibleRows)
+            {
+                _VisibleRows = rows;
+                _SelectQueueRow(_QueueSelected);
+            }
+        }
+
+        private void _SetSearch(string search)
+        {
+            _Search = search;
+            _UpdateFilter();
+            _QueueSelected = 0;
+            _QueueScroll = 0;
+            _UpdateQueueRows();
+        }
+
+        private void _SelectQueueRow(int index)
+        {
+            _QueueSelected = Math.Max(0, Math.Min(_Filtered.Count - 1, index));
+            if (_QueueSelected < _QueueScroll)
+            {
+                _QueueScroll = _QueueSelected;
+            }
+            else if (_QueueSelected >= _QueueScroll + _VisibleRows)
+            {
+                _QueueScroll = _QueueSelected - _VisibleRows + 1;
+            }
+
+            _ClampQueueScroll();
+            _UpdateQueueRows();
+        }
+
+        private void _ClampQueueScroll()
+        {
+            _QueueScroll = Math.Max(0, Math.Min(Math.Max(0, _Filtered.Count - _VisibleRows), _QueueScroll));
+        }
+
+        private void _UpdateFilter()
+        {
+            _Filtered.Clear();
+            var queue = CJukebox.Queue;
+            for (var i = 0; i < queue.Count; i++)
+            {
+                var song = queue[i].Song;
+                if (song == null)
+                {
+                    continue;
+                }
+
+                if (_Search.Length == 0 || song.Title.IndexOf(_Search, StringComparison.CurrentCultureIgnoreCase) >= 0 ||
+                    song.Artist.IndexOf(_Search, StringComparison.CurrentCultureIgnoreCase) >= 0)
+                {
+                    _Filtered.Add(i);
+                }
+            }
+
+            if (_QueueSelected >= _Filtered.Count)
+            {
+                _QueueSelected = Math.Max(0, _Filtered.Count - 1);
+            }
+
+            _ClampQueueScroll();
+            _UpdateQueueRows();
+            _UpdateSongPosition();
+        }
+
+        private void _UpdateQueueRows()
+        {
+            var queue = CJukebox.Queue;
+            for (var i = 0; i < _QueueRows.Count; i++)
+            {
+                var row = _QueueRows[i];
+                var index = _QueueScroll + i;
+                var visible = i < _VisibleRows && index < _Filtered.Count;
+                var song = visible ? queue[_Filtered[index]].Song : null;
+                visible = visible && song != null;
+
+                row.Highlight.Visible = visible && index == _QueueSelected;
+                row.Playing.Visible = visible && _Filtered[index] == CJukebox.Current;
+                row.PlayingIcon.Visible = row.Playing.Visible;
+                row.Cover.Visible = visible;
+                row.Title.Visible = visible;
+                row.Artist.Visible = visible;
+                if (!visible)
+                {
+                    continue;
+                }
+
+                row.Cover.Texture = song.CoverTextureSmall;
+                row.Title.Text = song.Title;
+                row.Artist.Text = song.Artist;
+            }
+
+            _Texts[_TextQueueCount].Text = CLanguage.Translate("TR_SCREENJUKEBOXPLAYER_NUMSONGS").Replace("%d", _Filtered.Count.ToString());
+            _Texts[_TextQueueSearch].Text = _Search.Length > 0 ? _Search : CLanguage.Translate("TR_SCREENJUKEBOXPLAYER_SEARCH");
+        }
+
+        private void _UpdateSongInfo()
+        {
+            var song = _Current == null ? null : _Current.Entry.Song;
+            if (song == null)
+            {
+                return;
+            }
+
+            _Statics[_StaticInfoCover].Texture = song.CoverTextureBig;
+            _Texts[_TextInfoTitle].Text = song.Title;
+            _Texts[_TextInfoArtist].Text = song.Artist;
+            _UpdateSongPosition();
+        }
+
+        private void _UpdateSongPosition()
+        {
+            _Texts[_TextInfoPosition].Text = (CJukebox.Current + 1) + " / " + CJukebox.Queue.Count;
+        }
+
+        private void _UpdateLyrics()
+        {
+            var main = _Lyrics[_LyricMain];
+            var sub = _Lyrics[_LyricSub];
+
+            var song = _Current == null ? null : _Current.Entry.Song;
+            var visible = CJukebox.ShowLyrics && song != null && song.Notes.VoiceCount > 0;
+            main.Visible = visible;
+            sub.Visible = visible;
+            _Statics[_StaticLyrics].Visible = visible;
+            if (!visible)
+            {
+                return;
+            }
+
+            var position = _Current.Player.Position;
+            var beat = CGame.GetBeatFromTime(position, song.Bpm, song.Gap);
+            CSongLine[] lines = null;
+            var line = -1;
+            var key = -1;
+            var bestScore = float.MaxValue;
+            for (var voiceNr = 0; voiceNr < song.Notes.VoiceCount; voiceNr++)
+            {
+                var voice = song.Notes.GetVoice(voiceNr);
+                var voiceLines = voice.Lines;
+                var nr = _FindCurrentLine(voice, voiceLines, song, position - song.Gap, (int)Math.Floor(beat));
+                if (nr < 0)
+                {
+                    continue;
+                }
+
+                var candidate = voiceLines[nr];
+                float score;
+                if (beat > candidate.LastNoteBeat)
+                {
+                    score = 100000f + beat - candidate.LastNoteBeat;
+                }
+                else if (beat >= candidate.FirstNoteBeat)
+                {
+                    score = -1f;
+                }
+                else
+                {
+                    score = candidate.FirstNoteBeat - beat;
+                }
+
+                if (score < bestScore)
+                {
+                    bestScore = score;
+                    lines = voiceLines;
+                    line = nr;
+                    key = voiceNr * 100000 + nr;
+                }
+            }
+
+            if (lines == null)
+            {
+                if (_CurrentLine != -1)
+                {
+                    main.Clear();
+                    sub.Clear();
+                    _CurrentLine = -1;
+                }
+
+                return;
+            }
+
+            if (key != _CurrentLine)
+            {
+                main.SetLine(lines[line]);
+                if (line + 1 < lines.Length)
+                {
+                    sub.SetLine(lines[line + 1]);
+                }
+                else
+                {
+                    sub.Clear();
+                }
+
+                _CurrentLine = key;
+            }
+
+            main.Update(beat);
+            sub.Update(-100);
+        }
+
+        private static int _FindCurrentLine(CVoice voice, CSongLine[] lines, CSong song, float time, int beat)
+        {
+            for (var j = voice.FindPreviousLine(beat); j >= 0; j--)
+            {
+                var firstNoteTime = CGame.GetTimeFromBeats(lines[j].FirstNoteBeat, song.Bpm);
+                if (firstNoteTime > time + 10f)
+                {
+                    continue;
+                }
+
+                if (j == 0 || firstNoteTime - CConfig.Config.Game.MinLineBreakTime <= time)
+                {
+                    return j;
+                }
+
+                var lastNoteTime = CGame.GetTimeFromBeats(lines[j - 1].LastNoteBeat, song.Bpm);
+                return lastNoteTime >= time ? j - 1 : j;
+            }
+
+            return -1;
+        }
+
+        private bool _IsUiIdle()
+        {
+            return !_Paused && _InputTimer.Elapsed.TotalSeconds > _HideDelay;
+        }
+
+        private void _UpdateUi(float delta)
+        {
+            var uiTarget = _IsUiIdle() ? 0f : 1f;
+            _UiAlpha = _Approach(_UiAlpha, uiTarget, delta * _UiFadeSpeed);
+
+            var infoTarget = uiTarget > 0f || _InfoTimer.Elapsed.TotalSeconds < _InfoDuration ? 1f : 0f;
+            _InfoAlpha = _Approach(_InfoAlpha, infoTarget, delta * _UiFadeSpeed);
+        }
+
+        private static float _Approach(float value, float target, float step)
+        {
+            return value < target ? Math.Min(target, value + step) : Math.Max(target, value - step);
+        }
+
+        private void _UpdateControls()
+        {
+            _Buttons[_ButtonPlay].Visible = _Paused;
+            _Buttons[_ButtonPause].Visible = !_Paused;
+            if (_Paused && _Buttons[_ButtonPause].Selected)
+            {
+                _SelectElement(_Buttons[_ButtonPlay]);
+            }
+            else if (!_Paused && _Buttons[_ButtonPlay].Selected)
+            {
+                _SelectElement(_Buttons[_ButtonPause]);
+            }
+
+            var song = _Current == null ? null : _Current.Entry.Song;
+            var instrumental = _Current != null && _Current.AudioMode == EAudioMode.TR_AUDIOMODE_INSTRUMENTAL;
+            _SetButtonState(_ButtonSkipIntro, _CanSkipIntro());
+            _SetButtonState(_ButtonShuffle, CJukebox.Shuffle);
+            _SetButtonState(_ButtonRepeat, CJukebox.Repeat);
+            _SetButtonState(_ButtonLyrics, CJukebox.ShowLyrics);
+            _SetButtonState(_ButtonAudioMode, song != null && song.HasInstrumental());
+
+            var audioMode = _Buttons[_ButtonAudioMode];
+            var audioModeIcon = _Statics[_StaticAudioModeIcon];
+            audioModeIcon.Texture = _Statics[instrumental ? _StaticAudioModeInstrumental : _StaticAudioModeNormal].Texture;
+            audioModeIcon.Color = audioMode.Selected ? audioMode.Text.SelColor : audioMode.Text.Color;
+            audioMode.Text.Text = instrumental ? "TR_AUDIOMODE_INSTRUMENTAL" : "TR_AUDIOMODE_NORMAL";
+
+            if (_Current == null)
+            {
+                return;
+            }
+
+            var length = Math.Max(0f, _Current.End - _Current.Start);
+            var elapsed = Math.Max(0f, Math.Min(length, _Current.Player.Position - _Current.Start));
+            _Texts[_TextTimeElapsed].Text = _FormatTime(elapsed);
+            _Texts[_TextTimeTotal].Text = _FormatTime(length);
+            _Statics[_StaticTimeBarFill].W = length > 0f ? _TimeBarWidth * elapsed / length : 0f;
+        }
+
+        private void _SetButtonState(string button, bool active)
+        {
+            var color = _ButtonColors[button];
+            _Buttons[button].Color = active ? color : new SColorF(color.R, color.G, color.B, color.A * _DimmedAlpha);
+        }
+
+        private static string _FormatTime(float seconds)
+        {
+            var total = (int)seconds;
+            return (total / 60) + ":" + (total % 60).ToString("00");
+        }
+    }
+}
diff --git a/Vocaluxe/Screens/CScreenMain.cs b/Vocaluxe/Screens/CScreenMain.cs
index c84c46c7..aad50a60 100644
--- a/Vocaluxe/Screens/CScreenMain.cs
+++ b/Vocaluxe/Screens/CScreenMain.cs
@@ -27,11 +27,12 @@ namespace Vocaluxe.Screens
         // Version number for theme files. Increment it, if you've changed something on the theme files!
         protected override int _ScreenVersion
         {
-            get { return 5; }
+            get { return 6; }
         }
 
         private const string _ButtonSing = "ButtonSing";
         private const string _ButtonParty = "ButtonParty";
+        private const string _ButtonJukebox = "ButtonJukebox";
         private const string _ButtonStatistics = "ButtonStatistics";
         private const string _ButtonOptions = "ButtonOptions";
         private const string _ButtonProfiles = "ButtonProfiles";
@@ -57,7 +58,7 @@ namespace Vocaluxe.Screens
             base.Init();
 
             _ThemeStatics = new string[] { "StaticMenuBar", _StaticWarningProfiles };
-            _ThemeButtons = new string[] { _ButtonSing, _ButtonParty, _ButtonStatistics, _ButtonOptions, _ButtonProfiles, _ButtonExit };
+            _ThemeButtons = new string[] { _ButtonSing, _ButtonParty, _ButtonJukebox, _ButtonStatistics, _ButtonOptions, _ButtonProfiles, _ButtonExit };
             _ThemeTexts = new string[] { _TextRelease, _TextWarningProfiles };
         }
 
@@ -119,6 +120,12 @@ namespace Vocaluxe.Screens
                             _LeaveScreen();
                         }
 
+                        if (_Buttons[_ButtonJukebox].Selected)
+                        {
+                            CGraphics.FadeTo(EScreen.Jukebox);
+                            _LeaveScreen();
+                        }
+
                         if (_Buttons[_ButtonStatistics].Selected)
                         {
                             CGraphics.FadeTo(EScreen.Statistics);
@@ -172,6 +179,12 @@ namespace Vocaluxe.Screens
                     _LeaveScreen();
                 }
 
+                if (_Buttons[_ButtonJukebox].Selected)
+                {
+                    CGraphics.FadeTo(EScreen.Jukebox);
+                    _LeaveScreen();
+                }
+
                 if (_Buttons[_ButtonStatistics].Selected)
                 {
                     CGraphics.FadeTo(EScreen.Statistics);
@@ -208,6 +221,8 @@ namespace Vocaluxe.Screens
             _Buttons[_ButtonParty].Selectable = profileOK;
             _Buttons[_ButtonSing].Visible = profileOK;
             _Buttons[_ButtonParty].Visible = profileOK;
+            _Buttons[_ButtonJukebox].Selectable = profileOK;
+            _Buttons[_ButtonJukebox].Visible = profileOK;
 
             if (_Texts[_TextWarningProfiles].Visible && !_HasPlayedWarningSound)
             {
diff --git a/Vocaluxe/Screens/CScreenNames.cs b/Vocaluxe/Screens/CScreenNames.cs
index b98db299..b2306381 100644
--- a/Vocaluxe/Screens/CScreenNames.cs
+++ b/Vocaluxe/Screens/CScreenNames.cs
@@ -314,7 +314,7 @@ namespace Vocaluxe.Screens
                 {
                     case Keys.Escape:
                     case Keys.Back:
-                        CGraphics.FadeTo(EScreen.Song);
+                        _FadeBack();
                         _LeaveScreen();
                         break;
 
@@ -322,7 +322,7 @@ namespace Vocaluxe.Screens
 
                         if (_Buttons[_ButtonBack].Selected)
                         {
-                            CGraphics.FadeTo(EScreen.Song);
+                            _FadeBack();
                             _LeaveScreen();
                         }
                         else if (_Buttons[_ButtonStart].Selected)
@@ -532,7 +532,7 @@ namespace Vocaluxe.Screens
             {
                 if (_Buttons[_ButtonBack].Selected)
                 {
-                    CGraphics.FadeTo(EScreen.Song);
+                    _FadeBack();
                     _LeaveScreen();
                 }
                 else if (_Buttons[_ButtonStart].Selected)
@@ -589,7 +589,7 @@ namespace Vocaluxe.Screens
 
                 if (exit)
                 {
-                    CGraphics.FadeTo(EScreen.Song);
+                    _FadeBack();
                     _LeaveScreen();
                 }
             }
@@ -941,6 +941,14 @@ namespace Vocaluxe.Screens
             }
         }
 
+        private static void _FadeBack()
+        {
+            if (!CJukebox.ReturnAfterSinging())
+            {
+                CGraphics.FadeTo(EScreen.Song);
+            }
+        }
+
         private void _LeaveScreen()
         {
             if (_WarningStream != -1)
diff --git a/Vocaluxe/Screens/CScreenScore.cs b/Vocaluxe/Screens/CScreenScore.cs
index aa7dfda2..03ca4b80 100644
--- a/Vocaluxe/Screens/CScreenScore.cs
+++ b/Vocaluxe/Screens/CScreenScore.cs
@@ -589,7 +589,10 @@ namespace Vocaluxe.Screens
 
             if (_IsKaraokeMode(-1))
             {
-                CGraphics.FadeTo(EScreen.Song);
+                if (!CJukebox.ReturnAfterSinging())
+                {
+                    CGraphics.FadeTo(EScreen.Song);
+                }
             }
             else
             {
diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj
index d428ff1e..c2874891 100644
--- a/Vocaluxe/Vocaluxe.csproj
+++ b/Vocaluxe/Vocaluxe.csproj
@@ -245,6 +245,7 @@
     <Compile Include="Base\CCursor.cs" />
     <Compile Include="Base\CDataBase.cs" />
     <Compile Include="Base\CStatistics.cs" />
+    <Compile Include="Base\CJukebox.cs" />
     <Compile Include="Base\CDraw.cs" />
     <Compile Include="Lib\Sound\Playback\PortAudio\CPt1.cs" />
     <Compile Include="Lib\Sound\Playback\PortAudio\CSyncTimer.cs" />
@@ -346,6 +347,8 @@
     <Compile Include="Screens\CScreenParty.cs" />
     <Compile Include="Screens\CScreenStatistics.cs" />
     <Compile Include="Screens\CScreenStatisticsDetail.cs" />
+    <Compile Include="Screens\CScreenJukebox.cs" />
+    <Compile Include="Screens\CScreenJukeboxPlayer.cs" />
     <Compile Include="Screens\CScreenProfiles.cs" />
     <Compile Include="Screens\CScreenScore.cs" />
     <Compile Include="Screens\CScreenSing.cs" />
diff --git a/VocaluxeLib/Enums.cs b/VocaluxeLib/Enums.cs
index b037ca41..1f905231 100644
--- a/VocaluxeLib/Enums.cs
+++ b/VocaluxeLib/Enums.cs
@@ -432,6 +432,8 @@ namespace VocaluxeLib
         Party,
         Statistics,
         StatisticsDetail,
+        Jukebox,
+        JukeboxPlayer,
 
         CountEntry //Leave this as last entry and never use it!
     }
diff --git a/VocaluxeLib/Menu/CSelectSlide.cs b/VocaluxeLib/Menu/CSelectSlide.cs
index 303e13b8..cbd23a08 100644
--- a/VocaluxeLib/Menu/CSelectSlide.cs
+++ b/VocaluxeLib/Menu/CSelectSlide.cs
@@ -121,6 +121,7 @@ namespace VocaluxeLib.Menu
                 RectArrowLeft.X += delta;
                 RectArrowRight.X += delta;
                 base.X = value;
+                _NeedsRevalidate = true;
             }
         }
         public override float Y
@@ -131,6 +132,7 @@ namespace VocaluxeLib.Menu
                 RectArrowLeft.Y += delta;
                 RectArrowRight.Y += delta;
                 base.Y = value;
+                _NeedsRevalidate = true;
             }
         }
         public override float Z
diff --git a/VocaluxeLib/Utils/Player/CSongPlayer.cs b/VocaluxeLib/Utils/Player/CSongPlayer.cs
index b7d8e911..9b758d3d 100644
--- a/VocaluxeLib/Utils/Player/CSongPlayer.cs
+++ b/VocaluxeLib/Utils/Player/CSongPlayer.cs
@@ -141,11 +141,38 @@ namespace VocaluxeLib.Utils.Player
                 throw new ArgumentNullException("song");
             }
 
+            Load(song, song.GetMP3(), true, position, autoplay);
+        }
+
+        public void Load(CSong song, string audioFile, bool loadVideo, float position = 0f, bool autoplay = false)
+        {
+            if (song == null)
+            {
+                throw new ArgumentNullException("song");
+            }
+
             lock (_lock)
             {
-                Load(song.GetMP3(), position, autoplay);
+                Load(audioFile, position, autoplay);
                 _Song = song;
-                _LoadVideo();
+                if (loadVideo)
+                {
+                    _LoadVideo();
+                }
+            }
+        }
+
+        public void SetPosition(float position)
+        {
+            lock (_lock)
+            {
+                Position = position;
+                var video = _Video;
+                var song = _Song;
+                if (video != null && !video.IsClosed() && song != null)
+                {
+                    CBase.Video?.Skip(video, position, song.VideoGap);
+                }
             }
         }