3 files changed, 99 insertions, 52 deletions
diff --git a/us_maker_edition/game/languages/Polish.ini b/us_maker_edition/game/languages/Polish.ini
index 9c7c0880..84357370 100644
--- a/us_maker_edition/game/languages/Polish.ini
+++ b/us_maker_edition/game/languages/Polish.ini
@@ -429,7 +429,7 @@ EDITOR_ERROR_NO_TRACK_SELECTED=Nie zaznaczona ścieżka
 MSG_ERROR_TITLE=Błąd
 MSG_INFO_TITLE=Informacja
 MSG_QUESTION_TITLE=Pytanie
-MSG_QUIT_USDX=Czy na prawdę chcesz opóścić UltraStar?
+MSG_QUIT_USDX=Czy na prawdę chcesz opuścić UltraStar?
 MSG_END_PARTY=Na pewno chcesz zakończyć tryb imprezy?
 
 ERROR_NO_SONGS=Brak piosenek
diff --git a/us_maker_edition/game/themes/Classic.ini b/us_maker_edition/game/themes/Classic.ini
index a4e255ab..531f6223 100644
--- a/us_maker_edition/game/themes/Classic.ini
+++ b/us_maker_edition/game/themes/Classic.ini
@@ -8033,12 +8033,12 @@ Align = 0
 
 Color = ColorDark
 DColor = ColorLight
-TColor = White
-TDColor = White
+TColor = GrayDark
+TDColor = GrayDark
 
 SBGColor = ColorDark
 SBGDColor = ColorLight
-STColor = White
+STColor = GrayDark
 STDColor = GrayDark
 
 [EditSubArtist]
@@ -8059,12 +8059,12 @@ Align = 0
 
 Color = ColorDark
 DColor = ColorLight
-TColor = White
-TDColor = White
+TColor = GrayDark
+TDColor = GrayDark
 
 SBGColor = ColorDark
 SBGDColor = ColorLight
-STColor = White
+STColor = GrayDark
 STDColor = GrayDark
 
 [EditSubMP3]
@@ -8086,15 +8086,15 @@ Align = 0
 
 Color = ColorDark
 DColor = ColorLight
-TColor = White
-TDColor = White
+TColor = GrayDark
+TDColor = GrayDark
 
 SBGColor = ColorDark
 SBGDColor = ColorLight
-STColor = White
+STColor = GrayDark
 STDColor = GrayDark
 
-[EditSubCover]
+[EditSubSlideCover]
 X = 30
 Y = 123
 W = 100
@@ -8104,7 +8104,7 @@ TextSize = 16
 Text = EDIT_COVER
 Tex = MainBar
 Type = Colorized
-TexSBG = MainBar
+TexSBG = SelectBG
 TypeSBG = Colorized
 ShowArrows = 1
 OneItemOnly = 1
@@ -8113,15 +8113,15 @@ Align = 0
 
 Color = ColorDark
 DColor = ColorLight
-TColor = White
-TDColor = White
+TColor = GrayDark
+TDColor = GrayDark
 
 SBGColor = ColorDark
 SBGDColor = ColorLight
-STColor = White
+STColor = GrayDark
 STDColor = GrayDark
 
-[EditSubBackground]
+[EditSubSlideBG]
 X = 30
 Y = 144
 W = 100
@@ -8131,7 +8131,7 @@ TextSize = 16
 Text = EDIT_BACKGROUND
 Tex = MainBar
 Type = Colorized
-TexSBG = MainBar
+TexSBG = SelectBG
 TypeSBG = Colorized
 ShowArrows = 1
 OneItemOnly = 1
@@ -8140,12 +8140,12 @@ Align = 0
 
 Color = ColorDark
 DColor = ColorLight
-TColor = White
-TDColor = White
+TColor = GrayDark
+TDColor = GrayDark
 
 SBGColor = ColorDark
 SBGDColor = ColorLight
-STColor = White
+STColor = GrayDark
 STDColor = GrayDark
 
 [EditSubBPM]
@@ -8166,12 +8166,12 @@ Align = 0
 
 Color = ColorDark
 DColor = ColorLight
-TColor = White
-TDColor = White
+TColor = GrayDark
+TDColor = GrayDark
 
 SBGColor = ColorDark
 SBGDColor = ColorLight
-STColor = White
+STColor = GrayDark
 STDColor = GrayDark
 
 [EditSubGAP]
@@ -8192,12 +8192,12 @@ Align = 0
 
 Color = ColorDark
 DColor = ColorLight
-TColor = White
-TDColor = White
+TColor = GrayDark
+TDColor = GrayDark
 
 SBGColor = ColorDark
 SBGDColor = ColorLight
-STColor = White
+STColor = GrayDark
 STDColor = GrayDark
 
 [EditSubStart]
@@ -8218,12 +8218,12 @@ Align = 0
 
 Color = ColorDark
 DColor = ColorLight
-TColor = White
-TDColor = White
+TColor = GrayDark
+TDColor = GrayDark
 
 SBGColor = ColorDark
 SBGDColor = ColorLight
-STColor = White
+STColor = GrayDark
 STDColor = GrayDark
 
 [EditSubDuration]
@@ -8244,12 +8244,12 @@ Align = 0
 
 Color = ColorDark
 DColor = ColorLight
-TColor = White
-TDColor = White
+TColor = GrayDark
+TDColor = GrayDark
 
 SBGColor = ColorDark
 SBGDColor = ColorLight
-STColor = White
+STColor = GrayDark
 STDColor = GrayDark
 
 [EditSubTone]
@@ -8270,12 +8270,12 @@ Align = 0
 
 Color = ColorDark
 DColor = ColorLight
-TColor = White
-TDColor = White
+TColor = GrayDark
+TDColor = GrayDark
 
 SBGColor = ColorDark
 SBGDColor = ColorLight
-STColor = White
+STColor = GrayDark
 STDColor = GrayDark
 
 [EditSubLyric]
@@ -8296,12 +8296,12 @@ Align = 0
 
 Color = ColorDark
 DColor = ColorLight
-TColor = White
-TDColor = White
+TColor = GrayDark
+TDColor = GrayDark
 
 SBGColor = ColorDark
 SBGDColor = ColorLight
-STColor = White
+STColor = GrayDark
 STDColor = GrayDark
 
 [EditSubVideoGap]
@@ -8322,12 +8322,12 @@ Align = 0
 
 Color = ColorDark
 DColor = ColorLight
-TColor = White
-TDColor = White
+TColor = GrayDark
+TDColor = GrayDark
 
 SBGColor = ColorDark
 SBGDColor = ColorLight
-STColor = White
+STColor = GrayDark
 STDColor = GrayDark
 
 [EditSubSelectVolAudio]
@@ -8347,12 +8347,12 @@ SBGW = 100
 
 Color = ColorDark
 DColor = ColorLight
-TColor = White
-TDColor = White
+TColor = GrayDark
+TDColor = GrayDark
 
 SBGColor = DarkBlue
 SBGDColor = LightBlue
-STColor = White
+STColor = GrayDark
 STDColor = GrayDark
 
 [EditSubSelectVolMidi]
@@ -8372,12 +8372,12 @@ SBGW = 100
 
 Color = ColorDark
 DColor = ColorLight
-TColor = White
-TDColor = White
+TColor = GrayDark
+TDColor = GrayDark
 
 SBGColor = DarkBlue
 SBGDColor = LightBlue
-STColor = White
+STColor = GrayDark
 STDColor = GrayDark
 
 [EditSubSelectVolClick]
@@ -8397,12 +8397,12 @@ SBGW = 100
 
 Color = ColorDark
 DColor = ColorLight
-TColor = White
-TDColor = White
+TColor = GrayDark
+TDColor = GrayDark
 
 SBGColor = DarkBlue
 SBGDColor = LightBlue
-STColor = White
+STColor = GrayDark
 STDColor = GrayDark
 
 [EditSubBackgroundImage]
@@ -8411,8 +8411,55 @@ Y = 60
 W = 250
 H = 205
 Z = 0.95
-Color = White
+Color = GrayDark
 Tex = prevbackground
 Type = Transparent
 Reflection = 0
 ReflectionSpacing = 22
+
+[EditSubButtonCurrentLine]
+X = 20
+Y = 10
+Z = 0.97
+W = 110
+H = 20
+Size = 20
+Font = 1
+Align = 1
+Color = ColorLight
+DColor = ColorLight
+Tex = Leiste1
+Type = Colorized
+Texts = 1
+
+[EditSubButtonCurrentLineText1]
+X = 55
+Y = 2
+Color = GrayDark
+Font = 1
+Size = 18
+Align = 1
+
+[EditSubButtonCurrentNote]
+X = 140
+Y = 10
+Z = 0.97
+W = 110
+H = 20
+Size = 20
+Font = 1
+Align = 1
+Color = ColorLight
+DColor = ColorLight
+Tex = Leiste1
+Type = Colorized
+Texts = 1
+
+[EditSubButtonCurrentNoteText1]
+X = 55
+Y = 2
+Color = GrayDark
+Font = 1
+Size = 18
+Align = 1
+
diff --git a/us_maker_edition/src/screens/UScreenEditSub.pas b/us_maker_edition/src/screens/UScreenEditSub.pas
index 9b838a39..d799f6ef 100644
--- a/us_maker_edition/src/screens/UScreenEditSub.pas
+++ b/us_maker_edition/src/screens/UScreenEditSub.pas
@@ -820,7 +820,7 @@ begin
              ArtistEditMode := true;
            end;
 
-           if Interaction = 4 then //LyricSlideId
+           if Interaction = 12 then //LyricSlideId
            begin
              BackupEditText := Lines[0].Line[Lines[0].Current].Note[CurrentNote].Text;
              CurrentEditText := BackupEditText;