merge with current trunk (just update)

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1634 b956fd51-792f-4845-bead-9b4dfca2ff2c

19 files changed, 1481 insertions, 1255 deletions

diff --git a/unicode/src/screens/UScreenCredits.pas b/unicode/src/screens/UScreenCredits.pas
index de559cc6..25fa96df 100644
--- a/unicode/src/screens/UScreenCredits.pas
+++ b/unicode/src/screens/UScreenCredits.pas
@@ -34,6 +34,7 @@ interface
 {$I switches.inc}
 
 uses
+    SysUtils,
     UMenu,
     SDL,
     SDL_Image,
@@ -42,7 +43,6 @@ uses
     gl,
     UMusic,
     UFiles,
-    SysUtils,
     UThemes,
     UGraphicClasses;
 
@@ -167,16 +167,16 @@ const
 implementation
 
 uses
-     ULog,
-     UGraphic,
-     UMain,
-     UIni,
-     USongs,
-     Textgl,
-     ULanguage,
-     UCommon,
-     Math;
-
+  Math,
+  ULog,
+  UGraphic,
+  UMain,
+  UIni,
+  USongs,
+  Textgl,
+  ULanguage,
+  UCommon,
+  UPath;
 
 function TScreenCredits.ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean;
 begin
@@ -246,63 +246,6 @@ begin
   Draw:=true;
 end;
 
-function pixfmt_eq(fmt1,fmt2: TSDL_Pixelformat): boolean;
-begin
-  if (fmt1.BitsPerPixel = fmt2.BitsPerPixel) and
-     (fmt1.BytesPerPixel = fmt2.BytesPerPixel) and
-     (fmt1.Rloss = fmt2.Rloss) and
-     (fmt1.Gloss = fmt2.Gloss) and
-     (fmt1.Bloss = fmt2.Bloss) and
-     (fmt1.Rmask = fmt2.Rmask) and
-     (fmt1.Gmask = fmt2.Gmask) and
-     (fmt1.Bmask = fmt2.Bmask) and
-     (fmt1.Rshift = fmt2.Rshift) and
-     (fmt1.Gshift = fmt2.Gshift) and
-     (fmt1.Bshift = fmt2.Bshift)
-   then
-    pixfmt_eq:=True
-  else
-    pixfmt_eq:=False;
-end;
-
-function inttohexstr(i: cardinal):pchar;
-var helper, i2, c:cardinal;
-    tmpstr: string;
-begin
-  helper:=0;
-  i2:=i;
-  tmpstr:='';
-  for c:=1 to 8 do
-  begin
-    helper:=(helper shl 4) or (i2 and $f);
-    i2:=i2 shr 4;
-  end;
-  for c:=1 to 8 do
-  begin
-    i2:=helper and $f;
-    helper := helper shr 4;
-    case i2 of
-      0: tmpstr:=tmpstr+'0';
-      1: tmpstr:=tmpstr+'1';
-      2: tmpstr:=tmpstr+'2';
-      3: tmpstr:=tmpstr+'3';
-      4: tmpstr:=tmpstr+'4';
-      5: tmpstr:=tmpstr+'5';
-      6: tmpstr:=tmpstr+'6';
-      7: tmpstr:=tmpstr+'7';
-      8: tmpstr:=tmpstr+'8';
-      9: tmpstr:=tmpstr+'9';
-     10: tmpstr:=tmpstr+'a';
-     11: tmpstr:=tmpstr+'b';
-     12: tmpstr:=tmpstr+'c';
-     13: tmpstr:=tmpstr+'d';
-     14: tmpstr:=tmpstr+'e';
-     15: tmpstr:=tmpstr+'f';
-    end;
-  end;
-  inttohexstr:=pchar(tmpstr);
-end;
-
 procedure TScreenCredits.onShow;
 begin
   inherited;
diff --git a/unicode/src/screens/UScreenEdit.pas b/unicode/src/screens/UScreenEdit.pas
index 3be9308e..2111adef 100644
--- a/unicode/src/screens/UScreenEdit.pas
+++ b/unicode/src/screens/UScreenEdit.pas
@@ -33,20 +33,24 @@ interface
 
 {$I switches.inc}
 
-uses UMenu, SDL, UThemes;
+uses
+  UMenu,
+  SDL,
+  UThemes;
 
 type
   TScreenEdit = class(TMenu)
     public
-{      Tex_Background:     TTexture;
-      FadeOut:            boolean;
-      Path:               string;
-      FileName:           string;}
+      TextDescription:     integer;
+      TextDescriptionLong: integer;
+
       constructor Create; override;
-      procedure onShow; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean; override;
-{      function Draw: boolean; override;
-      procedure Finish;}
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
+      procedure InteractNext; override;
+      procedure InteractPrev; override;
+      procedure InteractInc; override;
+      procedure InteractDec; override;
+      procedure SetAnimationProgress(Progress: real); override;
   end;
 
 implementation
@@ -58,12 +62,18 @@ uses
   UUnicodeUtils,
   SysUtils;
 
-function TScreenEdit.ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean;
+function TScreenEdit.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
+var
+  SDL_ModState: word;
 begin
   Result := true;
-  If (PressedDown) Then
+
+  SDL_ModState := SDL_GetModState and (KMOD_LSHIFT + KMOD_RSHIFT +
+    KMOD_LCTRL + KMOD_RCTRL + KMOD_LALT + KMOD_RALT);
+
+  if (PressedDown) then
   begin // Key Down
-    // check normal keys
+        // check normal keys
     case UCS4UpperCase(CharCode) of
       Ord('Q'):
         begin
@@ -79,7 +89,6 @@ begin
         begin
           AudioPlayback.PlaySound(SoundLib.Back);
           FadeTo(@ScreenMain);
-//          Result := false;
         end;
       SDLK_RETURN:
         begin
@@ -88,10 +97,6 @@ begin
             AudioPlayback.PlaySound(SoundLib.Start);
             FadeTo(@ScreenEditConvert);
           end;
-//          if Interaction = 1 then begin
-//            Music.PlayStart;
-//            FadeTo(@ScreenEditHeader);
-//          end;
 
           if Interaction = 1 then
           begin
@@ -100,14 +105,10 @@ begin
           end;
         end;
 
-      SDLK_DOWN:
-        begin
-          InteractNext;
-        end;
-      SDLK_UP:
-        begin
-          InteractPrev;
-        end;
+      SDLK_DOWN:  InteractInc;
+      SDLK_UP:    InteractDec;
+      SDLK_RIGHT: InteractNext;
+      SDLK_LEFT:  InteractPrev;
     end;
   end;
 end;
@@ -115,41 +116,49 @@ end;
 constructor TScreenEdit.Create;
 begin
   inherited Create;
-  AddButton(400-200, 100 + 0*70, 400, 40, Skin.GetTextureFileName('ButtonF'));
-  AddButtonText(10, 5, 0, 0, 0, 'Convert Midi to Txt');
-//  Button[High(Button)].Text[0].Size := 11;
 
-//  AddButton(400-200, 100 + 1*60, 400, 40, 'ButtonF');
-//  AddButtonText(10, 5, 0, 0, 0, 'Edit Headers');
+  TextDescription := AddText(Theme.Edit.TextDescription);
 
-//  AddButton(400-200, 100 + 2*60, 400, 40, 'ButtonF');
-//  AddButtonText(10, 5, 0, 0, 0, 'Set GAP');
+  LoadFromTheme(Theme.Edit);
 
-  AddButton(400-200, 100 + 3*60, 400, 40, Skin.GetTextureFileName('ButtonF'));
-  AddButtonText(10, 5, 0, 0, 0, 'Exit');
+  AddButton(Theme.Edit.ButtonConvert);
+{ Some ideas for more:
+  AddButton(Theme.Edit.ButtonEditHeaders);
+  AddButton(Theme.Edit.ButtonAdjustGap);
+}
+  AddButton(Theme.Edit.ButtonExit);
 
+  Interaction := 0;
 end;
 
-procedure TScreenEdit.onShow;
+procedure TScreenEdit.InteractNext;
 begin
-  inherited;
+  inherited InteractNext;
+  Text[TextDescription].Text := Theme.Edit.Description[Interaction];
+end;
 
-//  Interaction := 0;
+procedure TScreenEdit.InteractPrev;
+begin
+  inherited InteractPrev;
+  Text[TextDescription].Text := Theme.Edit.Description[Interaction];
 end;
 
-(*function TScreenEdit.Draw: boolean;
-var
-  Min:    integer;
-  Sec:    integer;
-  Tekst:  string;
-  Pet:    integer;
-  AktBeat:  integer;
+procedure TScreenEdit.InteractDec;
 begin
+  inherited InteractDec;
+  Text[TextDescription].Text := Theme.Edit.Description[Interaction];
 end;
 
-procedure TScreenEdit.Finish;
+procedure TScreenEdit.InteractInc;
 begin
-//
-end;*)
+  inherited InteractInc;
+  Text[TextDescription].Text := Theme.Edit.Description[Interaction];
+end;
+
+procedure TScreenEdit.SetAnimationProgress(Progress: real);
+begin
+  Static[0].Texture.ScaleW := Progress;
+  Static[0].Texture.ScaleH := Progress;
+end;
 
 end.
diff --git a/unicode/src/screens/UScreenEditConvert.pas b/unicode/src/screens/UScreenEditConvert.pas
index 328398aa..835590ed 100644
--- a/unicode/src/screens/UScreenEditConvert.pas
+++ b/unicode/src/screens/UScreenEditConvert.pas
@@ -48,21 +48,21 @@ uses
 
 type
   TNote = record
-    Event:        integer;
-    EventType:    integer;
-    Channel:    integer;
-    Start:    real;
-    Len:      real;
-    Data1:    integer;
-    Data2:    integer;
-    Str:      string;
+    Event:     integer;
+    EventType: integer;
+    Channel:   integer;
+    Start:     real;
+    Len:       real;
+    Data1:     integer;
+    Data2:     integer;
+    Str:       string;
   end;
 
   TTrack = record
-    Note:     array of TNote;
-    Name:     string;
-    Hear:     boolean;
-    Status:   byte;     // 0 - none, 1 - notes, 2 - lyrics, 3 - notes + lyrics
+    Note:   array of TNote;
+    Name:   string;
+    Hear:   boolean;
+    Status: set of (notes, lyrics);
   end;
 
   TNuta = record
@@ -77,29 +77,29 @@ type
 
   TScreenEditConvert = class(TMenu)
     public
-      ATrack:             TArrayTrack; // actual track
-//      Track:              TArrayTrack;
-      Channel:            TArrayTrack;
-      ColR:               array[0..100] of real;
-      ColG:               array[0..100] of real;
-      ColB:               array[0..100] of real;
-      Len:                real;
-      Sel:                integer;
-      Selected:           boolean;
-//      FileName:           string;
+      ATrack:    TArrayTrack; // actual track
+//      Track:     TArrayTrack;
+      Channel:   TArrayTrack;
+      ColR:      array[0..100] of real;
+      ColG:      array[0..100] of real;
+      ColB:      array[0..100] of real;
+      Len:       real;
+      Sel:       integer;
+      Selected:  boolean;
+//      FileName:  string;
 
       {$IFDEF UseMIDIPort}
-      MidiFile:           TMidiFile;
-      MidiTrack:          TMidiTrack;
-      MidiEvent:          pMidiEvent;
-      MidiOut:            TMidiOutput;
+      MidiFile:  TMidiFile;
+      MidiTrack: TMidiTrack;
+      MidiEvent: pMidiEvent;
+      MidiOut:   TMidiOutput;
       {$ENDIF}
 
-      Song:               TSong;
-      Lines:              TLines;
-      BPM:                real;
-      Ticks:              real;
-      Note:               array of TNuta;
+      Song:      TSong;
+      Lines:     TLines;
+      BPM:       real;
+      Ticks:     real;
+      Note:      array of TNuta;
 
       procedure AddLyric(Start: integer; Text: string);
       procedure Extract;
@@ -111,26 +111,30 @@ type
       function SelectedNumber: integer;
       constructor Create; override;
       procedure onShow; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
       function Draw: boolean; override;
       procedure onHide; override;
   end;
 
+var
+  ConversionFileName: string;
+
 implementation
 
 uses
   SysUtils,
+  TextGL,
   gl,
-  UGraphic,
   UDrawTexture,
-  TextGL,
   UFiles,
-  UMain,
+  UGraphic,
   UIni,
+  UMain,
+  UPath,
   USkins,
   UUnicodeUtils;
 
-function TScreenEditConvert.ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean;
+function TScreenEditConvert.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
 begin
   Result := true;
   If (PressedDown) Then
@@ -175,13 +179,16 @@ begin
             {$ENDIF}
           end;
 
-          if Interaction = 2 then begin
+          if Interaction = 2 then
+	  begin
             Selected := true;
             {$IFDEF UseMIDIPort}
             MidiFile.OnMidiEvent := nil;
             {$ENDIF}
-            {for T := 0 to High(ATrack) do begin
-              if ATrack[T].Hear then begin
+            {for T := 0 to High(ATrack) do
+	    begin
+              if ATrack[T].Hear then
+	      begin
                 MidiTrack := MidiFile.GetTrack(T);
                 MidiTrack.OnMidiEvent := MidiFile1MidiEvent;
               end;
@@ -189,8 +196,10 @@ begin
             MidiFile.StartPlaying;//}
           end;
 
-          if Interaction = 3 then begin
-            if SelectedNumber > 0 then begin
+          if Interaction = 3 then
+	  begin
+            if SelectedNumber > 0 then
+	    begin
               Extract;
               SaveSong(Song, Lines, ChangeFileExt(ConversionFileName, '.txt'), false);
             end;
@@ -201,9 +210,19 @@ begin
       SDLK_SPACE:
         begin
 //          ATrack[Sel].Hear := not ATrack[Sel].Hear;
-          ATrack[Sel].Status := (ATrack[Sel].Status + 1) mod 4;
-
-{          if Selected then begin
+	  if Notes in ATrack[Sel].Status then
+	  begin
+	    ATrack[Sel].Status := ATrack[Sel].Status - [Notes];
+	    if Lyrics in ATrack[Sel].Status then
+	      ATrack[Sel].Status := ATrack[Sel].Status - [Lyrics]
+	    else
+	      ATrack[Sel].Status := ATrack[Sel].Status + [Lyrics];
+	  end
+	  else
+	    ATrack[Sel].Status := ATrack[Sel].Status + [Notes];
+
+{          if Selected then
+          begin
             MidiTrack := MidiFile.GetTrack(Sel);
             if Track[Sel].Hear then
               MidiTrack.OnMidiEvent := MidiFile1MidiEvent
@@ -225,12 +244,14 @@ begin
       SDLK_DOWN:
         begin
           Inc(Sel);
-          if Sel > High(ATrack) then Sel := 0;
+          if Sel > High(ATrack) then
+	    Sel := 0;
         end;
       SDLK_UP:
         begin
           Dec(Sel);
-          if Sel < 0 then Sel := High(ATrack);
+          if Sel < 0 then
+	    Sel := High(ATrack);
         end;
     end;
   end;
@@ -240,11 +261,15 @@ procedure TScreenEditConvert.AddLyric(Start: integer; Text: string);
 var
   N:    integer;
 begin
-  for N := 0 to High(Note) do begin
-    if Note[N].Start = Start then begin
+  for N := 0 to High(Note) do
+  begin
+    if Note[N].Start = Start then
+    begin
       // check for new sentece
-      if Copy(Text, 1, 1) = '\' then Delete(Text, 1, 1);
-      if Copy(Text, 1, 1) = '/' then begin
+      if Copy(Text, 1, 1) = '\' then
+        Delete(Text, 1, 1);
+      if Copy(Text, 1, 1) = '/' then
+      begin
         Delete(Text, 1, 1);
         Note[N].NewSentence := true;
       end;
@@ -279,11 +304,16 @@ begin
   SetLength(Note, 0);
 
   // extract notes
-  for T := 0 to High(ATrack) do begin
-//    if ATrack[T].Hear then begin
-    if ((ATrack[T].Status div 1) and 1) = 1 then begin
-      for N := 0 to High(ATrack[T].Note) do begin
-        if (ATrack[T].Note[N].EventType = 9) and (ATrack[T].Note[N].Data2 > 0) then begin
+  for T := 0 to High(ATrack) do
+  begin
+//    if ATrack[T].Hear then
+//    begin
+    if Notes in ATrack[T].Status then
+    begin
+      for N := 0 to High(ATrack[T].Note) do
+      begin
+        if (ATrack[T].Note[N].EventType = 9) and (ATrack[T].Note[N].Data2 > 0) then
+	begin
           Nu := Length(Note);
           SetLength(Note, Nu + 1);
           Note[Nu].Start := Round(ATrack[T].Note[N].Start / Ticks);
@@ -296,11 +326,16 @@ begin
   end;
 
   // extract lyrics
-  for T := 0 to High(ATrack) do begin
-//    if ATrack[T].Hear then begin
-    if ((ATrack[T].Status div 2) and 1) = 1 then begin
-      for N := 0 to High(ATrack[T].Note) do begin
-        if (ATrack[T].Note[N].EventType = 15) then begin
+  for T := 0 to High(ATrack) do
+  begin
+//    if ATrack[T].Hear then
+//    begin
+    if Lyrics in ATrack[T].Status then
+    begin
+      for N := 0 to High(ATrack[T].Note) do
+      begin
+        if (ATrack[T].Note[N].EventType = 15) then
+	begin
 //          Log.LogStatus('<' + Track[T].Note[N].Str + '>', 'MIDI');
           AddLyric(Round(ATrack[T].Note[N].Start / Ticks), ATrack[T].Note[N].Str);
         end;
@@ -311,7 +346,8 @@ begin
   // sort notes
   for N := 0 to High(Note) do
     for Nu := 0 to High(Note)-1 do
-      if Note[Nu].Start > Note[Nu+1].Start then begin
+      if Note[Nu].Start > Note[Nu+1].Start then
+      begin
         NoteTemp := Note[Nu];
         Note[Nu] := Note[Nu+1];
         Note[Nu+1] := NoteTemp;
@@ -331,8 +367,10 @@ begin
   N := 0;
   Lines.Line[C].HighNote := -1;
 
-  for Nu := 0 to High(Note) do begin
-    if Note[Nu].NewSentence then begin // nowa linijka
+  for Nu := 0 to High(Note) do
+  begin
+    if Note[Nu].NewSentence then // new line
+    begin
       SetLength(Lines.Line, Length(Lines.Line)+1);
       Lines.Number := Lines.Number + 1;
       Lines.High := Lines.High + 1;
@@ -363,10 +401,10 @@ begin
       end;
     end;
 
-    // tworzy miejsce na nowa nute
+    // create space for new note
     SetLength(Lines.Line[C].Note, Length(Lines.Line[C].Note)+1);
 
-    // dopisuje
+    // initialize note
     Lines.Line[C].Note[N].Start := Note[Nu].Start;
     Lines.Line[C].Note[N].Length := Note[Nu].Len;
     Lines.Line[C].Note[N].Tone := Note[Nu].Tone;
@@ -383,8 +421,10 @@ var
 begin
   Result := 0;
   for T := 0 to High(ATrack) do
-//    if ATrack[T].Hear then Inc(Result);
-    if ((ATrack[T].Status div 1) and 1) = 1 then Inc(Result);
+//    if ATrack[T].Hear then
+//      Inc(Result);
+    if Notes in ATrack[T].Status then
+      Inc(Result);
 end;
 
 {$IFDEF UseMIDIPort}
@@ -428,7 +468,8 @@ begin
   MidiFile := TMidiFile.Create(nil);
   {$ENDIF}
 
-  for P := 0 to 100 do begin
+  for P := 0 to 100 do
+  begin
     ColR[P] := Random(10)/10;
     ColG[P] := Random(10)/10;
     ColB[P] := Random(10)/10;
@@ -464,13 +505,15 @@ begin
     BPM := MidiFile.Bpm;
     Ticks := MidiFile.TicksPerQuarter / 4;
 
-{    for T := 0 to MidiFile.NumberOfTracks-1 do begin
+{    for T := 0 to MidiFile.NumberOfTracks-1 do
+    begin
       SetLength(Track, Length(Track)+1);
       MidiTrack := MidiFile.GetTrack(T);
       MidiTrack.OnMidiEvent := MidiFile1MidiEvent;
       Track[T].Name := MidiTrack.getName;
 
-      for N := 0 to MidiTrack.getEventCount-1 do begin
+      for N := 0 to MidiTrack.getEventCount-1 do
+      begin
         SetLength(Track[T].Note, Length(Track[T].Note)+1);
         MidiEvent := MidiTrack.GetEvent(N);
         Track[T].Note[N].Start := MidiEvent.time;
@@ -487,20 +530,21 @@ begin
       end;
     end;}
 
-
     SetLength(Channel, 16);
     for T := 0 to 15 do
     begin
       Channel[T].Name := IntToStr(T+1);
       SetLength(Channel[T].Note, 0);
-      Channel[T].Status := 0;
+      Channel[T].Status := [];
     end;
 
-    for T := 0 to MidiFile.NumberOfTracks-1 do begin
+    for T := 0 to MidiFile.NumberOfTracks-1 do
+    begin
       MidiTrack := MidiFile.GetTrack(T);
       MidiTrack.OnMidiEvent := MidiFile1MidiEvent;
 
-      for N := 0 to MidiTrack.getEventCount-1 do begin
+      for N := 0 to MidiTrack.getEventCount-1 do
+      begin
         MidiEvent := MidiTrack.GetEvent(N);
         C := MidiEvent.event and 15;
 
@@ -530,8 +574,8 @@ end;
 
 function TScreenEditConvert.Draw: boolean;
 var
-  Pet:    integer;
-  Pet2:   integer;
+  Count:  integer;
+  Count2: integer;
   Bottom: real;
   X:      real;
   Y:      real;
@@ -544,7 +588,8 @@ begin
   Y := 100;
 
   H := Length(ATrack)*40;
-  if H > 480 then H := 480;
+  if H > 480 then
+    H := 480;
   Bottom := Y + H;
 
   YSkip := H / Length(ATrack);
@@ -553,18 +598,21 @@ begin
   DrawQuad(10, Y+Sel*YSkip, 780, YSkip, 0.8, 0.8, 0.8);
 
   // selected - now me use Status System
-  for Pet := 0 to High(ATrack) do
-    if ATrack[Pet].Hear then
-      DrawQuad(10, Y+Pet*YSkip, 50, YSkip, 0.8, 0.3, 0.3);
+  for Count := 0 to High(ATrack) do
+    if ATrack[Count].Hear then
+      DrawQuad(10, Y+Count*YSkip, 50, YSkip, 0.8, 0.3, 0.3);
   glColor3f(0, 0, 0);
-  for Pet := 0 to High(ATrack) do begin
-    if ((ATrack[Pet].Status div 1) and 1) = 1 then begin
-      SetFontPos(25, Y + Pet*YSkip + 10);
+  for Count := 0 to High(ATrack) do
+  begin
+    if Notes in ATrack[Count].Status then
+    begin
+      SetFontPos(25, Y + Count*YSkip + 10);
       SetFontSize(15);
       glPrint('N');
     end;
-    if ((ATrack[Pet].Status div 2) and 1) = 1 then begin
-      SetFontPos(40, Y + Pet*YSkip + 10);
+    if Lyrics in ATrack[Count].Status then
+    begin
+      SetFontPos(40, Y + Count*YSkip + 10);
       SetFontSize(15);
       glPrint('L');
     end;
@@ -574,21 +622,23 @@ begin
   DrawLine(60, Y,   60, Bottom, 0, 0, 0);
   DrawLine(790, Y, 790, Bottom, 0, 0, 0);
 
-  for Pet := 0 to Length(ATrack) do
-    DrawLine(10, Y+Pet*YSkip, 790, Y+Pet*YSkip, 0, 0, 0);
+  for Count := 0 to Length(ATrack) do
+    DrawLine(10, Y+Count*YSkip, 790, Y+Count*YSkip, 0, 0, 0);
 
-  for Pet := 0 to High(ATrack) do begin
-    SetFontPos(11, Y + 10 + Pet*YSkip);
+  for Count := 0 to High(ATrack) do
+  begin
+    SetFontPos(11, Y + 10 + Count*YSkip);
     SetFontSize(15);
-    glPrint(ATrack[Pet].Name);
+    glPrint(ATrack[Count].Name);
   end;
 
-  for Pet := 0 to High(ATrack) do
-    for Pet2 := 0 to High(ATrack[Pet].Note) do begin
-      if ATrack[Pet].Note[Pet2].EventType = 9 then
-        DrawQuad(60 + ATrack[Pet].Note[Pet2].Start/Len * 725, Y + (Pet+1)*YSkip - ATrack[Pet].Note[Pet2].Data1*35/127, 3, 3, ColR[Pet], ColG[Pet], ColB[Pet]);
-      if ATrack[Pet].Note[Pet2].EventType = 15 then
-        DrawLine(60 + ATrack[Pet].Note[Pet2].Start/Len * 725, Y + 0.75 * YSkip + Pet*YSkip, 60 + ATrack[Pet].Note[Pet2].Start/Len * 725, Y + YSkip + Pet*YSkip, ColR[Pet], ColG[Pet], ColB[Pet]);
+  for Count := 0 to High(ATrack) do
+    for Count2 := 0 to High(ATrack[Count].Note) do
+    begin
+      if ATrack[Count].Note[Count2].EventType = 9 then
+        DrawQuad(60 + ATrack[Count].Note[Count2].Start/Len * 725, Y + (Count+1)*YSkip - ATrack[Count].Note[Count2].Data1*35/127, 3, 3, ColR[Count], ColG[Count], ColB[Count]);
+      if ATrack[Count].Note[Count2].EventType = 15 then
+        DrawLine(60 + ATrack[Count].Note[Count2].Start/Len * 725, Y + 0.75 * YSkip + Count*YSkip, 60 + ATrack[Count].Note[Count2].Start/Len * 725, Y + YSkip + Count*YSkip, ColR[Count], ColG[Count], ColB[Count]);
     end;
 
   // playing line
diff --git a/unicode/src/screens/UScreenEditHeader.pas b/unicode/src/screens/UScreenEditHeader.pas
index 10480299..2548069d 100644
--- a/unicode/src/screens/UScreenEditHeader.pas
+++ b/unicode/src/screens/UScreenEditHeader.pas
@@ -73,7 +73,7 @@ type
 
       constructor Create; override;
       procedure onShow; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
 {      function Draw: boolean; override;
       procedure Finish;}
   end;
@@ -89,13 +89,13 @@ uses
   UTexture,
   UUnicodeUtils;
 
-function TScreenEditHeader.ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean;
+function TScreenEditHeader.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
 var
   T:    integer;
 begin
   Result := true;
-  If (PressedDown) Then begin // Key Down
-    // check normal keys
+  if (PressedDown) then    // Key Down
+   begin   // check normal keys
     case UCS4UpperCase(CharCode) of
       Ord('Q'):
         begin
@@ -115,7 +115,8 @@ begin
 
       SDLK_RETURN:
         begin
-          if Interaction = 1 then begin
+          if Interaction = 1 then
+	  begin
 //            Save;
           end;
         end;
@@ -124,14 +125,14 @@ begin
         begin
           case Interaction of
             0..0: InteractNext;
-            1:  Interaction := 0;
+            1:    Interaction := 0;
           end;
         end;
 
       SDLK_LEFT:
         begin
           case Interaction of
-            0:  Interaction := 1;
+            0:    Interaction := 1;
             1..1: InteractPrev;
           end;
         end;
@@ -139,25 +140,26 @@ begin
       SDLK_DOWN:
         begin
           case Interaction of
-            0..1:   Interaction := 2;
-            2..12:  InteractNext;
-            13:     Interaction := 0;
+            0..1:  Interaction := 2;
+            2..12: InteractNext;
+            13:    Interaction := 0;
           end;
         end;
 
       SDLK_UP:
         begin
           case Interaction of
-            0..1:   Interaction := 13;
-            2:      Interaction := 0;
-            3..13:  InteractPrev;
+            0..1:  Interaction := 13;
+            2:     Interaction := 0;
+            3..13: InteractPrev;
           end;
         end;
 
       SDLK_BACKSPACE:
         begin
           T := Interaction - 2 + TextTitle;
-          if (Interaction >= 2) and (Interaction <= 13) and (Length(Text[T].Text) >= 1) then begin
+          if (Interaction >= 2) and (Interaction <= 13) and (Length(Text[T].Text) >= 1) then
+	  begin
             Text[T].DeleteLastLetter;
             SetRoundButtons;            
           end;
@@ -167,7 +169,8 @@ begin
     case CharCode of
       32..255:
         begin
-          if (Interaction >= 2) and (Interaction <= 13) then begin
+          if (Interaction >= 2) and (Interaction <= 13) then
+	  begin
             Text[Interaction - 2 + TextTitle].Text :=
               Text[Interaction - 2 + TextTitle].Text + UCS4ToUTF8String(CharCode);
             SetRoundButtons;
@@ -252,7 +255,8 @@ procedure TScreenEditHeader.onShow;
 begin
   inherited;
 
-{  if FileExists(FileName) then begin // load file
+{  if FileExists(FileName) then  // load file
+  begin
     CurrentSong.FileName := FileName;
     SkanujPlik(CurrentSong);
 
@@ -281,29 +285,33 @@ end;
 
 (*function TScreenEdit.Draw: boolean;
 var
-  Min:    integer;
-  Sec:    integer;
-  Tekst:  string;
-  Pet:    integer;
-  AktBeat:  integer;
+  Min:     integer;
+  Sec:     integer;
+  Count:   integer;
+  AktBeat: integer;
 begin
 {  glClearColor(1,1,1,1);
 
   // control music
-  if PlaySentence then begin
+  if PlaySentence then
+  begin
     // stop the music
-    if (Music.Position > PlayStopTime) then begin
+    if (Music.Position > PlayStopTime) then
+    begin
       Music.Stop;
       PlaySentence := false;
     end;
 
     // click
-    if (Click) and (PlaySentence) then begin
+    if (Click) and (PlaySentence) then
+    begin
       AktBeat := Floor(CurrentSong.BPM[0].BPM * (Music.Position - CurrentSong.GAP / 1000) / 60);
       Text[TextDebug].Text := IntToStr(AktBeat);
-      if AktBeat <> LastClick then begin
-        for Pet := 0 to Czesci[0].Czesc[Czesci[0].Akt].HighNut do
-          if (Czesci[0].Czesc[Czesci[0].Akt].Nuta[Pet].Start = AktBeat) then begin
+      if AktBeat <> LastClick then
+      begin
+        for Count := 0 to Czesci[0].Czesc[Czesci[0].Akt].HighNut do
+          if (Czesci[0].Czesc[Czesci[0].Akt].Nuta[Count].Start = AktBeat) then
+          begin
             Music.PlayClick;
             LastClick := AktBeat;
           end;
@@ -322,7 +330,7 @@ begin
   Text[TextNStart].Text :=    IntToStr(Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Start);
   Text[TextNDlugosc].Text :=  IntToStr(Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Dlugosc);
   Text[TextNTon].Text :=      IntToStr(Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Ton);
-  Text[TextNText].Text :=              Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Tekst;
+  Text[TextNText].Text :=              Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Text;
 
   // draw static menu
   inherited Draw;
@@ -339,37 +347,52 @@ end;*)
 
 procedure TScreenEditHeader.SetRoundButtons;
 begin
-  if Length(Text[TextTitle].Text) > 0 then Static[StaticTitle].Visible := true
-  else Static[StaticTitle].Visible := false;
-
-  if Length(Text[TextArtist].Text) > 0 then Static[StaticArtist].Visible := true
-  else Static[StaticArtist].Visible := false;
-
-  if Length(Text[TextMp3].Text) > 0 then Static[StaticMp3].Visible := true
-  else Static[StaticMp3].Visible := false;
-
-  if Length(Text[TextBackground].Text) > 0 then Static[StaticBackground].Visible := true
-  else Static[StaticBackground].Visible := false;
-
-  if Length(Text[TextVideo].Text) > 0 then Static[StaticVideo].Visible := true
-  else Static[StaticVideo].Visible := false;
+  if Length(Text[TextTitle].Text) > 0 then
+    Static[StaticTitle].Visible := true
+  else
+    Static[StaticTitle].Visible := false;
+
+  if Length(Text[TextArtist].Text) > 0 then
+    Static[StaticArtist].Visible := true
+  else
+    Static[StaticArtist].Visible := false;
+
+  if Length(Text[TextMp3].Text) > 0 then
+    Static[StaticMp3].Visible := true
+  else 
+    Static[StaticMp3].Visible := false;
+
+  if Length(Text[TextBackground].Text) > 0 then
+    Static[StaticBackground].Visible := true
+  else
+    Static[StaticBackground].Visible := false;
+
+  if Length(Text[TextVideo].Text) > 0 then
+    Static[StaticVideo].Visible := true
+  else
+    Static[StaticVideo].Visible := false;
 
   try
     StrToFloat(Text[TextVideoGAP].Text);
-    if StrToFloat(Text[TextVideoGAP].Text)<> 0 then Static[StaticVideoGAP].Visible := true
-    else Static[StaticVideoGAP].Visible := false;
+    if StrToFloat(Text[TextVideoGAP].Text)<> 0 then
+      Static[StaticVideoGAP].Visible := true
+    else
+      Static[StaticVideoGAP].Visible := false;
   except
     Static[StaticVideoGAP].Visible := false;
   end;
 
-  if LowerCase(Text[TextRelative].Text) = 'yes' then Static[StaticRelative].Visible := true
-  else Static[StaticRelative].Visible := false;
+  if LowerCase(Text[TextRelative].Text) = 'yes' then
+    Static[StaticRelative].Visible := true
+  else
+    Static[StaticRelative].Visible := false;
 
   try
     StrToInt(Text[TextResolution].Text);
-    if (StrToInt(Text[TextResolution].Text) <> 0) and (StrToInt(Text[TextResolution].Text) >= 1)
-    then Static[StaticResolution].Visible := true
-    else Static[StaticResolution].Visible := false;
+    if (StrToInt(Text[TextResolution].Text) <> 0) and (StrToInt(Text[TextResolution].Text) >= 1) then
+      Static[StaticResolution].Visible := true
+    else
+      Static[StaticResolution].Visible := false;
   except
     Static[StaticResolution].Visible := false;
   end;
@@ -384,8 +407,10 @@ begin
   // start
   try
     StrToFloat(Text[TextStart].Text);
-    if (StrToFloat(Text[TextStart].Text) > 0) then Static[StaticStart].Visible := true
-    else Static[StaticStart].Visible := false;
+    if (StrToFloat(Text[TextStart].Text) > 0) then
+      Static[StaticStart].Visible := true
+    else
+      Static[StaticStart].Visible := false;
   except
     Static[StaticStart].Visible := false;
   end;
@@ -401,8 +426,10 @@ begin
   // BPM
   try
     StrToFloat(Text[TextBPM].Text);
-    if (StrToFloat(Text[TextBPM].Text) > 0) then Static[StaticBPM].Visible := true
-    else Static[StaticBPM].Visible := false;
+    if (StrToFloat(Text[TextBPM].Text) > 0) then
+      Static[StaticBPM].Visible := true
+    else
+      Static[StaticBPM].Visible := false;
   except
     Static[StaticBPM].Visible := false;
   end;
diff --git a/unicode/src/screens/UScreenEditSub.pas b/unicode/src/screens/UScreenEditSub.pas
index e3adeaf8..a892651a 100644
--- a/unicode/src/screens/UScreenEditSub.pas
+++ b/unicode/src/screens/UScreenEditSub.pas
@@ -57,7 +57,7 @@ type
   TScreenEditSub = class(TMenu)
     private
       //Variable is True if no Song is loaded
-      Error:            Boolean;
+      Error:            boolean;
       
       TextNote:         integer;
       TextSentence:     integer;
@@ -80,18 +80,18 @@ type
       CopySrc:          integer;
 
       {$IFDEF UseMIDIPort}
-      MidiOut:         TMidiOutput;
+      MidiOut:          TMidiOutput;
       {$endif}
 
-      MidiStart:       real;
-      MidiStop:        real;
-      MidiTime:        real;
-      MidiPos:         real;
-      MidiLastNote:    integer;
+      MidiStart:        real;
+      MidiStop:         real;
+      MidiTime:         real;
+      MidiPos:          real;
+      MidiLastNote:     integer;
 
-      TextEditMode:    boolean;
+      TextEditMode:     boolean;
 
-      Lyric:    TEditorLyrics;
+      Lyric:            TEditorLyrics;
 
       procedure DivideBPM;
       procedure MultiplyBPM;
@@ -111,14 +111,14 @@ type
       procedure CopySentence(Src, Dst: integer);
       procedure CopySentences(Src, Dst, Num: integer);
       //Note Name Mod
-      function GetNoteName(Note: Integer): String;
+      function GetNoteName(Note: integer): string;
     public
       Tex_Background:     TTexture;
       FadeOut:            boolean;
       constructor Create; override;
       procedure onShow; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean; override;
-      function ParseInputEditText(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean;
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
+      function ParseInputEditText(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
       function Draw: boolean; override;
       procedure onHide; override;
   end;
@@ -128,29 +128,32 @@ implementation
 uses
   UGraphic,
   UDraw,
-  UMain,
+  UNote,
   USkins,
   ULanguage,
   UUnicodeUtils;
 
 // Method for input parsing. If False is returned, GetNextWindow
 // should be checked to know the next window to load;
-function TScreenEditSub.ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean;
+function TScreenEditSub.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
 var
   SDL_ModState:  Word;
   R:    real;
 begin
   Result := true;
 
-  if TextEditMode then begin
+  if TextEditMode then
+  begin
     Result := ParseInputEditText(PressedKey, CharCode, PressedDown);
-  end else begin
+  end
+  else
+  begin
 
   SDL_ModState := SDL_GetModState and (KMOD_LSHIFT + KMOD_RSHIFT
     + KMOD_LCTRL + KMOD_RCTRL + KMOD_LALT  + KMOD_RALT {+ KMOD_CAPS});
 
-  If (PressedDown) then begin // Key Down
-    // check normal keys
+  if (PressedDown) then  // Key Down
+  begin  // check normal keys
     case UCS4UpperCase(CharCode) of
       Ord('Q'):
         begin
@@ -202,14 +205,16 @@ begin
       Ord('V'):
         begin
           // Paste text
-          if SDL_ModState = KMOD_LCTRL then begin
+          if SDL_ModState = KMOD_LCTRL then
+	  begin
             if Lines[0].Line[Lines[0].Current].HighNote >= Lines[0].Line[CopySrc].HighNote then
               PasteText
             else
               Log.LogStatus('PasteText: invalid range', 'TScreenEditSub.ParseInput');
           end;
 
-          if SDL_ModState = KMOD_LCTRL + KMOD_LSHIFT then begin
+          if SDL_ModState = KMOD_LCTRL + KMOD_LSHIFT then
+	  begin
             CopySentence(CopySrc, Lines[0].Current);
           end;
         end;
@@ -328,20 +333,23 @@ begin
 
       SDLK_4:
         begin
-          if SDL_ModState = KMOD_LCTRL + KMOD_LSHIFT then begin
+          if SDL_ModState = KMOD_LCTRL + KMOD_LSHIFT then
+	  begin
             CopySentence(CopySrc, Lines[0].Current);
             CopySentence(CopySrc+1, Lines[0].Current+1);
             CopySentence(CopySrc+2, Lines[0].Current+2);
             CopySentence(CopySrc+3, Lines[0].Current+3);
           end;
 
-          if SDL_ModState = KMOD_LCTRL + KMOD_LSHIFT + KMOD_LALT then begin
+          if SDL_ModState = KMOD_LCTRL + KMOD_LSHIFT + KMOD_LALT then
+	  begin
             CopySentences(CopySrc, Lines[0].Current, 4);
           end;
         end;
       SDLK_5:
         begin
-          if SDL_ModState = KMOD_LCTRL + KMOD_LSHIFT then begin
+          if SDL_ModState = KMOD_LCTRL + KMOD_LSHIFT then
+	  begin
             CopySentence(CopySrc, Lines[0].Current);
             CopySentence(CopySrc+1, Lines[0].Current+1);
             CopySentence(CopySrc+2, Lines[0].Current+2);
@@ -349,7 +357,8 @@ begin
             CopySentence(CopySrc+4, Lines[0].Current+4);
           end;
 
-          if SDL_ModState = KMOD_LCTRL + KMOD_LSHIFT + KMOD_LALT then begin
+          if SDL_ModState = KMOD_LCTRL + KMOD_LSHIFT + KMOD_LALT then
+	  begin
             CopySentences(CopySrc, Lines[0].Current, 5);
           end;
         end;
@@ -391,19 +400,22 @@ begin
 
       SDLK_SLASH:
         begin
-          if SDL_ModState = 0 then begin
+          if SDL_ModState = 0 then
+	  begin
             // Insert start of sentece
             if CurrentNote > 0 then
               DivideSentence;
           end;
 
-          if SDL_ModState = KMOD_LSHIFT then begin
+          if SDL_ModState = KMOD_LSHIFT then
+	  begin
             // Join next sentence with current
-            if Lines[0].Current < Lines[0].High  then
+            if Lines[0].Current < Lines[0].High then
               JoinSentence;
           end;
 
-          if SDL_ModState = KMOD_LCTRL then begin
+          if SDL_ModState = KMOD_LCTRL then
+	  begin
             // divide note
             DivideNote;
           end;
@@ -435,13 +447,10 @@ begin
         begin
         end;
 
-      SDLK_LCTRL:
-        begin
-        end;
-
       SDLK_DELETE:
         begin
-          if SDL_ModState = KMOD_LCTRL then begin
+          if SDL_ModState = KMOD_LCTRL then
+	  begin
             // moves text to right in current sentence
             DeleteNote;
           end;
@@ -456,29 +465,36 @@ begin
       SDLK_RIGHT:
         begin
           // right
-          if SDL_ModState = 0 then begin
+          if SDL_ModState = 0 then
+	  begin
             Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 0;
             Inc(CurrentNote);
-            if CurrentNote > Lines[0].Line[Lines[0].Current].HighNote then CurrentNote := 0;
+            if CurrentNote > Lines[0].Line[Lines[0].Current].HighNote then
+	      CurrentNote := 0;
             Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
             Lyric.Selected := CurrentNote;
           end;
 
           // ctrl + right
-          if SDL_ModState = KMOD_LCTRL then begin
-            if Lines[0].Line[Lines[0].Current].Note[CurrentNote].Length > 1 then begin
+          if SDL_ModState = KMOD_LCTRL then
+	  begin
+            if Lines[0].Line[Lines[0].Current].Note[CurrentNote].Length > 1 then
+	    begin
               Dec(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Length);
               Inc(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Start);
-              if CurrentNote = 0 then begin
+              if CurrentNote = 0 then
+	      begin
                 Inc(Lines[0].Line[Lines[0].Current].Start);
               end;
             end;
           end;
 
           // shift + right
-          if SDL_ModState = KMOD_LSHIFT then begin
+          if SDL_ModState = KMOD_LSHIFT then
+	  begin
             Inc(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Start);
-            if CurrentNote = 0 then begin
+            if CurrentNote = 0 then
+	    begin
               Inc(Lines[0].Line[Lines[0].Current].Start);
             end;
             if CurrentNote = Lines[0].Line[Lines[0].Current].HighNote then
@@ -486,14 +502,16 @@ begin
           end;
 
           // alt + right
-          if SDL_ModState = KMOD_LALT then begin
+          if SDL_ModState = KMOD_LALT then
+	  begin
             Inc(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Length);
             if CurrentNote = Lines[0].Line[Lines[0].Current].HighNote then
               Inc(Lines[0].Line[Lines[0].Current].End_);
           end;
 
           // alt + ctrl + shift + right = move all from cursor to right
-          if SDL_ModState = KMOD_LALT + KMOD_LCTRL + KMOD_LSHIFT then begin
+          if SDL_ModState = KMOD_LALT + KMOD_LCTRL + KMOD_LSHIFT then
+	  begin
             MoveAllToEnd(1);
           end;
 
@@ -502,29 +520,35 @@ begin
       SDLK_LEFT:
         begin
           // left
-          if SDL_ModState = 0 then begin
+          if SDL_ModState = 0 then
+	  begin
             Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 0;
             Dec(CurrentNote);
-            if CurrentNote = -1 then CurrentNote := Lines[0].Line[Lines[0].Current].HighNote;
+            if CurrentNote = -1 then
+	      CurrentNote := Lines[0].Line[Lines[0].Current].HighNote;
             Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
             Lyric.Selected := CurrentNote;
           end;
 
           // ctrl + left
-          if SDL_ModState = KMOD_LCTRL then begin
+          if SDL_ModState = KMOD_LCTRL then
+	  begin
             Dec(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Start);
             Inc(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Length);
-            if CurrentNote = 0 then begin
+            if CurrentNote = 0 then
+	    begin
               Dec(Lines[0].Line[Lines[0].Current].Start);
             end;
           end;
 
           // shift + left
-          if SDL_ModState = KMOD_LSHIFT then begin
+          if SDL_ModState = KMOD_LSHIFT then
+	  begin
             Dec(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Start);
 
             // resizing sentences
-            if CurrentNote = 0 then begin
+            if CurrentNote = 0 then
+	    begin
               Dec(Lines[0].Line[Lines[0].Current].Start);
             end;
 
@@ -534,8 +558,10 @@ begin
           end;
 
           // alt + left
-          if SDL_ModState = KMOD_LALT then begin
-            if Lines[0].Line[Lines[0].Current].Note[CurrentNote].Length > 1 then begin
+          if SDL_ModState = KMOD_LALT then
+	  begin
+            if Lines[0].Line[Lines[0].Current].Note[CurrentNote].Length > 1 then
+	    begin
               Dec(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Length);
               if CurrentNote = Lines[0].Line[Lines[0].Current].HighNote then
                 Dec(Lines[0].Line[Lines[0].Current].End_);
@@ -543,7 +569,8 @@ begin
           end;
 
           // alt + ctrl + shift + right = move all from cursor to left
-          if SDL_ModState = KMOD_LALT + KMOD_LCTRL + KMOD_LSHIFT then begin
+          if SDL_ModState = KMOD_LALT + KMOD_LCTRL + KMOD_LSHIFT then
+	  begin
             MoveAllToEnd(-1);
           end;
 
@@ -553,7 +580,8 @@ begin
         begin
 
           // skip to next sentence
-          if SDL_ModState = 0 then begin                       {$IFDEF UseMIDIPort}
+          if SDL_ModState = 0 then
+	  begin                       {$IFDEF UseMIDIPort}
             MidiOut.PutShort($81, Lines[0].Line[Lines[0].Current].Note[MidiLastNote].Tone + 60, 127);
             PlaySentenceMidi := false;
             {$endif}
@@ -561,7 +589,8 @@ begin
             Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 0;
             Inc(Lines[0].Current);
             CurrentNote := 0;
-            if Lines[0].Current > Lines[0].High then Lines[0].Current := 0;
+            if Lines[0].Current > Lines[0].High then
+	      Lines[0].Current := 0;
             Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
 
             Lyric.AddLine(Lines[0].Current);
@@ -571,7 +600,8 @@ begin
           end;
 
           // decrease tone
-          if SDL_ModState = KMOD_LCTRL then begin
+          if SDL_ModState = KMOD_LCTRL then
+	  begin
             TransposeNote(-1);
           end;
 
@@ -581,7 +611,8 @@ begin
         begin
 
           // skip to previous sentence
-          if SDL_ModState = 0 then begin
+          if SDL_ModState = 0 then
+	  begin
             {$IFDEF UseMIDIPort}
             MidiOut.PutShort($81, Lines[0].Line[Lines[0].Current].Note[MidiLastNote].Tone + 60, 127);
             PlaySentenceMidi := false;
@@ -590,7 +621,8 @@ begin
             Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 0;
             Dec(Lines[0].Current);
             CurrentNote := 0;
-            if Lines[0].Current = -1 then Lines[0].Current := Lines[0].High;
+            if Lines[0].Current = -1 then
+	      Lines[0].Current := Lines[0].High;
             Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
 
             Lyric.AddLine(Lines[0].Current);
@@ -600,7 +632,8 @@ begin
           end;
 
           // increase tone
-          if SDL_ModState = KMOD_LCTRL then begin
+          if SDL_ModState = KMOD_LCTRL then
+	  begin
             TransposeNote(1);
           end;
         end;
@@ -610,7 +643,7 @@ begin
   end; // if
 end;
 
-function TScreenEditSub.ParseInputEditText(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean;
+function TScreenEditSub.ParseInputEditText(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
 var
   SDL_ModState:  Word;
 begin
@@ -620,7 +653,7 @@ begin
   SDL_ModState := SDL_GetModState and (KMOD_LSHIFT + KMOD_RSHIFT
     + KMOD_LCTRL + KMOD_RCTRL + KMOD_LALT  + KMOD_RALT {+ KMOD_CAPS});
 
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     case PressedKey of
 
@@ -648,10 +681,12 @@ begin
       SDLK_RIGHT:
         begin
           // right
-          if SDL_ModState = 0 then begin
+          if SDL_ModState = 0 then
+	  begin
             Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 0;
             Inc(CurrentNote);
-            if CurrentNote > Lines[0].Line[Lines[0].Current].HighNote then CurrentNote := 0;
+            if CurrentNote > Lines[0].Line[Lines[0].Current].HighNote then
+	      CurrentNote := 0;
             Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
             Lyric.Selected := CurrentNote;
           end;
@@ -659,10 +694,12 @@ begin
       SDLK_LEFT:
         begin
           // left
-          if SDL_ModState = 0 then begin
+          if SDL_ModState = 0 then
+	  begin
             Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 0;
             Dec(CurrentNote);
-            if CurrentNote = -1 then CurrentNote := Lines[0].Line[Lines[0].Current].HighNote;
+            if CurrentNote = -1 then
+	      CurrentNote := Lines[0].Line[Lines[0].Current].HighNote;
             Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
             Lyric.Selected := CurrentNote;
           end;
@@ -687,11 +724,13 @@ var
   N:    integer;
 begin                    
   CurrentSong.BPM[0].BPM := CurrentSong.BPM[0].BPM / 2;
-  for C := 0 to Lines[0].High do begin
-    Lines[0].Line[C].Start :=     Lines[0].Line[C].Start div 2;
-    Lines[0].Line[C].End_ :=    Lines[0].Line[C].End_ div 2;
-    for N := 0 to Lines[0].Line[C].HighNote do begin
-      Lines[0].Line[C].Note[N].Start :=   Lines[0].Line[C].Note[N].Start div 2;
+  for C := 0 to Lines[0].High do
+  begin
+    Lines[0].Line[C].Start := Lines[0].Line[C].Start div 2;
+    Lines[0].Line[C].End_  := Lines[0].Line[C].End_ div 2;
+    for N := 0 to Lines[0].Line[C].HighNote do
+    begin
+      Lines[0].Line[C].Note[N].Start  :=       Lines[0].Line[C].Note[N].Start div 2;
       Lines[0].Line[C].Note[N].Length := Round(Lines[0].Line[C].Note[N].Length / 2);
     end; // N
   end; // C
@@ -703,11 +742,13 @@ var
   N:    integer;
 begin
   CurrentSong.BPM[0].BPM := CurrentSong.BPM[0].BPM * 2;
-  for C := 0 to Lines[0].High do begin
-    Lines[0].Line[C].Start :=     Lines[0].Line[C].Start * 2;
-    Lines[0].Line[C].End_ :=    Lines[0].Line[C].End_ * 2;
-    for N := 0 to Lines[0].Line[C].HighNote do begin
-      Lines[0].Line[C].Note[N].Start :=   Lines[0].Line[C].Note[N].Start * 2;
+  for C := 0 to Lines[0].High do
+  begin
+    Lines[0].Line[C].Start := Lines[0].Line[C].Start * 2;
+    Lines[0].Line[C].End_  := Lines[0].Line[C].End_ * 2;
+    for N := 0 to Lines[0].Line[C].HighNote do
+    begin
+      Lines[0].Line[C].Note[N].Start  := Lines[0].Line[C].Note[N].Start * 2;
       Lines[0].Line[C].Note[N].Length := Lines[0].Line[C].Note[N].Length * 2;
     end; // N
   end; // C
@@ -724,7 +765,8 @@ begin
     for N := 0 to Lines[0].Line[C].HighNut do
       Lines[0].Line[C].Note[N].Text := UTF8LowerCase(Lines[0].Line[C].Note[N].Text);}
 
-  for C := 0 to Lines[0].High do begin
+  for C := 0 to Lines[0].High do
+  begin
     S := AnsiUpperCase(Copy(Lines[0].Line[C].Note[0].Text, 1, 1));
     S := S + Copy(Lines[0].Line[C].Note[0].Text, 2, Length(Lines[0].Line[C].Note[0].Text)-1);
     Lines[0].Line[C].Note[0].Text := S;
@@ -736,33 +778,39 @@ var
   C:    integer;
   N:    integer;
 begin
-  for C := 0 to Lines[0].High do begin
+  for C := 0 to Lines[0].High do
+  begin
     // correct starting spaces in the first word
     while Copy(Lines[0].Line[C].Note[0].Text, 1, 1) = ' ' do
       Lines[0].Line[C].Note[0].Text := Copy(Lines[0].Line[C].Note[0].Text, 2, 100);
 
     // move spaces on the start to the end of the previous note
-    for N := 1 to Lines[0].Line[C].HighNote do begin
-      while (Copy(Lines[0].Line[C].Note[N].Text, 1, 1) = ' ') do begin
+    for N := 1 to Lines[0].Line[C].HighNote do
+    begin
+      while (Copy(Lines[0].Line[C].Note[N].Text, 1, 1) = ' ') do
+      begin
         Lines[0].Line[C].Note[N].Text := Copy(Lines[0].Line[C].Note[N].Text, 2, 100);
         Lines[0].Line[C].Note[N-1].Text := Lines[0].Line[C].Note[N-1].Text + ' ';
       end;
     end; // N
 
     // correct '-'  to '- '
-    for N := 0 to Lines[0].Line[C].HighNote do begin
+    for N := 0 to Lines[0].Line[C].HighNote do
+    begin
       if Lines[0].Line[C].Note[N].Text = '-' then
         Lines[0].Line[C].Note[N].Text := '- ';
     end; // N
 
     // add space to the previous note when the current word is '- '
-    for N := 1 to Lines[0].Line[C].HighNote do begin
+    for N := 1 to Lines[0].Line[C].HighNote do
+    begin
       if Lines[0].Line[C].Note[N].Text  = '- ' then
         Lines[0].Line[C].Note[N-1].Text := Lines[0].Line[C].Note[N-1].Text + ' ';
     end; // N
 
     // correct too many spaces at the end of note
-    for N := 0 to Lines[0].Line[C].HighNote do begin
+    for N := 0 to Lines[0].Line[C].HighNote do
+    begin
       while Copy(Lines[0].Line[C].Note[N].Text, Length(Lines[0].Line[C].Note[N].Text)-1, 2) = '  ' do
         Lines[0].Line[C].Note[N].Text := Copy(Lines[0].Line[C].Note[N].Text, 1, Length(Lines[0].Line[C].Note[N].Text)-1);
     end; // N
@@ -782,8 +830,10 @@ var
   Min:  integer;
   Max:  integer;
 begin
-  for C := 1 to Lines[0].High do begin
-    with Lines[0].Line[C-1] do begin
+  for C := 1 to Lines[0].High do
+  begin
+    with Lines[0].Line[C-1] do
+    begin
       Min := Note[HighNote].Start + Note[HighNote].Length;
       Max := Lines[0].Line[C].Note[0].Start;
       case (Max - Min) of
@@ -829,15 +879,15 @@ begin
   NStart := CurrentNote;
   Lines[0].Line[CNew].Start := Lines[0].Line[CStart].Note[NStart].Start;
   Lines[0].Line[CNew].Lyric := '';
-  Lines[0].Line[CNew].LyricWidth := 0;
   Lines[0].Line[CNew].End_ := 0;
-  Lines[0].Line[CNew].BaseNote := 0; // 0.5.0: we modify it later in this procedure
+  Lines[0].Line[CNew].BaseNote := 0;//High(Integer); // TODO: High (Integer) will causes a memory exception later in this procedure. Weird!
   Lines[0].Line[CNew].HighNote := -1;
   SetLength(Lines[0].Line[CNew].Note, 0);
 
   // move right notes to new sentences
   NHigh := Lines[0].Line[CStart].HighNote;
-  for N := NStart to NHigh do begin
+  for N := NStart to NHigh do
+  begin
     // increase sentence counters
     with Lines[0].Line[CNew] do
     begin
@@ -857,6 +907,16 @@ begin
     Lines[0].Line[CStart].Note[NStart-1].Length;
   SetLength(Lines[0].Line[CStart].Note, Lines[0].Line[CStart].HighNote + 1);
 
+  //recalculate BaseNote of the divided Sentence
+  with Lines[0].Line[CStart] do
+  begin
+    BaseNote := High(Integer);
+
+    For N := 0 to HighNote do
+      if Note[N].Tone < BaseNote then
+        BaseNote := Note[N].Tone;
+  end;
+
   Lines[0].Current := Lines[0].Current + 1;
   CurrentNote := 0;
   Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
@@ -878,7 +938,8 @@ begin
   SetLength(Lines[0].Line[C].Note, Lines[0].Line[C].HighNote + 1);
 
   // move right notes to new sentences
-  for N := 0 to Lines[0].Line[C+1].HighNote do begin
+  for N := 0 to Lines[0].Line[C+1].HighNote do
+  begin
     NDst := NStart + N;
     Lines[0].Line[C].Note[NDst] := Lines[0].Line[C+1].Note[N];
   end;
@@ -911,7 +972,8 @@ begin
     SetLength(Note, HighNote + 1);
 
     // we copy all notes including selected one
-    for N := HighNote downto CurrentNote+1 do begin
+    for N := HighNote downto CurrentNote+1 do
+    begin
       Note[N] := Note[N-1];
     end;
 
@@ -936,7 +998,8 @@ begin
   begin
 
     // we copy all notes from the next to the selected one
-    for N := CurrentNote+1 to Lines[0].Line[C].HighNote do begin
+    for N := CurrentNote+1 to Lines[0].Line[C].HighNote do
+    begin
       Lines[0].Line[C].Note[N-1] := Lines[0].Line[C].Note[N];
     end;
     
@@ -984,7 +1047,8 @@ var
   C:  integer;
   N:  integer;
 begin
-  for C := 0 to Lines[0].High do begin
+  for C := 0 to Lines[0].High do
+  begin
     Lines[0].Line[C].BaseNote := Lines[0].Line[C].BaseNote + Tone;
     for N := 0 to Lines[0].Line[C].HighNote do
       Lines[0].Line[C].Note[N].Tone := Lines[0].Line[C].Note[N].Tone + Tone;
@@ -997,13 +1061,17 @@ var
   N:    integer;
   NStart: integer;
 begin
-  for C := Lines[0].Current to Lines[0].High do begin
+  for C := Lines[0].Current to Lines[0].High do
+  begin
     NStart := 0;
-    if C = Lines[0].Current then NStart := CurrentNote;
-    for N := NStart to Lines[0].Line[C].HighNote do begin
+    if C = Lines[0].Current then
+      NStart := CurrentNote;
+    for N := NStart to Lines[0].Line[C].HighNote do
+    begin
       Inc(Lines[0].Line[C].Note[N].Start, Move); // move note start
 
-      if N = 0 then begin // fix beginning
+      if N = 0 then
+      begin // fix beginning
         Inc(Lines[0].Line[C].Start, Move);
       end;
 
@@ -1022,7 +1090,8 @@ var
 begin
 {  C := Lines[0].Current;
 
-  for N := Lines[0].Line[C].HighNut downto 1 do begin
+  for N := Lines[0].Line[C].HighNut downto 1 do
+  begin
     Lines[0].Line[C].Note[N].Text := Lines[0].Line[C].Note[N-1].Text;
   end; // for
 
@@ -1035,7 +1104,8 @@ begin
   Lines[0].Line[C].Note[NHigh].Text := Lines[0].Line[C].Note[NHigh-1].Text + Lines[0].Line[C].Note[NHigh].Text;
 
   // other words
-  for N := NHigh - 1 downto CurrentNote + 1 do begin
+  for N := NHigh - 1 downto CurrentNote + 1 do
+  begin
     Lines[0].Line[C].Note[N].Text := Lines[0].Line[C].Note[N-1].Text;
   end; // for
   Lines[0].Line[C].Note[CurrentNote].Text := '- ';
@@ -1059,10 +1129,10 @@ end;
 
 procedure TScreenEditSub.CopySentence(Src, Dst: integer);
 var
-  N:      integer;
-  Time1:  integer;
-  Time2:  integer;
-  TD:  integer;
+  N:     integer;
+  Time1: integer;
+  Time2: integer;
+  TD:    integer;
 begin
   Time1 := Lines[0].Line[Src].Note[0].Start;
   Time2 := Lines[0].Line[Dst].Note[0].Start;
@@ -1070,7 +1140,8 @@ begin
 
   SetLength(Lines[0].Line[Dst].Note, Lines[0].Line[Src].HighNote + 1);
   Lines[0].Line[Dst].HighNote := Lines[0].Line[Src].HighNote;
-  for N := 0 to Lines[0].Line[Src].HighNote do begin
+  for N := 0 to Lines[0].Line[Src].HighNote do
+  begin
     Lines[0].Line[Dst].Note[N].Text := Lines[0].Line[Src].Note[N].Text;
     Lines[0].Line[Dst].Note[N].Length := Lines[0].Line[Src].Note[N].Length;
     Lines[0].Line[Dst].Note[N].Tone := Lines[0].Line[Src].Note[N].Tone;
@@ -1088,12 +1159,14 @@ begin
   SetLength(Lines[0].Line, Lines[0].Number + Num - 1);
 
   // moves sentences next to the destination
-  for C := Lines[0].High downto Dst + 1 do begin
+  for C := Lines[0].High downto Dst + 1 do
+  begin
     Lines[0].Line[C + Num - 1] := Lines[0].Line[C];
   end;
 
   // prepares new sentences: sets sentence start and create first note
-  for C := 1 to Num-1 do begin
+  for C := 1 to Num-1 do
+  begin
     Lines[0].Line[Dst + C].Start := Lines[0].Line[Dst + C - 1].Note[0].Start +
       (Lines[0].Line[Src + C].Note[0].Start - Lines[0].Line[Src + C - 1].Note[0].Start);
     SetLength(Lines[0].Line[Dst + C].Note, 1);
@@ -1175,9 +1248,10 @@ begin
 
   try 
   //Check if File is XML
-   if copy(CurrentSong.FileName,length(CurrentSong.FileName)-3,4) = '.xml'
-    then Error := not CurrentSong.LoadXMLSong()
-    else Error := not CurrentSong.LoadSong();
+   if copy(CurrentSong.FileName,length(CurrentSong.FileName)-3,4) = '.xml' then
+     Error := not CurrentSong.LoadXMLSong()
+   else
+     Error := not CurrentSong.LoadSong();
   except
     Error := True;
   end;
@@ -1189,7 +1263,8 @@ begin
     ScreenPopupError.ShowPopup (Language.Translate('ERROR_CORRUPT_SONG'));
     Exit;
   end
-  else begin
+  else
+  begin
   {$IFDEF UseMIDIPort}
     MidiOut := TMidiOutput.Create(nil);
     if Ini.Debug = 1 then
@@ -1210,7 +1285,7 @@ begin
     Lyric.Clear;
     Lyric.X := 400;
     Lyric.Y := 500;
-    Lyric.Align := 1;
+    Lyric.Align := center;
     Lyric.Size := 42;
     Lyric.ColR := 0;
     Lyric.ColG := 0;
@@ -1238,13 +1313,15 @@ begin
   glClearColor(1,1,1,1);
 
   // midi music
-  if PlaySentenceMidi then begin
+  if PlaySentenceMidi then
+  begin
    {$IFDEF UseMIDIPort}
     MidiPos := USTime.GetTime - MidiTime + MidiStart;
 
 
     // stop the music
-    if (MidiPos > MidiStop) then begin
+    if (MidiPos > MidiStop) then
+    begin
       MidiOut.PutShort($81, Lines[0].Line[Lines[0].Current].Note[MidiLastNote].Tone + 60, 127);
       PlaySentenceMidi := false;
     end;
@@ -1254,7 +1331,8 @@ begin
     AktBeat := Floor(GetMidBeat(MidiPos - CurrentSong.GAP / 1000));
     Text[TextDebug].Text := IntToStr(AktBeat);
 
-    if AktBeat <> LastClick then begin
+    if AktBeat <> LastClick then
+    begin
       for Pet := 0 to Lines[0].Line[Lines[0].Current].HighNote do
         if (Lines[0].Line[Lines[0].Current].Note[Pet].Start = AktBeat) then
         begin
@@ -1273,7 +1351,8 @@ begin
   end; // if PlaySentenceMidi
 
   // mp3 music
-  if PlaySentence then begin
+  if PlaySentence then
+  begin
     // stop the music
     if (AudioPlayback.Position > PlayStopTime) then
     begin
@@ -1282,11 +1361,13 @@ begin
     end;
 
     // click
-    if (Click) and (PlaySentence) then begin
+    if (Click) and (PlaySentence) then
+    begin
 //      AktBeat := Floor(CurrentSong.BPM[0].BPM * (Music.Position - CurrentSong.GAP / 1000) / 60);
       AktBeat := Floor(GetMidBeat(AudioPlayback.Position - CurrentSong.GAP / 1000));
       Text[TextDebug].Text := IntToStr(AktBeat);
-      if AktBeat <> LastClick then begin
+      if AktBeat <> LastClick then
+      begin
         for Pet := 0 to Lines[0].Line[Lines[0].Current].HighNote do
           if (Lines[0].Line[Lines[0].Current].Note[Pet].Start = AktBeat) then
           begin
@@ -1347,8 +1428,8 @@ begin
   //Music.SetVolume(1.0);
 end;
 
-function TScreenEditSub.GetNoteName(Note: Integer): String;
-var N1, N2: Integer;
+function TScreenEditSub.GetNoteName(Note: integer): string;
+var N1, N2: integer;
 begin
   if (Note > 0) then
   begin
@@ -1361,8 +1442,6 @@ begin
     N2 := -1;
   end;
 
-
-
   case N1 of
     0: Result := 'c';
     1: Result := 'c#';
diff --git a/unicode/src/screens/UScreenMain.pas b/unicode/src/screens/UScreenMain.pas
index 0909fc8b..eb2e051e 100644
--- a/unicode/src/screens/UScreenMain.pas
+++ b/unicode/src/screens/UScreenMain.pas
@@ -63,7 +63,7 @@ implementation
 
 uses
   UGraphic,
-  UMain,
+  UNote,
   UIni,
   UTexture,
   USongs,
diff --git a/unicode/src/screens/UScreenName.pas b/unicode/src/screens/UScreenName.pas
index 244a559d..64e90cc9 100644
--- a/unicode/src/screens/UScreenName.pas
+++ b/unicode/src/screens/UScreenName.pas
@@ -34,12 +34,12 @@ interface
 {$I switches.inc}
 
 uses
-  UMenu,
+  SysUtils, 
+  SDL,
   UDisplay,
-  UMusic,
   UFiles,
-  SDL,
-  SysUtils,
+  UMenu,
+  UMusic,
   UThemes;
 
 type
@@ -55,9 +55,10 @@ type
 implementation
 
 uses
-  UGraphic,
-  UMain,
+  UCommon,
+  UGraphic, 
   UIni,
+  UNote,
   UTexture,
   UUnicodeUtils;
 
diff --git a/unicode/src/screens/UScreenOpen.pas b/unicode/src/screens/UScreenOpen.pas
index ac524f4c..fa65a1df 100644
--- a/unicode/src/screens/UScreenOpen.pas
+++ b/unicode/src/screens/UScreenOpen.pas
@@ -34,12 +34,10 @@ interface
 {$I switches.inc}
 
 uses
-  SDL,
-  SysUtils,
-  Math,
-  gl,
   UMenu,
   UMusic,
+  SDL,
+  SysUtils,
   UFiles,
   UTime,
   USongs,
@@ -48,22 +46,24 @@ uses
   UTexture,
   UMenuText,
   ULyrics,
+  Math,
+  gl,
   UThemes;
 
 type
   TScreenOpen = class(TMenu)
     private
-      TextF:    array[0..1] of integer;
-      TextN:    integer;
+      TextF:          array[0..1] of integer;
+      TextN:          integer;
     public
-      Tex_Background:     TTexture;
-      FadeOut:            boolean;
-      Path:               string;
-      BackScreen:         pointer;
+      Tex_Background: TTexture;
+      FadeOut:        boolean;
+      Path:           string;
+      BackScreen:     pointer;
       procedure AddBox(X, Y, W, H: real);
       constructor Create; override;
       procedure onShow; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
 //      function Draw: boolean; override;
 //      procedure Finish;
   end;
@@ -74,14 +74,16 @@ uses
   UGraphic,
   UDraw,
   UMain,
+  UScreenEditConvert,
   USkins,
   UUnicodeUtils;
 
-function TScreenOpen.ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean;
+function TScreenOpen.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
 begin
   Result := true;
 
-  if (PressedDown) then begin // Key Down
+  if (PressedDown) then  // Key Down
+  begin
     // check normal keys
     case CharCode of
       Ord('0')..Ord('9'),
@@ -89,7 +91,8 @@ begin
       Ord('A')..Ord('Z'),
       Ord(' '), Ord('-'), Ord('.'), Ord(':'), Ord('\'):
         begin
-          if Interaction = 0 then begin
+          if Interaction = 0 then
+	  begin
             Text[TextN].Text := Text[TextN].Text + UCS4ToUTF8String(CharCode);
           end;
         end;
@@ -103,24 +106,24 @@ begin
         end;
       8: // del
         begin
-            if Interaction = 0 then
-            begin
-              Text[TextN].DeleteLastLetter;
-            end;
+          if Interaction = 0 then
+          begin
+            Text[TextN].DeleteLastLetter;
+          end;
         end;
 
-
-      SDLK_ESCAPE :
+      SDLK_ESCAPE:
         begin
           //Empty Filename and go to last Screen
-            ConversionFileName := '';
-            AudioPlayback.PlaySound(SoundLib.Back);
-            FadeTo(BackScreen);
+          ConversionFileName := '';
+          AudioPlayback.PlaySound(SoundLib.Back);
+          FadeTo(BackScreen);
         end;
 
       SDLK_RETURN:
         begin
-          if (Interaction = 2) then begin
+          if (Interaction = 2) then
+	  begin
             //Update Filename and go to last Screen
             ConversionFileName := Text[TextN].Text;
             AudioPlayback.PlaySound(SoundLib.Back);
@@ -166,9 +169,9 @@ constructor TScreenOpen.Create;
 begin
   inherited Create;
 
-  // linijka
+  // line
 {  AddStatic(20, 10, 80, 30, 0, 0, 0, 'MainBar', 'JPG', TEXTURE_TYPE_COLORIZED);
-  AddText(35, 17, 1, 18, 1, 1, 1, 'Linijka');
+  AddText(35, 17, 1, 18, 1, 1, 1, 'line');
   TextSentence := AddText(120, 14, 1, 24, 0, 0, 0, '0 / 0');}
 
   // file list
@@ -195,7 +198,6 @@ begin
   AddButton(670, 540, 100, 40, Skin.GetTextureFileName('ButtonF'));
   AddButtonText(30, 5, 0, 0, 0, 'OK');
 
-
 end;
 
 procedure TScreenOpen.onShow;
@@ -207,11 +209,9 @@ end;
 
 (*function TScreenEditSub.Draw: boolean;
 var
-  Min:    integer;
-  Sec:    integer;
-  Tekst:  string;
-  Pet:    integer;
-  AktBeat:  integer;
+  Min:     integer;
+  Sec:     integer;
+  AktBeat: integer;
 begin
 
 end;
@@ -222,4 +222,3 @@ begin
 end;*)
 
 end.
-
diff --git a/unicode/src/screens/UScreenOptions.pas b/unicode/src/screens/UScreenOptions.pas
index ab49c49c..ff2a3fe2 100644
--- a/unicode/src/screens/UScreenOptions.pas
+++ b/unicode/src/screens/UScreenOptions.pas
@@ -82,7 +82,7 @@ begin
       SDLK_ESCAPE,
       SDLK_BACKSPACE :
         begin
-//          Ini.Save;
+          Ini.Save;
           AudioPlayback.PlaySound(SoundLib.Back);
           FadeTo(@ScreenMain);
         end;
diff --git a/unicode/src/screens/UScreenOptionsRecord.pas b/unicode/src/screens/UScreenOptionsRecord.pas
index 391c2090..0cf9eb37 100644
--- a/unicode/src/screens/UScreenOptionsRecord.pas
+++ b/unicode/src/screens/UScreenOptionsRecord.pas
@@ -167,8 +167,8 @@ begin
       SDLK_ESCAPE,
       SDLK_BACKSPACE:
         begin
-          // Escape -> save nothing - just leave this screen
-          
+          // TODO: Show Save/Abort screen
+          Ini.Save;          
           AudioPlayback.PlaySound(SoundLib.Back);
           FadeTo(@ScreenOptions);
         end;
diff --git a/unicode/src/screens/UScreenOptionsThemes.pas b/unicode/src/screens/UScreenOptionsThemes.pas
index dcd870ca..64816d34 100644
--- a/unicode/src/screens/UScreenOptionsThemes.pas
+++ b/unicode/src/screens/UScreenOptionsThemes.pas
@@ -57,12 +57,13 @@ type
 
 implementation
 
-uses
-  UMain,
+uses 
+  SysUtils,
   UGraphic,
-  USkins,
+  UMain,
+  UPath,
   UUnicodeUtils,
-  SysUtils;
+  USkins;
 
 function TScreenOptionsThemes.ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean;
 begin
diff --git a/unicode/src/screens/UScreenPartyOptions.pas b/unicode/src/screens/UScreenPartyOptions.pas
index b484144b..74c51b15 100644
--- a/unicode/src/screens/UScreenPartyOptions.pas
+++ b/unicode/src/screens/UScreenPartyOptions.pas
@@ -34,46 +34,47 @@ interface
 {$I switches.inc}
 
 uses
-  SDL,
-  SysUtils,
   UMenu,
+  SDL,
   UDisplay,
   UMusic,
   UFiles,
+  SysUtils,
   UThemes;
 
 type
   TScreenPartyOptions = class(TMenu)
     public
-      SelectLevel: Cardinal;
-      SelectPlayList: Cardinal;
-      SelectPlayList2: Cardinal;
-      SelectRounds: Cardinal;
-      SelectTeams: Cardinal;
-      SelectPlayers1: Cardinal;
-      SelectPlayers2: Cardinal;
-      SelectPlayers3: Cardinal;
-
-      PlayList:  Integer;
-      PlayList2: Integer;
-      Rounds:    Integer;
-      NumTeams:  Integer;
-      NumPlayer1, NumPlayer2, NumPlayer3: Integer;
-      
+      SelectLevel:     cardinal;
+      SelectPlayList:  cardinal;
+      SelectPlayList2: cardinal;
+      SelectRounds:    cardinal;
+      SelectTeams:     cardinal;
+      SelectPlayers1:  cardinal;
+      SelectPlayers2:  cardinal;
+      SelectPlayers3:  cardinal;
+
+      PlayList:  integer;
+      PlayList2: integer;
+      Rounds:    integer;
+      NumTeams:  integer;
+      NumPlayer1, NumPlayer2, NumPlayer3: integer;
+
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
       procedure onShow; override;
       procedure SetAnimationProgress(Progress: real); override;
       procedure SetPlaylist2;
   end;
 
 var
-  IPlaylist: array[0..2] of String;
-  IPlaylist2: array of String;
-const
-  ITeams: array[0..1] of String =('2', '3');
-  IPlayers: array[0..3] of String =('1', '2', '3', '4');
-  IRounds: array[0..5] of String = ('2', '3', '4', '5', '6', '7');
+  IPlaylist: array[0..2] of string;
+  IPlaylist2: array of string;
+
+  const
+  ITeams:   array[0..1] of string = ('2', '3');
+  IPlayers: array[0..3] of string = ('1', '2', '3', '4');
+  IRounds:  array[0..5] of string = ('2', '3', '4', '5', '6', '7');
 
 implementation
 
@@ -90,13 +91,13 @@ uses
   USongs,
   UUnicodeUtils;
 
-function TScreenPartyOptions.ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean;
-  var
-    I, J: Integer;
-    OnlyMultiPlayer: boolean;
+function TScreenPartyOptions.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
+var
+  I, J: integer;
+  OnlyMultiPlayer: boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     // check normal keys
     case UCS4UpperCase(CharCode) of
@@ -119,14 +120,16 @@ begin
       SDLK_RETURN:
         begin
           //Don'T start when Playlist is Selected and there are no Playlists
-          If (Playlist = 2) and (Length(PlaylistMan.Playlists) = 0) then
+          if (Playlist = 2) and (Length(PlaylistMan.Playlists) = 0) then
             Exit;
           // Don't start when SinglePlayer Teams but only Multiplayer Plugins available
-          OnlyMultiPlayer:=true;
-          for I := 0 to High(DLLMan.Plugins) do begin
-            OnlyMultiPlayer := (OnlyMultiPlayer AND DLLMan.Plugins[I].TeamModeOnly);
+          OnlyMultiPlayer := true;
+          for I := 0 to High(DLLMan.Plugins) do
+	  begin
+            OnlyMultiPlayer := (OnlyMultiPlayer and DLLMan.Plugins[I].TeamModeOnly);
           end;
-          if (OnlyMultiPlayer) AND ((NumPlayer1 = 0) OR (NumPlayer2 = 0) OR ((NumPlayer3 = 0) AND (NumTeams = 1))) then begin
+          if (OnlyMultiPlayer) and ((NumPlayer1 = 0) or (NumPlayer2 = 0) or ((NumPlayer3 = 0) and (NumTeams = 1))) then
+	  begin
             ScreenPopupError.ShowPopup(Language.Translate('ERROR_NO_PLUGINS'));
             Exit;
           end;
@@ -143,12 +146,12 @@ begin
 
           //Save Playlist
           PlaylistMan.Mode := TSingMode( Playlist );
-          PlaylistMan.CurPlayList := High(Cardinal);
-          //If Category Selected Search Category ID
+          PlaylistMan.CurPlayList := High(cardinal);
+          //if Category Selected Search Category ID
           if Playlist = 1 then
           begin
             J := -1;
-            For I := 0 to high(CatSongs.Song) do
+            for I := 0 to high(CatSongs.Song) do
             begin
               if CatSongs.Song[I].Main then
                 Inc(J);
@@ -161,7 +164,7 @@ begin
             end;
 
             //No Categorys or Invalid Entry
-            If PlaylistMan.CurPlayList = High(Cardinal) then
+            if PlaylistMan.CurPlayList = High(cardinal) then
               Exit;
           end
           else
@@ -187,11 +190,11 @@ begin
           InteractInc;
 
           //Change Playlist2 if Playlist is Changed
-          If (Interaction = 1) then
+          if (Interaction = 1) then
           begin
             SetPlaylist2;
           end //Change Team3 Players visibility
-          Else If (Interaction = 4) then
+          else if (Interaction = 4) then
           begin
               SelectsS[7].Visible := (NumTeams = 1);
           end;
@@ -202,11 +205,11 @@ begin
           InteractDec;
 
           //Change Playlist2 if Playlist is Changed
-          If (Interaction = 1) then
+          if (Interaction = 1) then
           begin
             SetPlaylist2;
           end //Change Team3 Players visibility
-          Else If (Interaction = 4) then
+          else if (Interaction = 4) then
           begin
             SelectsS[7].Visible := (NumTeams = 1);
           end;
@@ -239,25 +242,25 @@ begin
   //Load Screen From Theme
   LoadFromTheme(Theme.PartyOptions);
 
-  SelectLevel := AddSelectSlide (Theme.PartyOptions.SelectLevel, Ini.Difficulty, Theme.ILevel);
-  SelectPlayList := AddSelectSlide (Theme.PartyOptions.SelectPlayList, PlayList, IPlaylist);
+  SelectLevel     := AddSelectSlide (Theme.PartyOptions.SelectLevel, Ini.Difficulty, Theme.ILevel);
+  SelectPlayList  := AddSelectSlide (Theme.PartyOptions.SelectPlayList, PlayList, IPlaylist);
   SelectPlayList2 := AddSelectSlide (Theme.PartyOptions.SelectPlayList2, PlayList2, IPlaylist2);
-  SelectRounds := AddSelectSlide (Theme.PartyOptions.SelectRounds, Rounds, IRounds);
-  SelectTeams := AddSelectSlide (Theme.PartyOptions.SelectTeams, NumTeams, ITeams);
-  SelectPlayers1 := AddSelectSlide (Theme.PartyOptions.SelectPlayers1, NumPlayer1, IPlayers);
-  SelectPlayers2 := AddSelectSlide (Theme.PartyOptions.SelectPlayers2, NumPlayer2, IPlayers);
-  SelectPlayers3 := AddSelectSlide (Theme.PartyOptions.SelectPlayers3, NumPlayer3, IPlayers);
+  SelectRounds    := AddSelectSlide (Theme.PartyOptions.SelectRounds, Rounds, IRounds);
+  SelectTeams     := AddSelectSlide (Theme.PartyOptions.SelectTeams, NumTeams, ITeams);
+  SelectPlayers1  := AddSelectSlide (Theme.PartyOptions.SelectPlayers1, NumPlayer1, IPlayers);
+  SelectPlayers2  := AddSelectSlide (Theme.PartyOptions.SelectPlayers2, NumPlayer2, IPlayers);
+  SelectPlayers3  := AddSelectSlide (Theme.PartyOptions.SelectPlayers3, NumPlayer3, IPlayers);
 
   Interaction := 0;
 
   //Hide Team3 Players
-  SelectsS[7].Visible := False;
+  SelectsS[7].Visible := false;
 end;
 
 procedure TScreenPartyOptions.SetPlaylist2;
-var I: Integer;
+var I: integer;
 begin
-  Case Playlist of
+  case Playlist of
     0:
       begin
         SetLength(IPlaylist2, 1);
@@ -266,16 +269,16 @@ begin
     1:
       begin
         SetLength(IPlaylist2, 0);
-        For I := 0 to high(CatSongs.Song) do
+        for I := 0 to high(CatSongs.Song) do
         begin
-          If (CatSongs.Song[I].Main) then
+          if (CatSongs.Song[I].Main) then
           begin
             SetLength(IPlaylist2, Length(IPlaylist2) + 1);
             IPlaylist2[high(IPlaylist2)] := CatSongs.Song[I].Artist;
           end;
         end;
 
-        If (Length(IPlaylist2) = 0) then
+        if (Length(IPlaylist2) = 0) then
         begin
           SetLength(IPlaylist2, 1);
           IPlaylist2[0] := 'No Categories found';
diff --git a/unicode/src/screens/UScreenScore.pas b/unicode/src/screens/UScreenScore.pas
index e807f8d8..5c312938 100644
--- a/unicode/src/screens/UScreenScore.pas
+++ b/unicode/src/screens/UScreenScore.pas
@@ -46,56 +46,56 @@ uses
   UTexture;
 
 const
-  ZBars            : real = 0.8; // Z value for the bars
-  ZRatingPic       : real = 0.8; // Z value for the rating pictures
+  ZBars:            real = 0.8;   // Z value for the bars
+  ZRatingPic:       real = 0.8;   // Z value for the rating pictures
 
-  EaseOut_MaxSteps : real = 10;  // that's the speed of the bars (10 is fast | 100 is slower)
+  EaseOut_MaxSteps: real = 10;    // that's the speed of the bars (10 is fast | 100 is slower)
 
-  BarRaiseSpeed    : cardinal = 0; // Time for raising the bar one step higher (in ms)
+  BarRaiseSpeed:    cardinal = 0; // Time for raising the bar one step higher (in ms)
 
 type
   TPlayerScoreScreenTexture = record            // holds all colorized textures for up to 6 players
     //Bar textures
-    Score_NoteBarLevel_Dark     : TTexture;     // Note
-    Score_NoteBarRound_Dark     : TTexture;     // that's the round thing on top
+    Score_NoteBarLevel_Dark:     TTexture;      // Note
+    Score_NoteBarRound_Dark:     TTexture;      // that's the round thing on top
 
-    Score_NoteBarLevel_Light    : TTexture;     // LineBonus | Phrasebonus
-    Score_NoteBarRound_Light    : TTexture;
+    Score_NoteBarLevel_Light:    TTexture;      // LineBonus | Phrasebonus
+    Score_NoteBarRound_Light:    TTexture;
 
-    Score_NoteBarLevel_Lightest : TTexture;     // GoldenNotes
-    Score_NoteBarRound_Lightest : TTexture;
+    Score_NoteBarLevel_Lightest: TTexture;      // GoldenNotes
+    Score_NoteBarRound_Lightest: TTexture;
   end;
 
   TPlayerScoreScreenData = record               // holds the positions and other data
-    Bar_Y      :Real;
-    Bar_Actual_Height      : Real;              // this one holds the actual height of the bar, while we animate it
-    BarScore_ActualHeight  : Real;
-    BarLine_ActualHeight   : Real;
-    BarGolden_ActualHeight : Real;
+    Bar_Y:                  real;
+    Bar_Actual_Height:      real;               // this one holds the actual height of the bar, while we animate it
+    BarScore_ActualHeight:  real;
+    BarLine_ActualHeight:   real;
+    BarGolden_ActualHeight: real;
   end;
 
   TPlayerScoreRatingPics = record               // a fine array of the rating pictures
-    RateEaseStep : Integer;
-    RateEaseValue: Real;
+    RateEaseStep:  integer;
+    RateEaseValue: real;
   end;
 
   TScreenScore = class(TMenu)
     private
-      BarTime : Cardinal;
-      ArrayStartModifier : integer;
+      BarTime:            cardinal;
+      ArrayStartModifier: integer;
     public
-      aPlayerScoreScreenTextures   : array[1..6] of TPlayerScoreScreenTexture;
-      aPlayerScoreScreenDatas      : array[1..6] of TPlayerScoreScreenData;
-      aPlayerScoreScreenRatings    : array[1..6] of TPlayerScoreRatingPics;
+      aPlayerScoreScreenTextures: array[1..6] of TPlayerScoreScreenTexture;
+      aPlayerScoreScreenDatas:    array[1..6] of TPlayerScoreScreenData;
+      aPlayerScoreScreenRatings:  array[1..6] of TPlayerScoreRatingPics;
 
-      BarScore_EaseOut_Step  : real;
-      BarPhrase_EaseOut_Step : real;
-      BarGolden_EaseOut_Step : real;
+      BarScore_EaseOut_Step:  real;
+      BarPhrase_EaseOut_Step: real;
+      BarGolden_EaseOut_Step: real;
 
-      TextArtist:   integer;
-      TextTitle:    integer;
+      TextArtist:             integer;
+      TextTitle:              integer;
 
-      TextArtistTitle : integer;
+      TextArtistTitle:        integer;
 
       TextName:             array[1..6] of integer;
       TextScore:            array[1..6] of integer;
@@ -110,65 +110,62 @@ type
       TextTotalScore:       array[1..6] of integer;
 
       PlayerStatic:         array[1..6] of array of integer;
-      PlayerTexts :         array[1..6] of array of integer;
-
+      PlayerTexts:          array[1..6] of array of integer;
 
       StaticBoxLightest:    array[1..6] of integer;
       StaticBoxLight:       array[1..6] of integer;
       StaticBoxDark:        array[1..6] of integer;
 
-      StaticBackLevel:        array[1..6] of integer;
-      StaticBackLevelRound:   array[1..6] of integer;
-      StaticLevel:            array[1..6] of integer;
-      StaticLevelRound:       array[1..6] of integer;
-
-      Animation:    real;
-
-      TextScore_ActualValue  : array[1..6] of integer;
-      TextPhrase_ActualValue : array[1..6] of integer;
-      TextGolden_ActualValue : array[1..6] of integer;
+      StaticBackLevel:      array[1..6] of integer;
+      StaticBackLevelRound: array[1..6] of integer;
+      StaticLevel:          array[1..6] of integer;
+      StaticLevelRound:     array[1..6] of integer;
 
+      Animation:            real;
 
+      TextScore_ActualValue:  array[1..6] of integer;
+      TextPhrase_ActualValue: array[1..6] of integer;
+      TextGolden_ActualValue: array[1..6] of integer;
 
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
       procedure onShow; override;
       procedure onShowFinish; override;
       function Draw: boolean; override;
       procedure FillPlayer(Item, P: integer);
 
-      procedure EaseBarIn(PlayerNumber : Integer; BarType: String);
-      procedure EaseScoreIn(PlayerNumber : Integer; ScoreType: String);
-
-      procedure FillPlayerItems(PlayerNumber : Integer; ScoreType: String);
+      procedure EaseBarIn(PlayerNumber: integer; BarType: string);
+      procedure EaseScoreIn(PlayerNumber: integer; ScoreType: string);
 
+      procedure FillPlayerItems(PlayerNumber: integer; ScoreType: string);
 
-      procedure DrawBar(BarType:string; PlayerNumber: integer; BarStartPosY: single; NewHeight: real);
+      procedure DrawBar(BarType: string; PlayerNumber: integer; BarStartPosY: single; NewHeight: real);
 
       //Rating Picture
       procedure ShowRating(PlayerNumber: integer);
-        function  CalculateBouncing(PlayerNumber : Integer): real;
-        procedure DrawRating(PlayerNumber:integer;Rating:integer);
+      function  CalculateBouncing(PlayerNumber: integer): real;
+      procedure DrawRating(PlayerNumber: integer; Rating: integer);
   end;
 
 implementation
 
-
 uses
   UGraphic,
   UScreenSong,
   UMenuStatic,
   UTime,
-  UMain,
   UIni,
   ULog,
   ULanguage,
+  UNote,
   UUnicodeUtils;
 
-function TScreenScore.ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean;
+
+function TScreenScore.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then begin
+  if (PressedDown) then
+  begin
     // check normal keys
     case UCS4UpperCase(CharCode) of
       Ord('Q'):
@@ -258,9 +255,9 @@ end;
 
 procedure TScreenScore.onShow;
 var
-  P:    integer;  // player
-  I:    integer;
-  V:    array[1..6] of boolean; // visibility array
+  P: integer;  // player
+  I: integer;
+  V: array[1..6] of boolean; // visibility array
 
 begin
 
@@ -297,7 +294,6 @@ begin
     aPlayerScoreScreenRatings[P].RateEaseValue        := 20;
   end;
 
-
   Text[TextArtist].Text      := CurrentSong.Artist;
   Text[TextTitle].Text       := CurrentSong.Title;
   Text[TextArtistTitle].Text := CurrentSong.Artist + ' - ' + CurrentSong.Title;
@@ -349,7 +345,6 @@ begin
     Static[StaticBoxLight[P]].Texture.Alpha    := 0;
     Static[StaticBoxDark[P]].Texture.Alpha     := 0;
 
-
     Text[TextNotes[P]].Visible              := V[P];
     Text[TextNotesScore[P]].Visible         := V[P];
     Text[TextLineBonus[P]].Visible          := V[P];
@@ -379,14 +374,14 @@ end;
 
 procedure TScreenScore.onShowFinish;
 var
-  index : integer;
+  index: integer;
 begin
   for index := 1 to (PlayersPlay) do
-    begin
-      TextScore_ActualValue[index]  := 0;
-      TextPhrase_ActualValue[index] := 0;
-      TextGolden_ActualValue[index] := 0;
-    end;
+  begin
+    TextScore_ActualValue[index]  := 0;
+    TextPhrase_ActualValue[index] := 0;
+    TextGolden_ActualValue[index] := 0;
+  end;
 
   BarScore_EaseOut_Step  := 1;
   BarPhrase_EaseOut_Step := 1;
@@ -395,11 +390,11 @@ end;
 
 function TScreenScore.Draw: boolean;
 var
-  CurrentTime : Cardinal;
-  PlayerCounter : integer;
+  CurrentTime:   cardinal;
+  PlayerCounter: integer;
+  PStart:        integer;
+  PHigh:         integer;
 begin
-
-  inherited Draw;
 {*
   player[0].ScoreInt       := 7000;
   player[0].ScoreLineInt   := 2000;
@@ -411,13 +406,38 @@ begin
   player[1].ScoreGoldenInt :=  900;
   player[1].ScoreTotalInt  := 4500;
 *}
+
+  //Draw the Background
+  DrawBG;
+
+  //Calculate first and last Player on this Screen
+  if (PlayersPlay > 3) then
+  begin
+    case PlayersPlay of
+      4: begin
+        PStart := 1 + ((ScreenAct-1) * 2);
+        PHigh  := 2 + ((ScreenAct-1) * 2);
+      end;
+
+      6: begin
+        PStart := 1 + ((ScreenAct-1) * 3);
+        PHigh  := 3 + ((ScreenAct-1) * 3);
+      end;
+    end;
+  end
+  else
+  begin
+    PStart := 1;
+    PHigh  := PlayersPlay;
+  end;
+
   // Let's start to arise the bars
   CurrentTime := SDL_GetTicks();
-  if((CurrentTime >= BarTime) AND ShowFinish) then
+  if((CurrentTime >= BarTime) and ShowFinish) then
   begin
     BarTime := CurrentTime + BarRaiseSpeed;
 
-    for PlayerCounter := 1 to PlayersPlay do
+    for PlayerCounter := PStart to PHigh do
     begin
       // We actually arise them in the right order, but we have to draw them in reverse order (golden -> phrase -> mainscore)
       if (BarScore_EaseOut_Step < EaseOut_MaxSteps * 10) then
@@ -429,7 +449,6 @@ begin
         if (BarPhrase_EaseOut_Step < EaseOut_MaxSteps * 10) then
           BarPhrase_EaseOut_Step := BarPhrase_EaseOut_Step + 1;
 
-
         // GoldenNotebonus
         if (BarPhrase_EaseOut_Step >= (EaseOut_MaxSteps * 10)) then
         begin
@@ -450,12 +469,25 @@ begin
       EaseBarIn(PlayerCounter,  'Note');
       EaseScoreIn(PlayerCounter,'Note');
 
-
-      FillPlayerItems(PlayerCounter,'Funky');
+      if (PlayersPlay <= 3) then
+        //If we play w/ 3 or less players they fit in one screen
+        //so we don't have to swap the values of themeobjects
+        //on every draw
+        FillPlayerItems(PlayerCounter,'Funky');
 
     end;
   end;
 
+  if (PlayersPlay > 3) then
+    //more then 3 players don't fit the screen
+    //so we have to swap the themeobjects values on every draw
+    for PlayerCounter := PStart to PHigh do
+    begin
+      FillPlayerItems(PlayerCounter,'Funky');
+    end;
+
+  //Draw Theme Objects
+  DrawFG;
 
 (*
     //todo: i need a clever method to draw statics with their z value
@@ -468,7 +500,7 @@ begin
   Result := true;
 end;
 
-procedure TscreenScore.FillPlayerItems(PlayerNumber : Integer; ScoreType: String);
+procedure TscreenScore.FillPlayerItems(PlayerNumber: integer; ScoreType: string);
 var
   ThemeIndex: integer;
 begin
@@ -476,7 +508,13 @@ begin
   Text[TextName[PlayerNumber + ArrayStartModifier]].Text := Ini.Name[PlayerNumber - 1];
   // end todo
 
-  ThemeIndex := PlayerNumber + ArrayStartModifier;
+  // We have to do this here because we use the same Theme Object
+  // for players on the first and second screen
+  case PlayersPlay of
+    1, 2, 3: ThemeIndex := PlayerNumber + ArrayStartModifier;
+    4: ThemeIndex := ((PlayerNumber-1) mod 2) + 1 + ArrayStartModifier;
+    6: ThemeIndex := ((PlayerNumber-1) mod 3) + 1 + ArrayStartModifier;
+  end;
 
   //golden
   Text[TextGoldenNotesScore[ThemeIndex]].Text         := IntToStr(TextGolden_ActualValue[PlayerNumber]);
@@ -513,14 +551,19 @@ begin
   end;
 end;
 
-
 procedure TScreenScore.ShowRating(PlayerNumber: integer);
 var
-  Rating : integer;
-  ThemeIndex : integer;
+  Rating: integer;
+  ThemeIndex: integer;
 begin
 
-  ThemeIndex := PlayerNumber + ArrayStartModifier;
+  // We have to do this here because we use the same Theme Object
+  // for players on the first and second screen
+  case PlayersPlay of
+    1, 2, 3: ThemeIndex := PlayerNumber + ArrayStartModifier;
+    4: ThemeIndex := ((PlayerNumber-1) mod 2) + 1 + ArrayStartModifier;
+    6: ThemeIndex := ((PlayerNumber-1) mod 3) + 1 + ArrayStartModifier;
+  end;
 
   case (Player[PlayerNumber-1].ScoreTotalInt) of
    0..2009:
@@ -568,7 +611,7 @@ begin
   end;
 
   //todo: this could break if the width is not given, for instance when there's a skin with no picture for ratings
-  if ( Theme.Score.StaticRatings[ThemeIndex].W > 0 ) AND  ( aPlayerScoreScreenRatings[PlayerNumber].RateEaseValue > 0 ) then
+  if ( Theme.Score.StaticRatings[ThemeIndex].W > 0 ) and  ( aPlayerScoreScreenRatings[PlayerNumber].RateEaseValue > 0 ) then
   begin
     Text[TextScore[ThemeIndex]].Alpha := aPlayerScoreScreenRatings[PlayerNumber].RateEaseValue / Theme.Score.StaticRatings[ThemeIndex].W;
   end;
@@ -577,11 +620,11 @@ begin
   DrawRating(PlayerNumber, Rating);
 end;
 
-procedure TscreenScore.DrawRating(PlayerNumber:integer;Rating:integer);
+procedure TscreenScore.DrawRating(PlayerNumber: integer; Rating: integer);
 var
-  Posx : real;
-  Posy : real;
-  Width :real;
+  Posx:  real;
+  Posy:  real;
+  Width: real;
 begin
 
   CalculateBouncing(PlayerNumber);
@@ -608,56 +651,53 @@ begin
   glDisable(GL_TEXTURE_2d);
 end;
 
-
-
-function TscreenScore.CalculateBouncing(PlayerNumber : Integer): real;
+function TscreenScore.CalculateBouncing(PlayerNumber: integer): real;
 var
-  ReturnValue : real;
-  p, s        : real;
+  ReturnValue:       real;
+  p, s:              real;
 
-  RaiseStep, MaxVal  : real;
-  EaseOut_Step : integer;
+  RaiseStep, MaxVal: real;
+  EaseOut_Step:      integer;
 begin
   EaseOut_Step  := aPlayerScoreScreenRatings[PlayerNumber].RateEaseStep;
   MaxVal        := Theme.Score.StaticRatings[PlayerNumber + ArrayStartModifier].W;
 
   RaiseStep     := EaseOut_Step;
 
-  if (MaxVal > 0) AND (RaiseStep > 0) then
+  if (MaxVal > 0) and (RaiseStep > 0) then
     RaiseStep := RaiseStep / MaxVal;
 
-    if (RaiseStep = 1) then
-      begin
-        ReturnValue := MaxVal;
-      end
-    else
-      begin
-        p := MaxVal * 0.4;
+  if (RaiseStep = 1) then
+  begin
+    ReturnValue := MaxVal;
+  end
+  else
+  begin
+    p := MaxVal * 0.4;
 
-        s           := p/(2*PI) * arcsin (1);
-        ReturnValue := MaxVal * power(2,-5 * RaiseStep) * sin( (RaiseStep * MaxVal - s) * (2 * PI) / p) + MaxVal;
+    s           := p/(2*PI) * arcsin (1);
+    ReturnValue := MaxVal * power(2,-5 * RaiseStep) * sin( (RaiseStep * MaxVal - s) * (2 * PI) / p) + MaxVal;
 
-        inc(aPlayerScoreScreenRatings[PlayerNumber].RateEaseStep);
-        aPlayerScoreScreenRatings[PlayerNumber].RateEaseValue := ReturnValue;
-      end;
+    inc(aPlayerScoreScreenRatings[PlayerNumber].RateEaseStep);
+    aPlayerScoreScreenRatings[PlayerNumber].RateEaseValue := ReturnValue;
+  end;
 
   Result := ReturnValue;
 end;
 
-
-procedure TscreenScore.EaseBarIn(PlayerNumber : Integer; BarType: String);
+procedure TscreenScore.EaseBarIn(PlayerNumber: integer; BarType: string);
 const
-  RaiseSmoothness : integer = 100;
+  RaiseSmoothness: integer = 100;
 var
-  MaxHeight       : real;
-  NewHeight       : real;
+  MaxHeight:    real;
+  NewHeight:    real;
 
-  Height2Reach    : real;
-  RaiseStep       : real;
-  BarStartPosY    : single;
+  Height2Reach: real;
+  RaiseStep:    real;
+  BarStartPosY: single;
 
-  lTmp            : real;
-  Score           : integer;
+  lTmp:         real;
+  Score:        integer;
 begin
   MaxHeight    := Theme.Score.StaticBackLevel[PlayerNumber + ArrayStartModifier].H;
 
@@ -718,10 +758,10 @@ begin
     aPlayerScoreScreenDatas[PlayerNumber].BarGolden_ActualHeight := NewHeight;
 end;
 
-procedure TscreenScore.DrawBar(BarType:string; PlayerNumber: integer; BarStartPosY: single; NewHeight: real);
+procedure TscreenScore.DrawBar(BarType: string; PlayerNumber: integer; BarStartPosY: single; NewHeight: real);
 var
-  Width:real;
-  BarStartPosX:real;
+  Width:        real;
+  BarStartPosX: real;
 begin
   // this is solely for better readability of the drawing
   Width        := Theme.Score.StaticBackLevel[PlayerNumber + ArrayStartModifier].W;
@@ -775,15 +815,15 @@ begin
   glDisable(GL_TEXTURE_2d);
 end;
 
-procedure TScreenScore.EaseScoreIn(PlayerNumber: integer; ScoreType : String);
+procedure TScreenScore.EaseScoreIn(PlayerNumber: integer; ScoreType: string);
 const
-  RaiseSmoothness : integer = 100;
+  RaiseSmoothness: integer = 100;
 var
-  RaiseStep    : Real;
-  lTmpA        : Real;
-  ScoreReached :Integer;
-  EaseOut_Step :Real;
-  ActualScoreValue:integer;
+  RaiseStep:        real;
+  lTmpA:            real;
+  ScoreReached:     integer;
+  EaseOut_Step:     real;
+  ActualScoreValue: integer;
 begin
   if (ScoreType = 'Note') then
   begin
@@ -815,7 +855,7 @@ begin
     // quadratic easing out - decelerating to zero velocity
     // -end_position * current_time * ( current_time - 2 ) + start_postion
     lTmpA := (-ScoreReached * RaiseStep * (RaiseStep - 20));
-    if ( lTmpA           > 0 ) AND
+    if ( lTmpA           > 0 ) and
        ( RaiseSmoothness > 0 ) then
     begin
       if (ScoreType = 'Note') then
@@ -869,7 +909,6 @@ begin
   Text[TextGoldenNotesScore[Item]].Text := S;
   //end of fix
 
-
 end;
 
 end.
diff --git a/unicode/src/screens/UScreenSing.pas b/unicode/src/screens/UScreenSing.pas
index 94d2b550..05683c83 100644
--- a/unicode/src/screens/UScreenSing.pas
+++ b/unicode/src/screens/UScreenSing.pas
@@ -33,24 +33,23 @@ interface
 
 {$I switches.inc}
 
-
 uses
-  SDL,
   SysUtils,
+  SDL,
+  TextGL,
   gl,
-  UMenu,
-  UMusic,
   UFiles,
-  UTime,
-  USongs,
+  UGraphicClasses,
   UIni,
   ULog,
-  UTexture,
   ULyrics,
-  TextGL,
+  UMenu,
+  UMusic,
+  USingScores,
+  USongs,
+  UTexture,
   UThemes,
-  UGraphicClasses,
-  USingScores;
+  UTime;
 
 type
   TLyricsSyncSource = class(TSyncSource)
@@ -62,22 +61,22 @@ type
   private
     VideoLoaded: boolean;
   protected
-    Paused:     boolean; //Pause Mod
+    Paused:     boolean; // pause mod
     LyricsSync: TLyricsSyncSource;
     NumEmptySentences: integer;
   public
-    // TimeBar fields
+    // timebar fields
     StaticTimeProgress: integer;
     TextTimeText: integer;
 
     StaticP1: integer;
     TextP1:   integer;
 
-    //shown when game is in 2/4 player modus
+    // shown when game is in 2/4 player modus
     StaticP1TwoP: integer;
     TextP1TwoP:   integer;
 
-    //shown when game is in 3/6 player modus
+    // shown when game is in 3/6 player modus
     StaticP1ThreeP: integer;
     TextP1ThreeP:   integer;
 
@@ -96,7 +95,7 @@ type
     FadeOut: boolean;
     Lyrics:  TLyricEngine;
 
-    //Score Manager:
+    // score manager:
     Scores: TSingScores;
 
     fShowVisualization: boolean;
@@ -106,16 +105,16 @@ type
     procedure onShow; override;
     procedure onShowFinish; override;
     procedure onHide; override;
-    
+
     function ParseInput(PressedKey: cardinal; CharCode: UCS4Char;
       PressedDown: boolean): boolean; override;
     function Draw: boolean; override;
 
     procedure Finish; virtual;
-    procedure Pause; // Toggle Pause
+    procedure Pause; // toggle pause
 
-    procedure OnSentenceEnd(SentenceIndex: cardinal);     // for LineBonus + Singbar
-    procedure OnSentenceChange(SentenceIndex: cardinal);  // for Golden Notes
+    procedure OnSentenceEnd(SentenceIndex: cardinal);     // for linebonus + singbar
+    procedure OnSentenceChange(SentenceIndex: cardinal);  // for golden notes
   end;
 
 implementation
@@ -123,37 +122,38 @@ implementation
 uses
   Classes,
   Math,
-  UGraphic,
   UDraw,
-  UMain,
-  USong,
-  URecord,
+  UGraphic,
   ULanguage,
+  UNote,
+  URecord,
+  USong,
   UUnicodeUtils;
 
- // Method for input parsing. If False is returned, GetNextWindow
- // should be checked to know the next window to load;
+// method for input parsing. if false is returned, getnextwindow
+// should be checked to know the next window to load;
+
 function TScreenSing.ParseInput(PressedKey: Cardinal; CharCode: UCS4Char;
   PressedDown: boolean): boolean;
 begin
-  Result := True;
+  Result := true;
   if (PressedDown) then
-  begin // Key Down
-        // check normal keys
+  begin // key down
+    // check normal keys
     case UCS4UpperCase(CharCode) of
       Ord('Q'):
       begin
-        //When not ask before Exit then Finish now
+        // when not ask before exit then finish now
         if (Ini.AskbeforeDel <> 1) then
           Finish
-        //else just Pause and let the Popup make the Work
+        // else just pause and let the popup make the work
         else if not Paused then
           Pause;
 
-        Result := False;
+        Result := false;
         Exit;
       end;
-      Ord('V'): //Show Visualization
+      Ord('V'): // show visualization
       begin
         fShowVisualization := not fShowVisualization;
 
@@ -179,7 +179,7 @@ begin
       SDLK_ESCAPE,
       SDLK_BACKSPACE:
       begin
-        //Record Sound Hack:
+        // record sound hack:
         //Sound[0].BufferLong
 
         Finish;
@@ -192,7 +192,7 @@ begin
         Pause;
       end;
 
-      SDLK_TAB: //Change Visualization Preset
+      SDLK_TAB: // change visualization preset
       begin
         if fShowVisualization then
           fCurrentVideoPlaybackEngine.Position := now; // move to a random position
@@ -202,8 +202,8 @@ begin
       begin
       end;
 
-      // Up and Down could be done at the same time,
-      // but I don't want to declare variables inside
+      // up and down could be done at the same time,
+      // but i don't want to declare variables inside
       // functions like this one, called so many times
       SDLK_DOWN:
       begin
@@ -215,57 +215,57 @@ begin
   end;
 end;
 
-//Pause Mod
+// pause mod
 procedure TScreenSing.Pause;
 begin
-  if (not Paused) then  //enable Pause
+  if (not Paused) then  // enable pause
   begin
-    // pause Time
-    Paused := True;
+    // pause time
+    Paused := true;
 
     LyricsState.Pause();
 
-    // pause Music
+    // pause music
     AudioPlayback.Pause;
 
-    // pause Video
+    // pause video
     if (CurrentSong.Video <> '') and FileExists(CurrentSong.Path +
       CurrentSong.Video) then
       fCurrentVideoPlaybackEngine.Pause;
 
   end
-  else              //disable Pause
+  else              // disable pause
   begin
     LyricsState.Resume();
 
-    // Play Music
+    // play music
     AudioPlayback.Play;
 
-    // Video
+    // video
     if (CurrentSong.Video <> '') and FileExists(CurrentSong.Path +
       CurrentSong.Video) then
       fCurrentVideoPlaybackEngine.Pause;
 
-    Paused := False;
+    Paused := false;
   end;
 end;
-//Pause Mod End
+// pause mod end
 
 constructor TScreenSing.Create;
 begin
   inherited Create;
 
-  fShowVisualization := False;
+  fShowVisualization := false;
 
   fCurrentVideoPlaybackEngine := VideoPlayback;
 
-  //Create Score Class
+  // create score class
   Scores := TSingScores.Create;
   Scores.LoadfromTheme;
 
   LoadFromTheme(Theme.Sing);
 
-  //TimeBar
+  // timebar
   StaticTimeProgress := AddStatic(Theme.Sing.StaticTimeProgress);
   TextTimeText := AddText(Theme.Sing.TextTimeText);
 
@@ -277,7 +277,7 @@ begin
   StaticP1TwoP := AddStatic(Theme.Sing.StaticP1TwoP);
   TextP1TwoP   := AddText(Theme.Sing.TextP1TwoP);
 
-  //              | P2
+  //                | P2
   StaticP2R := AddStatic(Theme.Sing.StaticP2R);
   TextP2R   := AddText(Theme.Sing.TextP2R);
 
@@ -285,18 +285,18 @@ begin
   StaticP1ThreeP := AddStatic(Theme.Sing.StaticP1ThreeP);
   TextP1ThreeP   := AddText(Theme.Sing.TextP1ThreeP);
 
-  //              | P2
+  //                | P2
   StaticP2M := AddStatic(Theme.Sing.StaticP2M);
   TextP2M   := AddText(Theme.Sing.TextP2M);
 
-  //              | P3
+  //                | P3
   StaticP3R := AddStatic(Theme.Sing.StaticP3R);
   TextP3R   := AddText(Theme.Sing.TextP3R);
 
   StaticPausePopup := AddStatic(Theme.Sing.PausePopUp);
 
-  //<note>Pausepopup is not visibile at the beginning</note>
-  Static[StaticPausePopup].Visible := False;
+  // <note> pausepopup is not visibile at the beginning </note>
+  Static[StaticPausePopup].Visible := false;
 
   Lyrics := TLyricEngine.Create(
       Skin_LyricsUpperX, Skin_LyricsUpperY, Skin_LyricsUpperW, Skin_LyricsUpperH,
@@ -307,10 +307,10 @@ end;
 
 procedure TScreenSing.onShow;
 var
-  P:      integer;
+  Index:  integer;
   V1:     boolean;
-  V1TwoP: boolean;   //Position of ScoreBox in two-player mode
-  V1ThreeP: boolean; //Position of ScoreBox in three-player mode
+  V1TwoP: boolean;   // position of score box in two player mode
+  V1ThreeP: boolean; // position of score box in three player mode
   V2R:    boolean;
   V2M:    boolean;
   V3R:    boolean;
@@ -321,9 +321,9 @@ begin
   inherited;
 
   Log.LogStatus('Begin', 'onShow');
-  FadeOut := False;
+  FadeOut := false;
 
-  // reset video playback engine, to play Video Clip...
+  // reset video playback engine, to play video clip ...
   fCurrentVideoPlaybackEngine := VideoPlayback;
 
   // setup score manager
@@ -333,12 +333,12 @@ begin
   Color.B := 0; // dummy atm  <- \(O.o)/? B like bummy?
 
   // add new players
-  for P := 0 to PlayersPlay - 1 do
+  for Index := 0 to PlayersPlay - 1 do
   begin
-    Scores.AddPlayer(Tex_ScoreBG[P], Color);
+    Scores.AddPlayer(Tex_ScoreBG[Index], Color);
   end;
 
-  Scores.Init; //Get Positions for Players
+  Scores.Init; // get positions for players
 
   // prepare players
   SetLength(Player, PlayersPlay);
@@ -346,92 +346,87 @@ begin
   case PlayersPlay of
     1:
     begin
-      V1     := True;
-      V1TwoP := False;
-      V1ThreeP := False;
-      V2R    := False;
-      V2M    := False;
-      V3R    := False;
+      V1     := true;
+      V1TwoP := false;
+      V1ThreeP := false;
+      V2R    := false;
+      V2M    := false;
+      V3R    := false;
     end;
     2:
     begin
-      V1     := False;
-      V1TwoP := True;
-      V1ThreeP := False;
-      V2R    := True;
-      V2M    := False;
-      V3R    := False;
+      V1     := false;
+      V1TwoP := true;
+      V1ThreeP := false;
+      V2R    := true;
+      V2M    := false;
+      V3R    := false;
     end;
     3:
     begin
-      V1     := False;
-      V1TwoP := False;
-      V1ThreeP := True;
-      V2R    := False;
-      V2M    := True;
-      V3R    := True;
+      V1     := false;
+      V1TwoP := false;
+      V1ThreeP := true;
+      V2R    := false;
+      V2M    := true;
+      V3R    := true;
     end;
     4:
     begin // double screen
-      V1     := False;
-      V1TwoP := True;
-      V1ThreeP := False;
-      V2R    := True;
-      V2M    := False;
-      V3R    := False;
+      V1     := false;
+      V1TwoP := true;
+      V1ThreeP := false;
+      V2R    := true;
+      V2M    := false;
+      V3R    := false;
     end;
     6:
     begin // double screen
-      V1     := False;
-      V1TwoP := False;
-      V1ThreeP := True;
-      V2R    := False;
-      V2M    := True;
-      V3R    := True;
+      V1     := false;
+      V1TwoP := false;
+      V1ThreeP := true;
+      V2R    := false;
+      V2M    := true;
+      V3R    := true;
     end;
 
   end;
 
-  //This one is shown in 1P mode
+  // this one is shown in 1P mode
   Static[StaticP1].Visible := V1;
   Text[TextP1].Visible     := V1;
 
-
-  //This one is shown in 2/4P mode
+  // this one is shown in 2/4P mode
   Static[StaticP1TwoP].Visible := V1TwoP;
   Text[TextP1TwoP].Visible     := V1TwoP;
 
   Static[StaticP2R].Visible := V2R;
   Text[TextP2R].Visible     := V2R;
 
-
-  //This one is shown in 3/6P mode
+  // this one is shown in 3/6P mode
   Static[StaticP1ThreeP].Visible := V1ThreeP;
   Text[TextP1ThreeP].Visible     := V1ThreeP;
 
-
   Static[StaticP2M].Visible := V2M;
   Text[TextP2M].Visible     := V2M;
 
-
   Static[StaticP3R].Visible := V3R;
   Text[TextP3R].Visible     := V3R;
 
-
-  // FIXME: sets Path and Filename to ''
+  // FIXME: sets path and filename to ''
   ResetSingTemp;
 
   CurrentSong := CatSongs.Song[CatSongs.Selected];
 
-  // FIXME: bad style, put the try-except into LoadSong() and not here
+  // FIXME: bad style, put the try-except into loadsong() and not here
   try
-    // Check if file is XML
+    // check if file is xml
     if copy(CurrentSong.FileName, length(CurrentSong.FileName) - 3, 4) = '.xml' then
       success := CurrentSong.LoadXMLSong()
     else
       success := CurrentSong.LoadSong();
   except
-    success := False;
+    success := false;
   end;
 
   if (not success) then
@@ -450,7 +445,7 @@ begin
     Exit;
   end;
 
-  // reset video playback engine, to play video clip...
+  // reset video playback engine, to play video clip ...
   fCurrentVideoPlaybackEngine.Close;
   fCurrentVideoPlaybackEngine := VideoPlayback;
 
@@ -460,32 +455,32 @@ begin
    *   + Blank        : Nothing has been set, this is our fallback
    *   + Picture      : Picture has been set, and exists - otherwise we fallback
    *   + Video        : Video has been set, and exists - otherwise we fallback
-   *   + Visualization: + Off        : No Visialization
-   *                    + WhenNoVideo: Overwrites Blank and Picture
-   *                    + On         : Overwrites Blank, Picture and Video
+   *   + Visualization: + Off        : No visualization
+   *                    + WhenNoVideo: Overwrites blank and picture
+   *                    + On         : Overwrites blank, picture and video
    *}
 
   {*
    * set background to: video
    *}
-  VideoLoaded := False;
-  fShowVisualization := False;
+  VideoLoaded := false;
+  fShowVisualization := false;
   if (CurrentSong.Video <> '') and FileExists(CurrentSong.Path + CurrentSong.Video) then
   begin
     if (fCurrentVideoPlaybackEngine.Open(CurrentSong.Path + CurrentSong.Video)) then
     begin
-      fShowVisualization := False;
+      fShowVisualization := false;
       fCurrentVideoPlaybackEngine := VideoPlayback;
       fCurrentVideoPlaybackEngine.Position := CurrentSong.VideoGAP + CurrentSong.Start;
       fCurrentVideoPlaybackEngine.Play;
-      VideoLoaded := True;
+      VideoLoaded := true;
     end;
   end;
 
   {*
    * set background to: picture
    *}
-  if (CurrentSong.Background <> '') and (VideoLoaded = False)
+  if (CurrentSong.Background <> '') and (VideoLoaded = false)
     and (TVisualizerOption(Ini.VisualizerOption) = voOff)  then
     try
       Tex_Background := Texture.LoadTexture(CurrentSong.Path + CurrentSong.Background);
@@ -504,7 +499,7 @@ begin
    *}
   if (TVisualizerOption(Ini.VisualizerOption) in [voOn]) then
   begin
-    fShowVisualization := True;
+    fShowVisualization := true;
     fCurrentVideoPlaybackEngine := Visualization;
     if (fCurrentVideoPlaybackEngine <> nil) then
       fCurrentVideoPlaybackEngine.Play;
@@ -514,9 +509,9 @@ begin
    * set background to: visualization (Videos are still shown)
    *}
   if ((TVisualizerOption(Ini.VisualizerOption) in [voWhenNoVideo]) and
-     (VideoLoaded = False)) then
+     (VideoLoaded = false)) then
   begin
-    fShowVisualization := True;
+    fShowVisualization := true;
     fCurrentVideoPlaybackEngine := Visualization;
     if (fCurrentVideoPlaybackEngine <> nil) then
       fCurrentVideoPlaybackEngine.Play;
@@ -541,8 +536,24 @@ begin
   // prepare and start voice-capture
   AudioInput.CaptureStart;
 
-  for P := 0 to High(Player) do
-    ClearScores(P);
+  // clear the scores of all players
+
+  for Index := 0 to High(Player) do
+    with Player[Index] do
+    begin
+      Score          := 0;
+      ScoreLine      := 0;
+      ScoreGolden    := 0;
+
+      ScoreInt       := 0;
+      ScoreLineInt   := 0;
+      ScoreGoldenInt := 0;
+      ScoreTotalInt  := 0;
+
+      ScoreLast      := 0;
+
+      LastSentencePerfect := false;
+    end;
 
   // main text
   Lyrics.Clear(CurrentSong.BPM[0].BPM, CurrentSong.Resolution);
@@ -589,24 +600,24 @@ begin
     end;
   end; // case
 
-  // Initialize lyrics by filling its queue
+  // initialize lyrics by filling its queue
   while (not Lyrics.IsQueueFull) and
         (Lyrics.LineCounter <= High(Lines[0].Line)) do
   begin
     Lyrics.AddLine(@Lines[0].Line[Lyrics.LineCounter]);
   end;
 
-  // Deactivate pause
-  Paused := False;
+  // deactivate pause
+  Paused := false;
 
-  // Kill all stars not killed yet (GoldenStarsTwinkle Mod)
+  // kill all stars not killed yet (goldenstarstwinkle mod)
   GoldenRec.SentenceChange;
 
-  // set Position of Line Bonus - Line Bonus end
-  // set number of empty sentences for Line Bonus
+  // set position of line bonus - line bonus end
+  // set number of empty sentences for line bonus
   NumEmptySentences := 0;
-  for P := Low(Lines[0].Line) to High(Lines[0].Line) do
-    if Lines[0].Line[P].TotalNotes = 0 then
+  for Index := Low(Lines[0].Line) to High(Lines[0].Line) do
+    if Lines[0].Line[Index].TotalNotes = 0 then
       Inc(NumEmptySentences);
 
   Log.LogStatus('End', 'onShow');
@@ -626,7 +637,7 @@ end;
 
 procedure TScreenSing.onHide;
 begin
-  // Unload background texture
+  // background texture
   if (Tex_Background.TexNum > 0) then
   begin
     glDeleteTextures(1, PGLuint(@Tex_Background.TexNum));
@@ -643,10 +654,15 @@ var
   T:     integer;
   CurLyricsTime: real;
 begin
-
   Background.Draw;
 
-  // set player names (for 2 screens and only Singstar skin)
+  // draw background picture (if any, and if no visualizations)
+  // when we don't check for visualizations the visualizations would
+  // be overdrawn by the picture when {UNDEFINED UseTexture} in UVisualizer
+  if (not fShowVisualization) then
+    SingDrawBackground;
+
+  // set player names (for 2 screens and only singstar skin)
   if ScreenAct = 1 then
   begin
     Text[TextP1].Text     := 'P1';
@@ -674,7 +690,6 @@ begin
     end; // case
   end; // if
 
-
   ////
   // dual screen, part 1
   ////////////////////////
@@ -683,29 +698,26 @@ begin
   // will move the statics and texts to the correct screen here.
   // FIXME: clean up this weird stuff. Commenting this stuff out, nothing
   //   was missing on screen w/ 6 players - so do we even need this stuff?
-  Static[StaticP1].Texture.X := Static[StaticP1].Texture.X + 10 * ScreenX;
+  {Static[StaticP1].Texture.X := Static[StaticP1].Texture.X + 10 * ScreenX;
 
-  Text[TextP1].X := Text[TextP1].X + 10 * ScreenX;
+  Text[TextP1].X := Text[TextP1].X + 10 * ScreenX;  }
 
   {Static[StaticP1ScoreBG].Texture.X  := Static[StaticP1ScoreBG].Texture.X + 10*ScreenX;
   Text[TextP1Score].X                := Text[TextP1Score].X + 10*ScreenX;}
 
+  {Static[StaticP2R].Texture.X := Static[StaticP2R].Texture.X + 10 * ScreenX;
 
-  Static[StaticP2R].Texture.X := Static[StaticP2R].Texture.X + 10 * ScreenX;
-
-  Text[TextP2R].X := Text[TextP2R].X + 10 * ScreenX;
+  Text[TextP2R].X := Text[TextP2R].X + 10 * ScreenX; }
 
   {Static[StaticP2RScoreBG].Texture.X := Static[StaticP2RScoreBG].Texture.X + 10*ScreenX;
   Text[TextP2RScore].X               := Text[TextP2RScore].X + 10*ScreenX;}
 
   // end of weird stuff
+  {
+  Static[1].Texture.X := Static[1].Texture.X + 10 * ScreenX;     }
 
-  Static[1].Texture.X := Static[1].Texture.X + 10 * ScreenX;
-
-  for T := 0 to 1 do
-    Text[T].X := Text[T].X + 10 * ScreenX;
-
-
+ { for T := 0 to 1 do
+    Text[T].X := Text[T].X + 10 * ScreenX;    }
 
   // retrieve current lyrics time, we have to store the value to avoid
   // that min- and sec-values do not match
@@ -726,15 +738,17 @@ begin
   // Note: there is no menu and the animated background brakes the video playback
   //DrawBG;
 
-  // Draw Background
-  SingDrawBackground;
-
   // update and draw movie
   if (ShowFinish and (VideoLoaded or fShowVisualization)) then
   begin
     if assigned(fCurrentVideoPlaybackEngine) then
     begin
-      fCurrentVideoPlaybackEngine.GetFrame(LyricsState.GetCurrentTime());
+      // Just call this once
+      // when Screens = 2
+      If (ScreenAct = 1) then
+        fCurrentVideoPlaybackEngine.GetFrame(CurrentSong.VideoGAP + LyricsState.GetCurrentTime());
+
+
       fCurrentVideoPlaybackEngine.DrawGL(ScreenAct);
     end;
   end;
@@ -758,7 +772,7 @@ begin
       if (not FadeOut) then
       begin
         Finish;
-        FadeOut := True;
+        FadeOut := true;
         FadeTo(@ScreenScore);
       end;
     end;
@@ -767,10 +781,10 @@ begin
   // always draw custom items
   SingDraw;
 
-  //GoldenNoteStarsTwinkle
+  // goldennotestarstwinkle
   GoldenRec.SpawnRec;
 
-  //Draw Scores
+  // draw scores
   Scores.Draw;
 
   ////
@@ -781,30 +795,30 @@ begin
   // will move the statics and texts to the correct screen here.
   // FIXME: clean up this weird stuff
 
-  Static[StaticP1].Texture.X := Static[StaticP1].Texture.X - 10 * ScreenX;
+  {Static[StaticP1].Texture.X := Static[StaticP1].Texture.X - 10 * ScreenX;
   Text[TextP1].X := Text[TextP1].X - 10 * ScreenX;
 
   Static[StaticP2R].Texture.X := Static[StaticP2R].Texture.X - 10 * ScreenX;
   Text[TextP2R].X := Text[TextP2R].X - 10 * ScreenX;
 
-  //end of weird
+  // end of weird
 
   Static[1].Texture.X := Static[1].Texture.X - 10 * ScreenX;
 
   for T := 0 to 1 do
-    Text[T].X := Text[T].X - 10 * ScreenX;
+    Text[T].X := Text[T].X - 10 * ScreenX;        }
 
-  // Draw Pausepopup
-  // FIXME: this is a workaround that the Static is drawn over the Lyrics, Lines, Scores and Effects
+  // draw pausepopup
+  // FIXME: this is a workaround that the static is drawn over the lyrics, lines, scores and effects
   // maybe someone could find a better solution
   if Paused then
   begin
-    Static[StaticPausePopup].Visible := True;
+    Static[StaticPausePopup].Visible := true;
     Static[StaticPausePopup].Draw;
-    Static[StaticPausePopup].Visible := False;
+    Static[StaticPausePopup].Visible := false;
   end;
 
-  Result := True;
+  Result := true;
 end;
 
 procedure TScreenSing.Finish;
@@ -820,11 +834,11 @@ begin
     Visualization.Close;
 
   // to prevent drawing closed video
-  VideoLoaded := False;
+  VideoLoaded := false;
 
-  //Kill all Stars and Effects
+  // kill all stars and effects
   GoldenRec.KillAll;
-  
+
   if (Ini.SavePlayback = 1) then
   begin
     Log.BenchmarkStart(0);
@@ -835,7 +849,7 @@ begin
     Log.LogBenchmark('Creating files', 0);
   end;
 
-  SetFontItalic(False);
+  SetFontItalic(false);
 end;
 
 procedure TScreenSing.OnSentenceEnd(SentenceIndex: cardinal);
@@ -874,14 +888,14 @@ begin
     CurrentPlayer := @Player[PlayerIndex];
     CurrentScore  := CurrentPlayer.Score + CurrentPlayer.ScoreGolden;
 
-    // Line Bonus
+    // line bonus
 
     // points for this line
     LineScore := CurrentScore - CurrentPlayer.ScoreLast;
 
     // determine LinePerfection
     // Note: the "+2" extra points are a little bonus so the player does not
-    //   have to be that perfect to reach the bonus steps.
+    // have to be that perfect to reach the bonus steps.
     LinePerfection := (LineScore + 2) / MaxLineScore;
 
     // clamp LinePerfection to range [0..1]
@@ -899,7 +913,7 @@ begin
       // apply line-bonus
       CurrentPlayer.ScoreLine :=
         CurrentPlayer.ScoreLine + LineBonus * LinePerfection;
-      CurrentPlayer.ScoreLineInt := Round(CurrentPlayer.ScoreLine / 10) * 10;
+      CurrentPlayer.ScoreLineInt := Floor(CurrentPlayer.ScoreLine / 10) * 10;
       // update total score
       CurrentPlayer.ScoreTotalInt :=
         CurrentPlayer.ScoreInt +
@@ -911,7 +925,7 @@ begin
       Scores.SpawnPopUp(PlayerIndex, Rating, CurrentPlayer.ScoreTotalInt);
     end;
 
-    // PerfectLineTwinkle (effect), Part 1
+    // PerfectLineTwinkle (effect), part 1
     if (Ini.EffectSing = 1) then
       CurrentPlayer.LastSentencePerfect := (LinePerfection >= 1);
 
@@ -919,7 +933,7 @@ begin
     CurrentPlayer.ScoreLast := CurrentScore;
   end;
 
-  // PerfectLineTwinkle (effect), Part 2
+  // PerfectLineTwinkle (effect), part 2
   if (Ini.EffectSing = 1) then
     GoldenRec.SpawnPerfectLineTwinkle;
 end;
@@ -928,14 +942,14 @@ end;
  // SentenceIndex: index of the new active sentence
 procedure TScreenSing.OnSentenceChange(SentenceIndex: cardinal);
 begin
-  //GoldenStarsTwinkle
+  // goldenstarstwinkle
   GoldenRec.SentenceChange;
 
-  // Fill lyrics queue and set upper line to the current sentence
+  // fill lyrics queue and set upper line to the current sentence
   while (Lyrics.GetUpperLineIndex() < SentenceIndex) or
     (not Lyrics.IsQueueFull) do
   begin
-    // Add the next line to the queue or a dummy if no more lines are available
+    // add the next line to the queue or a dummy if no more lines are available
     if (Lyrics.LineCounter <= High(Lines[0].Line)) then
       Lyrics.AddLine(@Lines[0].Line[Lyrics.LineCounter])
     else
diff --git a/unicode/src/screens/UScreenSingModi.pas b/unicode/src/screens/UScreenSingModi.pas
index 5230d33a..b9c9365d 100644
--- a/unicode/src/screens/UScreenSingModi.pas
+++ b/unicode/src/screens/UScreenSingModi.pas
@@ -119,7 +119,19 @@ procedure PlaySound (const Index: Cardinal); stdcall;       //Plays a Custom Sou
 function ToSentences(Const Lines: TLines): TSentences;
 
 implementation
-uses UGraphic, UDraw, UMain, Classes, URecord, ULanguage, math, UDLLManager, USkins, UGraphicClasses;
+
+uses
+  Classes, 
+  Math,
+  UDLLManager,
+  UDraw,
+  UGraphic,
+  UGraphicClasses,
+  ULanguage,
+  UNote,
+  UPath,
+  URecord, 
+  USkins;
 
 // Method for input parsing. If False is returned, GetNextWindow
 // should be checked to know the next window to load;
@@ -167,7 +179,6 @@ begin
     Result.Sentence[I].Start      := Lines.Line[I].Start;
     Result.Sentence[I].StartNote  := Lines.Line[I].Note[0].Start;
     Result.Sentence[I].Lyric      := Lines.Line[I].Lyric;
-    Result.Sentence[I].LyricWidth := Lines.Line[I].LyricWidth;
     Result.Sentence[I].End_       := Lines.Line[I].End_;
     Result.Sentence[I].BaseNote   := Lines.Line[I].BaseNote;
     Result.Sentence[I].HighNote   := Lines.Line[I].HighNote;
@@ -180,7 +191,7 @@ begin
       Result.Sentence[I].Note[J].Start     := Lines.Line[I].Note[J].Start;
       Result.Sentence[I].Note[J].Length    := Lines.Line[I].Note[J].Length;
       Result.Sentence[I].Note[J].Tone      := Lines.Line[I].Note[J].Tone;
-      //Result.Sentence[I].Note[J].Text      := Lines.Line[I].Note[J].Tekst;
+      //Result.Sentence[I].Note[J].Text      := Lines.Line[I].Note[J].Text;
       Result.Sentence[I].Note[J].FreeStyle := (Lines.Line[I].Note[J].NoteType = ntFreestyle);
     end;
   end;
@@ -299,7 +310,7 @@ function TScreenSingModi.Draw: boolean;
 var
   Min:    integer;
   Sec:    integer;
-  Tekst:  string;
+  TextStr:  string;
   S, I:   integer;
   T:      integer;
   CurLyricsTime: real;
@@ -445,82 +456,82 @@ begin
 
     // .. and scores
     {if PlayersPlay = 1 then begin
-      Tekst := IntToStr(Player[0].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP1Score].Text := Tekst;
+      TextStr := IntToStr(Player[0].ScoreTotalI);
+      while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+      Text[TextP1Score].Text := TextStr;
     end;
 
     if PlayersPlay = 2 then begin
-      Tekst := IntToStr(Player[0].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP1TwoPScore].Text := Tekst;
+      TextStr := IntToStr(Player[0].ScoreTotalI);
+      while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+      Text[TextP1TwoPScore].Text := TextStr;
 
-      Tekst := IntToStr(Player[1].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP2RScore].Text := Tekst;
+      TextStr := IntToStr(Player[1].ScoreTotalI);
+      while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+      Text[TextP2RScore].Text := TextStr;
     end;
 
     if PlayersPlay = 3 then begin
-      Tekst := IntToStr(Player[0].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP1ThreePScore].Text := Tekst;
+      TextStr := IntToStr(Player[0].ScoreTotalI);
+      while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+      Text[TextP1ThreePScore].Text := TextStr;
 
-      Tekst := IntToStr(Player[1].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP2MScore].Text := Tekst;
+      TextStr := IntToStr(Player[1].ScoreTotalI);
+      while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+      Text[TextP2MScore].Text := TextStr;
 
-      Tekst := IntToStr(Player[2].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP3RScore].Text := Tekst;
+      TextStr := IntToStr(Player[2].ScoreTotalI);
+      while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+      Text[TextP3RScore].Text := TextStr;
     end;
 
     if PlayersPlay = 4 then begin
       if ScreenAct = 1 then begin
-        Tekst := IntToStr(Player[0].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP1TwoPScore].Text := Tekst;
+        TextStr := IntToStr(Player[0].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP1TwoPScore].Text := TextStr;
 
-        Tekst := IntToStr(Player[1].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP2RScore].Text := Tekst;
+        TextStr := IntToStr(Player[1].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP2RScore].Text := TextStr;
       end;
       if ScreenAct = 2 then begin
-        Tekst := IntToStr(Player[2].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP1TwoPScore].Text := Tekst;
+        TextStr := IntToStr(Player[2].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP1TwoPScore].Text := TextStr;
 
-        Tekst := IntToStr(Player[3].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP2RScore].Text := Tekst;
+        TextStr := IntToStr(Player[3].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP2RScore].Text := TextStr;
       end;
     end;
 
     if PlayersPlay = 6 then begin
       if ScreenAct = 1 then begin
-        Tekst := IntToStr(Player[0].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP1ThreePScore].Text := Tekst;
+        TextStr := IntToStr(Player[0].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP1ThreePScore].Text := TextStr;
 
-        Tekst := IntToStr(Player[1].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP2MScore].Text := Tekst;
+        TextStr := IntToStr(Player[1].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP2MScore].Text := TextStr;
 
-        Tekst := IntToStr(Player[2].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP3RScore].Text := Tekst;
+        TextStr := IntToStr(Player[2].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP3RScore].Text := TextStr;
       end;
       if ScreenAct = 2 then begin
-        Tekst := IntToStr(Player[3].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP1ThreePScore].Text := Tekst;
+        TextStr := IntToStr(Player[3].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP1ThreePScore].Text := TextStr;
 
-        Tekst := IntToStr(Player[4].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP2MScore].Text := Tekst;
+        TextStr := IntToStr(Player[4].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP2MScore].Text := TextStr;
 
-        Tekst := IntToStr(Player[5].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP3RScore].Text := Tekst;
+        TextStr := IntToStr(Player[5].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP3RScore].Text := TextStr;
       end;
     end;   }
 
@@ -553,9 +564,7 @@ begin
   if (DllMan.Selected.LoadSong) AND (DllMan.Selected.LoadBack) then
     SingDrawBackground;
 
-  // comment by blindy: wo zum henker wird denn in diesem screen ein video abgespielt?
   // update and draw movie
-  // <mog> wie wo wadd? also in der selben funktion in der uscreensing kommt des video in der zeile 995, oder was wollteste wissen? :X
 {  if ShowFinish and CurrentSong.VideoLoaded AND DllMan.Selected.LoadVideo then begin
     UpdateSmpeg; // this only draws
   end;}
@@ -688,7 +697,7 @@ begin
   SetFontStyle(Style and 7);
   // FIXME: FONTSIZE
   // used by Hold_The_Line / TeamDuell
-  SetFontSize(Size * 3);
+  SetFontSize(Size);
   SetFontPos (X, Y);
   glPrint (Language.Translate(String(Text)));
 end;
diff --git a/unicode/src/screens/UScreenSong.pas b/unicode/src/screens/UScreenSong.pas
index ac1ee194..da725a59 100644
--- a/unicode/src/screens/UScreenSong.pas
+++ b/unicode/src/screens/UScreenSong.pas
@@ -65,7 +65,7 @@ type
       TextNumber:   integer;
 
       //Video Icon Mod
-      VideoIcon: Cardinal;
+      VideoIcon: cardinal;
 
       TextCat:   integer;
       StaticCat: integer;
@@ -88,28 +88,28 @@ type
       Mode: TSingMode;
 
       //party Statics (Joker)
-      StaticTeam1Joker1: Cardinal;
-      StaticTeam1Joker2: Cardinal;
-      StaticTeam1Joker3: Cardinal;
-      StaticTeam1Joker4: Cardinal;
-      StaticTeam1Joker5: Cardinal;
-
-      StaticTeam2Joker1: Cardinal;
-      StaticTeam2Joker2: Cardinal;
-      StaticTeam2Joker3: Cardinal;
-      StaticTeam2Joker4: Cardinal;
-      StaticTeam2Joker5: Cardinal;
-
-      StaticTeam3Joker1: Cardinal;
-      StaticTeam3Joker2: Cardinal;
-      StaticTeam3Joker3: Cardinal;
-      StaticTeam3Joker4: Cardinal;
-      StaticTeam3Joker5: Cardinal;
-
-      StaticParty:    array of Cardinal;
-      TextParty:      array of Cardinal;
-      StaticNonParty: array of Cardinal;
-      TextNonParty:   array of Cardinal;
+      StaticTeam1Joker1: cardinal;
+      StaticTeam1Joker2: cardinal;
+      StaticTeam1Joker3: cardinal;
+      StaticTeam1Joker4: cardinal;
+      StaticTeam1Joker5: cardinal;
+
+      StaticTeam2Joker1: cardinal;
+      StaticTeam2Joker2: cardinal;
+      StaticTeam2Joker3: cardinal;
+      StaticTeam2Joker4: cardinal;
+      StaticTeam2Joker5: cardinal;
+
+      StaticTeam3Joker1: cardinal;
+      StaticTeam3Joker2: cardinal;
+      StaticTeam3Joker3: cardinal;
+      StaticTeam3Joker4: cardinal;
+      StaticTeam3Joker5: cardinal;
+
+      StaticParty:    array of cardinal;
+      TextParty:      array of cardinal;
+      StaticNonParty: array of cardinal;
+      TextNonParty:   array of cardinal;
 
 
       constructor Create; override;
@@ -120,18 +120,18 @@ type
       procedure SetScroll4;
       procedure SetScroll5;
       procedure SetScroll6;
-      function ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
       function Draw: boolean; override;
       procedure GenerateThumbnails();
       procedure onShow; override;
       procedure onHide; override;
       procedure SelectNext;
       procedure SelectPrev;
-      procedure SkipTo(Target: Cardinal);
+      procedure SkipTo(Target: cardinal);
       procedure FixSelected; //Show Wrong Song when Tabs on Fix
       procedure FixSelected2; //Show Wrong Song when Tabs on Fix
-      procedure ShowCatTL(Cat: Integer);// Show Cat in Top left
-      procedure ShowCatTLCustom(Caption: String);// Show Custom Text in Top left
+      procedure ShowCatTL(Cat: integer);// Show Cat in Top left
+      procedure ShowCatTLCustom(Caption: string);// Show Custom Text in Top left
       procedure HideCatTL;// Show Cat in Tob left
       procedure Refresh; //Refresh Song Sorting
       procedure ChangeMusic;
@@ -154,24 +154,26 @@ type
 implementation
 
 uses
-  UGraphic,
-  UMain,
-  UCovers,
-  math,
+  Math,
   gl,
-  USkins,
+  UCovers,
   UDLLManager,
+  UGraphic,
+  UMain,
+  UMenuButton,
+  UNote,
   UParty,
   UPlaylist,
-  UMenuButton,
-  UUnicodeUtils,
-  UScreenSongMenu;
+  UScreenSongMenu,
+  USkins,
+  UUnicodeUtils;
 
 // ***** Public methods ****** //
 
 //Show Wrong Song when Tabs on Fix
 procedure TScreenSong.FixSelected;
-var I, I2: Integer;
+var
+  I, I2: integer;
 begin
   if CatSongs.VisibleSongs > 0 then
   begin
@@ -191,7 +193,8 @@ begin
 end;
 
 procedure TScreenSong.FixSelected2;
-var I, I2: Integer;
+var
+  I, I2: integer;
 begin
   if CatSongs.VisibleSongs > 0 then
   begin
@@ -210,15 +213,15 @@ begin
 end;
 //Show Wrong Song when Tabs on Fix End
 
-procedure TScreenSong.ShowCatTLCustom(Caption: String);// Show Custom Text in Top left
+procedure TScreenSong.ShowCatTLCustom(Caption: string);// Show Custom Text in Top left
 begin
   Text[TextCat].Text := Caption;
   Text[TextCat].Visible := true;
-  Static[StaticCat].Visible := False;
+  Static[StaticCat].Visible := false;
 end;
 
 //Show Cat in Top Left Mod
-procedure TScreenSong.ShowCatTL(Cat: Integer);
+procedure TScreenSong.ShowCatTL(Cat: integer);
 begin
   //Change
   Text[TextCat].Text := CatSongs.Song[Cat].Artist;
@@ -226,7 +229,7 @@ begin
 
   //Show
   Text[TextCat].Visible := true;
-  Static[StaticCat].Visible := True;
+  Static[StaticCat].Visible := true;
 end;
 
 procedure TScreenSong.HideCatTL;
@@ -235,7 +238,7 @@ begin
   //Text[TextCat].Visible := false;
   Static[StaticCat].Visible := false;
   //New -> Show Text specified in Theme
-  Text[TextCat].Visible := True;
+  Text[TextCat].Visible := true;
   Text[TextCat].Text := Theme.Song.TextCat.Text;
 end;
 //Show Cat in Top Left Mod End
@@ -243,7 +246,7 @@ end;
 
 // Method for input parsing. If False is returned, GetNextWindow
 // should be checked to know the next window to load;
-function TScreenSong.ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean;
+function TScreenSong.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
 var
   I:      integer;
   I2:     integer;
@@ -388,7 +391,7 @@ begin
         begin
           if (Songs.SongList.Count > 0) and (Mode = smNormal) then
           begin
-            ScreenSongJumpto.Visible := True;
+            ScreenSongJumpto.Visible := true;
           end;
           Exit;
         end;
@@ -401,21 +404,22 @@ begin
 
       Ord('R'):
         begin
-          if (Songs.SongList.Count > 0) and (Mode = smNormal) then
+          if (Songs.SongList.Count > 0) and
+             (Mode = smNormal) then
           begin
-            if (SDL_ModState = KMOD_LSHIFT) and (Ini.Tabs_at_startup = 1) then //Random Category
+            if (SDL_ModState = KMOD_LSHIFT) and (Ini.TabsAtStartup = 1) then //Random Category
             begin
               I2 := 0; //Count Cats
-              for I:= low(CatSongs.Song) to high (CatSongs.Song) do
+              for I:= 0 to high(CatSongs.Song) do
               begin
                 if CatSongs.Song[I].Main then
                   Inc(I2);
               end;
 
-              I2 := Random (I2)+1; //Zufall
+              I2 := Random(I2)+1; //Zufall
 
               //Find Cat:
-              for I:= low(CatSongs.Song) to high (CatSongs.Song) do
+              for I:= 0 to high(CatSongs.Song) do
                 begin
                 if CatSongs.Song[I].Main then
                   Dec(I2);
@@ -434,14 +438,14 @@ begin
                 end;
               end;
             end
-            else if (SDL_ModState = KMOD_LCTRL) and (Ini.Tabs_at_startup = 1) then //random in All Categorys
+            else if (SDL_ModState = KMOD_LCTRL) and (Ini.TabsAtStartup = 1) then //random in All Categorys
             begin
               repeat
-                I2 := Random(high(CatSongs.Song)+1) - low(CatSongs.Song)+1;
-              until CatSongs.Song[I2].Main = false;
+                I2 := Random(high(CatSongs.Song)+1) + 1;
+              until (not CatSongs.Song[I2].Main);
 
               //Search Cat
-              for I := I2 downto low(CatSongs.Song) do
+              for I := I2 downto 0 do
               begin
               if CatSongs.Song[I].Main then
                 break;
@@ -459,7 +463,8 @@ begin
               SelectNext;
 
               //Fix: Not Existing Song selected:
-              //if (I+1=I2) then Inc(I2);
+              //if (I+1=I2) then
+	        Inc(I2);
 
               //Choose Song
               SkipTo(I2-I);
@@ -485,20 +490,20 @@ begin
           if (Mode = smNormal) then
           begin
             //On Escape goto Cat-List Hack
-            if (Ini.Tabs_at_startup = 1) and (CatSongs.CatNumShow <> -1) then
+            if (Ini.TabsAtStartup = 1) and (CatSongs.CatNumShow <> -1) then
               begin
               //Find Category
               I := Interaction;
-              while not catsongs.Song[I].Main  do
-                begin
-                Dec (I);
-                if (I < low(catsongs.Song)) then
+              while (not CatSongs.Song[I].Main) do
+              begin
+                Dec(I);
+                if (I < 0) then
                   break;
-                end;
-              if (I<= 1) then
-              Interaction := high(catsongs.Song)
+              end;
+              if (I <= 1) then
+                Interaction := high(CatSongs.Song)
               else
-              Interaction := I - 1;
+                Interaction := I - 1;
 
               //Stop Music
               StopMusicPreview();
@@ -513,7 +518,7 @@ begin
               SelectNext;
               FixSelected;
               //SelectPrev;
-              //CatSongs.Song[0].Visible := False;
+              //CatSongs.Song[0].Visible := false;
               end
             else
             begin
@@ -553,7 +558,7 @@ begin
         end;
       SDLK_RETURN:
         begin
-          if Songs.SongList.Count > 0 then
+          if (Songs.SongList.Count > 0) then
           begin
             if CatSongs.Song[Interaction].Main then
             begin // clicked on Category Button
@@ -610,10 +615,11 @@ begin
             if (CatSongs.CatNumShow > -2) then
             begin
               //Cat Change Hack
-              if Ini.Tabs_at_startup = 1 then
+              if Ini.TabsAtStartup = 1 then
               begin
                 I := Interaction;
-                if I <= 0 then I := 1;
+                if I <= 0 then
+		  I := 1;
 
                 while not catsongs.Song[I].Main do
                 begin
@@ -650,11 +656,12 @@ begin
             if (CatSongs.CatNumShow > -2) then
             begin
               //Cat Change Hack
-              if Ini.Tabs_at_startup = 1 then
+              if Ini.TabsAtStartup = 1 then
               begin
                 I := Interaction;
                 I2 := 0;
-                if I <= 0 then I := 1;
+                if I <= 0 then
+		  I := 1;
 
                 while not catsongs.Song[I].Main or (I2 = 0) do
                 begin
@@ -740,7 +747,7 @@ begin
           end; }
         end;
     end;
-  end;
+  end; // if (PressedDown)
 end;
 
 constructor TScreenSong.Create;
@@ -816,7 +823,7 @@ end;
 
 procedure TScreenSong.GenerateThumbnails();
 var
-  I: Integer;
+  I: integer;
   CoverButtonIndex: integer;
   CoverButton: TButton;
   CoverName: string;
@@ -877,7 +884,7 @@ end;
 
 procedure TScreenSong.SetScroll;
 var
-  VS, B: Integer;
+  VS, B: integer;
 begin
   VS := CatSongs.VisibleSongs;
   if VS > 0 then
@@ -901,7 +908,7 @@ begin
     // Set texts
     Text[TextArtist].Text := CatSongs.Song[Interaction].Artist;
     Text[TextTitle].Text  :=  CatSongs.Song[Interaction].Title;
-    if (Ini.Tabs_at_startup = 1) and (CatSongs.CatNumShow = -1) then
+    if (Ini.TabsAtStartup = 1) and (CatSongs.CatNumShow = -1) then
     begin
       Text[TextNumber].Text := IntToStr(CatSongs.Song[Interaction].OrderNum) + '/' + IntToStr(CatSongs.CatCount);
       Text[TextTitle].Text  := '(' + IntToStr(CatSongs.Song[Interaction].CatNumber) + ' ' + Language.Translate('SING_SONGS_IN_CAT') + ')';
@@ -910,7 +917,7 @@ begin
       Text[TextNumber].Text := IntToStr(CatSongs.VisibleIndex(Interaction)+1) + '/' + IntToStr(VS)
     else if (CatSongs.CatNumShow = -3) then
       Text[TextNumber].Text := IntToStr(CatSongs.VisibleIndex(Interaction)+1) + '/' + IntToStr(VS)
-    else if (Ini.Tabs_at_startup = 1) then
+    else if (Ini.TabsAtStartup = 1) then
       Text[TextNumber].Text := IntToStr(CatSongs.Song[Interaction].CatNumber) + '/' + IntToStr(CatSongs.Song[Interaction - CatSongs.Song[Interaction].CatNumber].CatNumber)
     else
       Text[TextNumber].Text := IntToStr(Interaction+1) + '/' + IntToStr(Length(CatSongs.Song));
@@ -921,7 +928,7 @@ begin
     Text[TextArtist].Text := '';
     Text[TextTitle].Text  := '';
     for B := 0 to High(Button) do
-      Button[B].Visible := False;
+      Button[B].Visible := false;
 
   end;
 end;
@@ -951,29 +958,37 @@ begin
 
   VisCount := 0;
   for B := 0 to High(Button) do
-    if CatSongs.Song[B].Visible then Inc(VisCount);
+    if CatSongs.Song[B].Visible then
+      Inc(VisCount);
 
   VisInt := 0;
   for B := 0 to Interaction-1 do
-    if CatSongs.Song[B].Visible then Inc(VisInt);
+    if CatSongs.Song[B].Visible then
+      Inc(VisInt);
 
 
-  if VisCount <= 6 then begin
+  if VisCount <= 6 then
+  begin
     Typ := 0;
-  end else begin
-    if VisInt <= 3 then begin
+  end
+  else
+  begin
+    if VisInt <= 3 then
+    begin
       Typ := 1;
       Count := 7;
       Ready := true;
     end;
 
-    if (VisCount - VisInt) <= 3 then begin
+    if (VisCount - VisInt) <= 3 then
+    begin
       Typ := 2;
       Count := 7;
       Ready := true;
     end;
 
-    if not Ready then begin
+    if not Ready then
+    begin
       Typ := 3;
       Src := Interaction;
     end;
@@ -982,13 +997,15 @@ begin
 
 
   // hide all buttons
-  for B := 0 to High(Button) do begin
+  for B := 0 to High(Button) do
+  begin
     Button[B].Visible := false;
     Button[B].Selectable := CatSongs.Song[B].Visible;
   end;
 
   {
-  for B := Src to Dst do begin
+  for B := Src to Dst do
+  begin
     //Button[B].Visible := true;
     Button[B].Visible := CatSongs.Song[B].Visible;
     Button[B].Selectable := Button[B].Visible;
@@ -997,9 +1014,12 @@ begin
   }
 
 
-  if Typ = 0 then begin
-    for B := 0 to High(Button) do begin
-      if CatSongs.Song[B].Visible then begin
+  if Typ = 0 then
+  begin
+    for B := 0 to High(Button) do
+    begin
+      if CatSongs.Song[B].Visible then
+      begin
         Button[B].Visible := true;
         Button[B].Y := 140 + (Placed) * 60;
         Inc(Placed);
@@ -1007,10 +1027,13 @@ begin
     end;
   end;
 
-  if Typ = 1 then begin
+  if Typ = 1 then
+  begin
     B := 0;
-    while (Count > 0) do begin
-      if CatSongs.Song[B].Visible then begin
+    while (Count > 0) do
+    begin
+      if CatSongs.Song[B].Visible then
+      begin
         Button[B].Visible := true;
         Button[B].Y := 140 + (Placed) * 60;
         Inc(Placed);
@@ -1020,10 +1043,13 @@ begin
     end;
   end;
 
-  if Typ = 2 then begin
+  if Typ = 2 then
+  begin
     B := High(Button);
-    while (Count > 0) do begin
-      if CatSongs.Song[B].Visible then begin
+    while (Count > 0) do
+    begin
+      if CatSongs.Song[B].Visible then
+      begin
         Button[B].Visible := true;
         Button[B].Y := 140 + (6-Placed) * 60;
         Inc(Placed);
@@ -1033,11 +1059,14 @@ begin
     end;
   end;
 
-  if Typ = 3 then begin
+  if Typ = 3 then
+  begin
     B := Src;
     Count := 4;
-    while (Count > 0) do begin
-      if CatSongs.Song[B].Visible then begin
+    while (Count > 0) do
+    begin
+      if CatSongs.Song[B].Visible then
+      begin
         Button[B].Visible := true;
         Button[B].Y := 140 + (3+Placed) * 60;
         Inc(Placed);
@@ -1049,8 +1078,10 @@ begin
     B := Src-1;
     Placed := 0;
     Count := 3;
-    while (Count > 0) do begin
-      if CatSongs.Song[B].Visible then begin
+    while (Count > 0) do
+    begin
+      if CatSongs.Song[B].Visible then
+      begin
         Button[B].Visible := true;
         Button[B].Y := 140 + (2-Placed) * 60;
         Inc(Placed);
@@ -1068,14 +1099,15 @@ end;
 procedure TScreenSong.SetScroll2;
 var
   B:      integer;
-  //Wsp:    integer; // wspolczynnik przesuniecia wzgledem srodka ekranu 
-  //Wsp2:   real;
+  //Factor:    integer; // factor of position relative to center of screen
+  //Factor2:   real;
 begin
-  // liniowe
+  // line
   for B := 0 to High(Button) do
     Button[B].X := 300 + (B - Interaction) * 260;
 
-  if Length(Button) >= 3 then begin
+  if Length(Button) >= 3 then
+  begin
     if Interaction = 0 then
       Button[High(Button)].X := 300 - 260;
 
@@ -1083,12 +1115,13 @@ begin
       Button[0].X := 300 + 260;
   end;
 
-  // kolowe
+  // circle
   {
-  for B := 0 to High(Button) do begin
-    Wsp := (B - Interaction); // 0 dla srodka, -1 dla lewego, +1 dla prawego itd.
-    Wsp2 := Wsp / Length(Button);
-    Button[B].X := 300 + 10000 * sin(2*pi*Wsp2);
+  for B := 0 to High(Button) do
+  begin
+    Factor := (B - Interaction); // 0 to center, -1: to left, +1 to right
+    Factor2 := Factor / Length(Button);
+    Button[B].X := 300 + 10000 * sin(2*pi*Factor2);
     //Button[B].Y := 140 + 50 * ;
   end;
   }
@@ -1098,23 +1131,24 @@ end;
 procedure TScreenSong.SetScroll3; // with slide
 var
   B:      integer;
-  //Wsp:    integer; // wspolczynnik przesuniecia wzgledem srodka ekranu
-  //Wsp2:   real;
+  //Factor:    integer; // factor of position relative to center of screen
+  //Factor2:   real;
 begin
   SongTarget := Interaction;
 
-  // liniowe
+  // line
   for B := 0 to High(Button) do
   begin
     Button[B].X := 300 + (B - SongCurrent) * 260;
     if (Button[B].X < -Button[B].W) or (Button[B].X > 800) then
-      Button[B].Visible := False
+      Button[B].Visible := false
     else
-      Button[B].Visible := True;
+      Button[B].Visible := true;
   end;
 
   {
-  if Length(Button) >= 3 then begin
+  if Length(Button) >= 3 then
+  begin
     if Interaction = 0 then
       Button[High(Button)].X := 300 - 260;
 
@@ -1123,12 +1157,13 @@ begin
   end;
   }
 
-  // kolowe
+  // circle
   {
-  for B := 0 to High(Button) do begin
-    Wsp := (B - Interaction); // 0 dla srodka, -1 dla lewego, +1 dla prawego itd.
-    Wsp2 := Wsp / Length(Button);
-    Button[B].X := 300 + 10000 * sin(2*pi*Wsp2);
+  for B := 0 to High(Button) do
+  begin
+    Factor := (B - Interaction); // 0 to center, -1: to left, +1 to right
+    Factor2 := Factor / Length(Button);
+    Button[B].X := 300 + 10000 * sin(2*pi*Factor2);
     //Button[B].Y := 140 + 50 * ;
   end;
   }
@@ -1182,10 +1217,10 @@ procedure TScreenSong.SetScroll5;
 var
   B:      integer;
   Angle:    real;
-  Pos:    Real;
+  Pos:    real;
   VS:     integer;
   Padding:     real;
-  X:        Real;
+  X:        real;
   {
   Theme.Song.CoverW: circle radius
   Theme.Song.CoverX: x-pos. of the left edge of the selected cover
@@ -1257,37 +1292,38 @@ end;
 procedure TScreenSong.SetScroll6; // rotate (slotmachine style)
 var
   B:      integer;
-  Angle:    real;
-  Pos:    Real;
+  Angle:  real;
+  Pos:    real;
   VS:     integer;
-  diff:     real;
-  X:        Real;
-  Wsp:    real;
-  Z, Z2:      real;
+  diff:   real;
+  X:      real;
+  Factor: real;
+  Z, Z2:  real;
 begin
   VS := CatSongs.VisibleSongs;
   if VS <= 5 then
   begin
-    // kolowe
+    // circle
     for B := 0 to High(Button) do
     begin
-      Button[B].Visible := CatSongs.Song[B].Visible; // nowe
-      if Button[B].Visible then begin // optimization for 1000 songs - updates only visible songs, hiding in tabs becomes useful for maintaing good speed
+      Button[B].Visible := CatSongs.Song[B].Visible;
+      if Button[B].Visible then // optimization for 1000 songs - updates only visible songs, hiding in tabs becomes useful for maintaing good speed
+      begin
+  
+	Factor := 2 * pi * (CatSongs.VisibleIndex(B) - SongCurrent) /  VS {CatSongs.VisibleSongs};// 0.5.0 (II): takes another 16ms
 
-      Wsp := 2 * pi * (CatSongs.VisibleIndex(B) - SongCurrent) /  VS {CatSongs.VisibleSongs};// 0.5.0 (II): takes another 16ms
+	Z := (1 + cos(Factor)) / 2;
+	Z2 := (1 + 2*Z) / 3;
 
-      Z := (1 + cos(Wsp)) / 2;
-      Z2 := (1 + 2*Z) / 3;
 
+	Button[B].Y := Theme.Song.Cover.Y + (0.185 * Theme.Song.Cover.H * VS * sin(Factor)) * Z2 - ((Button[B].H - Theme.Song.Cover.H)/2); // 0.5.0 (I): 2 times faster by not calling CatSongs.VisibleSongs
+	Button[B].Z := Z / 2 + 0.3;
 
-      Button[B].Y := Theme.Song.Cover.Y + (0.185 * Theme.Song.Cover.H * VS * sin(Wsp)) * Z2 - ((Button[B].H - Theme.Song.Cover.H)/2); // 0.5.0 (I): 2 times faster by not calling CatSongs.VisibleSongs
-      Button[B].Z := Z / 2 + 0.3;
+	Button[B].W := Theme.Song.Cover.H * Z2;
 
-      Button[B].W := Theme.Song.Cover.H * Z2;
-
-      //Button[B].Y := {50 +} 140 + 50 - 50 * Z2;
-      Button[B].X := Theme.Song.Cover.X  + (Theme.Song.Cover.H - Abs(Button[B].H)) * 0.7 ;
-      Button[B].H := Button[B].W;
+	//Button[B].Y := {50 +} 140 + 50 - 50 * Z2;
+	Button[B].X := Theme.Song.Cover.X  + (Theme.Song.Cover.H - Abs(Button[B].H)) * 0.7 ;
+	Button[B].H := Button[B].W;
       end;
     end;
   end
@@ -1295,10 +1331,10 @@ begin
   begin
     //Change Pos of all Buttons
     for B := low(Button) to high(Button) do
-      begin
-          Button[B].Visible := CatSongs.Song[B].Visible; //Adjust Visibility
+    begin
+      Button[B].Visible := CatSongs.Song[B].Visible; //Adjust Visibility
       if Button[B].Visible then //Only Change Pos for Visible Buttons
-        begin
+      begin
         Pos := (CatSongs.VisibleIndex(B) - SongCurrent);
         if (Pos < -VS/2) then
           Pos := Pos + VS
@@ -1308,7 +1344,7 @@ begin
         if (Abs(Pos) < 2.5) then {fixed Positions}
         begin
           Angle := Pi * (Pos / 5);
-          //Button[B].Visible := False;
+          //Button[B].Visible := false;
 
           Button[B].H := Abs(Theme.Song.Cover.H * cos(Angle*0.8));//Power(Z2, 3);
 
@@ -1331,8 +1367,10 @@ begin
         begin {Behind the Front Covers}
 
           // limit-bg-covers hack
-          if (abs(VS/2-abs(Pos))>10) then Button[B].Visible:=False;
-          if VS > 25 then VS:=25;
+          if (abs(VS/2-abs(Pos))>10) then
+	    Button[B].Visible := false;
+          if VS > 25 then
+	    VS:=25;
           // end of limit-bg-covers hack
 
           if Pos < 0 then
@@ -1375,7 +1413,7 @@ begin
   if Ini.Players  = 4 then PlayersPlay := 6;
 
   //Cat Mod etc
-  if (Ini.Tabs_at_startup = 1) and (CatSongs.CatNumShow = -1) then
+  if (Ini.TabsAtStartup = 1) and (CatSongs.CatNumShow = -1) then
   begin
     CatSongs.ShowCategoryList;
     FixSelected;
@@ -1450,9 +1488,9 @@ end;
 
 function TScreenSong.Draw: boolean;
 var
-  dx:   real;
-  dt:   real;
-  I:    Integer;
+  dx: real;
+  dt: real;
+  I:  integer;
 begin
   dx := SongTarget-SongCurrent;
   dt := TimeSkip * 7;
@@ -1463,7 +1501,8 @@ begin
   SongCurrent := SongCurrent + dx*dt;
 
   {
-  if SongCurrent > Catsongs.VisibleSongs then begin
+  if SongCurrent > Catsongs.VisibleSongs then
+  begin
     SongCurrent := SongCurrent - Catsongs.VisibleSongs;
     SongTarget := SongTarget - Catsongs.VisibleSongs;
   end;
@@ -1529,8 +1568,8 @@ end;
 
 procedure TScreenSong.SelectNext;
 var
-  Skip:   integer;
-  VS:     Integer;
+  Skip: integer;
+  VS:   integer;
 begin
   VS := CatSongs.VisibleSongs;
 
@@ -1549,22 +1588,23 @@ begin
     Interaction := (Interaction + Skip) mod Length(Interactions);
 
     // try to keep all at the beginning
-    if SongTarget > VS-1 then begin
+    if SongTarget > VS-1 then
+    begin
       SongTarget := SongTarget - VS;
       SongCurrent := SongCurrent - VS;
     end;
 
   end;
 
-  // Interaction -> Button, ktorego okladke przeczytamy
+  // Interaction -> Button, load cover
   // show uncached texture
   //Button[Interaction].Texture := Texture.GetTexture(Button[Interaction].Texture.Name, TEXTURE_TYPE_PLAIN, false);
 end;
 
 procedure TScreenSong.SelectPrev;
 var
-  Skip:   integer;
-  VS:     Integer;
+  Skip: integer;
+  VS:   integer;
 begin
   VS := CatSongs.VisibleSongs;
 
@@ -1574,13 +1614,15 @@ begin
 
     Skip := 1;
 
-    while (not CatSongs.Song[(Interaction - Skip + Length(Interactions)) mod Length(Interactions)].Visible) do Inc(Skip);
+    while (not CatSongs.Song[(Interaction - Skip + Length(Interactions)) mod Length(Interactions)].Visible) do
+      Inc(Skip);
     SongTarget := SongTarget - 1;//Skip;
 
     Interaction := (Interaction - Skip + Length(Interactions)) mod Length(Interactions);
 
     // try to keep all at the beginning
-    if SongTarget < 0 then begin
+    if SongTarget < 0 then
+    begin
       SongTarget := SongTarget + CatSongs.VisibleSongs;
       SongCurrent := SongCurrent + CatSongs.VisibleSongs;
     end;
@@ -1660,9 +1702,9 @@ begin
   end;
 end;
 
-procedure TScreenSong.SkipTo(Target: Cardinal);
+procedure TScreenSong.SkipTo(Target: cardinal);
 var
-  i:      integer;
+  i: integer;
 begin
   UnLoadDetailedCover;
 
@@ -1677,13 +1719,13 @@ end;
 
 procedure TScreenSong.SelectRandomSong;
 var
-  I, I2: Integer;
+  I, I2: integer;
 begin
   case PlaylistMan.Mode of
       smNormal:  //All Songs Just Select Random Song
         begin
           //When Tabs are activated then use Tab Method
-          if (Ini.Tabs_at_startup = 1) then
+          if (Ini.TabsAtStartup = 1) then
           begin
             repeat
               I2 := Random(high(CatSongs.Song)+1) - low(CatSongs.Song)+1;
@@ -1756,11 +1798,11 @@ begin
     end
     else
     begin
-      Static[StaticTeam1Joker1].Visible := False;
-      Static[StaticTeam1Joker2].Visible := False;
-      Static[StaticTeam1Joker3].Visible := False;
-      Static[StaticTeam1Joker4].Visible := False;
-      Static[StaticTeam1Joker5].Visible := False;
+      Static[StaticTeam1Joker1].Visible := false;
+      Static[StaticTeam1Joker2].Visible := false;
+      Static[StaticTeam1Joker3].Visible := false;
+      Static[StaticTeam1Joker4].Visible := false;
+      Static[StaticTeam1Joker5].Visible := false;
     end;
 
     if (PartySession.Teams.NumTeams >= 2) then
@@ -1773,11 +1815,11 @@ begin
     end
     else
     begin
-      Static[StaticTeam2Joker1].Visible := False;
-      Static[StaticTeam2Joker2].Visible := False;
-      Static[StaticTeam2Joker3].Visible := False;
-      Static[StaticTeam2Joker4].Visible := False;
-      Static[StaticTeam2Joker5].Visible := False;
+      Static[StaticTeam2Joker1].Visible := false;
+      Static[StaticTeam2Joker2].Visible := false;
+      Static[StaticTeam2Joker3].Visible := false;
+      Static[StaticTeam2Joker4].Visible := false;
+      Static[StaticTeam2Joker5].Visible := false;
     end;
 
     if (PartySession.Teams.NumTeams >= 3) then
@@ -1790,40 +1832,40 @@ begin
     end
     else
     begin
-      Static[StaticTeam3Joker1].Visible := False;
-      Static[StaticTeam3Joker2].Visible := False;
-      Static[StaticTeam3Joker3].Visible := False;
-      Static[StaticTeam3Joker4].Visible := False;
-      Static[StaticTeam3Joker5].Visible := False;
+      Static[StaticTeam3Joker1].Visible := false;
+      Static[StaticTeam3Joker2].Visible := false;
+      Static[StaticTeam3Joker3].Visible := false;
+      Static[StaticTeam3Joker4].Visible := false;
+      Static[StaticTeam3Joker5].Visible := false;
     end;
   *)
   end
   else
   begin //Hide all
-    Static[StaticTeam1Joker1].Visible := False;
-    Static[StaticTeam1Joker2].Visible := False;
-    Static[StaticTeam1Joker3].Visible := False;
-    Static[StaticTeam1Joker4].Visible := False;
-    Static[StaticTeam1Joker5].Visible := False;
-
-    Static[StaticTeam2Joker1].Visible := False;
-    Static[StaticTeam2Joker2].Visible := False;
-    Static[StaticTeam2Joker3].Visible := False;
-    Static[StaticTeam2Joker4].Visible := False;
-    Static[StaticTeam2Joker5].Visible := False;
-
-    Static[StaticTeam3Joker1].Visible := False;
-    Static[StaticTeam3Joker2].Visible := False;
-    Static[StaticTeam3Joker3].Visible := False;
-    Static[StaticTeam3Joker4].Visible := False;
-    Static[StaticTeam3Joker5].Visible := False;
+    Static[StaticTeam1Joker1].Visible := false;
+    Static[StaticTeam1Joker2].Visible := false;
+    Static[StaticTeam1Joker3].Visible := false;
+    Static[StaticTeam1Joker4].Visible := false;
+    Static[StaticTeam1Joker5].Visible := false;
+
+    Static[StaticTeam2Joker1].Visible := false;
+    Static[StaticTeam2Joker2].Visible := false;
+    Static[StaticTeam2Joker3].Visible := false;
+    Static[StaticTeam2Joker4].Visible := false;
+    Static[StaticTeam2Joker5].Visible := false;
+
+    Static[StaticTeam3Joker1].Visible := false;
+    Static[StaticTeam3Joker2].Visible := false;
+    Static[StaticTeam3Joker3].Visible := false;
+    Static[StaticTeam3Joker4].Visible := false;
+    Static[StaticTeam3Joker5].Visible := false;
   end;
 end;
 
 procedure TScreenSong.SetStatics;
 var
-  I:       Integer;
-  Visible: Boolean;
+  I:       integer;
+  Visible: boolean;
 begin
   //Set Visibility of Party Statics and Text
   Visible := (Mode = smPartyMode);
@@ -1867,7 +1909,7 @@ begin
   CatSongs.Selected := Interaction;
   StopMusicPreview();
 
-  ScreenName.Goto_SingScreen := True;
+  ScreenName.Goto_SingScreen := true;
   FadeTo(@ScreenName);
 end;
 
diff --git a/unicode/src/screens/UScreenSongMenu.pas b/unicode/src/screens/UScreenSongMenu.pas
index 8098548c..b8720b86 100644
--- a/unicode/src/screens/UScreenSongMenu.pas
+++ b/unicode/src/screens/UScreenSongMenu.pas
@@ -45,38 +45,36 @@ uses
 type
   TScreenSongMenu = class(TMenu)
     private
-      CurMenu: Byte; //Num of the cur. Shown Menu
+      CurMenu: byte; // num of the cur. shown menu
     public
-      Visible: Boolean; //Whether the Menu should be Drawn
+      Visible: boolean; // whether the menu should be drawn
 
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
       procedure onShow; override;
       function Draw: boolean; override;
-      procedure MenuShow(sMenu: Byte);
+      procedure MenuShow(sMenu: byte);
       procedure HandleReturn;
   end;
 
 const
   SM_Main = 1;
-  
-  SM_PlayList = 64 or 1;
-  SM_Playlist_Add = 64 or 2;
-  SM_Playlist_New = 64 or 3;
 
-  SM_Playlist_DelItem = 64 or 5;
+  SM_PlayList         = 64 or 1;
+  SM_Playlist_Add     = 64 or 2;
+  SM_Playlist_New     = 64 or 3;
 
-  SM_Playlist_Load = 64 or 8 or 1;
-  SM_Playlist_Del  = 64 or 8 or 5;
+  SM_Playlist_DelItem = 64 or 5;
 
+  SM_Playlist_Load    = 64 or 8 or 1;
+  SM_Playlist_Del     = 64 or 8 or 5;
 
-  SM_Party_Main = 128 or 1;
-  SM_Party_Joker = 128 or 2;
+  SM_Party_Main       = 128 or 1;
+  SM_Party_Joker      = 128 or 2;
 
 var
-  ISelections: Array of string;
-  SelectValue: Integer;
-
+  ISelections: array of string;
+  SelectValue: integer;
 
 implementation
 
@@ -91,12 +89,12 @@ uses
   USongs,
   UUnicodeUtils;
 
-function TScreenSongMenu.ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean;
+function TScreenSongMenu.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
 begin
   Result := true;
   if (PressedDown) then
-  begin // Key Down
-    if (CurMenu = SM_Playlist_New) AND (Interaction=0) then
+  begin // key down
+    if (CurMenu = SM_Playlist_New) and (Interaction=0) then
     begin
       // check normal keys
       if IsAlphaNumericChar(CharCode) or
@@ -131,10 +129,10 @@ begin
     // check special keys
     case PressedKey of
       SDLK_ESCAPE,
-      SDLK_BACKSPACE :
+      SDLK_BACKSPACE:
         begin
           AudioPlayback.PlaySound(SoundLib.Back);
-          Visible := False;
+          Visible := false;
         end;
 
       SDLK_RETURN:
@@ -142,8 +140,8 @@ begin
           HandleReturn;
         end;
 
-      SDLK_DOWN:    InteractNext;
-      SDLK_UP:      InteractPrev;
+      SDLK_DOWN: InteractNext;
+      SDLK_UP:   InteractPrev;
 
       SDLK_RIGHT:
         begin
@@ -157,8 +155,8 @@ begin
         end;
 
       SDLK_1:
-        begin //Jocker
-            //Use Joker
+        begin // jocker
+            // use joker
           case CurMenu of
             SM_Party_Main:
             begin
@@ -167,8 +165,8 @@ begin
           end;
         end;
       SDLK_2:
-        begin //Jocker
-            //Use Joker
+        begin // jocker
+            // use joker
           case CurMenu of
             SM_Party_Main:
             begin
@@ -177,8 +175,8 @@ begin
           end;
         end;
       SDLK_3:
-        begin //Jocker
-            //Use Joker
+        begin // jocker
+            // use joker
           case CurMenu of
             SM_Party_Main:
             begin
@@ -193,12 +191,12 @@ end;
 constructor TScreenSongMenu.Create;
 begin
   inherited Create;
-  
-  //Create Dummy SelectSlide Entrys
+
+  // create dummy selectslide entrys
   SetLength(ISelections, 1);
   ISelections[0] := 'Dummy';
 
-  
+
   AddText(Theme.SongMenu.TextMenu);
 
   LoadFromTheme(Theme.SongMenu);
@@ -221,7 +219,6 @@ begin
   if (Length(Button[3].Text) = 0) then
     AddButtonText(14, 20, 'Button 4');
 
-
   Interaction := 0;
 end;
 
@@ -233,24 +230,23 @@ end;
 procedure TScreenSongMenu.onShow;
 begin
   inherited;
-
 end;
 
-procedure TScreenSongMenu.MenuShow(sMenu: Byte);
+procedure TScreenSongMenu.MenuShow(sMenu: byte);
 begin
-  Interaction := 0; //Reset Interaction
-  Visible := True;  //Set Visible
-  Case sMenu of
+  Interaction := 0; // reset interaction
+  Visible := true;  // set visible
+  case sMenu of
     SM_Main:
       begin
         CurMenu := sMenu;
         Text[0].Text := Language.Translate('SONG_MENU_NAME_MAIN');
 
-        Button[0].Visible := True;
-        Button[1].Visible := True;
-        Button[2].Visible := True;
-        Button[3].Visible := True;
-        SelectsS[0].Visible := False;
+        Button[0].Visible := true;
+        Button[1].Visible := true;
+        Button[2].Visible := true;
+        Button[3].Visible := true;
+        SelectsS[0].Visible := false;
 
         Button[0].Text[0].Text := Language.Translate('SONG_MENU_PLAY');
         Button[1].Text[0].Text := Language.Translate('SONG_MENU_CHANGEPLAYERS');
@@ -263,11 +259,11 @@ begin
         CurMenu := sMenu;
         Text[0].Text := Language.Translate('SONG_MENU_NAME_PLAYLIST');
 
-        Button[0].Visible := True;
-        Button[1].Visible := True;
-        Button[2].Visible := True;
-        Button[3].Visible := True;
-        SelectsS[0].Visible := False;
+        Button[0].Visible := true;
+        Button[1].Visible := true;
+        Button[2].Visible := true;
+        Button[3].Visible := true;
+        SelectsS[0].Visible := false;
 
         Button[0].Text[0].Text := Language.Translate('SONG_MENU_PLAY');
         Button[1].Text[0].Text := Language.Translate('SONG_MENU_CHANGEPLAYERS');
@@ -280,11 +276,11 @@ begin
         CurMenu := sMenu;
         Text[0].Text := Language.Translate('SONG_MENU_NAME_PLAYLIST_ADD');
 
-        Button[0].Visible := True;
-        Button[1].Visible := False;
-        Button[2].Visible := False;
-        Button[3].Visible := True;
-        SelectsS[0].Visible := True;
+        Button[0].Visible := true;
+        Button[1].Visible := false;
+        Button[2].Visible := false;
+        Button[3].Visible := true;
+        SelectsS[0].Visible := true;
 
         Button[0].Text[0].Text := Language.Translate('SONG_MENU_PLAYLIST_ADD_NEW');
         Button[3].Text[0].Text := Language.Translate('SONG_MENU_PLAYLIST_ADD_EXISTING');
@@ -298,9 +294,9 @@ begin
         end
         else
         begin
-          Button[3].Visible := False;
-          SelectsS[0].Visible := False;
-          Button[2].Visible := True;
+          Button[3].Visible := false;
+          SelectsS[0].Visible := false;
+          Button[2].Visible := true;
           Button[2].Text[0].Text := Language.Translate('SONG_MENU_PLAYLIST_NOEXISTING');
         end;
       end;
@@ -310,11 +306,11 @@ begin
         CurMenu := sMenu;
         Text[0].Text := Language.Translate('SONG_MENU_NAME_PLAYLIST_NEW');
 
-        Button[0].Visible := True;
-        Button[1].Visible := False;
-        Button[2].Visible := True;
-        Button[3].Visible := True;
-        SelectsS[0].Visible := False;
+        Button[0].Visible := true;
+        Button[1].Visible := false;
+        Button[2].Visible := true;
+        Button[3].Visible := true;
+        SelectsS[0].Visible := false;
 
         Button[0].Text[0].Text := Language.Translate('SONG_MENU_PLAYLIST_NEW_UNNAMED');
         Button[2].Text[0].Text := Language.Translate('SONG_MENU_PLAYLIST_NEW_CREATE');
@@ -326,11 +322,11 @@ begin
         CurMenu := sMenu;
         Text[0].Text := Language.Translate('SONG_MENU_NAME_PLAYLIST_DELITEM');
 
-        Button[0].Visible := True;
-        Button[1].Visible := False;
-        Button[2].Visible := False;
-        Button[3].Visible := True;
-        SelectsS[0].Visible := False;
+        Button[0].Visible := true;
+        Button[1].Visible := false;
+        Button[2].Visible := false;
+        Button[3].Visible := true;
+        SelectsS[0].Visible := false;
 
         Button[0].Text[0].Text := Language.Translate('SONG_MENU_YES');
         Button[3].Text[0].Text := Language.Translate('SONG_MENU_CANCEL');
@@ -341,13 +337,13 @@ begin
         CurMenu := sMenu;
         Text[0].Text := Language.Translate('SONG_MENU_NAME_PLAYLIST_LOAD');
 
-        //Show Delete Curent Playlist Button when Playlist is opened
+        // show delete curent playlist button when playlist is opened
         Button[0].Visible := (CatSongs.CatNumShow = -3);
 
-        Button[1].Visible := False;
-        Button[2].Visible := False;
-        Button[3].Visible := True;
-        SelectsS[0].Visible := True;
+        Button[1].Visible := false;
+        Button[2].Visible := false;
+        Button[3].Visible := true;
+        SelectsS[0].Visible := true;
 
         Button[0].Text[0].Text := Language.Translate('SONG_MENU_PLAYLIST_DELCURRENT');
         Button[3].Text[0].Text := Language.Translate('SONG_MENU_PLAYLIST_LOAD');
@@ -362,9 +358,9 @@ begin
         end
         else
         begin
-          Button[3].Visible := False;
-          SelectsS[0].Visible := False;
-          Button[2].Visible := True;
+          Button[3].Visible := false;
+          SelectsS[0].Visible := false;
+          Button[2].Visible := true;
           Button[2].Text[0].Text := Language.Translate('SONG_MENU_PLAYLIST_NOEXISTING');
           Interaction := 2;
         end;
@@ -375,27 +371,26 @@ begin
         CurMenu := sMenu;
         Text[0].Text := Language.Translate('SONG_MENU_NAME_PLAYLIST_DEL');
 
-        Button[0].Visible := True;
-        Button[1].Visible := False;
-        Button[2].Visible := False;
-        Button[3].Visible := True;
-        SelectsS[0].Visible := False;
+        Button[0].Visible := true;
+        Button[1].Visible := false;
+        Button[2].Visible := false;
+        Button[3].Visible := true;
+        SelectsS[0].Visible := false;
 
         Button[0].Text[0].Text := Language.Translate('SONG_MENU_YES');
         Button[3].Text[0].Text := Language.Translate('SONG_MENU_CANCEL');
       end;
 
-
     SM_Party_Main:
       begin
         CurMenu := sMenu;
         Text[0].Text := Language.Translate('SONG_MENU_NAME_PARTY_MAIN');
 
-        Button[0].Visible := True;
-        Button[1].Visible := False;
-        Button[2].Visible := False;
-        Button[3].Visible := True;
-        SelectsS[0].Visible := False;
+        Button[0].Visible := true;
+        Button[1].Visible := false;
+        Button[2].Visible := false;
+        Button[3].Visible := true;
+        SelectsS[0].Visible := false;
 
         Button[0].Text[0].Text := Language.Translate('SONG_MENU_PLAY');
         //Button[1].Text[0].Text := Language.Translate('SONG_MENU_JOKER');
@@ -408,172 +403,175 @@ begin
         CurMenu := sMenu;
         Text[0].Text := Language.Translate('SONG_MENU_NAME_PARTY_JOKER');
         // to-do : Party
-        {Button[0].Visible := (PartySession.Teams.NumTeams >= 1) AND (PartySession.Teams.Teaminfo[0].Joker > 0);
-        Button[1].Visible := (PartySession.Teams.NumTeams >= 2) AND (PartySession.Teams.Teaminfo[1].Joker > 0);
-        Button[2].Visible := (PartySession.Teams.NumTeams >= 3) AND (PartySession.Teams.Teaminfo[2].Joker > 0);}
-        Button[3].Visible := True;
-        SelectsS[0].Visible := False;
-
-        {Button[0].Text[0].Text := String(PartySession.Teams.Teaminfo[0].Name);
+{
+	Button[0].Visible := (PartySession.Teams.NumTeams >= 1) and (PartySession.Teams.Teaminfo[0].Joker > 0);
+        Button[1].Visible := (PartySession.Teams.NumTeams >= 2) and (PartySession.Teams.Teaminfo[1].Joker > 0);
+        Button[2].Visible := (PartySession.Teams.NumTeams >= 3) and (PartySession.Teams.Teaminfo[2].Joker > 0);
+}
+        Button[3].Visible := true;
+        SelectsS[0].Visible := false;
+{
+	Button[0].Text[0].Text := String(PartySession.Teams.Teaminfo[0].Name);
         Button[1].Text[0].Text := String(PartySession.Teams.Teaminfo[1].Name);
-        Button[2].Text[0].Text := String(PartySession.Teams.Teaminfo[2].Name);}
+        Button[2].Text[0].Text := String(PartySession.Teams.Teaminfo[2].Name);
+}
         Button[3].Text[0].Text := Language.Translate('SONG_MENU_CANCEL');
 
-        //Set right Interaction
+        // set right interaction
         if (not Button[0].Visible) then
         begin
           if (not Button[1].Visible) then
           begin
             if (not Button[2].Visible) then
-            begin
-              Interaction := 4;
-            end
-            else Interaction := 2;
+              Interaction := 4
+            else
+	      Interaction := 2;
           end
-          else Interaction := 1;
+          else
+	    Interaction := 1;
         end;
-        
+
       end;
   end;
 end;
 
 procedure TScreenSongMenu.HandleReturn;
 begin
-  Case CurMenu of
+  case CurMenu of
     SM_Main:
       begin
-        Case Interaction of
-          0: //Button 1
+        case Interaction of
+          0: // button 1
             begin
               ScreenSong.StartSong;
-              Visible := False;
+              Visible := false;
             end;
 
-          1: //Button 2
+          1: // button 2
             begin
-              //Select New Players then Sing:
+              // select new players then sing:
               ScreenSong.SelectPlayers;
-              Visible := False;
+              Visible := false;
             end;
 
-          2: //Button 3
+          2: // button 3
             begin
-              //Show add to Playlist Menu
+              // show add to playlist menu
               MenuShow(SM_Playlist_Add);
             end;
 
-          3: //SelectSlide 3
+          3: // selectslide 3
             begin
               //Dummy
             end;
 
-          4: //Button 4
+          4: // button 4
             begin
               ScreenSong.OpenEditor;
-              Visible := False;
+              Visible := false;
             end;
         end;
       end;
 
     SM_PlayList:
       begin
-        Visible := False;
-        Case Interaction of
-          0: //Button 1
+        Visible := false;
+        case Interaction of
+          0: // button 1
             begin
               ScreenSong.StartSong;
-              Visible := False;
+              Visible := false;
             end;
 
-          1: //Button 2
+          1: // button 2
             begin
-              //Select New Players then Sing:
+              // select new players then sing:
               ScreenSong.SelectPlayers;
-              Visible := False;
+              Visible := false;
             end;
 
-          2: //Button 3
+          2: // button 3
             begin
-              //Show add to Playlist Menu
+              // show add to playlist menu
               MenuShow(SM_Playlist_DelItem);
             end;
 
-          3: //SelectSlide 3
+          3: // selectslide 3
             begin
-              //Dummy
+              // dummy
             end;
 
-          4: //Button 4
+          4: // button 4
             begin
               ScreenSong.OpenEditor;
-              Visible := False;
+              Visible := false;
             end;
         end;
       end;
 
     SM_Playlist_Add:
       begin
-        Case Interaction of
-          0: //Button 1
+        case Interaction of
+          0: // button 1
             begin
               MenuShow(SM_Playlist_New);
             end;
 
-          3: //SelectSlide 3
+          3: // selectslide 3
             begin
-              //Dummy
+              // dummy
             end;
 
-          4: //Button 4
+          4: // button 4
             begin
               PlaylistMan.AddItem(ScreenSong.Interaction, SelectValue);
-              Visible := False;
+              Visible := false;
             end;
         end;
       end;
 
       SM_Playlist_New:
       begin
-        Case Interaction of
-          0: //Button 1
+        case Interaction of
+          0: // button 1
             begin
-              //Nothing, Button for Entering Name
+              // nothing, button for entering name
             end;
 
-          2: //Button 3
+          2: // button 3
             begin
-              //Create Playlist and Add Song
+              // create playlist and add song
               PlaylistMan.AddItem(
               ScreenSong.Interaction,
               PlaylistMan.AddPlaylist(Button[0].Text[0].Text));
-              Visible := False;
+              Visible := false;
             end;
 
-          3: //SelectSlide 3
+          3: // selectslide 3
             begin
-              //Cancel -> Go back to Add screen
+              // cancel -> go back to add screen
               MenuShow(SM_Playlist_Add);
             end;
 
-          4: //Button 4
+          4: // button 4
             begin
-              Visible := False;
+              Visible := false;
             end;
         end;
       end;
 
     SM_Playlist_DelItem:
       begin
-        Visible := False;
-        Case Interaction of
-          0: //Button 1
+        Visible := false;
+        case Interaction of
+          0: // button 1
             begin
-              //Delete
+              // delete
               PlayListMan.DelItem(PlayListMan.GetIndexbySongID(ScreenSong.Interaction));
-              Visible := False;
+              Visible := false;
             end;
 
-          4: //Button 4
+          4: // button 4
             begin
               MenuShow(SM_Playlist);
             end;
@@ -582,32 +580,32 @@ begin
 
     SM_Playlist_Load:
       begin
-        Case Interaction of
-          0: //Button 1 (Delete Playlist)
+        case Interaction of
+          0: // button 1 (Delete playlist)
             begin
               MenuShow(SM_Playlist_Del);
             end;
-          4: //Button 4
+          4: // button 4
             begin
-              //Load Playlist
+              // load playlist
               PlaylistMan.SetPlayList(SelectValue);
-              Visible := False;
+              Visible := false;
             end;
         end;
       end;
 
     SM_Playlist_Del:
       begin
-        Visible := False;
-        Case Interaction of
-          0: //Button 1
+        Visible := false;
+        case Interaction of
+          0: // button 1
             begin
-              //Delete
+              // delete
               PlayListMan.DelPlaylist(PlaylistMan.CurPlayList);
-              Visible := False;
+              Visible := false;
             end;
 
-          4: //Button 4
+          4: // button 4
             begin
               MenuShow(SM_Playlist_Load);
             end;
@@ -616,17 +614,17 @@ begin
 
     SM_Party_Main:
       begin
-        Case Interaction of
-          0: //Button 1
+        case Interaction of
+          0: // button 1
             begin
-              //Start Singing
+              // start singing
               ScreenSong.StartSong;
-              Visible := False;
+              Visible := false;
             end;
 
-          4: //Button 4
+          4: // button 4
             begin
-              //Joker
+              // joker
               MenuShow(SM_Party_Joker);
             end;
         end;
@@ -634,29 +632,29 @@ begin
 
     SM_Party_Joker:
       begin
-        Visible := False;
-        Case Interaction of
-          0: //Button 1
+        Visible := false;
+        case Interaction of
+          0: // button 1
             begin
-              //Joker Team 1
+              // joker team 1
               ScreenSong.DoJoker(0);
             end;
 
-          1: //Button 2
+          1: // button 2
             begin
-              //Joker Team 2
+              // joker team 2
               ScreenSong.DoJoker(1);
             end;
 
-          2: //Button 3
+          2: // button 3
             begin
-              //Joker Team 3
+              // joker team 3
               ScreenSong.DoJoker(2);
             end;
 
-          4: //Button 4
+          4: // button 4
             begin
-              //Cancel... (Fo back to old Menu)
+              // cancel... (go back to old menu)
               MenuShow(SM_Party_Main);
             end;
         end;
@@ -665,4 +663,3 @@ begin
 end;
 
 end.
- 
diff --git a/unicode/src/screens/UScreenTop5.pas b/unicode/src/screens/UScreenTop5.pas
index ba990dc6..eaa90ab1 100644
--- a/unicode/src/screens/UScreenTop5.pas
+++ b/unicode/src/screens/UScreenTop5.pas
@@ -34,10 +34,10 @@ interface
 {$I switches.inc}
 
 uses
-  SDL,
   SysUtils,
-  UMenu,
+  SDL,
   UDisplay,
+  UMenu,
   UMusic,
   USongs,
   UThemes;
@@ -45,17 +45,18 @@ uses
 type
   TScreenTop5 = class(TMenu)
     public
-      TextLevel:        integer;
-      TextArtistTitle:  integer;
+      TextLevel:       integer;
+      TextArtistTitle: integer;
 
-      StaticNumber:     array[1..5] of integer;
-      TextNumber:       array[1..5] of integer;
-      TextName:         array[1..5] of integer;
-      TextScore:        array[1..5] of integer;
+      StaticNumber:    array[1..5] of integer;
+      TextNumber:      array[1..5] of integer;
+      TextName:        array[1..5] of integer;
+      TextScore:       array[1..5] of integer;
+
+      Fadeout:         boolean;
 
-      Fadeout:      boolean;
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
       procedure onShow; override;
       function Draw: boolean; override;
   end;
@@ -63,16 +64,18 @@ type
 implementation
 
 uses
-  UGraphic,
   UDataBase,
+  UGraphic,
   UMain,
   UIni,
+  UNote,
   UUnicodeUtils;
 
-function TScreenTop5.ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean;
+function TScreenTop5.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then begin
+  if (PressedDown) then
+  begin
     // check normal keys
     case UCS4UpperCase(CharCode) of
       Ord('Q'):
@@ -81,14 +84,15 @@ begin
           Exit;
         end;
     end;
-    
+
     // check special keys
     case PressedKey of
       SDLK_ESCAPE,
       SDLK_BACKSPACE,
       SDLK_RETURN:
         begin
-          if (not Fadeout) then begin
+          if (not Fadeout) then
+	  begin
             FadeTo(@ScreenSong);
             Fadeout := true;
           end;
@@ -103,7 +107,7 @@ end;
 
 constructor TScreenTop5.Create;
 var
-  I:    integer;
+  I: integer;
 begin
   inherited Create;
 
@@ -127,8 +131,8 @@ end;
 
 procedure TScreenTop5.onShow;
 var
-  I:      integer;
-  PMax:   integer;
+  I:    integer;
+  PMax: integer;
 begin
   inherited;
 
@@ -147,7 +151,8 @@ begin
 
   Text[TextArtistTitle].Text := CurrentSong.Artist + ' - ' + CurrentSong.Title;
 
-  for I := 1 to Length(CurrentSong.Score[Ini.Difficulty]) do begin
+  for I := 1 to Length(CurrentSong.Score[Ini.Difficulty]) do
+  begin
     Static[StaticNumber[I]].Visible := true;
     Text[TextNumber[I]].Visible := true;
     Text[TextName[I]].Visible := true;
@@ -157,7 +162,8 @@ begin
     Text[TextScore[I]].Text := IntToStr(CurrentSong.Score[Ini.Difficulty, I-1].Score);
   end;
 
-  for I := Length(CurrentSong.Score[Ini.Difficulty])+1 to 5 do begin
+  for I := Length(CurrentSong.Score[Ini.Difficulty])+1 to 5 do
+  begin
     Static[StaticNumber[I]].Visible := false;
     Text[TextNumber[I]].Visible := false;
     Text[TextName[I]].Visible := false;
@@ -169,25 +175,30 @@ end;
 
 function TScreenTop5.Draw: boolean;
 //var
-{  Min:    real;
-  Max:    real;
-  Wsp:    real;
-  Wsp2:   real;
-  Pet:    integer;}
-
-{  Item:   integer;
-  P:      integer;
-  C:      integer;}
+{
+  Min:     real;
+  Max:     real;
+  Factor:  real;
+  Factor2: real;
+
+  Item:    integer;
+  P:       integer;
+  C:       integer;
+}
 begin
   // Singstar - let it be...... with 6 statics
-(*  if PlayersPlay = 6 then begin
-    for Item := 4 to 6 do begin
+(*
+  if PlayersPlay = 6 then
+  begin
+    for Item := 4 to 6 do
+    begin
       if ScreenAct = 1 then P := Item-4;
       if ScreenAct = 2 then P := Item-1;
 
       FillPlayer(Item, P);
-
-{      if ScreenAct = 1 then begin
+{
+      if ScreenAct = 1 then
+      begin
         LoadColor(
           Static[StaticBoxLightest[Item]].Texture.ColR,
           Static[StaticBoxLightest[Item]].Texture.ColG,
@@ -195,16 +206,18 @@ begin
           'P1Dark');
       end;
 
-      if ScreenAct = 2 then begin
+      if ScreenAct = 2 then
+      begin
         LoadColor(
           Static[StaticBoxLightest[Item]].Texture.ColR,
           Static[StaticBoxLightest[Item]].Texture.ColG,
           Static[StaticBoxLightest[Item]].Texture.ColB,
           'P4Dark');
-      end; }
-
+      end;
+}
     end;
-  end; *)
+  end;
+*)
 
   Result := inherited Draw;
 end;
diff --git a/unicode/src/screens/UScreenWelcome.pas b/unicode/src/screens/UScreenWelcome.pas
index ead30c10..4df2b6f7 100644
--- a/unicode/src/screens/UScreenWelcome.pas
+++ b/unicode/src/screens/UScreenWelcome.pas
@@ -94,8 +94,8 @@ function TScreenWelcome.Draw: boolean;
 var
   Min:    real;
   Max:    real;
-  Wsp:    real;
-  Pet:    integer;
+  Factor:    real;
+  Count:    integer;
 begin
   // star animation
   Animation := Animation + TimeSkip*1000;
@@ -108,34 +108,34 @@ begin
   // popup
   Min := 1000; Max := 1120;
   if (Animation >= Min) and (Animation < Max) then begin
-    Wsp := (Animation - Min) / (Max - Min);
+    Factor := (Animation - Min) / (Max - Min);
     Static[0].Texture.X := 600;
-    Static[0].Texture.Y := 600 - Wsp * 230;
+    Static[0].Texture.Y := 600 - Factor * 230;
     Static[0].Texture.W := 200;
-    Static[0].Texture.H := Wsp * 230;
+    Static[0].Texture.H := Factor * 230;
   end;
 
   // bounce
   Min := 1120; Max := 1200;
   if (Animation >= Min) and (Animation < Max) then begin
-    Wsp := (Animation - Min) / (Max - Min);
-    Static[0].Texture.Y := 370 + Wsp * 50;
-    Static[0].Texture.H := 230 - Wsp * 50;
+    Factor := (Animation - Min) / (Max - Min);
+    Static[0].Texture.Y := 370 + Factor * 50;
+    Static[0].Texture.H := 230 - Factor * 50;
   end;
 
   // run
   Min := 1500; Max := 3500;
   if (Animation >= Min) and (Animation < Max) then begin
-    Wsp := (Animation - Min) / (Max - Min);
+    Factor := (Animation - Min) / (Max - Min);
 
-    Static[0].Texture.X := 600 - Wsp * 1400;
+    Static[0].Texture.X := 600 - Factor * 1400;
     Static[0].Texture.H := 180;
 
 
-    for Pet := 1 to 5 do begin
-      Static[Pet].Texture.X := 770 - Wsp * 1400;
-      Static[Pet].Texture.W := 150 + Wsp * 200;
-      Static[Pet].Texture.Alpha := Wsp * 0.5;
+    for Count := 1 to 5 do begin
+      Static[Count].Texture.X := 770 - Factor * 1400;
+      Static[Count].Texture.W := 150 + Factor * 200;
+      Static[Count].Texture.Alpha := Factor * 0.5;
     end;
   end;