Cosmetics. No code change

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

32 files changed, 1361 insertions, 1118 deletions

diff --git a/src/screens/UScreenCredits.pas b/src/screens/UScreenCredits.pas
index 6e5c5ba7..2982fe24 100644
--- a/src/screens/UScreenCredits.pas
+++ b/src/screens/UScreenCredits.pas
@@ -34,17 +34,17 @@ interface
 {$I switches.inc}
 
 uses
-    SysUtils,
-    UMenu,
-    SDL,
-    SDL_Image,
-    UDisplay,
-    UTexture,
-    gl,
-    UMusic,
-    UFiles,
-    UThemes,
-    UGraphicClasses;
+  SysUtils,
+  UMenu,
+  SDL,
+  SDL_Image,
+  UDisplay,
+  UTexture,
+  gl,
+  UMusic,
+  UFiles,
+  UThemes,
+  UGraphicClasses;
 
 type
   TCreditsStages=(InitialDelay,Intro,MainPart,Outro);
@@ -52,12 +52,12 @@ type
   TScreenCredits = class(TMenu)
     public
 
-      Credits_X: Real;
-      Credits_Time: Cardinal;
-      Credits_Alpha: Cardinal;
-      CTime: Cardinal;
-      CTime_hold: Cardinal;
-      ESC_Alpha: Integer;
+      Credits_X:     real;
+      Credits_Time:  cardinal;
+      Credits_Alpha: cardinal;
+      CTime:         cardinal;
+      CTime_hold:    cardinal;
+      ESC_Alpha:     integer;
 
       credits_entry:       TTexture;
       credits_entry_dx:    TTexture;
@@ -89,16 +89,16 @@ type
 
       deluxe_slidein: cardinal;
 
-      CurrentScrollText: String;
-      NextScrollUpdate:  Real;
-      EndofLastScrollingPart: Cardinal;
-      CurrentScrollStart, CurrentScrollEnd: Integer;
+      CurrentScrollText: string;
+      NextScrollUpdate:  real;
+      EndofLastScrollingPart: cardinal;
+      CurrentScrollStart, CurrentScrollEnd: integer;
 
       CRDTS_Stage: TCreditsStages;
 
       Fadeout:      boolean;
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       function Draw: boolean; override;
       procedure onShow; override;
       procedure onHide; override;
@@ -113,7 +113,7 @@ const
     'irc helping us - eBandit and Gabari, scene ppl who really helped instead of compiling and running away. Greetings to DennisTheMenace for betatesting, '+
     'Demoscene.tv, pouet.net, KakiArts, Sourceforge,..';
 
-  CRDTS_BG_FILE    = 'credits_v5_bg.png';
+  CRDTS_BG_FILE           = 'credits_v5_bg.png';
   CRDTS_OVL_FILE          = 'credits_v5_overlay.png';
   CRDTS_blindguard_FILE   = 'names_blindguard.png';
   CRDTS_blindy_FILE       = 'names_blindy.png';
@@ -137,7 +137,7 @@ const
   OUTRO_ESC_FILE          = 'outro-esc.png';
   OUTRO_EXD_FILE          = 'outro-exit-dark.png';
 
-  Timings: array[0..21] of Cardinal=(
+  Timings: array[0..21] of cardinal=(
      20,   //  0 Delay vor Start
 
     149,   //  1 Ende erster Intro Zoom
@@ -178,10 +178,10 @@ uses
   UCommon,
   UPath;
 
-function TScreenCredits.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+function TScreenCredits.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     case PressedKey of
 
@@ -243,14 +243,14 @@ end;
 function TScreenCredits.Draw: boolean;
 begin
   DrawCredits;
-  Draw:=true;
+  Draw := true;
 end;
 
 procedure TScreenCredits.onShow;
 begin
   inherited;
 
-  CRDTS_Stage:=InitialDelay;
+  CRDTS_Stage := InitialDelay;
   Credits_X := 580;
   deluxe_slidein := 0;
   Credits_Alpha := 0;
@@ -268,8 +268,8 @@ end;
 
 Procedure TScreenCredits.Draw_FunkyText;
 var
-  S: Integer;
-  X,Y,A: Real;
+  S: integer;
+  X,Y,A: real;
   visibleText: string;
 begin
   SetFontSize(30);
@@ -326,46 +326,47 @@ begin
   {  // timing hack
     X:=5;
     SetFontStyle (2);
-     SetFontItalic(False);
+     SetFontItalic(false);
      SetFontSize(27);
      glColor4f(1, 1, 1, 1);
-     for S:=0 to high(CTime_hold) do begin
-     visibleText:=inttostr(CTime_hold[S]);
-     SetFontPos (500, X);
-     glPrint (visibleText[0]);
-     X:=X+20;
+     for S:=0 to high(CTime_hold) do
+     begin
+       visibleText := inttostr(CTime_hold[S]);
+       SetFontPos (500, X);
+       glPrint(visibleText[0]);
+       X := X + 20;
      end;
   }
 end;
 
 procedure Start3D;
 begin
-      glMatrixMode(GL_PROJECTION);
-      glPushMatrix;
-      glLoadIdentity;
-      glFrustum(-0.3*4/3,0.3*4/3,-0.3,0.3,1,1000);
-      glMatrixMode(GL_MODELVIEW);
-      glLoadIdentity;
+  glMatrixMode(GL_PROJECTION);
+  glPushMatrix;
+  glLoadIdentity;
+  glFrustum(-0.3*4/3,0.3*4/3,-0.3,0.3,1,1000);
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity;
 end;
 procedure End3D;
 begin
-      glMatrixMode(GL_PROJECTION);
-      glPopMatrix;
-      glMatrixMode(GL_MODELVIEW);
+  glMatrixMode(GL_PROJECTION);
+  glPopMatrix;
+  glMatrixMode(GL_MODELVIEW);
 end;
 
 procedure TScreenCredits.DrawCredits;
 var
-  T: Cardinal;
-  Data: TFFTData;
-  j,k,l:cardinal;
-  f,g: Real;
-  STime:cardinal;
-  Delay:cardinal;
-  myScale: Real;
-  myAngle: Real;
+  T:       cardinal;
+  Data:    TFFTData;
+  j, k, l: cardinal;
+  f, g:    real;
+  STime:   cardinal;
+  Delay:   cardinal;
+  myScale: real;
+  myAngle: real;
 const
-  myLogoCoords: Array[0..27,0..1] of Cardinal = (
+  myLogoCoords: array[0..27,0..1] of cardinal = (
     (39,32),(84,32),(100,16),(125,24),
     (154,31),(156,58),(168,32),(203,36),
     (258,34),(251,50),(274,93),(294,84),
@@ -389,19 +390,19 @@ begin
     Credits_X := Credits_X-2;
     
     Log.LogStatus('',' JB-2');
-    if (CRDTS_Stage=InitialDelay) and (CTime=Timings[0]) then
+    if (CRDTS_Stage=InitialDelay) and (CTime = Timings[0]) then
     begin
-      //CTime:=Timings[20];
-      //CRDTS_Stage:=Outro;
-      CRDTS_Stage:=Intro;
-      CTime:=0;
+      //CTime := Timings[20];
+      //CRDTS_Stage := Outro;
+      CRDTS_Stage := Intro;
+      CTime := 0;
       AudioPlayback.Play;
     end;
-    if (CRDTS_Stage=Intro) and (CTime=Timings[7]) then
+    if (CRDTS_Stage = Intro) and (CTime = Timings[7]) then
     begin
-      CRDTS_Stage:=MainPart;
+      CRDTS_Stage := MainPart;
     end;
-    if (CRDTS_Stage=MainPart) and (CTime=Timings[20]) then
+    if (CRDTS_Stage = MainPart) and (CTime = Timings[20]) then
     begin
       CRDTS_Stage:=Outro;
     end;
@@ -410,143 +411,150 @@ begin
   Log.LogStatus('',' JB-3');
 
   //draw background
-  if CRDTS_Stage=InitialDelay then
-      begin
-        glClearColor(0,0,0,0);
-        glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
-      end
+  if CRDTS_Stage = InitialDelay then
+  begin
+    glClearColor(0,0,0,0);
+    glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
+  end
   else
-  if CRDTS_Stage=Intro then
-      begin
-        Start3D;
-        glPushMatrix;
+  if CRDTS_Stage = Intro then
+  begin
+    Start3D;
+    glPushMatrix;
 
-        glClearColor(0,0,0,0);
-        glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
+    glClearColor(0,0,0,0);
+    glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
 
-        glEnable(GL_TEXTURE_2D);
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-        glEnable(GL_BLEND);
-
-        if CTime < Timings[1] then begin
-          myScale:= 0.5+0.5*(Timings[1]-CTime)/(Timings[1]); // slowly move layers together
-          myAngle:=cos((CTime)*pi/((Timings[1])*2)); // and make logo face towards camera
-        end else begin // this is the part when the logo stands still
-          myScale:=0.5;
-          myAngle:=0;
-        end;
-        if CTime > Timings[2] then begin
-          myScale:= 0.5+0.5*(CTime-Timings[2])/(Timings[3]-Timings[2]); // get some space between layers
-          myAngle:=0;
-        end;
-        //if CTime > Timings[3] then myScale:=1; // keep the space between layers
-        glTranslatef(0,0,-5+0.5*myScale);
-        if CTime > Timings[3] then myScale:=1; // keep the space between layers
-        if CTime > Timings[3] then begin // make logo rotate left and grow
-          //myScale:=(CTime-Timings[4])/(Timings[7]-Timings[4]);
-          glRotatef(20*sqr(CTime-Timings[3])/sqr((Timings[7]-Timings[3])/2),0,0,1);
-          glScalef(1+sqr(CTime-Timings[3])/(32*(Timings[7]-Timings[3])),1+sqr(CTime-Timings[3])/(32*(Timings[7]-Timings[3])),1);
-        end;
-        if CTime < Timings[2] then
-          glRotatef(30*myAngle,0.5*myScale+myScale,1+myScale,0);
-        //glScalef(0.5,0.5,0.5);
-        glScalef(4/3,-1,1);
-        glColor4f(1, 1, 1, 1);
+    glEnable(GL_TEXTURE_2D);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glEnable(GL_BLEND);
 
-        glBindTexture(GL_TEXTURE_2D, intro_layer01.TexNum);
-        glbegin(gl_quads);
-          glTexCoord2f(0,0);glVertex3f(-1,   -1, -0.4 * myScale);
-          glTexCoord2f(0,1);glVertex3f(-1,   1, -0.4 * myScale);
-          glTexCoord2f(1,1); glVertex3f(1, 1, -0.4 * myScale);
-          glTexCoord2f(1,0);glVertex3f(1, -1, -0.4 * myScale);
-        glEnd;
-        glBindTexture(GL_TEXTURE_2D, intro_layer02.TexNum);
-        glbegin(gl_quads);
-          glTexCoord2f(0,0);glVertex3f(-1,   -1, -0.3 * myScale);
-          glTexCoord2f(0,1);glVertex3f(-1,   1, -0.3 * myScale);
-          glTexCoord2f(1,1); glVertex3f(1, 1, -0.3 * myScale);
-          glTexCoord2f(1,0);glVertex3f(1, -1, -0.3 * myScale);
-        glEnd;
-        glBindTexture(GL_TEXTURE_2D, intro_layer03.TexNum);
-        glbegin(gl_quads);
-          glTexCoord2f(0,0);glVertex3f(-1,   -1, -0.2 * myScale);
-          glTexCoord2f(0,1);glVertex3f(-1,   1, -0.2 * myScale);
-          glTexCoord2f(1,1); glVertex3f(1, 1, -0.2 * myScale);
-          glTexCoord2f(1,0);glVertex3f(1, -1, -0.2 * myScale);
-        glEnd;
-        glBindTexture(GL_TEXTURE_2D, intro_layer04.TexNum);
-        glbegin(gl_quads);
-          glTexCoord2f(0,0);glVertex3f(-1,   -1, -0.1 * myScale);
-          glTexCoord2f(0,1);glVertex3f(-1,   1, -0.1 * myScale);
-          glTexCoord2f(1,1); glVertex3f(1, 1, -0.1 * myScale);
-          glTexCoord2f(1,0);glVertex3f(1, -1, -0.1 * myScale);
-        glEnd;
-        glBindTexture(GL_TEXTURE_2D, intro_layer05.TexNum);
-        glbegin(gl_quads);
-          glTexCoord2f(0,0);glVertex3f(-1,   -1, 0 * myScale);
-          glTexCoord2f(0,1);glVertex3f(-1,   1, 0 * myScale);
-          glTexCoord2f(1,1); glVertex3f(1, 1, 0 * myScale);
-          glTexCoord2f(1,0);glVertex3f(1, -1, 0 * myScale);
-        glEnd;
-        glBindTexture(GL_TEXTURE_2D, intro_layer06.TexNum);
-        glbegin(gl_quads);
-          glTexCoord2f(0,0);glVertex3f(-1,   -1, 0.1 * myScale);
-          glTexCoord2f(0,1);glVertex3f(-1,   1, 0.1 * myScale);
-          glTexCoord2f(1,1); glVertex3f(1, 1, 0.1 * myScale);
-          glTexCoord2f(1,0);glVertex3f(1, -1, 0.1 * myScale);
-        glEnd;
-        glBindTexture(GL_TEXTURE_2D, intro_layer07.TexNum);
-        glbegin(gl_quads);
-          glTexCoord2f(0,0);glVertex3f(-1,   -1, 0.2 * myScale);
-          glTexCoord2f(0,1);glVertex3f(-1,   1, 0.2 * myScale);
-          glTexCoord2f(1,1); glVertex3f(1, 1, 0.2 * myScale);
-          glTexCoord2f(1,0);glVertex3f(1, -1, 0.2 * myScale);
-        glEnd;
-        glBindTexture(GL_TEXTURE_2D, intro_layer08.TexNum);
-        glbegin(gl_quads);
-          glTexCoord2f(0,0);glVertex3f(-1,   -1, 0.3 * myScale);
-          glTexCoord2f(0,1);glVertex3f(-1,   1, 0.3 * myScale);
-          glTexCoord2f(1,1); glVertex3f(1, 1, 0.3 * myScale);
-          glTexCoord2f(1,0);glVertex3f(1, -1, 0.3 * myScale);
-        glEnd;
-        glBindTexture(GL_TEXTURE_2D, intro_layer09.TexNum);
-        glbegin(gl_quads);
-          glTexCoord2f(0,0);glVertex3f(-1,   -1, 0.22 * myScale);
-          glTexCoord2f(0,1);glVertex3f(-1,   1, 0.22 * myScale);
-          glTexCoord2f(1,1); glVertex3f(1, 1, 0.22 * myScale);
-          glTexCoord2f(1,0);glVertex3f(1, -1, 0.22 * myScale);
-        glEnd;
-        gldisable(gl_texture_2d);
-        glDisable(GL_BLEND);
-
-        glPopMatrix;
-        End3D;
+    if CTime < Timings[1] then
+    begin
+      myScale := 0.5+0.5*(Timings[1]-CTime)/(Timings[1]); // slowly move layers together
+      myAngle := cos((CTime)*pi/((Timings[1])*2)); // and make logo face towards camera
+    end
+    else
+    begin // this is the part when the logo stands still
+      myScale := 0.5;
+      myAngle := 0;
+    end;
+    if CTime > Timings[2] then
+    begin
+      myScale:= 0.5+0.5*(CTime-Timings[2])/(Timings[3]-Timings[2]); // get some space between layers
+      myAngle:=0;
+    end;
+    //if CTime > Timings[3] then myScale:=1; // keep the space between layers
+    glTranslatef(0,0,-5+0.5*myScale);
+    if CTime > Timings[3] then
+      myScale:=1; // keep the space between layers
+    if CTime > Timings[3] then
+    begin // make logo rotate left and grow
+      //myScale:=(CTime-Timings[4])/(Timings[7]-Timings[4]);
+      glRotatef(20*sqr(CTime-Timings[3])/sqr((Timings[7]-Timings[3])/2),0,0,1);
+      glScalef(1+sqr(CTime-Timings[3])/(32*(Timings[7]-Timings[3])),1+sqr(CTime-Timings[3])/(32*(Timings[7]-Timings[3])),1);
+    end;
+    if CTime < Timings[2] then
+      glRotatef(30*myAngle,0.5*myScale+myScale,1+myScale,0);
+    //glScalef(0.5,0.5,0.5);
+    glScalef(4/3,-1,1);
+    glColor4f(1, 1, 1, 1);
 
-        // do some sparkling effects
-        if (CTime < Timings[1]) and (CTime > Timings[21]) then
-        begin
-          for k:=1 to 3 do begin
-             l:=410+floor((CTime-Timings[21])/(Timings[1]-Timings[21])*(536-410))+RandomRange(-5,5);
-             j:=floor((Timings[1]-CTime)/22)+RandomRange(285,301);
-             GoldenRec.Spawn(l, j, 1, 16, 0, -1, Flare, 0);
-          end;
-        end;
+    glBindTexture(GL_TEXTURE_2D, intro_layer01.TexNum);
+    glbegin(gl_quads);
+      glTexCoord2f(0,0);glVertex3f(-1,   -1, -0.4 * myScale);
+      glTexCoord2f(0,1);glVertex3f(-1,   1, -0.4 * myScale);
+      glTexCoord2f(1,1); glVertex3f(1, 1, -0.4 * myScale);
+      glTexCoord2f(1,0);glVertex3f(1, -1, -0.4 * myScale);
+    glEnd;
+    glBindTexture(GL_TEXTURE_2D, intro_layer02.TexNum);
+    glbegin(gl_quads);
+      glTexCoord2f(0,0);glVertex3f(-1,   -1, -0.3 * myScale);
+      glTexCoord2f(0,1);glVertex3f(-1,   1, -0.3 * myScale);
+      glTexCoord2f(1,1); glVertex3f(1, 1, -0.3 * myScale);
+      glTexCoord2f(1,0);glVertex3f(1, -1, -0.3 * myScale);
+    glEnd;
+    glBindTexture(GL_TEXTURE_2D, intro_layer03.TexNum);
+    glbegin(gl_quads);
+      glTexCoord2f(0,0);glVertex3f(-1,   -1, -0.2 * myScale);
+      glTexCoord2f(0,1);glVertex3f(-1,   1, -0.2 * myScale);
+      glTexCoord2f(1,1); glVertex3f(1, 1, -0.2 * myScale);
+      glTexCoord2f(1,0);glVertex3f(1, -1, -0.2 * myScale);
+    glEnd;
+    glBindTexture(GL_TEXTURE_2D, intro_layer04.TexNum);
+    glbegin(gl_quads);
+      glTexCoord2f(0,0);glVertex3f(-1,   -1, -0.1 * myScale);
+      glTexCoord2f(0,1);glVertex3f(-1,   1, -0.1 * myScale);
+      glTexCoord2f(1,1); glVertex3f(1, 1, -0.1 * myScale);
+      glTexCoord2f(1,0);glVertex3f(1, -1, -0.1 * myScale);
+    glEnd;
+    glBindTexture(GL_TEXTURE_2D, intro_layer05.TexNum);
+    glbegin(gl_quads);
+      glTexCoord2f(0,0);glVertex3f(-1,   -1, 0 * myScale);
+      glTexCoord2f(0,1);glVertex3f(-1,   1, 0 * myScale);
+      glTexCoord2f(1,1); glVertex3f(1, 1, 0 * myScale);
+      glTexCoord2f(1,0);glVertex3f(1, -1, 0 * myScale);
+    glEnd;
+    glBindTexture(GL_TEXTURE_2D, intro_layer06.TexNum);
+    glbegin(gl_quads);
+      glTexCoord2f(0,0);glVertex3f(-1,   -1, 0.1 * myScale);
+      glTexCoord2f(0,1);glVertex3f(-1,   1, 0.1 * myScale);
+      glTexCoord2f(1,1); glVertex3f(1, 1, 0.1 * myScale);
+      glTexCoord2f(1,0);glVertex3f(1, -1, 0.1 * myScale);
+    glEnd;
+    glBindTexture(GL_TEXTURE_2D, intro_layer07.TexNum);
+    glbegin(gl_quads);
+      glTexCoord2f(0,0);glVertex3f(-1,   -1, 0.2 * myScale);
+      glTexCoord2f(0,1);glVertex3f(-1,   1, 0.2 * myScale);
+      glTexCoord2f(1,1); glVertex3f(1, 1, 0.2 * myScale);
+      glTexCoord2f(1,0);glVertex3f(1, -1, 0.2 * myScale);
+    glEnd;
+    glBindTexture(GL_TEXTURE_2D, intro_layer08.TexNum);
+    glbegin(gl_quads);
+      glTexCoord2f(0,0);glVertex3f(-1,   -1, 0.3 * myScale);
+      glTexCoord2f(0,1);glVertex3f(-1,   1, 0.3 * myScale);
+      glTexCoord2f(1,1); glVertex3f(1, 1, 0.3 * myScale);
+      glTexCoord2f(1,0);glVertex3f(1, -1, 0.3 * myScale);
+    glEnd;
+    glBindTexture(GL_TEXTURE_2D, intro_layer09.TexNum);
+    glbegin(gl_quads);
+      glTexCoord2f(0,0);glVertex3f(-1,   -1, 0.22 * myScale);
+      glTexCoord2f(0,1);glVertex3f(-1,   1, 0.22 * myScale);
+      glTexCoord2f(1,1); glVertex3f(1, 1, 0.22 * myScale);
+      glTexCoord2f(1,0);glVertex3f(1, -1, 0.22 * myScale);
+    glEnd;
+    gldisable(gl_texture_2d);
+    glDisable(GL_BLEND);
+
+    glPopMatrix;
+    End3D;
+
+    // do some sparkling effects
+    if (CTime < Timings[1]) and (CTime > Timings[21]) then
+    begin
+      for k:=1 to 3 do
+      begin
+         l:=410+floor((CTime-Timings[21])/(Timings[1]-Timings[21])*(536-410))+RandomRange(-5,5);
+         j:=floor((Timings[1]-CTime)/22)+RandomRange(285,301);
+         GoldenRec.Spawn(l, j, 1, 16, 0, -1, Flare, 0);
+      end;
+    end;
 
-        // fade to white at end
-        if Ctime > Timings[6] then
-        begin
-          glColor4f(1,1,1,sqr(Ctime-Timings[6])*(Ctime-Timings[6])/sqr(Timings[7]-Timings[6]));
-          glEnable(GL_BLEND);
-          glBegin(GL_QUADS);
-            glVertex2f(0,0);
-            glVertex2f(0,600);
-            glVertex2f(800,600);
-            glVertex2f(800,0);
-          glEnd;
-          glDisable(GL_BLEND);
-        end;
+    // fade to white at end
+    if Ctime > Timings[6] then
+    begin
+      glColor4f(1,1,1,sqr(Ctime-Timings[6])*(Ctime-Timings[6])/sqr(Timings[7]-Timings[6]));
+      glEnable(GL_BLEND);
+      glBegin(GL_QUADS);
+        glVertex2f(0,0);
+        glVertex2f(0,600);
+        glVertex2f(800,600);
+        glVertex2f(800,0);
+      glEnd;
+      glDisable(GL_BLEND);
+    end;
 
-      end;
+    end;
     if (CRDTS_Stage=MainPart) then
       // main credits screen background, scroller, logo and girl
       begin
@@ -572,38 +580,50 @@ begin
     //#########################################################################
     // draw credits names
 
-
     Log.LogStatus('',' JB-4');
 
     // BlindGuard (rotate in from upper left, rotate out to lower right)
-    STime:=Timings[9]-10;
-    Delay:=Timings[10]-Timings[9];
+    STime := Timings[9]-10;
+    Delay := Timings[10]-Timings[9];
     if CTime > STime then
     begin
       k:=0;
-      ESC_Alpha:=20;
+      ESC_Alpha := 20;
 
       try
-      for j:=0 to 40 do
+      for j := 0 to 40 do
       begin
-        if ( j < length( Data ) ) AND
-           ( k < length( Data ) ) then
+        if (j < length(Data)) and
+           (k < length(Data)) then
         begin
           if Data[j] >= Data[k] then
-             k:=j;
+             k := j;
         end;
       end;
       except
       end;
 
-      if Data[k]>0.25 then ESC_Alpha:=5 else inc(ESC_Alpha);
-      if ESC_Alpha >20 then ESC_Alpha:=20;
-      if ((CTime-STime)<20) then ESC_Alpha:=20;
-      if CTime <=STime+10 then j:=CTime-STime else j:=10;
-      if (CTime >=STime+Delay-10) then if (CTime <=STime+Delay) then j:=(STime+Delay)-CTime else j:=0;
+      if Data[k] > 0.25 then
+        ESC_Alpha := 5
+      else
+        inc(ESC_Alpha);
+      if ESC_Alpha > 20 then
+        ESC_Alpha := 20;
+      if ((CTime - STime) < 20) then
+        ESC_Alpha := 20;
+      if CTime <= STime + 10 then
+        j := CTime - STime
+      else
+	j := 10;
+      if (CTime >= STime + Delay - 10) then
+        if (CTime <= STime + Delay) then
+	  j := (STime + Delay) - CTime
+	else
+	  j := 0;
       glColor4f(1, 1, 1, ESC_Alpha/20*j/10);
 
-      if (CTime >= STime+10) and (CTime<=STime+12) then begin
+      if (CTime >= STime + 10) and (CTime <= STime + 12) then
+      begin
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 0);
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 1);
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 5);
@@ -617,22 +637,25 @@ begin
 
       glPushMatrix;
       gltranslatef(0,329,0);
-      if CTime <= STime+10 then begin glrotatef((CTime-STime)*9+270,0,0,1);end;
+      if CTime <= STime + 10 then
+        glrotatef((CTime - STime) * 9 + 270,0,0,1);
       gltranslatef(223,0,0);
-      if CTime >=STime+Delay-10 then if CTime <=STime+Delay then begin
-        gltranslatef(223,0,0);
-        glrotatef((integer(CTime)-(integer(STime+Delay)-10))*-9,0,0,1);
-        gltranslatef(-223,0,0);
-      end;
+      if CTime >= STime + Delay - 10 then
+        if CTime <= STime + Delay then
+        begin
+          gltranslatef(223,0,0);
+          glrotatef((integer(CTime) - (integer(STime + Delay) - 10))*-9,0,0,1);
+          gltranslatef(-223,0,0);
+        end;
       glBindTexture(GL_TEXTURE_2D, credits_blindguard.TexNum);
       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
       glEnable(GL_BLEND);
       glEnable(GL_TEXTURE_2D);
       glbegin(gl_quads);
-        glTexCoord2f(0,0);glVertex2f(-163,   -129);
-        glTexCoord2f(0,1);glVertex2f(-163,   129);
-        glTexCoord2f(1,1); glVertex2f(163, 129);
-        glTexCoord2f(1,0);glVertex2f(163, -129);
+        glTexCoord2f(0,0);glVertex2f(-163, -129);
+        glTexCoord2f(0,1);glVertex2f(-163,  129);
+        glTexCoord2f(1,1);glVertex2f( 163,  129);
+        glTexCoord2f(1,0);glVertex2f( 163, -129);
       glEnd;
       gldisable(gl_texture_2d);
       gldisable(GL_BLEND);
@@ -640,35 +663,47 @@ begin
     end;
 
     // Blindy (zoom from 0 to full size and rotation, zoom zo doubble size and shift to upper right)
-    STime:=Timings[10]-10;
-    Delay:=Timings[11]-Timings[10]+5;
+    STime := Timings[10] - 10;
+    Delay := Timings[11] - Timings[10] + 5;
     if CTime > STime then
     begin
-      k:=0;
-      ESC_Alpha:=20;
+      k := 0;
+      ESC_Alpha := 20;
 
       try
-      for j:=0 to 40 do
+      for j := 0 to 40 do
       begin
-        if ( j < length( Data ) ) AND
-           ( k < length( Data ) ) then
+        if (j < length(Data)) and
+           (k < length(Data)) then
         begin
           if Data[j] >= Data[k] then
-             k:=j;
+            k := j;
         end;
       end;
       except
       end;
 
-
-      if Data[k]>0.25 then ESC_Alpha:=5 else inc(ESC_Alpha);
-      if ESC_Alpha >20 then ESC_Alpha:=20;
-      if ((CTime-STime)<20) then ESC_Alpha:=20;
-      if CTime <=STime+10 then j:=CTime-STime else j:=10;
-      if (CTime >=STime+Delay-10) then if (CTime <=STime+Delay) then j:=(STime+Delay)-CTime else j:=0;
+      if Data[k] > 0.25 then
+        ESC_Alpha := 5
+      else
+        inc(ESC_Alpha);
+      if ESC_Alpha > 20 then
+        ESC_Alpha := 20;
+      if ((CTime - STime) < 20) then
+        ESC_Alpha := 20;
+      if CTime <= STime + 10 then
+        j := CTime - STime
+      else
+        j := 10;
+      if (CTime >= STime + Delay - 10) then
+        if (CTime <= STime + Delay) then
+          j := (STime + Delay) - CTime
+        else
+          j := 0;
       glColor4f(1, 1, 1, ESC_Alpha/20*j/10);
 
-      if (CTime >= STime+20) and (CTime<=STime+22) then begin
+      if (CTime >= STime+20) and (CTime<=STime+22) then
+      begin
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 0);
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 1);
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 5);
@@ -682,18 +717,21 @@ begin
 
       glPushMatrix;
       gltranslatef(223,329,0);
-      if CTime <= STime+20 then begin
-        j:=CTime-Stime;
+      if CTime <= STime + 20 then
+      begin
+        j := CTime - Stime;
         glscalef(j*j/400,j*j/400,j*j/400);
         glrotatef(j*18.0,0,0,1);
       end;
-      if CTime >=STime+Delay-10 then if CTime <=STime+Delay then begin
-        j:=CTime-(STime+Delay-10);
-        f:=j*10.0;
-        gltranslatef(f*3,-f,0);
-        glscalef(1+j/10,1+j/10,1+j/10);
-        glrotatef(j*9.0,0,0,1);
-      end;
+      if CTime >= STime + Delay - 10 then
+        if CTime <= STime + Delay then
+        begin
+          j := CTime - (STime + Delay - 10);
+          f := j * 10.0;
+          gltranslatef(f*3,-f,0);
+          glscalef(1+j/10,1+j/10,1+j/10);
+          glrotatef(j*9.0,0,0,1);
+        end;
       glBindTexture(GL_TEXTURE_2D, credits_blindy.TexNum);
       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
       glEnable(GL_BLEND);
@@ -710,35 +748,47 @@ begin
     end;
 
     // Canni  (shift in from left, shift out to upper right)
-    STime:=Timings[11]-10;
-    Delay:=Timings[12]-Timings[11]+5;
+    STime := Timings[11]-10;
+    Delay := Timings[12]-Timings[11]+5;
     if CTime > STime then
     begin
       k:=0;
-      ESC_Alpha:=20;
+      ESC_Alpha := 20;
 
       try
-      for j:=0 to 40 do
+      for j := 0 to 40 do
       begin
-        if ( j < length( Data ) ) AND
-           ( k < length( Data ) ) then
+        if (j < length(Data)) and
+           (k < length(Data)) then
         begin
           if Data[j] >= Data[k] then
-             k:=j;
+             k := j;
         end;
       end;
       except
       end;
 
-
-      if Data[k]>0.25 then ESC_Alpha:=5 else inc(ESC_Alpha);
-      if ESC_Alpha >20 then ESC_Alpha:=20;
-      if ((CTime-STime)<20) then ESC_Alpha:=20;
-      if CTime <=STime+10 then j:=CTime-STime else j:=10;
-      if (CTime >=STime+Delay-10) then if (CTime <=STime+Delay) then j:=(STime+Delay)-CTime else j:=0;
+      if Data[k] > 0.25 then
+        ESC_Alpha := 5
+      else
+        inc(ESC_Alpha);
+      if ESC_Alpha > 20 then
+        ESC_Alpha := 20;
+      if ((CTime - STime) < 20) then
+        ESC_Alpha := 20;
+      if CTime <= STime + 10 then
+        j := CTime - STime
+      else
+        j := 10;
+      if (CTime >= STime + Delay - 10) then
+        if (CTime <= STime + Delay) then
+          j := (STime + Delay) - CTime
+        else
+          j := 0;
       glColor4f(1, 1, 1, ESC_Alpha/20*j/10);
 
-      if (CTime >= STime+10) and (CTime<=STime+12) then begin
+      if (CTime >= STime + 10) and (CTime <= STime + 12) then
+      begin
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 0);
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 1);
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 5);
@@ -752,10 +802,12 @@ begin
 
       glPushMatrix;
       gltranslatef(223,329,0);
-      if CTime <= STime+10 then begin
+      if CTime <= STime + 10 then
+      begin
         gltranslatef(((CTime-STime)*21.0)-210,0,0);
       end;
-      if CTime >=STime+Delay-10 then if CTime <=STime+Delay then begin
+      if CTime >= STime + Delay - 10 then if CTime <= STime + Delay then
+      begin
         j:=(CTime-(STime+Delay-10))*21;
         gltranslatef(j,-j/2,0);
       end;
@@ -775,35 +827,47 @@ begin
     end;
 
     // Commandio  (flip in from down, flip out to upper right)
-    STime:=Timings[12]-10;
-    Delay:=Timings[13]-Timings[12];
+    STime := Timings[12]-10;
+    Delay := Timings[13]-Timings[12];
     if CTime > STime then
     begin
       k:=0;
-      ESC_Alpha:=20;
+      ESC_Alpha := 20;
 
       try
-      for j:=0 to 40 do
+      for j := 0 to 40 do
       begin
-        if ( j < length( Data ) ) AND
-           ( k < length( Data ) ) then
+        if (j < length(Data)) and
+           (k < length(Data)) then
         begin
           if Data[j] >= Data[k] then
-             k:=j;
+            k := j;
         end;
       end;
       except
       end;
 
-
-      if Data[k]>0.25 then ESC_Alpha:=5 else inc(ESC_Alpha);
-      if ESC_Alpha >20 then ESC_Alpha:=20;
-      if ((CTime-STime)<20) then ESC_Alpha:=20;
-      if CTime <=STime+10 then j:=CTime-STime else j:=10;
-      if (CTime >=STime+Delay-10) then if (CTime <=STime+Delay) then j:=(STime+Delay)-CTime else j:=0;
+      if Data[k] > 0.25 then
+        ESC_Alpha := 5
+      else
+        inc(ESC_Alpha);
+      if ESC_Alpha > 20 then
+        ESC_Alpha := 20;
+      if ((CTime - STime) < 20) then
+        ESC_Alpha := 20;
+      if CTime <= STime + 10 then
+        j := CTime - STime
+      else
+        j := 10;
+      if (CTime >= STime + Delay - 10) then
+        if (CTime <= STime + Delay) then
+          j := (STime + Delay) - CTime
+        else
+          j := 0;
       glColor4f(1, 1, 1, ESC_Alpha/20*j/10);
 
-      if (CTime >= STime+10) and (CTime<=STime+12) then begin
+      if (CTime >= STime + 10) and (CTime <= STime + 12) then
+      begin
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 0);
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 1);
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 5);
@@ -817,15 +881,17 @@ begin
 
       glPushMatrix;
       gltranslatef(223,329,0);
-      if CTime <= STime+10 then
+      if CTime <= STime + 10 then
         f:=258.0-25.8*(CTime-STime)
       else
-        f:=0;
-      g:=0;
-      if CTime >=STime+Delay-10 then if CTime <=STime+Delay then begin
-        j:=CTime-(STime+Delay-10);
-        g:=32.6*j;
-      end;
+        f := 0;
+      g := 0;
+      if CTime >= STime + Delay - 10 then
+        if CTime <= STime + Delay then
+        begin
+          j := CTime - (STime + Delay - 10);
+          g := 32.6 * j;
+        end;
       glBindTexture(GL_TEXTURE_2D, credits_commandio.TexNum);
       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
       glEnable(GL_BLEND);
@@ -842,33 +908,44 @@ begin
     end;
 
     // lazy joker  (just scrolls from left to right, no twinkling stars, no on-beat flashing)
-    STime:=Timings[13]-35;
-    Delay:=Timings[14]-Timings[13]+5;
+    STime := Timings[13]-35;
+    Delay := Timings[14]-Timings[13]+5;
     if CTime > STime then
     begin
       k:=0;
 
       try
-      for j:=0 to 40 do
+      for j := 0 to 40 do
       begin
-        if ( j < length( Data ) ) AND
-           ( k < length( Data ) ) then
+        if (j < length(Data)) and
+           (k < length(Data)) then
         begin
           if Data[j] >= Data[k] then
-             k:=j;
+             k := j;
         end;
       end;
       except
       end;
 
-
-      if Data[k]>0.25 then ESC_Alpha:=5 else inc(ESC_Alpha);
-      if ESC_Alpha >20 then ESC_Alpha:=20;
-      if ((CTime-STime)>10) and ((CTime-STime)<20) then ESC_Alpha:=20;
+      if Data[k] > 0.25 then
+        ESC_Alpha := 5
+      else
+        inc(ESC_Alpha);
+      if ESC_Alpha > 20 then
+        ESC_Alpha := 20;
+      if ((CTime-STime)>10) and ((CTime - STime) < 20) then
+        ESC_Alpha := 20;
       ESC_Alpha:=10;
       f:=CTime-STime;
-      if CTime <=STime+40 then j:=CTime-STime else j:=40;
-      if (CTime >=STime+Delay-40) then if (CTime <=STime+Delay) then j:=(STime+Delay)-CTime else j:=0;
+      if CTime <=STime+40 then
+        j := CTime - STime
+      else
+        j:=40;
+      if (CTime >=STime+Delay-40) then
+        if (CTime <= STime + Delay) then
+          j := (STime + Delay) - CTime
+        else
+          j := 0;
       glColor4f(1, 1, 1, ESC_Alpha/20*j*j/1600);
 
       glPushMatrix;
@@ -889,36 +966,47 @@ begin
     end;
 
     // Mog (flip in from right, flip out to lower right)
-    STime:=Timings[14]-10;
-    Delay:=Timings[15]-Timings[14]+5;
+    STime := Timings[14]-10;
+    Delay := Timings[15]-Timings[14]+5;
     if CTime > STime then
     begin
       k:=0;
-      ESC_Alpha:=20;
-
+      ESC_Alpha := 20;
 
       try
-      for j:=0 to 40 do
+      for j := 0 to 40 do
       begin
-        if ( j < length( Data ) ) AND
-           ( k < length( Data ) ) then
+        if (j < length(Data)) and
+           (k < length(Data)) then
         begin
           if Data[j] >= Data[k] then
-             k:=j;
+             k := j;
         end;
       end;
       except
       end;
 
-
-      if Data[k]>0.25 then ESC_Alpha:=5 else inc(ESC_Alpha);
-      if ESC_Alpha >20 then ESC_Alpha:=20;
-      if ((CTime-STime)<20) then ESC_Alpha:=20;
-      if CTime <=STime+10 then j:=CTime-STime else j:=10;
-      if (CTime >=STime+Delay-10) then if (CTime <=STime+Delay) then j:=(STime+Delay)-CTime else j:=0;
+      if Data[k] > 0.25 then
+        ESC_Alpha := 5
+      else
+        inc(ESC_Alpha);
+      if ESC_Alpha > 20 then
+        ESC_Alpha := 20;
+      if ((CTime - STime) < 20) then
+        ESC_Alpha := 20;
+      if CTime <= STime + 10 then
+        j := CTime - STime
+      else
+        j := 10;
+      if (CTime >= STime + Delay - 10) then
+        if (CTime <= STime + Delay) then
+          j := (STime + Delay) - CTime
+        else
+          j := 0;
       glColor4f(1, 1, 1, ESC_Alpha/20*j/10);
 
-      if (CTime >= STime+10) and (CTime<=STime+12) then begin
+      if (CTime >= STime + 10) and (CTime <= STime + 12) then
+      begin
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 0);
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 1);
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 5);
@@ -932,15 +1020,16 @@ begin
 
       glPushMatrix;
       gltranslatef(223,329,0);
-      if CTime <= STime+10 then
-        f:=326.0-32.6*(CTime-STime)
+      if CTime <= STime + 10 then
+        f := 326.0 - 32.6 * (CTime - STime)
       else
-        f:=0;
+        f := 0;
 
-      g:=0;
-      if CTime >=STime+Delay-10 then if CTime <=STime+Delay then begin
-        j:=CTime-(STime+Delay-10);
-        g:=32.6*j;
+      g := 0;
+      if CTime >= STime + Delay - 10 then if CTime <= STime + Delay then
+      begin
+        j := CTime - (STime + Delay - 10);
+        g := 32.6 * j;
       end;
       glBindTexture(GL_TEXTURE_2D, credits_mog.TexNum);
       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -958,35 +1047,47 @@ begin
     end;
 
     // Mota (rotate in from upper right, shift out to lower left while shrinking and rotateing)
-    STime:=Timings[15]-10;
-    Delay:=Timings[16]-Timings[15]+5;
+    STime := Timings[15]-10;
+    Delay := Timings[16]-Timings[15]+5;
     if CTime > STime then
     begin
       k:=0;
-      ESC_Alpha:=20;
+      ESC_Alpha := 20;
 
       try
-      for j:=0 to 40 do
+      for j := 0 to 40 do
       begin
-        if ( j < length( Data ) ) AND
-           ( k < length( Data ) ) then
+        if (j < length(Data)) and
+           (k < length(Data)) then
         begin
           if Data[j] >= Data[k] then
-             k:=j;
+             k := j;
         end;
       end;
       except
       end;
 
-
-      if Data[k]>0.25 then ESC_Alpha:=5 else inc(ESC_Alpha);
-      if ESC_Alpha >20 then ESC_Alpha:=20;
-      if ((CTime-STime)<20) then ESC_Alpha:=20;
-      if CTime <=STime+10 then j:=CTime-STime else j:=10;
-      if (CTime >=STime+Delay-10) then if (CTime <=STime+Delay) then j:=(STime+Delay)-CTime else j:=0;
+      if Data[k] > 0.25 then
+        ESC_Alpha := 5
+      else
+        inc(ESC_Alpha);
+      if ESC_Alpha > 20 then
+        ESC_Alpha := 20;
+      if ((CTime - STime) < 20) then
+        ESC_Alpha := 20;
+      if CTime <= STime + 10 then
+        j := CTime - STime
+      else
+        j := 10;
+      if (CTime >= STime + Delay - 10) then
+        if (CTime <= STime + Delay) then
+          j := (STime + Delay) - CTime
+        else
+          j := 0;
       glColor4f(1, 1, 1, ESC_Alpha/20*j/10);
 
-      if (CTime >= STime+10) and (CTime<=STime+12) then begin
+      if (CTime >= STime + 10) and (CTime <= STime + 12) then
+      begin
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 0);
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 1);
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 5);
@@ -1000,18 +1101,21 @@ begin
 
       glPushMatrix;
       gltranslatef(223,329,0);
-      if CTime <= STime+10 then begin
+      if CTime <= STime + 10 then
+      begin
         gltranslatef(223,0,0);
         glrotatef((10-(CTime-STime))*9,0,0,1);
         gltranslatef(-223,0,0);
       end;
-      if CTime >=STime+Delay-10 then if CTime <=STime+Delay then begin
-        j:=CTime-(STime+Delay-10);
-        f:=j*10.0;
-        gltranslatef(-f*2,-f,0);
-        glscalef(1-j/10,1-j/10,1-j/10);
-        glrotatef(-j*9.0,0,0,1);
-      end;
+      if CTime >= STime + Delay - 10 then
+        if CTime <= STime + Delay then
+        begin
+          j := CTime - (STime + Delay - 10);
+          f := j * 10.0;
+          gltranslatef(-f*2,-f,0);
+          glscalef(1-j/10,1-j/10,1-j/10);
+          glrotatef(-j*9.0,0,0,1);
+        end;
       glBindTexture(GL_TEXTURE_2D, credits_mota.TexNum);
       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
       glEnable(GL_BLEND);
@@ -1028,35 +1132,47 @@ begin
     end;
 
     // Skillmaster (shift in from lower right, rotate out to upper right)
-    STime:=Timings[16]-10;
-    Delay:=Timings[17]-Timings[16]+5;
+    STime := Timings[16]-10;
+    Delay := Timings[17]-Timings[16]+5;
     if CTime > STime then
     begin
       k:=0;
-      ESC_Alpha:=20;
+      ESC_Alpha := 20;
 
       try
-      for j:=0 to 40 do
+      for j := 0 to 40 do
       begin
-        if ( j < length( Data ) ) AND
-           ( k < length( Data ) ) then
+        if (j < length(Data)) and
+           (k < length(Data)) then
         begin
           if Data[j] >= Data[k] then
-             k:=j;
+             k := j;
         end;
       end;
       except
       end;
 
-
-      if Data[k]>0.25 then ESC_Alpha:=5 else inc(ESC_Alpha);
-      if ESC_Alpha >20 then ESC_Alpha:=20;
-      if ((CTime-STime)<20) then ESC_Alpha:=20;
-      if CTime <=STime+10 then j:=CTime-STime else j:=10;
-      if (CTime >=STime+Delay-10) then if (CTime <=STime+Delay) then j:=(STime+Delay)-CTime else j:=0;
+      if Data[k] > 0.25 then
+        ESC_Alpha := 5
+      else
+        inc(ESC_Alpha);
+      if ESC_Alpha > 20 then
+        ESC_Alpha := 20;
+      if ((CTime - STime) < 20) then
+        ESC_Alpha := 20;
+      if CTime <= STime + 10 then
+        j := CTime - STime
+      else
+        j := 10;
+      if (CTime >= STime + Delay - 10) then
+        if (CTime <= STime + Delay) then
+          j := (STime + Delay) - CTime
+        else
+          j := 0;
       glColor4f(1, 1, 1, ESC_Alpha/20*j/10);
 
-      if (CTime >= STime+10) and (CTime<=STime+12) then begin
+      if (CTime >= STime + 10) and (CTime <= STime + 12) then
+      begin
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 0);
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 1);
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 5);
@@ -1070,18 +1186,21 @@ begin
 
       glPushMatrix;
       gltranslatef(223,329,0);
-      if CTime <= STime+10 then begin
-        j:=STime+10-CTime;
-        f:=j*10.0;
+      if CTime <= STime + 10 then
+      begin
+        j := STime + 10 - CTime;
+        f := j * 10.0;
         gltranslatef(+f*2,+f/2,0);
       end;
-      if CTime >=STime+Delay-10 then if CTime <=STime+Delay then begin
-        j:=CTime-(STime+Delay-10);
-        gltranslatef(0,-223,0);
-        glrotatef(integer(j)*-9,0,0,1);
-        gltranslatef(0,223,0);
-        glrotatef(j*9,0,0,1);
-      end;
+      if CTime >= STime + Delay - 10 then
+        if CTime <= STime + Delay then
+        begin
+          j := CTime - (STime + Delay - 10);
+          gltranslatef(0,-223,0);
+          glrotatef(integer(j)*-9,0,0,1);
+          gltranslatef(0,223,0);
+          glrotatef(j*9,0,0,1);
+        end;
       glBindTexture(GL_TEXTURE_2D, credits_skillmaster.TexNum);
       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
       glEnable(GL_BLEND);
@@ -1098,35 +1217,47 @@ begin
     end;
 
     // WhiteShark (flip in from lower left, flip out to upper right)
-    STime:=Timings[17]-10;
-    Delay:=Timings[18]-Timings[17];
+    STime := Timings[17] - 10;
+    Delay := Timings[18] - Timings[17];
     if CTime > STime then
     begin
       k:=0;
-      ESC_Alpha:=20;
+      ESC_Alpha := 20;
 
       try
-      for j:=0 to 40 do
+      for j := 0 to 40 do
       begin
-        if ( j < length( Data ) ) AND
-           ( k < length( Data ) ) then
+        if (j < length(Data)) and
+           (k < length(Data)) then
         begin
           if Data[j] >= Data[k] then
-             k:=j;
+             k := j;
         end;
       end;
       except
       end;
 
-
-      if Data[k]>0.25 then ESC_Alpha:=5 else inc(ESC_Alpha);
-      if ESC_Alpha >20 then ESC_Alpha:=20;
-      if ((CTime-STime)<20) then ESC_Alpha:=20;
-      if CTime <=STime+10 then j:=CTime-STime else j:=10;
-      if (CTime >=STime+Delay-10) then if (CTime <=STime+Delay) then j:=(STime+Delay)-CTime else j:=0;
+      if Data[k] > 0.25 then
+        ESC_Alpha := 5
+      else
+        inc(ESC_Alpha);
+      if ESC_Alpha > 20 then
+        ESC_Alpha := 20;
+      if ((CTime - STime) < 20) then
+        ESC_Alpha := 20;
+      if CTime <= STime + 10 then
+        j := CTime - STime
+      else
+        j := 10;
+      if (CTime >= STime + Delay - 10) then
+        if (CTime <= STime + Delay) then
+          j := (STime + Delay) - CTime
+        else
+          j := 0;
       glColor4f(1, 1, 1, ESC_Alpha/20*j/10);
 
-      if (CTime >= STime+10) and (CTime<=STime+12) then begin
+      if (CTime >= STime + 10) and (CTime <= STime + 12) then
+      begin
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 0);
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 1);
         GoldenRec.Spawn(RandomRange(65,390), RandomRange(200,460), 1, 16, 0, -1, PerfectLineTwinkle, 5);
@@ -1140,19 +1271,19 @@ begin
 
       glPushMatrix;
       gltranslatef(223,329,0);
-      if CTime <= STime+10 then
-        f:=326.0-32.6*(CTime-STime)
+      if CTime <= STime + 10 then
+        f := 326.0 - 32.6 * (CTime - STime)
       else
-        f:=0;
+        f := 0;
 
-      if (CTime >= STime+Delay-10) and (CTime <= STime+Delay) then
+      if (CTime >= STime + Delay - 10) and (CTime <= STime + Delay) then
       begin
-        j:=CTime-(STime+Delay-10);
-        g:=32.6*j;
+        j := CTime - (STime + Delay - 10);
+        g := 32.6 * j;
       end
       else
       begin
-        g:=0;
+        g := 0;
       end;
 
       glBindTexture(GL_TEXTURE_2D, credits_whiteshark.TexNum);
@@ -1160,41 +1291,40 @@ begin
       glEnable(GL_BLEND);
       glEnable(GL_TEXTURE_2D);
       glbegin(gl_quads);
-        glTexCoord2f(0,0);glVertex2f(-163-f+g,   -129+f/4-g/2);
-        glTexCoord2f(0,1);glVertex2f(-163-f/4+g,   129+g/2+f/4);
-        glTexCoord2f(1,1); glVertex2f(163-f*1.2+g/4, 129+f/2-g/4);
-        glTexCoord2f(1,0);glVertex2f(163-f*1.5+g/4, -129+f*1.5+g/4);
+        glTexCoord2f(0,0);glVertex2f(-163-f+g,       -129+f/4-g/2);
+        glTexCoord2f(0,1);glVertex2f(-163-f/4+g,      129+g/2+f/4);
+        glTexCoord2f(1,1);glVertex2f( 163-f*1.2+g/4,  129+f/2-g/4);
+        glTexCoord2f(1,0);glVertex2f( 163-f*1.5+g/4, -129+f*1.5+g/4);
       glEnd;
       gldisable(gl_texture_2d);
       gldisable(GL_BLEND);
       glPopMatrix;
     end;
 
-
    Log.LogStatus('',' JB-103');
 
     // ####################################################################
     // do some twinkle stuff (kinda on beat)
 
-    if (CTime > Timings[8]  ) and
-       (CTime < Timings[19] ) then
+    if (CTime > Timings[8] ) and
+       (CTime < Timings[19]) then
     begin
       k := 0;
       
       try
-      for j:=0 to 40 do
+      for j := 0 to 40 do
       begin
-        if ( j < length( Data ) ) AND
-           ( k < length( Data ) ) then
+        if (j < length(Data)) and
+           (k < length(Data)) then
         begin
           if Data[j] >= Data[k] then
-             k:=j;
+             k := j;
         end;
       end;
       except
       end;
 
-      if Data[k]>0.2 then
+      if Data[k] > 0.2 then
       begin
          l := RandomRange(6,16);
          j := RandomRange(0,27);
@@ -1246,19 +1376,21 @@ begin
         end;
       end
     else
-    if (CRDTS_Stage=Outro) then
+    if (CRDTS_Stage = Outro) then
     begin
-      if CTime=Timings[20] then begin
-        CTime_hold:=0;
+      if CTime = Timings[20] then
+      begin
+        CTime_hold := 0;
         AudioPlayback.Stop;
         AudioPlayback.Open(soundpath + 'credits-outro-tune.mp3');
         AudioPlayback.SetVolume(0.2);
-        AudioPlayback.SetLoop(True);
+        AudioPlayback.SetLoop(true);
         AudioPlayback.Play;
       end;
-      if CTime_hold > 231 then begin
+      if CTime_hold > 231 then
+       begin
         AudioPlayback.Play;
-        Ctime_hold:=0;
+        Ctime_hold := 0;
       end;
       glClearColor(0,0,0,0);
       glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
@@ -1288,11 +1420,13 @@ begin
           glTexCoord2f(487/512,0);glVertex2f(487, 0);
         glEnd;
 
-        ESC_Alpha:=20;
-        if (RandomRange(0,20) > 18) and (ESC_Alpha=20) then
-          ESC_Alpha:=0
-        else inc(ESC_Alpha);
-        if ESC_Alpha > 20 then ESC_Alpha:=20;
+        ESC_Alpha := 20;
+        if (RandomRange(0,20) > 18) and (ESC_Alpha = 20) then
+          ESC_Alpha := 0
+        else
+          inc(ESC_Alpha);
+        if ESC_Alpha > 20 then
+          ESC_Alpha := 20;
         glColor4f(1, 1, 1, ESC_Alpha/20);
         glBindTexture(GL_TEXTURE_2D, outro_exd.TexNum);
         glbegin(gl_quads);
@@ -1311,12 +1445,12 @@ begin
    {
    // draw credits runtime counter
    SetFontStyle (2);
-    SetFontItalic(False);
+    SetFontItalic(false);
     SetFontSize(27);
     SetFontPos (5, 5);
     glColor4f(1, 1, 1, 1);
-    //RuntimeStr:='CTime: '+inttostr(floor(CTime/30.320663991914489602156136106092))+'.'+inttostr(floor(CTime/3.0320663991914489602156136106092)-floor(CTime/30.320663991914489602156136106092)*10);
-    RuntimeStr:='CTime: '+inttostr(CTime);
+    //RuntimeStr := 'CTime: '+inttostr(floor(CTime/30.320663991914489602156136106092))+'.'+inttostr(floor(CTime/3.0320663991914489602156136106092)-floor(CTime/30.320663991914489602156136106092)*10);
+    RuntimeStr := 'CTime: ' + inttostr(CTime);
     glPrint (RuntimeStr[1]);
     }
 
diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index 89fd64c5..361a3be7 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -136,7 +136,7 @@ uses
 function TScreenEditConvert.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     // check normal keys
     case WideCharUpperCase(CharCode)[1] of
@@ -179,15 +179,15 @@ begin
           end;
 
           if Interaction = 2 then
-	  begin
+          begin
             Selected := true;
             {$IFDEF UseMIDIPort}
             MidiFile.OnMidiEvent := nil;
             {$ENDIF}
             {for T := 0 to High(ATrack) do
-	    begin
+            begin
               if ATrack[T].Hear then
-	      begin
+              begin
                 MidiTrack := MidiFile.GetTrack(T);
                 MidiTrack.OnMidiEvent := MidiFile1MidiEvent;
               end;
@@ -196,9 +196,9 @@ begin
           end;
 
           if Interaction = 3 then
-	  begin
+          begin
             if SelectedNumber > 0 then
-	    begin
+            begin
               Extract;
               SaveSong(Song, Lines, ChangeFileExt(ConversionFileName, '.txt'), false);
             end;
@@ -209,16 +209,16 @@ begin
       SDLK_SPACE:
         begin
 //          ATrack[Sel].Hear := not ATrack[Sel].Hear;
-	  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 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
@@ -244,13 +244,13 @@ begin
         begin
           Inc(Sel);
           if Sel > High(ATrack) then
-	    Sel := 0;
+            Sel := 0;
         end;
       SDLK_UP:
         begin
           Dec(Sel);
           if Sel < 0 then
-	    Sel := High(ATrack);
+            Sel := High(ATrack);
         end;
     end;
   end;
@@ -312,7 +312,7 @@ 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
+        begin
           Nu := Length(Note);
           SetLength(Note, Nu + 1);
           Note[Nu].Start := Round(ATrack[T].Note[N].Start / Ticks);
@@ -334,7 +334,7 @@ begin
       for N := 0 to High(ATrack[T].Note) do
       begin
         if (ATrack[T].Note[N].EventType = 15) then
-	begin
+        begin
 //          Log.LogStatus('<' + Track[T].Note[N].Str + '>', 'MIDI');
           AddLyric(Round(ATrack[T].Note[N].Start / Ticks), ATrack[T].Note[N].Str);
         end;
@@ -452,7 +452,6 @@ begin
   AddButton(500, 20, 100, 40, Skin.GetTextureFileName('ButtonF'));
   AddButtonText(20, 5, 0, 0, 0, 'Save');
 
-
 {  MidiOut := TMidiOutput.Create(nil);
 //  MidiOut.Close;
 //  MidiOut.DeviceID := 0;
@@ -492,13 +491,11 @@ begin
   Log.LogStatus(MidiOut.ProductName, 'MIDI');
   MidiOut.Open;
 
-
   if FileExists(ConversionFileName) then
   begin
     MidiFile.Filename := ConversionFileName;
     MidiFile.ReadFile;
 
-
     Len := 0;
     Sel := 0;
     BPM := MidiFile.Bpm;
diff --git a/src/screens/UScreenEditHeader.pas b/src/screens/UScreenEditHeader.pas
index fb0b2c85..ad0fc40a 100644
--- a/src/screens/UScreenEditHeader.pas
+++ b/src/screens/UScreenEditHeader.pas
@@ -115,7 +115,7 @@ begin
       SDLK_RETURN:
         begin
           if Interaction = 1 then
-	  begin
+          begin
 //            Save;
           end;
         end;
@@ -158,7 +158,7 @@ begin
         begin
           T := Interaction - 2 + TextTitle;
           if (Interaction >= 2) and (Interaction <= 13) and (Length(Text[T].Text) >= 1) then
-	  begin
+          begin
             Text[T].DeleteLastL;
             SetRoundButtons;            
           end;
@@ -169,7 +169,7 @@ begin
       #32..#255:
         begin
           if (Interaction >= 2) and (Interaction <= 13) then
-	  begin
+          begin
             Text[Interaction - 2 + TextTitle].Text :=
               Text[Interaction - 2 + TextTitle].Text + CharCode;
             SetRoundButtons;
diff --git a/src/screens/UScreenEditSub.pas b/src/screens/UScreenEditSub.pas
index 8d4d7f28..3e1f3c1c 100644
--- a/src/screens/UScreenEditSub.pas
+++ b/src/screens/UScreenEditSub.pas
@@ -132,11 +132,11 @@ uses
   USkins,
   ULanguage;
 
-// Method for input parsing. If False is returned, GetNextWindow
+// 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: WideChar; PressedDown: boolean): boolean;
 var
-  SDL_ModState:  Word;
+  SDL_ModState:  word;
   R:    real;
 begin
   Result := true;
@@ -205,7 +205,7 @@ begin
         begin
           // Paste text
           if SDL_ModState = KMOD_LCTRL then
-	  begin
+          begin
             if Lines[0].Line[Lines[0].Current].HighNote >= Lines[0].Line[CopySrc].HighNote then
               PasteText
             else
@@ -213,7 +213,7 @@ begin
           end;
 
           if SDL_ModState = KMOD_LCTRL + KMOD_LSHIFT then
-	  begin
+          begin
             CopySentence(CopySrc, Lines[0].Current);
           end;
         end;
@@ -333,7 +333,7 @@ begin
       SDLK_4:
         begin
           if SDL_ModState = KMOD_LCTRL + KMOD_LSHIFT then
-	  begin
+          begin
             CopySentence(CopySrc, Lines[0].Current);
             CopySentence(CopySrc+1, Lines[0].Current+1);
             CopySentence(CopySrc+2, Lines[0].Current+2);
@@ -341,14 +341,14 @@ begin
           end;
 
           if SDL_ModState = KMOD_LCTRL + KMOD_LSHIFT + KMOD_LALT then
-	  begin
+          begin
             CopySentences(CopySrc, Lines[0].Current, 4);
           end;
         end;
       SDLK_5:
         begin
           if SDL_ModState = KMOD_LCTRL + KMOD_LSHIFT then
-	  begin
+          begin
             CopySentence(CopySrc, Lines[0].Current);
             CopySentence(CopySrc+1, Lines[0].Current+1);
             CopySentence(CopySrc+2, Lines[0].Current+2);
@@ -357,7 +357,7 @@ begin
           end;
 
           if SDL_ModState = KMOD_LCTRL + KMOD_LSHIFT + KMOD_LALT then
-	  begin
+          begin
             CopySentences(CopySrc, Lines[0].Current, 5);
           end;
         end;
@@ -400,21 +400,21 @@ begin
       SDLK_SLASH:
         begin
           if SDL_ModState = 0 then
-	  begin
+          begin
             // Insert start of sentece
             if CurrentNote > 0 then
               DivideSentence;
           end;
 
           if SDL_ModState = KMOD_LSHIFT then
-	  begin
+          begin
             // Join next sentence with current
             if Lines[0].Current < Lines[0].High then
               JoinSentence;
           end;
 
           if SDL_ModState = KMOD_LCTRL then
-	  begin
+          begin
             // divide note
             DivideNote;
           end;
@@ -449,7 +449,7 @@ begin
       SDLK_DELETE:
         begin
           if SDL_ModState = KMOD_LCTRL then
-	  begin
+          begin
             // moves text to right in current sentence
             DeleteNote;
           end;
@@ -465,24 +465,24 @@ begin
         begin
           // right
           if SDL_ModState = 0 then
-	  begin
+          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;
+              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
+          begin
             if Lines[0].Line[Lines[0].Current].Note[CurrentNote].Length > 1 then
-	    begin
+            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
+              begin
                 Inc(Lines[0].Line[Lines[0].Current].Start);
               end;
             end;
@@ -490,10 +490,10 @@ begin
 
           // shift + right
           if SDL_ModState = KMOD_LSHIFT then
-	  begin
+          begin
             Inc(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Start);
             if CurrentNote = 0 then
-	    begin
+            begin
               Inc(Lines[0].Line[Lines[0].Current].Start);
             end;
             if CurrentNote = Lines[0].Line[Lines[0].Current].HighNote then
@@ -502,7 +502,7 @@ begin
 
           // alt + right
           if SDL_ModState = KMOD_LALT then
-	  begin
+          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_);
@@ -510,7 +510,7 @@ begin
 
           // alt + ctrl + shift + right = move all from cursor to right
           if SDL_ModState = KMOD_LALT + KMOD_LCTRL + KMOD_LSHIFT then
-	  begin
+          begin
             MoveAllToEnd(1);
           end;
 
@@ -520,34 +520,34 @@ begin
         begin
           // left
           if SDL_ModState = 0 then
-	  begin
+          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;
+              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
+          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
+            begin
               Dec(Lines[0].Line[Lines[0].Current].Start);
             end;
           end;
 
           // shift + left
           if SDL_ModState = KMOD_LSHIFT then
-	  begin
+          begin
             Dec(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Start);
 
             // resizing sentences
             if CurrentNote = 0 then
-	    begin
+            begin
               Dec(Lines[0].Line[Lines[0].Current].Start);
             end;
 
@@ -558,9 +558,9 @@ begin
 
           // alt + left
           if SDL_ModState = KMOD_LALT then
-	  begin
+          begin
             if Lines[0].Line[Lines[0].Current].Note[CurrentNote].Length > 1 then
-	    begin
+            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_);
@@ -569,7 +569,7 @@ begin
 
           // alt + ctrl + shift + right = move all from cursor to left
           if SDL_ModState = KMOD_LALT + KMOD_LCTRL + KMOD_LSHIFT then
-	  begin
+          begin
             MoveAllToEnd(-1);
           end;
 
@@ -580,7 +580,7 @@ begin
 
           // skip to next sentence
           if SDL_ModState = 0 then
-	  begin                       {$IFDEF UseMIDIPort}
+          begin                       {$IFDEF UseMIDIPort}
             MidiOut.PutShort($81, Lines[0].Line[Lines[0].Current].Note[MidiLastNote].Tone + 60, 127);
             PlaySentenceMidi := false;
             {$endif}
@@ -589,7 +589,7 @@ begin
             Inc(Lines[0].Current);
             CurrentNote := 0;
             if Lines[0].Current > Lines[0].High then
-	      Lines[0].Current := 0;
+              Lines[0].Current := 0;
             Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
 
             Lyric.AddLine(Lines[0].Current);
@@ -600,7 +600,7 @@ begin
 
           // decrease tone
           if SDL_ModState = KMOD_LCTRL then
-	  begin
+          begin
             TransposeNote(-1);
           end;
 
@@ -611,7 +611,7 @@ begin
 
           // skip to previous sentence
           if SDL_ModState = 0 then
-	  begin
+          begin
             {$IFDEF UseMIDIPort}
             MidiOut.PutShort($81, Lines[0].Line[Lines[0].Current].Note[MidiLastNote].Tone + 60, 127);
             PlaySentenceMidi := false;
@@ -621,7 +621,7 @@ begin
             Dec(Lines[0].Current);
             CurrentNote := 0;
             if Lines[0].Current = -1 then
-	      Lines[0].Current := Lines[0].High;
+              Lines[0].Current := Lines[0].High;
             Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
 
             Lyric.AddLine(Lines[0].Current);
@@ -632,7 +632,7 @@ begin
 
           // increase tone
           if SDL_ModState = KMOD_LCTRL then
-	  begin
+          begin
             TransposeNote(1);
           end;
         end;
@@ -644,7 +644,7 @@ end;
 
 function TScreenEditSub.ParseInputEditText(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 var
-  SDL_ModState:  Word;
+  SDL_ModState:  word;
 begin
   // used when in Text Edit Mode
   Result := true;
@@ -679,11 +679,11 @@ begin
         begin
           // right
           if SDL_ModState = 0 then
-	  begin
+          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;
+              CurrentNote := 0;
             Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
             Lyric.Selected := CurrentNote;
           end;
@@ -692,11 +692,11 @@ begin
         begin
           // left
           if SDL_ModState = 0 then
-	  begin
+          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;
+              CurrentNote := Lines[0].Line[Lines[0].Current].HighNote;
             Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
             Lyric.Selected := CurrentNote;
           end;
@@ -877,7 +877,7 @@ begin
   Lines[0].Line[CNew].Start := Lines[0].Line[CStart].Note[NStart].Start;
   Lines[0].Line[CNew].Lyric := '';
   Lines[0].Line[CNew].End_ := 0;
-  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].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);
 
@@ -907,9 +907,9 @@ begin
   //recalculate BaseNote of the divided Sentence
   with Lines[0].Line[CStart] do
   begin
-    BaseNote := High(Integer);
+    BaseNote := High(integer);
 
-    For N := 0 to HighNote do
+    for N := 0 to HighNote do
       if Note[N].Tone < BaseNote then
         BaseNote := Note[N].Tone;
   end;
@@ -991,7 +991,7 @@ begin
   C := Lines[0].Current;
 
   //Do Not delete Last Note
-  if (Lines[0].High > 0) OR (Lines[0].Line[C].HighNote > 0) then
+  if (Lines[0].High > 0) or (Lines[0].Line[C].HighNote > 0) then
   begin
 
     // we copy all notes from the next to the selected one
@@ -1181,7 +1181,6 @@ begin
     CopySentence(Src + C, Dst + C);
 end;
 
-
 constructor TScreenEditSub.Create;
 begin
   inherited Create;
@@ -1250,7 +1249,7 @@ begin
    else
      Error := not CurrentSong.LoadSong();
   except
-    Error := True;
+    Error := true;
   end;
 
   if Error then
@@ -1315,7 +1314,6 @@ begin
    {$IFDEF UseMIDIPort}
     MidiPos := USTime.GetTime - MidiTime + MidiStart;
 
-
     // stop the music
     if (MidiPos > MidiStop) then
     begin
@@ -1334,7 +1332,6 @@ begin
         if (Lines[0].Line[Lines[0].Current].Note[Pet].Start = AktBeat) then
         begin
 
-
           LastClick := AktBeat;
           {$IFDEF UseMIDIPort}
           if Pet > 0 then
@@ -1426,7 +1423,8 @@ begin
 end;
 
 function TScreenEditSub.GetNoteName(Note: integer): string;
-var N1, N2: integer;
+var
+  N1, N2: integer;
 begin
   if (Note > 0) then
   begin
diff --git a/src/screens/UScreenLevel.pas b/src/screens/UScreenLevel.pas
index a632cf78..b41a8535 100644
--- a/src/screens/UScreenLevel.pas
+++ b/src/screens/UScreenLevel.pas
@@ -34,29 +34,36 @@ interface
 {$I switches.inc}
 
 uses
-  UMenu, SDL, UDisplay, UMusic, UFiles, SysUtils, UThemes;
+  UMenu,
+  SDL,
+  UDisplay,
+  UMusic,
+  UFiles,
+  SysUtils,
+  UThemes;
 
 type
   TScreenLevel = class(TMenu)
     public
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       procedure onShow; override;
       procedure SetAnimationProgress(Progress: real); override;
   end;
 
 implementation
 
-uses UGraphic,
-     UMain,
-     UIni,
-     USong,
-     UTexture;
+uses
+  UGraphic,
+  UMain,
+  UIni,
+  USong,
+  UTexture;
 
-function TScreenLevel.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+function TScreenLevel.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     // check normal keys
     case WideCharUpperCase(CharCode)[1] of
diff --git a/src/screens/UScreenLoading.pas b/src/screens/UScreenLoading.pas
index f4a3508a..ea639ba3 100644
--- a/src/screens/UScreenLoading.pas
+++ b/src/screens/UScreenLoading.pas
@@ -46,15 +46,16 @@ type
       Fadeout:      boolean;
       constructor Create; override;
       procedure   onShow; override;
-      function    ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function    ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
   end;
 
 implementation
 
-uses UGraphic,
-     UTime;
+uses
+  UGraphic,
+  UTime;
 
-function TScreenLoading.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+function TScreenLoading.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
 end;
diff --git a/src/screens/UScreenMain.pas b/src/screens/UScreenMain.pas
index 4980021e..36cf84b0 100644
--- a/src/screens/UScreenMain.pas
+++ b/src/screens/UScreenMain.pas
@@ -79,7 +79,7 @@ function TScreenMain.ParseInput(PressedKey: cardinal; CharCode: widechar;
 var
   SDL_ModState: word;
 begin
-  Result := True;
+  Result := true;
 
   SDL_ModState := SDL_GetModState and (KMOD_LSHIFT + KMOD_RSHIFT +
     KMOD_LCTRL + KMOD_RCTRL + KMOD_LALT + KMOD_RALT);
@@ -90,7 +90,7 @@ begin
     case WideCharUpperCase(CharCode)[1] of
       'Q':
       begin
-        Result := False;
+        Result := false;
         Exit;
       end;
       'C':
@@ -128,7 +128,7 @@ begin
       SDLK_ESCAPE,
       SDLK_BACKSPACE:
       begin
-        Result := False;
+        Result := false;
       end;
 
       SDLK_RETURN:
@@ -143,7 +143,7 @@ begin
             if (Ini.Players = 4) then
               PlayersPlay := 6;
 
-            ScreenName.Goto_SingScreen := False;
+            ScreenName.Goto_SingScreen := false;
             FadeTo(@ScreenName, SoundLib.Start);
           end
           else //show error message
@@ -187,7 +187,7 @@ begin
         //Exit
         if Interaction = 5 then
         begin
-          Result := False;
+          Result := false;
         end;
       end;
       {**
diff --git a/src/screens/UScreenName.pas b/src/screens/UScreenName.pas
index 055f644e..d13db170 100644
--- a/src/screens/UScreenName.pas
+++ b/src/screens/UScreenName.pas
@@ -45,9 +45,9 @@ uses
 type
   TScreenName = class(TMenu)
     public
-      Goto_SingScreen: Boolean; //If True then next Screen in SingScreen
+      Goto_SingScreen: boolean; //If true then next Screen in SingScreen
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       procedure onShow; override;
       procedure SetAnimationProgress(Progress: real); override;
   end;
@@ -61,14 +61,13 @@ uses
   UNote,
   UTexture;
 
-
-function TScreenName.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+function TScreenName.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 var
-  I:    integer;
-SDL_ModState:  Word;
+  I: integer;
+  SDL_ModState: word;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
 
     SDL_ModState := SDL_GetModState and (KMOD_LSHIFT + KMOD_RSHIFT
@@ -194,7 +193,6 @@ begin
            Button[Interaction].Text[0].Text := Ini.NameTemplate[11];
          end;
 
-
       SDLK_BACKSPACE:
         begin
           Button[Interaction].Text[0].DeleteLastL;
@@ -222,7 +220,7 @@ begin
           else
             FadeTo(@ScreenLevel);
 
-          GoTo_SingScreen := False;
+          GoTo_SingScreen := false;
         end;
 
       // Up and Down could be done at the same time,
@@ -244,7 +242,6 @@ begin
 
   LoadFromTheme(Theme.Name);
 
-
   for I := 1 to 6 do
     AddButton(Theme.Name.ButtonPlayer[I]);
 
@@ -260,12 +257,14 @@ begin
   for I := 1 to 6 do
     Button[I-1].Text[0].Text := Ini.Name[I-1];
 
-  for I := 1 to PlayersPlay do begin
+  for I := 1 to PlayersPlay do
+  begin
     Button[I-1].Visible := true;
     Button[I-1].Selectable := true;
   end;
 
-  for I := PlayersPlay+1 to 6 do begin
+  for I := PlayersPlay+1 to 6 do
+  begin
     Button[I-1].Visible := false;
     Button[I-1].Selectable := false;
   end;
diff --git a/src/screens/UScreenOpen.pas b/src/screens/UScreenOpen.pas
index fe9f0664..a854e81b 100644
--- a/src/screens/UScreenOpen.pas
+++ b/src/screens/UScreenOpen.pas
@@ -88,7 +88,7 @@ begin
       '0'..'9', 'a'..'z', 'A'..'Z', ' ', '-', '.', ':', '\':
         begin
           if Interaction = 0 then
-	  begin
+          begin
             Text[TextN].Text := Text[TextN].Text + CharCode;
           end;
         end;
@@ -119,7 +119,7 @@ begin
       SDLK_RETURN:
         begin
           if (Interaction = 2) then
-	  begin
+          begin
             //Update Filename and go to last Screen
             ConversionFileName := Text[TextN].Text;
             AudioPlayback.PlaySound(SoundLib.Back);
@@ -203,7 +203,8 @@ begin
   Interaction := 0;
 end;
 
-(*function TScreenEditSub.Draw: boolean;
+(*
+function TScreenEditSub.Draw: boolean;
 var
   Min:     integer;
   Sec:     integer;
@@ -215,6 +216,7 @@ end;
 procedure TScreenEditSub.Finish;
 begin
 //
-end;*)
+end;
+*)
 
 end.
diff --git a/src/screens/UScreenOptions.pas b/src/screens/UScreenOptions.pas
index 10785b86..a6486075 100644
--- a/src/screens/UScreenOptions.pas
+++ b/src/screens/UScreenOptions.pas
@@ -34,14 +34,21 @@ interface
 {$I switches.inc}
 
 uses
-  UMenu, SDL, SysUtils, UDisplay, UMusic, UFiles, UIni, UThemes;
+  UMenu,
+  SDL,
+  SysUtils,
+  UDisplay,
+  UMusic,
+  UFiles,
+  UIni,
+  UThemes;
 
 type
   TScreenOptions = class(TMenu)
     public
       TextDescription:    integer;
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       procedure onShow; override;
       procedure InteractNext; override;
       procedure InteractPrev; override;
@@ -52,12 +59,13 @@ type
 
 implementation
 
-uses UGraphic;
+uses
+  UGraphic;
 
-function TScreenOptions.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+function TScreenOptions.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     // check normal keys
     case WideCharUpperCase(CharCode)[1] of
diff --git a/src/screens/UScreenOptionsAdvanced.pas b/src/screens/UScreenOptionsAdvanced.pas
index 8960640d..f57ee865 100644
--- a/src/screens/UScreenOptionsAdvanced.pas
+++ b/src/screens/UScreenOptionsAdvanced.pas
@@ -34,24 +34,32 @@ interface
 {$I switches.inc}
 
 uses
-  UMenu, SDL, UDisplay, UMusic, UFiles, UIni, UThemes;
+  UMenu,
+  SDL,
+  UDisplay,
+  UMusic,
+  UFiles,
+  UIni,
+  UThemes;
 
 type
   TScreenOptionsAdvanced = class(TMenu)
     public
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       procedure onShow; override;
   end;
 
 implementation
 
-uses UGraphic, SysUtils;
+uses
+  UGraphic,
+  SysUtils;
 
-function TScreenOptionsAdvanced.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+function TScreenOptionsAdvanced.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     // check normal keys
     case WideCharUpperCase(CharCode)[1] of
@@ -76,7 +84,8 @@ begin
         begin
           //SelectLoadAnimation Hidden because it is useless atm
           //if SelInteraction = 7 then begin
-          if SelInteraction = 6 then begin
+          if SelInteraction = 6 then
+          begin
             Ini.Save;
             AudioPlayback.PlaySound(SoundLib.Back);
             FadeTo(@ScreenOptions);
@@ -90,7 +99,8 @@ begin
         begin
           //SelectLoadAnimation Hidden because it is useless atm
           //if (SelInteraction >= 0) and (SelInteraction <= 6) then begin
-          if (SelInteraction >= 0) and (SelInteraction <= 5) then begin
+          if (SelInteraction >= 0) and (SelInteraction <= 5) then
+          begin
             AudioPlayback.PlaySound(SoundLib.Option);
             InteractInc;
           end;
@@ -99,7 +109,8 @@ begin
         begin
           //SelectLoadAnimation Hidden because it is useless atm
           //if (SelInteraction >= 0) and (SelInteraction <= 6) then begin
-          if (SelInteraction >= 0) and (SelInteraction <= 5) then begin
+          if (SelInteraction >= 0) and (SelInteraction <= 5) then
+          begin
             AudioPlayback.PlaySound(SoundLib.Option);
             InteractDec;
           end;
diff --git a/src/screens/UScreenOptionsGame.pas b/src/screens/UScreenOptionsGame.pas
index e634419b..3c78363f 100644
--- a/src/screens/UScreenOptionsGame.pas
+++ b/src/screens/UScreenOptionsGame.pas
@@ -34,26 +34,35 @@ interface
 {$I switches.inc}
 
 uses
-  UMenu, SDL, UDisplay, UMusic, UFiles, UIni, UThemes, USongs;
+  UMenu,
+  SDL,
+  UDisplay,
+  UMusic,
+  UFiles,
+  UIni,
+  UThemes,
+  USongs;
 
 type
   TScreenOptionsGame = class(TMenu)
     public
       old_Tabs, old_Sorting: integer;
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       procedure onShow; override;
       procedure RefreshSongs;
   end;
 
 implementation
 
-uses UGraphic, SysUtils;
+uses
+  UGraphic,
+  SysUtils;
 
-function TScreenOptionsGame.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+function TScreenOptionsGame.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     // check normal keys
     case WideCharUpperCase(CharCode)[1] of
@@ -76,7 +85,8 @@ begin
         end;
       SDLK_RETURN:
         begin
-          if SelInteraction = 6 then begin
+          if SelInteraction = 6 then
+          begin
             AudioPlayback.PlaySound(SoundLib.Back);
             RefreshSongs;
             FadeTo(@ScreenOptions);
diff --git a/src/screens/UScreenOptionsGraphics.pas b/src/screens/UScreenOptionsGraphics.pas
index 2e2b4f0e..896f3d99 100644
--- a/src/screens/UScreenOptionsGraphics.pas
+++ b/src/screens/UScreenOptionsGraphics.pas
@@ -46,18 +46,22 @@ type
   TScreenOptionsGraphics = class(TMenu)
     public
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       procedure onShow; override;
   end;
 
 implementation
 
-uses UGraphic, UMain, SysUtils, TypInfo;
+uses
+  UGraphic,
+  UMain,
+  SysUtils,
+  TypInfo;
 
-function TScreenOptionsGraphics.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+function TScreenOptionsGraphics.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     // check normal keys
     case WideCharUpperCase(CharCode)[1] of
@@ -80,10 +84,12 @@ begin
         end;
       SDLK_RETURN:
         begin
-{          if SelInteraction <= 1 then begin
+{          if SelInteraction <= 1 then
+          begin
             Restart := true;
           end;}
-          if SelInteraction = 6 then begin
+          if SelInteraction = 6 then
+          begin
             Ini.Save;
             AudioPlayback.PlaySound(SoundLib.Back);
             // FIXME: changing the video mode does not work this way in windows
@@ -101,14 +107,16 @@ begin
         InteractPrev;
       SDLK_RIGHT:
         begin
-          if (SelInteraction >= 0) and (SelInteraction < 6) then begin
+          if (SelInteraction >= 0) and (SelInteraction < 6) then
+          begin
             AudioPlayback.PlaySound(SoundLib.Option);
             InteractInc;
           end;
         end;
       SDLK_LEFT:
         begin
-          if (SelInteraction >= 0) and (SelInteraction < 6) then begin
+          if (SelInteraction >= 0) and (SelInteraction < 6) then
+          begin
             AudioPlayback.PlaySound(SoundLib.Option);
             InteractDec;
           end;
@@ -124,13 +132,12 @@ begin
   inherited Create;
   LoadFromTheme(Theme.OptionsGraphics);
 
-  AddSelectSlide(Theme.OptionsGraphics.SelectResolution, Ini.Resolution, IResolution);
-  AddSelectSlide(Theme.OptionsGraphics.SelectFullscreen, Ini.Fullscreen, IFullscreen);
-  AddSelectSlide(Theme.OptionsGraphics.SelectDepth,      Ini.Depth, IDepth);
-  AddSelectSlide(Theme.OptionsGraphics.SelectVisualizer, Ini.VisualizerOption, IVisualizer);
+  AddSelectSlide(Theme.OptionsGraphics.SelectResolution,   Ini.Resolution, IResolution);
+  AddSelectSlide(Theme.OptionsGraphics.SelectFullscreen,   Ini.Fullscreen, IFullscreen);
+  AddSelectSlide(Theme.OptionsGraphics.SelectDepth,        Ini.Depth, IDepth);
+  AddSelectSlide(Theme.OptionsGraphics.SelectVisualizer,   Ini.VisualizerOption, IVisualizer);
   AddSelectSlide(Theme.OptionsGraphics.SelectOscilloscope, Ini.Oscilloscope, IOscilloscope);
-  AddSelectSlide(Theme.OptionsGraphics.SelectMovieSize, Ini.MovieSize, IMovieSize);
-
+  AddSelectSlide(Theme.OptionsGraphics.SelectMovieSize,    Ini.MovieSize, IMovieSize);
 
   AddButton(Theme.OptionsGraphics.ButtonExit);
   if (Length(Button[0].Text)=0) then
diff --git a/src/screens/UScreenOptionsLyrics.pas b/src/screens/UScreenOptionsLyrics.pas
index b5228a52..7efe1cd2 100644
--- a/src/screens/UScreenOptionsLyrics.pas
+++ b/src/screens/UScreenOptionsLyrics.pas
@@ -46,18 +46,20 @@ type
   TScreenOptionsLyrics = class(TMenu)
     public
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       procedure onShow; override;
   end;
 
 implementation
 
-uses UGraphic, SysUtils;
+uses
+  UGraphic,
+  SysUtils;
 
-function TScreenOptionsLyrics.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+function TScreenOptionsLyrics.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     // check normal keys
     case WideCharUpperCase(CharCode)[1] of
@@ -80,7 +82,8 @@ begin
         end;
       SDLK_RETURN:
         begin
-          if SelInteraction = 3 then begin
+          if SelInteraction = 3 then
+          begin
             Ini.Save;
             AudioPlayback.PlaySound(SoundLib.Back);
             FadeTo(@ScreenOptions);
@@ -92,14 +95,16 @@ begin
         InteractPrev;
       SDLK_RIGHT:
         begin
-          if (SelInteraction >= 0) and (SelInteraction <= 3) then begin
+          if (SelInteraction >= 0) and (SelInteraction <= 3) then
+          begin
             AudioPlayback.PlaySound(SoundLib.Option);
             InteractInc;
           end;
         end;
       SDLK_LEFT:
         begin
-          if (SelInteraction >= 0) and (SelInteraction <= 3) then begin
+          if (SelInteraction >= 0) and (SelInteraction <= 3) then
+          begin
             AudioPlayback.PlaySound(SoundLib.Option);
             InteractDec;
           end;
@@ -119,7 +124,6 @@ begin
   //AddSelect(Theme.OptionsLyrics.SelectSolmization, Ini.Solmization, ISolmization); GAH!!!!11 DIE!!!
   AddSelectSlide(Theme.OptionsLyrics.SelectNoteLines, Ini.NoteLines, INoteLines);
 
-
   AddButton(Theme.OptionsLyrics.ButtonExit);
   if (Length(Button[0].Text)=0) then
     AddButtonText(14, 20, Theme.Options.Description[7]);
diff --git a/src/screens/UScreenOptionsRecord.pas b/src/screens/UScreenOptionsRecord.pas
index f6ff85c6..3737a134 100644
--- a/src/screens/UScreenOptionsRecord.pas
+++ b/src/screens/UScreenOptionsRecord.pas
@@ -95,7 +95,7 @@ type
     public
       constructor Create; override;
       function    Draw: boolean; override;
-      function    ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function    ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       procedure   onShow; override;
       procedure   onHide; override;
   end;
@@ -128,10 +128,10 @@ uses
   UIni,
   ULog;
 
-function TScreenOptionsRecord.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+function TScreenOptionsRecord.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     // check normal keys
     case WideCharUpperCase(CharCode)[1] of
@@ -484,7 +484,6 @@ begin
   PreviewDeviceIndex := -1;
 end;
 
-
 procedure TScreenOptionsRecord.DrawVolume(x, y, Width, Height: single);
 var
   x1, y1, x2, y2: single;
@@ -802,8 +801,7 @@ begin
     end;
   end;
 
-  Result := True;
+  Result := true;
 end;
 
-
 end.
diff --git a/src/screens/UScreenOptionsSound.pas b/src/screens/UScreenOptionsSound.pas
index 80210f63..99ecb599 100644
--- a/src/screens/UScreenOptionsSound.pas
+++ b/src/screens/UScreenOptionsSound.pas
@@ -34,7 +34,13 @@ interface
 {$I switches.inc}
 
 uses
-  UMenu, SDL, UDisplay, UMusic, UFiles, UIni, UThemes;
+  UMenu,
+  SDL,
+  UDisplay,
+  UMusic,
+  UFiles,
+  UIni,
+  UThemes;
 
 type
   TScreenOptionsSound = class(TMenu)
@@ -47,19 +53,21 @@ type
 
 implementation
 
-uses UGraphic, SysUtils;
+uses
+  UGraphic,
+  SysUtils;
 
 function TScreenOptionsSound.ParseInput(PressedKey: cardinal;
   CharCode: widechar; PressedDown: boolean): boolean;
 begin
-  Result := True;
+  Result := true;
   if (PressedDown) then
   begin // Key Down
         // check normal keys
     case WideCharUpperCase(CharCode)[1] of
       'Q':
       begin
-        Result := False;
+        Result := false;
         Exit;
       end;
     end;
diff --git a/src/screens/UScreenOptionsThemes.pas b/src/screens/UScreenOptionsThemes.pas
index 4970de21..e44bfca8 100644
--- a/src/screens/UScreenOptionsThemes.pas
+++ b/src/screens/UScreenOptionsThemes.pas
@@ -47,9 +47,9 @@ type
     private
       procedure ReloadTheme;
     public
-      SkinSelect: Integer;
+      SkinSelect: integer;
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       procedure onShow; override;
       procedure InteractInc; override;
       procedure InteractDec; override;
@@ -64,10 +64,10 @@ uses
   UPath,
   USkins;
 
-function TScreenOptionsThemes.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+function TScreenOptionsThemes.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     // check normal keys
     case WideCharUpperCase(CharCode)[1] of
@@ -190,7 +190,6 @@ begin
   ScreenOptionsThemes.Interaction    := self.Interaction;
   ScreenOptionsThemes.Draw;
 
-
   Display.Draw;
   SwapBuffers;
 
diff --git a/src/screens/UScreenPartyNewRound.pas b/src/screens/UScreenPartyNewRound.pas
index f95f2ff1..03a72fa9 100644
--- a/src/screens/UScreenPartyNewRound.pas
+++ b/src/screens/UScreenPartyNewRound.pas
@@ -34,87 +34,93 @@ interface
 {$I switches.inc}
 
 uses
-  UMenu, SDL, UDisplay, UMusic, UFiles, SysUtils, UThemes;
+  UMenu,
+  SDL,
+  UDisplay,
+  UMusic,
+  UFiles,
+  SysUtils,
+  UThemes;
 
 type
   TScreenPartyNewRound = class(TMenu)
     public
       //Texts:
-      TextRound1: Cardinal;
-      TextRound2: Cardinal;
-      TextRound3: Cardinal;
-      TextRound4: Cardinal;
-      TextRound5: Cardinal;
-      TextRound6: Cardinal;
-      TextRound7: Cardinal;
-
-      TextWinner1: Cardinal;
-      TextWinner2: Cardinal;
-      TextWinner3: Cardinal;
-      TextWinner4: Cardinal;
-      TextWinner5: Cardinal;
-      TextWinner6: Cardinal;
-      TextWinner7: Cardinal;
-
-      TextNextRound: Cardinal;
-      TextNextRoundNo: Cardinal;
-      TextNextPlayer1: Cardinal;
-      TextNextPlayer2: Cardinal;
-      TextNextPlayer3: Cardinal;
+      TextRound1: cardinal;
+      TextRound2: cardinal;
+      TextRound3: cardinal;
+      TextRound4: cardinal;
+      TextRound5: cardinal;
+      TextRound6: cardinal;
+      TextRound7: cardinal;
+
+      TextWinner1: cardinal;
+      TextWinner2: cardinal;
+      TextWinner3: cardinal;
+      TextWinner4: cardinal;
+      TextWinner5: cardinal;
+      TextWinner6: cardinal;
+      TextWinner7: cardinal;
+
+      TextNextRound: cardinal;
+      TextNextRoundNo: cardinal;
+      TextNextPlayer1: cardinal;
+      TextNextPlayer2: cardinal;
+      TextNextPlayer3: cardinal;
 
       //Statics
-      StaticRound1: Cardinal;
-      StaticRound2: Cardinal;
-      StaticRound3: Cardinal;
-      StaticRound4: Cardinal;
-      StaticRound5: Cardinal;
-      StaticRound6: Cardinal;
-      StaticRound7: Cardinal;
+      StaticRound1: cardinal;
+      StaticRound2: cardinal;
+      StaticRound3: cardinal;
+      StaticRound4: cardinal;
+      StaticRound5: cardinal;
+      StaticRound6: cardinal;
+      StaticRound7: cardinal;
 
       //Scores
-      TextScoreTeam1: Cardinal;
-      TextScoreTeam2: Cardinal;
-      TextScoreTeam3: Cardinal;
-      TextNameTeam1: Cardinal;
-      TextNameTeam2: Cardinal;
-      TextNameTeam3: Cardinal;
+      TextScoreTeam1: cardinal;
+      TextScoreTeam2: cardinal;
+      TextScoreTeam3: cardinal;
+      TextNameTeam1: cardinal;
+      TextNameTeam2: cardinal;
+      TextNameTeam3: cardinal;
 
-      TextTeam1Players: Cardinal;
-      TextTeam2Players: Cardinal;
-      TextTeam3Players: Cardinal;
-
-      StaticTeam1: Cardinal;
-      StaticTeam2: Cardinal;
-      StaticTeam3: Cardinal;
-      StaticNextPlayer1: Cardinal;
-      StaticNextPlayer2: Cardinal;
-      StaticNextPlayer3: Cardinal;
+      TextTeam1Players: cardinal;
+      TextTeam2Players: cardinal;
+      TextTeam3Players: cardinal;
 
+      StaticTeam1: cardinal;
+      StaticTeam2: cardinal;
+      StaticTeam3: cardinal;
+      StaticNextPlayer1: cardinal;
+      StaticNextPlayer2: cardinal;
+      StaticNextPlayer3: cardinal;
 
 
 
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       procedure onShow; override;
       procedure SetAnimationProgress(Progress: real); override;
   end;
 
 implementation
 
-uses UGraphic,
-     UMain,
-     UIni,
-     UTexture,
-     UParty,
-     UDLLManager,
-     ULanguage,
-     USong,
-     ULog;
-
-function TScreenPartyNewRound.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+uses
+  UGraphic,
+  UMain,
+  UIni,
+  UTexture,
+  UParty,
+  UDLLManager,
+  ULanguage,
+  USong,
+  ULog;
+
+function TScreenPartyNewRound.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     // check normal keys
     case WideCharUpperCase(CharCode)[1] of
@@ -211,19 +217,19 @@ end;
 
 procedure TScreenPartyNewRound.onShow;
 var
-  I: Integer;
-  function GetTeamPlayers(const Num: Byte): String;
+  I: integer;
+  function GetTeamPlayers(const Num: byte): string;
   var
-    Players: Array of String;
-    J: Byte;
+    Players: array of string;
+    J: byte;
   begin
     if (Num-1 >= PartySession.Teams.NumTeams) then
       exit;
 
-    //Create Players Array
+    //Create Players array
     SetLength(Players, PartySession.Teams.TeamInfo[Num-1].NumPlayers);
-    For J := 0 to PartySession.Teams.TeamInfo[Num-1].NumPlayers-1 do
-      Players[J] := String(PartySession.Teams.TeamInfo[Num-1].PlayerInfo[J].Name);
+    for J := 0 to PartySession.Teams.TeamInfo[Num-1].NumPlayers-1 do
+      Players[J] := string(PartySession.Teams.TeamInfo[Num-1].PlayerInfo[J].Name);
 
     //Implode and Return
     Result := Language.Implode(Players);
@@ -237,9 +243,9 @@ begin
   I := Length(PartySession.Rounds);
   if (I >= 1) then
   begin
-    Static[StaticRound1].Visible := True;
-    Text[TextRound1].Visible := True;
-    Text[TextWinner1].Visible := True;
+    Static[StaticRound1].Visible := true;
+    Text[TextRound1].Visible := true;
+    Text[TextWinner1].Visible := true;
 
     //Texts:
     Text[TextRound1].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[0].Plugin].Name);
@@ -247,16 +253,16 @@ begin
   end
   else
   begin
-    Static[StaticRound1].Visible := False;
-    Text[TextRound1].Visible := False;
-    Text[TextWinner1].Visible := False;
+    Static[StaticRound1].Visible := false;
+    Text[TextRound1].Visible := false;
+    Text[TextWinner1].Visible := false;
   end;
 
   if (I >= 2) then
   begin
-    Static[StaticRound2].Visible := True;
-    Text[TextRound2].Visible := True;
-    Text[TextWinner2].Visible := True;
+    Static[StaticRound2].Visible := true;
+    Text[TextRound2].Visible := true;
+    Text[TextWinner2].Visible := true;
 
     //Texts:
     Text[TextRound2].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[1].Plugin].Name);
@@ -264,16 +270,16 @@ begin
   end
   else
   begin
-    Static[StaticRound2].Visible := False;
-    Text[TextRound2].Visible := False;
-    Text[TextWinner2].Visible := False;
+    Static[StaticRound2].Visible := false;
+    Text[TextRound2].Visible := false;
+    Text[TextWinner2].Visible := false;
   end;
 
   if (I >= 3) then
   begin
-    Static[StaticRound3].Visible := True;
-    Text[TextRound3].Visible := True;
-    Text[TextWinner3].Visible := True;
+    Static[StaticRound3].Visible := true;
+    Text[TextRound3].Visible := true;
+    Text[TextWinner3].Visible := true;
 
     //Texts:
     Text[TextRound3].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[2].Plugin].Name);
@@ -281,16 +287,16 @@ begin
   end
   else
   begin
-    Static[StaticRound3].Visible := False;
-    Text[TextRound3].Visible := False;
-    Text[TextWinner3].Visible := False;
+    Static[StaticRound3].Visible := false;
+    Text[TextRound3].Visible := false;
+    Text[TextWinner3].Visible := false;
   end;
 
   if (I >= 4) then
   begin
-    Static[StaticRound4].Visible := True;
-    Text[TextRound4].Visible := True;
-    Text[TextWinner4].Visible := True;
+    Static[StaticRound4].Visible := true;
+    Text[TextRound4].Visible := true;
+    Text[TextWinner4].Visible := true;
 
     //Texts:
     Text[TextRound4].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[3].Plugin].Name);
@@ -298,16 +304,16 @@ begin
   end
   else
   begin
-    Static[StaticRound4].Visible := False;
-    Text[TextRound4].Visible := False;
-    Text[TextWinner4].Visible := False;
+    Static[StaticRound4].Visible := false;
+    Text[TextRound4].Visible := false;
+    Text[TextWinner4].Visible := false;
   end;
 
   if (I >= 5) then
   begin
-    Static[StaticRound5].Visible := True;
-    Text[TextRound5].Visible := True;
-    Text[TextWinner5].Visible := True;
+    Static[StaticRound5].Visible := true;
+    Text[TextRound5].Visible := true;
+    Text[TextWinner5].Visible := true;
 
     //Texts:
     Text[TextRound5].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[4].Plugin].Name);
@@ -315,16 +321,16 @@ begin
   end
   else
   begin
-    Static[StaticRound5].Visible := False;
-    Text[TextRound5].Visible := False;
-    Text[TextWinner5].Visible := False;
+    Static[StaticRound5].Visible := false;
+    Text[TextRound5].Visible := false;
+    Text[TextWinner5].Visible := false;
   end;
 
   if (I >= 6) then
   begin
-    Static[StaticRound6].Visible := True;
-    Text[TextRound6].Visible := True;
-    Text[TextWinner6].Visible := True;
+    Static[StaticRound6].Visible := true;
+    Text[TextRound6].Visible := true;
+    Text[TextWinner6].Visible := true;
 
     //Texts:
     Text[TextRound6].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[5].Plugin].Name);
@@ -332,16 +338,16 @@ begin
   end
   else
   begin
-    Static[StaticRound6].Visible := False;
-    Text[TextRound6].Visible := False;
-    Text[TextWinner6].Visible := False;
+    Static[StaticRound6].Visible := false;
+    Text[TextRound6].Visible := false;
+    Text[TextWinner6].Visible := false;
   end;
 
   if (I >= 7) then
   begin
-    Static[StaticRound7].Visible := True;
-    Text[TextRound7].Visible := True;
-    Text[TextWinner7].Visible := True;
+    Static[StaticRound7].Visible := true;
+    Text[TextRound7].Visible := true;
+    Text[TextWinner7].Visible := true;
 
     //Texts:
     Text[TextRound7].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[6].Plugin].Name);
@@ -349,73 +355,73 @@ begin
   end
   else
   begin
-    Static[StaticRound7].Visible := False;
-    Text[TextRound7].Visible := False;
-    Text[TextWinner7].Visible := False;
+    Static[StaticRound7].Visible := false;
+    Text[TextRound7].Visible := false;
+    Text[TextWinner7].Visible := false;
   end;
 
   //Display Scores
   if (PartySession.Teams.NumTeams >= 1) then
   begin
     Text[TextScoreTeam1].Text := InttoStr(PartySession.Teams.TeamInfo[0].Score);
-    Text[TextNameTeam1].Text := String(PartySession.Teams.TeamInfo[0].Name);
+    Text[TextNameTeam1].Text := string(PartySession.Teams.TeamInfo[0].Name);
     Text[TextTeam1Players].Text := GetTeamPlayers(1);
 
-    Text[TextScoreTeam1].Visible := True;
-    Text[TextNameTeam1].Visible := True;
-    Text[TextTeam1Players].Visible := True;
-    Static[StaticTeam1].Visible := True;
-    Static[StaticNextPlayer1].Visible := True;
+    Text[TextScoreTeam1].Visible := true;
+    Text[TextNameTeam1].Visible := true;
+    Text[TextTeam1Players].Visible := true;
+    Static[StaticTeam1].Visible := true;
+    Static[StaticNextPlayer1].Visible := true;
   end
   else
   begin
-    Text[TextScoreTeam1].Visible := False;
-    Text[TextNameTeam1].Visible := False;
-    Text[TextTeam1Players].Visible := False;
-    Static[StaticTeam1].Visible := False;
-    Static[StaticNextPlayer1].Visible := False;
+    Text[TextScoreTeam1].Visible := false;
+    Text[TextNameTeam1].Visible := false;
+    Text[TextTeam1Players].Visible := false;
+    Static[StaticTeam1].Visible := false;
+    Static[StaticNextPlayer1].Visible := false;
   end;
 
   if (PartySession.Teams.NumTeams >= 2) then
   begin
     Text[TextScoreTeam2].Text := InttoStr(PartySession.Teams.TeamInfo[1].Score);
-    Text[TextNameTeam2].Text := String(PartySession.Teams.TeamInfo[1].Name);
+    Text[TextNameTeam2].Text := string(PartySession.Teams.TeamInfo[1].Name);
     Text[TextTeam2Players].Text := GetTeamPlayers(2);
 
-    Text[TextScoreTeam2].Visible := True;
-    Text[TextNameTeam2].Visible := True;
-    Text[TextTeam2Players].Visible := True;
-    Static[StaticTeam2].Visible := True;
-    Static[StaticNextPlayer2].Visible := True;
+    Text[TextScoreTeam2].Visible := true;
+    Text[TextNameTeam2].Visible := true;
+    Text[TextTeam2Players].Visible := true;
+    Static[StaticTeam2].Visible := true;
+    Static[StaticNextPlayer2].Visible := true;
   end
   else
   begin
-    Text[TextScoreTeam2].Visible := False;
-    Text[TextNameTeam2].Visible := False;
-    Text[TextTeam2Players].Visible := False;
-    Static[StaticTeam2].Visible := False;
-    Static[StaticNextPlayer2].Visible := False;
+    Text[TextScoreTeam2].Visible := false;
+    Text[TextNameTeam2].Visible := false;
+    Text[TextTeam2Players].Visible := false;
+    Static[StaticTeam2].Visible := false;
+    Static[StaticNextPlayer2].Visible := false;
   end;
 
   if (PartySession.Teams.NumTeams >= 3) then
   begin
     Text[TextScoreTeam3].Text := InttoStr(PartySession.Teams.TeamInfo[2].Score);
-    Text[TextNameTeam3].Text := String(PartySession.Teams.TeamInfo[2].Name);
+    Text[TextNameTeam3].Text := string(PartySession.Teams.TeamInfo[2].Name);
     Text[TextTeam3Players].Text := GetTeamPlayers(3);
 
-    Text[TextScoreTeam3].Visible := True;
-    Text[TextNameTeam3].Visible := True;
-    Text[TextTeam3Players].Visible := True;
-    Static[StaticTeam3].Visible := True;
-    Static[StaticNextPlayer3].Visible := True;
+    Text[TextScoreTeam3].Visible := true;
+    Text[TextNameTeam3].Visible := true;
+    Text[TextTeam3Players].Visible := true;
+    Static[StaticTeam3].Visible := true;
+    Static[StaticNextPlayer3].Visible := true;
   end
   else
   begin
-    Text[TextScoreTeam3].Visible := False;
-    Text[TextNameTeam3].Visible := False;
-    Text[TextTeam3Players].Visible := False;
-    Static[StaticTeam3].Visible := False;
-    Static[StaticNextPlayer3].Visible := False;
+    Text[TextScoreTeam3].Visible := false;
+    Text[TextNameTeam3].Visible := false;
+    Text[TextTeam3Players].Visible := false;
+    Static[StaticTeam3].Visible := false;
+    Static[StaticNextPlayer3].Visible := false;
   end;
 
   //nextRound Texts
@@ -424,26 +430,26 @@ begin
   if (PartySession.Teams.NumTeams >= 1) then
   begin
     Text[TextNextPlayer1].Text := PartySession.Teams.Teaminfo[0].Playerinfo[PartySession.Teams.Teaminfo[0].CurPlayer].Name;
-    Text[TextNextPlayer1].Visible := True;
+    Text[TextNextPlayer1].Visible := true;
   end
   else
-    Text[TextNextPlayer1].Visible := False;
+    Text[TextNextPlayer1].Visible := false;
     
   if (PartySession.Teams.NumTeams >= 2) then
   begin
     Text[TextNextPlayer2].Text := PartySession.Teams.Teaminfo[1].Playerinfo[PartySession.Teams.Teaminfo[1].CurPlayer].Name;
-    Text[TextNextPlayer2].Visible := True;
+    Text[TextNextPlayer2].Visible := true;
   end
   else
-    Text[TextNextPlayer2].Visible := False;
+    Text[TextNextPlayer2].Visible := false;
 
   if (PartySession.Teams.NumTeams >= 3) then
   begin
     Text[TextNextPlayer3].Text := PartySession.Teams.Teaminfo[2].Playerinfo[PartySession.Teams.Teaminfo[2].CurPlayer].Name;
-    Text[TextNextPlayer3].Visible := True;
+    Text[TextNextPlayer3].Visible := true;
   end
   else
-    Text[TextNextPlayer3].Visible := False;
+    Text[TextNextPlayer3].Visible := false;
 end;
 
 procedure TScreenPartyNewRound.SetAnimationProgress(Progress: real);
diff --git a/src/screens/UScreenPartyOptions.pas b/src/screens/UScreenPartyOptions.pas
index 147cb80f..5f7f1d9e 100644
--- a/src/screens/UScreenPartyOptions.pas
+++ b/src/screens/UScreenPartyOptions.pas
@@ -124,11 +124,11 @@ begin
           // Don't start when SinglePlayer Teams but only Multiplayer Plugins available
           OnlyMultiPlayer := true;
           for I := 0 to High(DLLMan.Plugins) do
-	  begin
+          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
+          begin
             ScreenPopupError.ShowPopup(Language.Translate('ERROR_NO_PLUGINS'));
             Exit;
           end;
@@ -136,7 +136,6 @@ begin
           Ini.Difficulty := SelectsS[SelectLevel].SelectedOption;
           Ini.SaveLevel;
 
-
           //Save Num Teams:
           PartySession.Teams.NumTeams := NumTeams + 2;
           PartySession.Teams.Teaminfo[0].NumPlayers := NumPlayer1+1;
@@ -256,7 +255,8 @@ begin
 end;
 
 procedure TScreenPartyOptions.SetPlaylist2;
-var I: integer;
+var
+  I: integer;
 begin
   case Playlist of
     0:
diff --git a/src/screens/UScreenPartyPlayer.pas b/src/screens/UScreenPartyPlayer.pas
index ea8e8bc5..c2070fce 100644
--- a/src/screens/UScreenPartyPlayer.pas
+++ b/src/screens/UScreenPartyPlayer.pas
@@ -45,26 +45,26 @@ uses
 type
   TScreenPartyPlayer = class(TMenu)
     public
-      Team1Name: Cardinal;
-      Player1Name: Cardinal;
-      Player2Name: Cardinal;
-      Player3Name: Cardinal;
-      Player4Name: Cardinal;
-
-      Team2Name: Cardinal;
-      Player5Name: Cardinal;
-      Player6Name: Cardinal;
-      Player7Name: Cardinal;
-      Player8Name: Cardinal;
-
-      Team3Name: Cardinal;
-      Player9Name: Cardinal;
-      Player10Name: Cardinal;
-      Player11Name: Cardinal;
-      Player12Name: Cardinal;
+      Team1Name: cardinal;
+      Player1Name: cardinal;
+      Player2Name: cardinal;
+      Player3Name: cardinal;
+      Player4Name: cardinal;
+
+      Team2Name: cardinal;
+      Player5Name: cardinal;
+      Player6Name: cardinal;
+      Player7Name: cardinal;
+      Player8Name: cardinal;
+
+      Team3Name: cardinal;
+      Player9Name: cardinal;
+      Player10Name: cardinal;
+      Player11Name: cardinal;
+      Player12Name: cardinal;
 
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       procedure onShow; override;
       procedure SetAnimationProgress(Progress: real); override;
   end;
@@ -78,7 +78,7 @@ uses
   UTexture,
   UParty;
 
-function TScreenPartyPlayer.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+function TScreenPartyPlayer.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 var
   SDL_ModState:  word;
   I, J: integer;
@@ -315,9 +315,9 @@ begin
     Button[10].Text[0].Text := Ini.NameTeam[2];
     // Templates for Names Mod end
   
-  If (PartySession.Teams.NumTeams>=1) then
+  if (PartySession.Teams.NumTeams>=1) then
   begin
-    Button[0].Visible := True;
+    Button[0].Visible := true;
     Button[1].Visible := (PartySession.Teams.Teaminfo[0].NumPlayers >=1);
     Button[2].Visible := (PartySession.Teams.Teaminfo[0].NumPlayers >=2);
     Button[3].Visible := (PartySession.Teams.Teaminfo[0].NumPlayers >=3);
@@ -325,16 +325,16 @@ begin
   end
   else
   begin
-    Button[0].Visible := False;
-    Button[1].Visible := False;
-    Button[2].Visible := False;
-    Button[3].Visible := False;
-    Button[4].Visible := False;
+    Button[0].Visible := false;
+    Button[1].Visible := false;
+    Button[2].Visible := false;
+    Button[3].Visible := false;
+    Button[4].Visible := false;
   end;
 
-  If (PartySession.Teams.NumTeams>=2) then
+  if (PartySession.Teams.NumTeams>=2) then
   begin
-    Button[5].Visible := True;
+    Button[5].Visible := true;
     Button[6].Visible := (PartySession.Teams.Teaminfo[1].NumPlayers >=1);
     Button[7].Visible := (PartySession.Teams.Teaminfo[1].NumPlayers >=2);
     Button[8].Visible := (PartySession.Teams.Teaminfo[1].NumPlayers >=3);
@@ -342,16 +342,16 @@ begin
   end
   else
   begin
-    Button[5].Visible := False;
-    Button[6].Visible := False;
-    Button[7].Visible := False;
-    Button[8].Visible := False;
-    Button[9].Visible := False;
+    Button[5].Visible := false;
+    Button[6].Visible := false;
+    Button[7].Visible := false;
+    Button[8].Visible := false;
+    Button[9].Visible := false;
   end;
 
-  If (PartySession.Teams.NumTeams>=3) then
+  if (PartySession.Teams.NumTeams>=3) then
   begin
-    Button[10].Visible := True;
+    Button[10].Visible := true;
     Button[11].Visible := (PartySession.Teams.Teaminfo[2].NumPlayers >=1);
     Button[12].Visible := (PartySession.Teams.Teaminfo[2].NumPlayers >=2);
     Button[13].Visible := (PartySession.Teams.Teaminfo[2].NumPlayers >=3);
@@ -359,11 +359,11 @@ begin
   end
   else
   begin
-    Button[10].Visible := False;
-    Button[11].Visible := False;
-    Button[12].Visible := False;
-    Button[13].Visible := False;
-    Button[14].Visible := False;
+    Button[10].Visible := false;
+    Button[11].Visible := false;
+    Button[12].Visible := false;
+    Button[13].Visible := false;
+    Button[14].Visible := false;
   end;
 
 end;
diff --git a/src/screens/UScreenPartyScore.pas b/src/screens/UScreenPartyScore.pas
index 87b4a886..23cf666d 100644
--- a/src/screens/UScreenPartyScore.pas
+++ b/src/screens/UScreenPartyScore.pas
@@ -34,49 +34,61 @@ interface
 {$I switches.inc}
 
 uses
-  UMenu, SDL, UDisplay, UMusic, SysUtils, UThemes;
+  UMenu,
+  SDL,
+  UDisplay,
+  UMusic,
+  SysUtils,
+  UThemes;
 
 type
   TScreenPartyScore = class(TMenu)
     public
-      TextScoreTeam1:    Cardinal;
-      TextScoreTeam2:    Cardinal;
-      TextScoreTeam3:    Cardinal;
-      TextNameTeam1:     Cardinal;
-      TextNameTeam2:     Cardinal;
-      TextNameTeam3:     Cardinal;
-      StaticTeam1:       Cardinal;
-      StaticTeam1BG:     Cardinal;
-      StaticTeam1Deco:   Cardinal;
-      StaticTeam2:       Cardinal;
-      StaticTeam2BG:     Cardinal;
-      StaticTeam2Deco:   Cardinal;
-      StaticTeam3:       Cardinal;
-      StaticTeam3BG:     Cardinal;
-      StaticTeam3Deco:   Cardinal;
-      TextWinner:        Cardinal;
-
-      DecoTex:          Array[0..5] of Integer;
-      DecoColor:        Array[0..5] of Record
-                                        R, G, B: Real;
+      TextScoreTeam1:    cardinal;
+      TextScoreTeam2:    cardinal;
+      TextScoreTeam3:    cardinal;
+      TextNameTeam1:     cardinal;
+      TextNameTeam2:     cardinal;
+      TextNameTeam3:     cardinal;
+      StaticTeam1:       cardinal;
+      StaticTeam1BG:     cardinal;
+      StaticTeam1Deco:   cardinal;
+      StaticTeam2:       cardinal;
+      StaticTeam2BG:     cardinal;
+      StaticTeam2Deco:   cardinal;
+      StaticTeam3:       cardinal;
+      StaticTeam3BG:     cardinal;
+      StaticTeam3Deco:   cardinal;
+      TextWinner:        cardinal;
+
+      DecoTex:          array[0..5] of integer;
+      DecoColor:        array[0..5] of Record
+                                        R, G, B: real;
                         end;
 
-      MaxScore:          Word;
+      MaxScore:          word;
       
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       procedure onShow; override;
       procedure SetAnimationProgress(Progress: real); override;
   end;
 
 implementation
 
-uses UGraphic, UMain, UParty, UScreenSingModi, ULanguage, UTexture, USkins;
-
-function TScreenPartyScore.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+uses
+  UGraphic,
+  UMain,
+  UParty,
+  UScreenSingModi,
+  ULanguage,
+  UTexture,
+  USkins;
+
+function TScreenPartyScore.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     // check normal keys
     case WideCharUpperCase(CharCode)[1] of
@@ -118,8 +130,8 @@ constructor TScreenPartyScore.Create;
 var
 // I:    integer; // Auto Removed, Unused Variable
   Tex:  TTexture;
-  R, G, B: Real;
-  Color: Integer;
+  R, G, B: real;
+  Color: integer;
 begin
   inherited Create;
 
@@ -184,12 +196,11 @@ end;
 
 procedure TScreenPartyScore.onShow;
 var
-  I, J: Integer;
-  Placings: Array [0..5] of Byte;
+  I, J: integer;
+  Placings: array [0..5] of byte;
 begin
   inherited;
 
-
   //Get Maxscore
 
   MaxScore := 0;
@@ -204,11 +215,10 @@ begin
   begin
     Placings[I] := 0;
     for J := 0 to ScreenSingModi.PlayerInfo.NumPlayers - 1 do
-      If (ScreenSingModi.PlayerInfo.Playerinfo[J].Score > ScreenSingModi.PlayerInfo.Playerinfo[I].Score) then
+      if (ScreenSingModi.PlayerInfo.Playerinfo[J].Score > ScreenSingModi.PlayerInfo.Playerinfo[I].Score) then
         Inc(Placings[I]);
   end;
 
-
   //Set Static Length
   Static[StaticTeam1].Texture.ScaleW := ScreenSingModi.PlayerInfo.Playerinfo[0].Percentage / 100;
   Static[StaticTeam2].Texture.ScaleW := ScreenSingModi.PlayerInfo.Playerinfo[1].Percentage / 100;
@@ -228,7 +238,7 @@ begin
   if (ScreenSingModi.PlayerInfo.NumPlayers >= 1) then
   begin
     Text[TextScoreTeam1].Text := InttoStr(ScreenSingModi.PlayerInfo.Playerinfo[0].Score);
-    Text[TextNameTeam1].Text := String(ScreenSingModi.TeamInfo.Teaminfo[0].Name);
+    Text[TextNameTeam1].Text := string(ScreenSingModi.TeamInfo.Teaminfo[0].Name);
 
     //Set Deco Texture
     if Theme.PartyScore.DecoTextures.ChangeTextures then
@@ -239,25 +249,25 @@ begin
       Static[StaticTeam1Deco].Texture.ColB := DecoColor[Placings[0]].B;
     end;
 
-    Text[TextScoreTeam1].Visible := True;
-    Text[TextNameTeam1].Visible := True;
-    Static[StaticTeam1].Visible := True;
-    Static[StaticTeam1BG].Visible := True;
-    Static[StaticTeam1Deco].Visible := True;
+    Text[TextScoreTeam1].Visible := true;
+    Text[TextNameTeam1].Visible := true;
+    Static[StaticTeam1].Visible := true;
+    Static[StaticTeam1BG].Visible := true;
+    Static[StaticTeam1Deco].Visible := true;
   end
   else
   begin
-    Text[TextScoreTeam1].Visible := False;
-    Text[TextNameTeam1].Visible := False;
-    Static[StaticTeam1].Visible := False;
-    Static[StaticTeam1BG].Visible := False;
-    Static[StaticTeam1Deco].Visible := False;
+    Text[TextScoreTeam1].Visible := false;
+    Text[TextNameTeam1].Visible := false;
+    Static[StaticTeam1].Visible := false;
+    Static[StaticTeam1BG].Visible := false;
+    Static[StaticTeam1Deco].Visible := false;
   end;
 
   if (ScreenSingModi.PlayerInfo.NumPlayers >= 2) then
   begin
     Text[TextScoreTeam2].Text := InttoStr(ScreenSingModi.PlayerInfo.Playerinfo[1].Score);
-    Text[TextNameTeam2].Text := String(ScreenSingModi.TeamInfo.Teaminfo[1].Name);
+    Text[TextNameTeam2].Text := string(ScreenSingModi.TeamInfo.Teaminfo[1].Name);
 
     //Set Deco Texture
     if Theme.PartyScore.DecoTextures.ChangeTextures then
@@ -268,25 +278,25 @@ begin
       Static[StaticTeam2Deco].Texture.ColB := DecoColor[Placings[1]].B;
     end;
 
-    Text[TextScoreTeam2].Visible := True;
-    Text[TextNameTeam2].Visible := True;
-    Static[StaticTeam2].Visible := True;
-    Static[StaticTeam2BG].Visible := True;
-    Static[StaticTeam2Deco].Visible := True;
+    Text[TextScoreTeam2].Visible := true;
+    Text[TextNameTeam2].Visible := true;
+    Static[StaticTeam2].Visible := true;
+    Static[StaticTeam2BG].Visible := true;
+    Static[StaticTeam2Deco].Visible := true;
   end
   else
   begin
-    Text[TextScoreTeam2].Visible := False;
-    Text[TextNameTeam2].Visible := False;
-    Static[StaticTeam2].Visible := False;
-    Static[StaticTeam2BG].Visible := False;
-    Static[StaticTeam2Deco].Visible := False;
+    Text[TextScoreTeam2].Visible := false;
+    Text[TextNameTeam2].Visible := false;
+    Static[StaticTeam2].Visible := false;
+    Static[StaticTeam2BG].Visible := false;
+    Static[StaticTeam2Deco].Visible := false;
   end;
 
   if (ScreenSingModi.PlayerInfo.NumPlayers >= 3) then
   begin
     Text[TextScoreTeam3].Text := InttoStr(ScreenSingModi.PlayerInfo.Playerinfo[2].Score);
-    Text[TextNameTeam3].Text := String(ScreenSingModi.TeamInfo.Teaminfo[2].Name);
+    Text[TextNameTeam3].Text := string(ScreenSingModi.TeamInfo.Teaminfo[2].Name);
 
     //Set Deco Texture
     if Theme.PartyScore.DecoTextures.ChangeTextures then
@@ -297,19 +307,19 @@ begin
       Static[StaticTeam3Deco].Texture.ColB := DecoColor[Placings[2]].B;
     end;
 
-    Text[TextScoreTeam3].Visible := True;
-    Text[TextNameTeam3].Visible := True;
-    Static[StaticTeam3].Visible := True;
-    Static[StaticTeam3BG].Visible := True;
-    Static[StaticTeam3Deco].Visible := True;
+    Text[TextScoreTeam3].Visible := true;
+    Text[TextNameTeam3].Visible := true;
+    Static[StaticTeam3].Visible := true;
+    Static[StaticTeam3BG].Visible := true;
+    Static[StaticTeam3Deco].Visible := true;
   end
   else
   begin
-    Text[TextScoreTeam3].Visible := False;
-    Text[TextNameTeam3].Visible := False;
-    Static[StaticTeam3].Visible := False;
-    Static[StaticTeam3BG].Visible := False;
-    Static[StaticTeam3Deco].Visible := False;
+    Text[TextScoreTeam3].Visible := false;
+    Text[TextNameTeam3].Visible := false;
+    Static[StaticTeam3].Visible := false;
+    Static[StaticTeam3BG].Visible := false;
+    Static[StaticTeam3Deco].Visible := false;
   end;
 end;
 
diff --git a/src/screens/UScreenPartyWin.pas b/src/screens/UScreenPartyWin.pas
index 64a50737..3c105c7d 100644
--- a/src/screens/UScreenPartyWin.pas
+++ b/src/screens/UScreenPartyWin.pas
@@ -34,42 +34,51 @@ interface
 {$I switches.inc}
 
 uses
-  UMenu, SDL, UDisplay, UMusic, SysUtils, UThemes;
+  UMenu,
+  SDL, UDisplay,
+  UMusic,
+  SysUtils,
+  UThemes;
 
 type
   TScreenPartyWin = class(TMenu)
     public
-      TextScoreTeam1:    Cardinal;
-      TextScoreTeam2:    Cardinal;
-      TextScoreTeam3:    Cardinal;
-      TextNameTeam1:     Cardinal;
-      TextNameTeam2:     Cardinal;
-      TextNameTeam3:     Cardinal;
-      StaticTeam1:       Cardinal;
-      StaticTeam1BG:     Cardinal;
-      StaticTeam1Deco:   Cardinal;
-      StaticTeam2:       Cardinal;
-      StaticTeam2BG:     Cardinal;
-      StaticTeam2Deco:   Cardinal;
-      StaticTeam3:       Cardinal;
-      StaticTeam3BG:     Cardinal;
-      StaticTeam3Deco:   Cardinal;
-      TextWinner:        Cardinal;
+      TextScoreTeam1:    cardinal;
+      TextScoreTeam2:    cardinal;
+      TextScoreTeam3:    cardinal;
+      TextNameTeam1:     cardinal;
+      TextNameTeam2:     cardinal;
+      TextNameTeam3:     cardinal;
+      StaticTeam1:       cardinal;
+      StaticTeam1BG:     cardinal;
+      StaticTeam1Deco:   cardinal;
+      StaticTeam2:       cardinal;
+      StaticTeam2BG:     cardinal;
+      StaticTeam2Deco:   cardinal;
+      StaticTeam3:       cardinal;
+      StaticTeam3BG:     cardinal;
+      StaticTeam3Deco:   cardinal;
+      TextWinner:        cardinal;
 
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       procedure onShow; override;
       procedure SetAnimationProgress(Progress: real); override;
   end;
 
 implementation
 
-uses UGraphic, UMain, UParty, UScreenSingModi, ULanguage;
+uses 
+  UGraphic,
+  UMain,
+  UParty,
+  UScreenSingModi,
+  ULanguage;
 
-function TScreenPartyWin.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+function TScreenPartyWin.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     // check normal keys
     case WideCharUpperCase(CharCode)[1] of
@@ -128,12 +137,12 @@ end;
 
 procedure TScreenPartyWin.onShow;
 var
-  I: Integer;
+  I: integer;
   Placing: TeamOrderArray;
 
-  Function GetTeamColor(Team: Byte): Cardinal;
+  Function GetTeamColor(Team: byte): cardinal;
   var
-    NameString: String;
+    NameString: string;
   begin
     NameString := 'P' + InttoStr(Team+1) + 'Dark';
 
@@ -151,16 +160,16 @@ begin
   if (PartySession.Teams.NumTeams >= 1) then
   begin
     Text[TextScoreTeam1].Text := InttoStr(PartySession.Teams.TeamInfo[Placing[0]].Score);
-    Text[TextNameTeam1].Text := String(PartySession.Teams.TeamInfo[Placing[0]].Name);
+    Text[TextNameTeam1].Text := string(PartySession.Teams.TeamInfo[Placing[0]].Name);
 
-    Text[TextScoreTeam1].Visible := True;
-    Text[TextNameTeam1].Visible := True;
-    Static[StaticTeam1].Visible := True;
-    Static[StaticTeam1BG].Visible := True;
-    Static[StaticTeam1Deco].Visible := True;
+    Text[TextScoreTeam1].Visible := true;
+    Text[TextNameTeam1].Visible := true;
+    Static[StaticTeam1].Visible := true;
+    Static[StaticTeam1BG].Visible := true;
+    Static[StaticTeam1Deco].Visible := true;
 
     //Set Static Color to Team Color
-    If (Theme.PartyWin.StaticTeam1BG.Color = 'TeamColor') then
+    if (Theme.PartyWin.StaticTeam1BG.Color = 'TeamColor') then
     begin
       I := GetTeamColor(Placing[0]);
       if (I <> -1) then
@@ -171,7 +180,7 @@ begin
       end;
     end;
 
-    If (Theme.PartyWin.StaticTeam1.Color = 'TeamColor') then
+    if (Theme.PartyWin.StaticTeam1.Color = 'TeamColor') then
     begin
       I := GetTeamColor(Placing[0]);
       if (I <> -1) then
@@ -184,26 +193,26 @@ begin
   end
   else
   begin
-    Text[TextScoreTeam1].Visible := False;
-    Text[TextNameTeam1].Visible := False;
-    Static[StaticTeam1].Visible := False;
-    Static[StaticTeam1BG].Visible := False;
-    Static[StaticTeam1Deco].Visible := False;
+    Text[TextScoreTeam1].Visible := false;
+    Text[TextNameTeam1].Visible := false;
+    Static[StaticTeam1].Visible := false;
+    Static[StaticTeam1BG].Visible := false;
+    Static[StaticTeam1Deco].Visible := false;
   end;
 
   if (PartySession.Teams.NumTeams >= 2) then
   begin
     Text[TextScoreTeam2].Text := InttoStr(PartySession.Teams.TeamInfo[Placing[1]].Score);
-    Text[TextNameTeam2].Text := String(PartySession.Teams.TeamInfo[Placing[1]].Name);
+    Text[TextNameTeam2].Text := string(PartySession.Teams.TeamInfo[Placing[1]].Name);
 
-    Text[TextScoreTeam2].Visible := True;
-    Text[TextNameTeam2].Visible := True;
-    Static[StaticTeam2].Visible := True;
-    Static[StaticTeam2BG].Visible := True;
-    Static[StaticTeam2Deco].Visible := True;
+    Text[TextScoreTeam2].Visible := true;
+    Text[TextNameTeam2].Visible := true;
+    Static[StaticTeam2].Visible := true;
+    Static[StaticTeam2BG].Visible := true;
+    Static[StaticTeam2Deco].Visible := true;
 
     //Set Static Color to Team Color
-    If (Theme.PartyWin.StaticTeam2BG.Color = 'TeamColor') then
+    if (Theme.PartyWin.StaticTeam2BG.Color = 'TeamColor') then
     begin
       I := GetTeamColor(Placing[1]);
       if (I <> -1) then
@@ -214,7 +223,7 @@ begin
       end;
     end;
 
-    If (Theme.PartyWin.StaticTeam2.Color = 'TeamColor') then
+    if (Theme.PartyWin.StaticTeam2.Color = 'TeamColor') then
     begin
       I := GetTeamColor(Placing[1]);
       if (I <> -1) then
@@ -227,26 +236,26 @@ begin
   end
   else
   begin
-    Text[TextScoreTeam2].Visible := False;
-    Text[TextNameTeam2].Visible := False;
-    Static[StaticTeam2].Visible := False;
-    Static[StaticTeam2BG].Visible := False;
-    Static[StaticTeam2Deco].Visible := False;
+    Text[TextScoreTeam2].Visible := false;
+    Text[TextNameTeam2].Visible := false;
+    Static[StaticTeam2].Visible := false;
+    Static[StaticTeam2BG].Visible := false;
+    Static[StaticTeam2Deco].Visible := false;
   end;
 
   if (PartySession.Teams.NumTeams >= 3) then
   begin
     Text[TextScoreTeam3].Text := InttoStr(PartySession.Teams.TeamInfo[Placing[2]].Score);
-    Text[TextNameTeam3].Text := String(PartySession.Teams.TeamInfo[Placing[2]].Name);
+    Text[TextNameTeam3].Text := string(PartySession.Teams.TeamInfo[Placing[2]].Name);
 
-    Text[TextScoreTeam3].Visible := True;
-    Text[TextNameTeam3].Visible := True;
-    Static[StaticTeam3].Visible := True;
-    Static[StaticTeam3BG].Visible := True;
-    Static[StaticTeam3Deco].Visible := True;
+    Text[TextScoreTeam3].Visible := true;
+    Text[TextNameTeam3].Visible := true;
+    Static[StaticTeam3].Visible := true;
+    Static[StaticTeam3BG].Visible := true;
+    Static[StaticTeam3Deco].Visible := true;
 
     //Set Static Color to Team Color
-    If (Theme.PartyWin.StaticTeam3BG.Color = 'TeamColor') then
+    if (Theme.PartyWin.StaticTeam3BG.Color = 'TeamColor') then
     begin
       I := GetTeamColor(Placing[2]);
       if (I <> -1) then
@@ -257,7 +266,7 @@ begin
       end;
     end;
 
-    If (Theme.PartyWin.StaticTeam3.Color = 'TeamColor') then
+    if (Theme.PartyWin.StaticTeam3.Color = 'TeamColor') then
     begin
       I := GetTeamColor(Placing[2]);
       if (I <> -1) then
@@ -270,11 +279,11 @@ begin
   end
   else
   begin
-    Text[TextScoreTeam3].Visible := False;
-    Text[TextNameTeam3].Visible := False;
-    Static[StaticTeam3].Visible := False;
-    Static[StaticTeam3BG].Visible := False;
-    Static[StaticTeam3Deco].Visible := False;
+    Text[TextScoreTeam3].Visible := false;
+    Text[TextNameTeam3].Visible := false;
+    Static[StaticTeam3].Visible := false;
+    Static[StaticTeam3BG].Visible := false;
+    Static[StaticTeam3Deco].Visible := false;
   end;
 end;
 
diff --git a/src/screens/UScreenPopup.pas b/src/screens/UScreenPopup.pas
index bf4752b9..7e4671d6 100644
--- a/src/screens/UScreenPopup.pas
+++ b/src/screens/UScreenPopup.pas
@@ -34,48 +34,60 @@ interface
 {$I switches.inc}
 
 uses
-  UMenu, SDL, UMusic, UFiles, SysUtils, UThemes;
+  UMenu,
+  SDL,
+  UMusic,
+  UFiles,
+  SysUtils,
+  UThemes;
 
 type
   TScreenPopupCheck = class(TMenu)
     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: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       procedure onShow; override;
-      procedure ShowPopup(msg: String);
+      procedure ShowPopup(msg: string);
       function Draw: boolean; override;
   end;
 
 type
   TScreenPopupError = 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: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       procedure onShow; override;
       procedure onHide; override;
-      procedure ShowPopup(msg: String);
+      procedure ShowPopup(msg: string);
       function Draw: boolean; override;
   end;
 
 var
-//  ISelections: Array of String;
-  SelectValue: Integer;
-
+//  ISelections: array of string;
+  SelectValue: integer;
 
 implementation
 
-uses UGraphic, UMain, UIni, UTexture, ULanguage, UParty, UPlaylist, UDisplay;
-
-function TScreenPopupCheck.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+uses
+  UGraphic,
+  UMain,
+  UIni,
+  UTexture,
+  ULanguage,
+  UParty,
+  UPlaylist,
+  UDisplay;
+
+function TScreenPopupCheck.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     // check normal keys
     case WideCharUpperCase(CharCode)[1] of
@@ -91,9 +103,9 @@ begin
       SDLK_ESCAPE,
       SDLK_BACKSPACE :
         begin
-          Display.CheckOK:=False;
-          Display.NextScreenWithCheck:=NIL;
-          Visible:=False;
+          Display.CheckOK := false;
+          Display.NextScreenWithCheck := NIL;
+          Visible := false;
           Result := false;
         end;
 
@@ -110,14 +122,14 @@ begin
                    ScreenSingModi.Finish;
                end;
 
-               Display.CheckOK:=True;
+               Display.CheckOK := true;
              end;
           1: begin
-               Display.CheckOK:=False;
-               Display.NextScreenWithCheck:=NIL;
+               Display.CheckOK := false;
+               Display.NextScreenWithCheck := NIL;
              end;
           end;
-          Visible:=False;
+          Visible := false;
           Result := false;
         end;
 
@@ -159,15 +171,15 @@ begin
   inherited;
 end;
 
-procedure TScreenPopupCheck.ShowPopup(msg: String);
+procedure TScreenPopupCheck.ShowPopup(msg: string);
 begin
   Interaction := 0; //Reset Interaction
-  Visible := True;  //Set Visible
+  Visible := true;  //Set Visible
 
   Text[0].Text := Language.Translate(msg);
 
-  Button[0].Visible := True;
-  Button[1].Visible := True;
+  Button[0].Visible := true;
+  Button[1].Visible := true;
 
   Button[0].Text[0].Text := Language.Translate('SONG_MENU_YES');
   Button[1].Text[0].Text := Language.Translate('SONG_MENU_NO');
@@ -177,10 +189,10 @@ end;
 
 // error popup
 
-function TScreenPopupError.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+function TScreenPopupError.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
 
     case PressedKey of
@@ -192,13 +204,13 @@ begin
       SDLK_ESCAPE,
       SDLK_BACKSPACE :
         begin
-          Visible:=False;
+          Visible := false;
           Result := false;
         end;
 
       SDLK_RETURN:
         begin
-          Visible:=False;
+          Visible := false;
           Result := false;
         end;
 
@@ -228,7 +240,7 @@ end;
 
 function TScreenPopupError.Draw: boolean;
 begin
-  Draw:=inherited Draw;
+  Draw := inherited Draw;
 end;
 
 procedure TScreenPopupError.onShow;
@@ -241,26 +253,26 @@ procedure TScreenPopupError.onHide;
 begin
 end;
 
-procedure TScreenPopupError.ShowPopup(msg: String);
+procedure TScreenPopupError.ShowPopup(msg: string);
 begin
   Interaction := 0; //Reset Interaction
-  Visible := True;  //Set Visible
+  Visible := true;  //Set Visible
   Background.OnShow;
 
 {  //dirty hack... Text[0] is invisible for some strange reason
   for i:=1 to high(Text) do
     if i-1 <= high(msg) then
     begin
-      Text[i].Visible:=True;
+      Text[i].Visible := true;
       Text[i].Text := msg[i-1];
     end
     else
     begin
-      Text[i].Visible:=False;
+      Text[i].Visible := false;
     end;}
-  Text[0].Text:=msg;
+  Text[0].Text := msg;
 
-  Button[0].Visible := True;
+  Button[0].Visible := true;
 
   Button[0].Text[0].Text := 'OK';
 end;
diff --git a/src/screens/UScreenSing.pas b/src/screens/UScreenSing.pas
index b5b93831..c29c0e2c 100644
--- a/src/screens/UScreenSing.pas
+++ b/src/screens/UScreenSing.pas
@@ -743,10 +743,9 @@ begin
     begin
       // Just call this once
       // when Screens = 2
-      If (ScreenAct = 1) then
+      if (ScreenAct = 1) then
         fCurrentVideoPlaybackEngine.GetFrame(CurrentSong.VideoGAP + LyricsState.GetCurrentTime());
 
-
       fCurrentVideoPlaybackEngine.DrawGL(ScreenAct);
     end;
   end;
diff --git a/src/screens/UScreenSingModi.pas b/src/screens/UScreenSingModi.pas
index 9108cd71..eeb06004 100644
--- a/src/screens/UScreenSingModi.pas
+++ b/src/screens/UScreenSingModi.pas
@@ -33,45 +33,45 @@ interface
 
 {$I switches.inc}
 
-
-uses UMenu,
-     UMusic,
-     SDL,
-     SysUtils,
-     UFiles,
-     UTime,
-     USongs,
-     UIni,
-     ULog,
-     UTexture,
-     ULyrics,
-     TextGL,
-     gl,
-
-     UThemes,
-     UScreenSing,
-     ModiSDK;
+uses
+  UMenu,
+  UMusic,
+  SDL,
+  SysUtils,
+  UFiles,
+  UTime,
+  USongs,
+  UIni,
+  ULog,
+  UTexture,
+  ULyrics,
+  TextGL,
+  gl,
+
+  UThemes,
+  UScreenSing,
+  ModiSDK;
 
 type
   TScreenSingModi = class(TScreenSing)
     protected
     
     public
-      Winner: Byte; //Who Wins
+      Winner: byte; //Who Wins
       PlayerInfo: TPlayerInfo;
       TeamInfo:   TTeamInfo;
 
       constructor Create; override;
       procedure onShow; override;
       //procedure onShowFinish; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       function Draw: boolean; override;
       procedure Finish; override;
   end;
 
 type
   TCustomSoundEntry = record
-    Filename : String;
+    Filename : string;
     Stream   : TAudioPlaybackStream;
   end;
 
@@ -85,13 +85,13 @@ function LoadTex(const Name: PChar; Typ: TTextureType): TsmallTexture;
 //function Translate (const Name: PChar): PChar;
 //  {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
 //Procedure to Print Text
-procedure Print(const Style, Size: Byte; const X, Y: Real; const Text: PChar);
+procedure Print(const Style, Size: byte; const X, Y: real; const Text: PChar);
   {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
 //Procedure that loads a Custom Sound
-function LoadSound(const Name: PChar): Cardinal;
+function LoadSound(const Name: PChar): cardinal;
   {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
 //Plays a Custom Sound
-procedure PlaySound(const Index: Cardinal);
+procedure PlaySound(const Index: cardinal);
   {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
 
 //Utilys
@@ -112,12 +112,12 @@ uses
   URecord, 
   USkins;
 
-// Method for input parsing. If False is returned, GetNextWindow
+// Method for input parsing. If false is returned, GetNextWindow
 // should be checked to know the next window to load;
-function TScreenSingModi.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+function TScreenSingModi.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     case PressedKey of
 
@@ -143,7 +143,7 @@ end;
 
 function ToSentences(Const Lines: TLines): TSentences;
 var
-  I, J: Integer;
+  I, J: integer;
 begin
   Result.Current     := Lines.Current;
   Result.High        := Lines.High;
@@ -178,7 +178,7 @@ end;
 
 procedure TScreenSingModi.onShow;
 var
-  I: Integer;
+  I: integer;
 begin
   inherited;
 
@@ -200,14 +200,14 @@ begin
     PlayerInfo.Playerinfo[I].Name    := PChar(Ini.Name[I]);
     PlayerInfo.Playerinfo[I].Score   := 0;
     PlayerInfo.Playerinfo[I].Bar     := 50;
-    PlayerInfo.Playerinfo[I].Enabled := True;
+    PlayerInfo.Playerinfo[I].Enabled := true;
   end;
 
   for I := PlayerInfo.NumPlayers to high(PlayerInfo.Playerinfo) do
   begin
     PlayerInfo.Playerinfo[I].Score:=  0;
     PlayerInfo.Playerinfo[I].Bar :=  0;
-    PlayerInfo.Playerinfo[I].Enabled := False;
+    PlayerInfo.Playerinfo[I].Enabled := false;
   end;
 
   {Case PlayersPlay of
@@ -254,7 +254,7 @@ begin
   end;
 
   // Set Background (Little Workaround, maybe change sometime)
-  if (DLLMan.Selected.LoadBack) AND (DLLMan.Selected.LoadSong) then
+  if (DLLMan.Selected.LoadBack) and (DLLMan.Selected.LoadSong) then
     ScreenSing.Tex_Background := Tex_Background;
 
   Winner := 0;
@@ -262,12 +262,14 @@ begin
   //Set Score Visibility
   Scores.Visible := DLLMan.Selected.ShowScore;
 
-  {if PlayersPlay = 1 then begin
+  {if PlayersPlay = 1 then
+  begin
     Text[TextP1Score].Visible := DLLMan.Selected.ShowScore;
     Static[StaticP1ScoreBG].Visible := DLLMan.Selected.ShowScore;
   end;
 
-  if (PlayersPlay = 2) OR (PlayersPlay = 4) then begin
+  if (PlayersPlay = 2) or (PlayersPlay = 4) then
+  begin
     Text[TextP1TwoPScore].Visible := DLLMan.Selected.ShowScore;
     Static[StaticP1TwoPScoreBG].Visible := DLLMan.Selected.ShowScore;
 
@@ -275,7 +277,8 @@ begin
     Static[StaticP2RScoreBG].Visible := DLLMan.Selected.ShowScore;
   end;
 
-  if (PlayersPlay = 3) OR (PlayersPlay = 6) then begin
+  if (PlayersPlay = 3) or (PlayersPlay = 6) then
+  begin
     Text[TextP1ThreePScore].Visible := DLLMan.Selected.ShowScore;
     Static[StaticP1ThreePScoreBG].Visible := DLLMan.Selected.ShowScore;
 
@@ -316,11 +319,12 @@ begin
   // 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 (DllMan.Selected.LoadSong) AND (DllMan.Selected.LoadBack) AND (not fShowVisualization) then
+  if (DllMan.Selected.LoadSong) and (DllMan.Selected.LoadBack) and (not fShowVisualization) then
     SingDrawBackground;
 
   // set player names (for 2 screens and only Singstar skin)
-  if ScreenAct = 1 then begin
+  if ScreenAct = 1 then
+  begin
     Text[TextP1].Text       := 'P1';
     Text[TextP1TwoP].Text   := 'P1'; // added for ps3 skin
     Text[TextP1ThreeP].Text := 'P1'; // added for ps3 skin
@@ -329,7 +333,8 @@ begin
     Text[TextP3R].Text      := 'P3';
   end
 
-  Else if ScreenAct = 2 then begin
+  Else if ScreenAct = 2 then
+  begin
     case PlayersPlay of
       4:  begin
             Text[TextP1TwoP].Text := 'P3';
@@ -343,7 +348,6 @@ begin
     end; // case
   end; // if
 
-
     // stereo   <- and where iss P2M? or P3?
     Static[StaticP1].Texture.X := Static[StaticP1].Texture.X + 10*ScreenX;
     Text[TextP1].X := Text[TextP1].X + 10*ScreenX;
@@ -375,7 +379,8 @@ begin
   end;
 
   // update and draw movie
-{  if ShowFinish and CurrentSong.VideoLoaded AND DllMan.Selected.LoadVideo then begin
+{  if ShowFinish and CurrentSong.VideoLoaded and DllMan.Selected.LoadVideo then
+  begin
     UpdateSmpeg; // this only draws
   end;}
 
@@ -386,10 +391,9 @@ begin
     begin
       // Just call this once
       // when Screens = 2
-      If (ScreenAct = 1) then
+      if (ScreenAct = 1) then
         fCurrentVideoPlaybackEngine.GetFrame(CurrentSong.VideoGAP + LyricsState.GetCurrentTime());
 
-
       fCurrentVideoPlaybackEngine.DrawGL(ScreenAct);
     end;
   end;
@@ -397,15 +401,20 @@ begin
   // draw static menu (FG)
   DrawFG;
 
-  if ShowFinish then begin
+  if ShowFinish then
+  begin
     if DllMan.Selected.LoadSong then
     begin
-      if (not AudioPlayback.Finished) and ((CurrentSong.Finish = 0) or (LyricsState.GetCurrentTime*1000 <= CurrentSong.Finish)) then begin
+      if (not AudioPlayback.Finished) and ((CurrentSong.Finish = 0) or (LyricsState.GetCurrentTime*1000 <= CurrentSong.Finish)) then
+      begin
         //Pause Mod:
         if not Paused then
           Sing(Self);       // analyze song
-      end else begin
-        if not FadeOut then begin
+      end
+      else
+      begin
+        if not FadeOut then
+        begin
           Finish;
           FadeOut := true;
           FadeTo(@ScreenPartyScore);
@@ -434,14 +443,15 @@ begin
     end;
   end;
 
-  if ((ShowFinish) AND (NOT Paused)) then
+  if ((ShowFinish) and (not Paused)) then
   begin
     if not DLLMan.PluginDraw(Playerinfo, Lines[0].Current) then
     begin
-      if not FadeOut then begin
-          Finish;
-          FadeOut := true;
-          FadeTo(@ScreenPartyScore);
+      if not FadeOut then
+      begin
+        Finish;
+        FadeOut := true;
+        FadeTo(@ScreenPartyScore);
       end;
     end;   
   end;
@@ -465,14 +475,12 @@ begin
   {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;
   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;}
 
-
   for S := 1 to 1 do
     Static[S].Texture.X := Static[S].Texture.X - 10*ScreenX;
 
@@ -495,11 +503,11 @@ end;
 
 function LoadTex(const Name: PChar; Typ: TTextureType): TsmallTexture;
 var
-  Texname, EXT: String;
+  Texname, EXT: string;
   Tex: TTexture;
 begin
   //Get texture Name
-  TexName := Skin.GetTextureFileName(String(Name));
+  TexName := Skin.GetTextureFileName(string(Name));
   //Get File Typ
   Ext := ExtractFileExt(TexName);
   if (uppercase(Ext) = '.JPG') then
@@ -516,11 +524,11 @@ end;
 {
 function Translate (const Name: PChar): PChar; stdcall;
 begin
-  Result := PChar(Language.Translate(String(Name)));
+  Result := PChar(Language.Translate(string(Name)));
 end; }
 
 //Procedure to Print Text
-procedure Print(const Style, Size: Byte; const X, Y: Real; const Text: PChar);
+procedure Print(const Style, Size: byte; const X, Y: real; const Text: PChar);
 begin
   SetFontItalic ((Style and 128) = 128);
   SetFontStyle(Style and 7);
@@ -528,15 +536,15 @@ begin
   // used by Hold_The_Line / TeamDuell
   SetFontSize(Size);
   SetFontPos (X, Y);
-  glPrint (Language.Translate(String(Text)));
+  glPrint (Language.Translate(string(Text)));
 end;
 
 //Procedure that loads a Custom Sound
-function LoadSound(const Name: PChar): Cardinal;
+function LoadSound(const Name: PChar): cardinal;
 var
   Stream: TAudioPlaybackStream;
-  i: Integer;
-  Filename: String;
+  i: integer;
+  Filename: string;
 begin
   //Search for Sound in already loaded Sounds
   Filename := UpperCase(SoundPath + Name);
@@ -549,7 +557,7 @@ begin
     end;
   end;
 
-  Stream := AudioPlayback.OpenSound(SoundPath + String(Name));
+  Stream := AudioPlayback.OpenSound(SoundPath + string(Name));
   if (Stream = nil) then
   begin
     Result := 0;
@@ -562,7 +570,7 @@ begin
 end;
 
 //Plays a Custom Sound
-procedure PlaySound(const Index: Cardinal);
+procedure PlaySound(const Index: cardinal);
 begin
   if (Index <= High(CustomSounds)) then
     AudioPlayback.PlaySound(CustomSounds[Index].Stream);
diff --git a/src/screens/UScreenSong.pas b/src/screens/UScreenSong.pas
index 8f6fafea..8f4dd5da 100644
--- a/src/screens/UScreenSong.pas
+++ b/src/screens/UScreenSong.pas
@@ -33,7 +33,6 @@ interface
 
 {$I switches.inc}
 
-
 uses
   UMenu,
   SDL,
@@ -111,7 +110,6 @@ type
       StaticNonParty: array of cardinal;
       TextNonParty:   array of cardinal;
 
-
       constructor Create; override;
       procedure SetScroll;
       //procedure SetScroll1;
@@ -142,7 +140,7 @@ type
       //procedures for Menu
       procedure StartSong;
       procedure OpenEditor;
-      procedure DoJoker(Team: Byte);
+      procedure DoJoker(Team: byte);
       procedure SelectPlayers;
 
       procedure UnloadDetailedCover;
@@ -242,14 +240,13 @@ begin
 end;
 //Show Cat in Top Left Mod End
 
-
-// Method for input parsing. If False is returned, GetNextWindow
+// 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: WideChar; PressedDown: boolean): boolean;
 var
   I:      integer;
   I2:     integer;
-  SDL_ModState:  Word;
+  SDL_ModState:  word;
   Letter: WideChar;
 begin
   Result := true;
@@ -455,7 +452,7 @@ begin
 
               //Fix: Not Existing Song selected:
               //if (I+1=I2) then
-	        Inc(I2);
+                Inc(I2);
 
               //Choose Song
               SkipTo(I2-I);
@@ -504,7 +501,6 @@ begin
               //Show Cat in Top Left Mod
               HideCatTL;
 
-
               //Show Wrong Song when Tabs on Fix
               SelectNext;
               FixSelected;
@@ -610,7 +606,7 @@ begin
               begin
                 I := Interaction;
                 if I <= 0 then
-		  I := 1;
+                  I := 1;
 
                 while not catsongs.Song[I].Main do
                 begin
@@ -652,7 +648,7 @@ begin
                 I := Interaction;
                 I2 := 0;
                 if I <= 0 then
-		  I := 1;
+                  I := 1;
 
                 while not catsongs.Song[I].Main or (I2 = 0) do
                 begin
@@ -802,7 +798,6 @@ begin
 
   GenerateThumbnails();
 
-
   // Randomize Patch
   Randomize;
 
@@ -957,7 +952,6 @@ begin
     if CatSongs.Song[B].Visible then
       Inc(VisInt);
 
-
   if VisCount <= 6 then
   begin
     Typ := 0;
@@ -986,7 +980,6 @@ begin
   end;
 
 
-
   // hide all buttons
   for B := 0 to High(Button) do
   begin
@@ -1004,7 +997,6 @@ begin
   end;
   }
 
-
   if Typ = 0 then
   begin
     for B := 0 to High(Button) do
@@ -1301,20 +1293,19 @@ begin
       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
-
-	Z := (1 + cos(Factor)) / 2;
-	Z2 := (1 + 2*Z) / 3;
+        Factor := 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;
 
-	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(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].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
@@ -1349,7 +1340,6 @@ begin
 
           Diff := (Button[B].H - Theme.Song.Cover.H)/2;
 
-
           X := Sin(Angle*1.3)*0.9;
 
           Button[B].Y := Theme.Song.Cover.Y + Theme.Song.Cover.W * X - Diff;
@@ -1359,9 +1349,9 @@ begin
 
           // limit-bg-covers hack
           if (abs(VS/2-abs(Pos))>10) then
-	    Button[B].Visible := false;
+            Button[B].Visible := false;
           if VS > 25 then
-	    VS:=25;
+            VS:=25;
           // end of limit-bg-covers hack
 
           if Pos < 0 then
@@ -1379,7 +1369,6 @@ begin
 
           Button[B].X := Theme.Song.Cover.X  - (Button[B].H - Theme.Song.Cover.H)*0.5;
 
-
           Button[B].DeSelectReflectionspacing := 15 * Button[B].H/Theme.Song.Cover.H;
 
           Button[B].Y := Theme.Song.Cover.Y+Theme.Song.Cover.H/2-Button[b].H/2+Theme.Song.Cover.W/320*(Theme.Song.Cover.H*sin(Angle/2)*1.52);
@@ -1389,7 +1378,6 @@ begin
   end;
 end;
 
-
 procedure TScreenSong.onShow;
 begin
   inherited;
@@ -1453,7 +1441,7 @@ begin
   AudioPlayback.SetVolume(1.0);
 
   // if preview is deactivated: load musicfile now
-  If (IPreviewVolumeVals[Ini.PreviewVolume] = 0) then
+  if (IPreviewVolumeVals[Ini.PreviewVolume] = 0) then
     AudioPlayback.Open(CatSongs.Song[Interaction].Path + CatSongs.Song[Interaction].Mp3);
 
   // if hide then stop music (for party mode popup on exit)
@@ -1915,7 +1903,7 @@ begin
 end;
 
 //Team No of Team (0-5)
-procedure TScreenSong.DoJoker (Team: Byte);
+procedure TScreenSong.DoJoker (Team: byte);
 begin
   if (Mode = smPartyMode) and
      (PartySession.Teams.NumTeams >= Team + 1) and
diff --git a/src/screens/UScreenSongJumpto.pas b/src/screens/UScreenSongJumpto.pas
index a8679368..e55a6276 100644
--- a/src/screens/UScreenSongJumpto.pas
+++ b/src/screens/UScreenSongJumpto.pas
@@ -34,44 +34,59 @@ interface
 {$I switches.inc}
 
 uses
-  UMenu, SDL, UDisplay, UMusic, UFiles, SysUtils, UThemes;
+  UMenu,
+  SDL,
+  UDisplay,
+  UMusic,
+  UFiles,
+  SysUtils,
+  UThemes;
 
 type
   TScreenSongJumpto = class(TMenu)
     private
       //For ChangeMusic
-      LastPlayed: Integer;
-      VisibleBool: Boolean;
+      LastPlayed: integer;
+      VisibleBool: boolean;
     public
-      VisSongs: Integer;
+      VisSongs: integer;
 
       constructor Create; override;
 
       //Visible //Whether the Menu should be Drawn
       //Whether the Menu should be Drawn
-      procedure SetVisible(Value: Boolean);
-      property Visible: Boolean read VisibleBool write SetVisible;
+      procedure SetVisible(Value: boolean);
+      property Visible: boolean read VisibleBool write SetVisible;
 
-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       procedure onShow; override;
       function Draw: boolean; override;
 
-      procedure SetTextFound(const Count: Cardinal);
+      procedure SetTextFound(const Count: cardinal);
   end;
 
 var
-  IType: Array [0..2] of String;
-  SelectType: Integer;
+  IType: array [0..2] of string;
+  SelectType: integer;
 
 
 implementation
 
-uses UGraphic, UMain, UIni, UTexture, ULanguage, UParty, USongs, UScreenSong, ULog;
-
-function TScreenSongJumpto.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+uses
+  UGraphic,
+  UMain,
+  UIni,
+  UTexture,
+  ULanguage,
+  UParty,
+  USongs,
+  UScreenSong,
+  ULog;
+
+function TScreenSongJumpto.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     // check normal keys
     case CharCode of
@@ -90,7 +105,7 @@ begin
     case PressedKey of
       SDLK_BACKSPACE:
         begin
-          if (Interaction = 0) AND (Length(Button[0].Text[0].Text) > 0) then
+          if (Interaction = 0) and (Length(Button[0].Text[0].Text) > 0) then
           begin
             Button[0].Text[0].DeleteLastL;
             SetTextFound(CatSongs.SetFilter(Button[0].Text[0].Text, SelectType));
@@ -100,9 +115,9 @@ begin
       SDLK_RETURN,
       SDLK_ESCAPE:
         begin
-          Visible := False;
+          Visible := false;
           AudioPlayback.PlaySound(SoundLib.Back);
-          if (VisSongs = 0) AND (Length(Button[0].Text[0].Text) > 0) then
+          if (VisSongs = 0) and (Length(Button[0].Text[0].Text) > 0) then
           begin
             ScreenSong.UnLoadDetailedCover;
             Button[0].Text[0].Text := '';
@@ -163,15 +178,14 @@ begin
   SelectType := 0;
   AddSelectSlide(Theme.SongJumpto.SelectSlideType, SelectType, Theme.SongJumpto.IType);
 
-
   Interaction := 0;
   LastPlayed  := 0;
 end;
 
-procedure TScreenSongJumpto.SetVisible(Value: Boolean);
+procedure TScreenSongJumpto.SetVisible(Value: boolean);
 begin
 //If change from unvisible to Visible then OnShow
-  if (VisibleBool = False) AND (Value = True) then
+  if (VisibleBool = false) and (Value = true) then
     OnShow;
 
   VisibleBool := Value;
@@ -192,7 +206,7 @@ begin
 
   //Select Input
   Interaction := 0;
-  Button[0].Text[0].Selected := True;
+  Button[0].Text[0].Selected := true;
 
   LastPlayed := ScreenSong.Interaction;
 end;
@@ -202,7 +216,7 @@ begin
   Result := inherited Draw;
 end;
 
-procedure TScreenSongJumpto.SetTextFound(const Count: Cardinal);
+procedure TScreenSongJumpto.SetTextFound(const Count: cardinal);
 begin
   if (Count = 0) then
   begin
@@ -220,7 +234,6 @@ begin
     ScreenSong.ShowCatTLCustom(Format(Theme.SongJumpto.CatText, [Button[0].Text[0].Text]));
   end;
 
-
   //Set visSongs
   VisSongs := Count;
 
diff --git a/src/screens/UScreenSongMenu.pas b/src/screens/UScreenSongMenu.pas
index 8d75eb67..0af94a8f 100644
--- a/src/screens/UScreenSongMenu.pas
+++ b/src/screens/UScreenSongMenu.pas
@@ -193,7 +193,6 @@ begin
   SetLength(ISelections, 1);
   ISelections[0] := 'Dummy';
 
-
   AddText(Theme.SongMenu.TextMenu);
 
   LoadFromTheme(Theme.SongMenu);
@@ -406,9 +405,9 @@ begin
         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[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[3].Text[0].Text := Language.Translate('SONG_MENU_CANCEL');
 
         // set right interaction
diff --git a/src/screens/UScreenStatDetail.pas b/src/screens/UScreenStatDetail.pas
index 20b89b33..bbbb4a1b 100644
--- a/src/screens/UScreenStatDetail.pas
+++ b/src/screens/UScreenStatDetail.pas
@@ -47,21 +47,20 @@ type
   TScreenStatDetail = class(TMenu)
     public
       Typ:  TStatType;
-      Page: Cardinal;
-      Count: Byte;
-      Reversed: Boolean;
-
-      TotEntrys: Cardinal;
-      TotPages:  Cardinal;
+      Page: cardinal;
+      Count: byte;
+      Reversed: boolean;
 
+      TotEntrys: cardinal;
+      TotPages:  cardinal;
 
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       procedure onShow; override;
       procedure SetAnimationProgress(Progress: real); override;
 
       procedure SetTitle;
-      Procedure SetPage(NewPage: Cardinal);
+      Procedure SetPage(NewPage: cardinal);
   end;
 
 implementation
@@ -73,10 +72,10 @@ uses
   Classes,
   ULog;
 
-function TScreenStatDetail.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+function TScreenStatDetail.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     // check normal keys
     case WideCharUpperCase(CharCode)[1] of
@@ -97,24 +96,28 @@ begin
         end;
       SDLK_RETURN:
         begin
-          if Interaction = 0 then begin
+          if Interaction = 0 then
+          begin
             //Next Page
             SetPage(Page+1);
           end;
 
-          if Interaction = 1 then begin
+          if Interaction = 1 then
+          begin
             //Previous Page
             if (Page > 0) then
               SetPage(Page-1);
           end;
 
-          if Interaction = 2 then begin
+          if Interaction = 2 then
+          begin
             //Reverse Order
             Reversed := not Reversed;
             SetPage(Page);
           end;
 
-          if Interaction = 3 then begin
+          if Interaction = 3 then
+          begin
             AudioPlayback.PlaySound(SoundLib.Back);
             FadeTo(@ScreenStatMain);
           end;
@@ -187,7 +190,7 @@ begin
   SetTitle;
 
   //Show First Page
-  Reversed := False;
+  Reversed := false;
   SetPage(0);
 end;
 
@@ -199,12 +202,12 @@ begin
     Text[Count].Text := Theme.StatDetail.Description[Ord(Typ)];
 end;
 
-procedure TScreenStatDetail.SetPage(NewPage: Cardinal);
+procedure TScreenStatDetail.SetPage(NewPage: cardinal);
 var
   StatList: TList;
-  I: Integer;
-  FormatStr: String;
-  PerPage: Byte;
+  I: integer;
+  FormatStr: string;
+  PerPage: byte;
 begin
   // fetch statistics
   StatList := Database.GetStats(Typ, Count, NewPage, Reversed);
@@ -288,9 +291,9 @@ begin
   Database.FreeStats(StatList);
 end;
 
-
 procedure TScreenStatDetail.SetAnimationProgress(Progress: real);
-var I: Integer;
+var
+  I: integer;
 begin
   for I := 0 to High(Button) do
     Button[I].Texture.ScaleW := Progress;
diff --git a/src/screens/UScreenStatMain.pas b/src/screens/UScreenStatMain.pas
index a6f67cab..2fd91288 100644
--- a/src/screens/UScreenStatMain.pas
+++ b/src/screens/UScreenStatMain.pas
@@ -46,14 +46,14 @@ type
   TScreenStatMain = class(TMenu)
     private
       //Some Stat Value that don't need to be calculated 2 times
-      SongsWithVid: Cardinal;
+      SongsWithVid: cardinal;
       function FormatOverviewIntro(FormatStr: string): string;
       function FormatSongOverview(FormatStr: string): string;
       function FormatPlayerOverview(FormatStr: string): string;
     public
       TextOverview:    integer;
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       procedure onShow; override;
       procedure SetAnimationProgress(Progress: real); override;
 
@@ -62,24 +62,25 @@ type
 
 implementation
 
-uses UGraphic,
-     UDataBase,
-     USongs,
-     USong,
-     ULanguage,
-     UCommon,
-     Classes,
-     {$IFDEF win32}
-     windows,
-     {$ELSE}
-     sysconst,
-     {$ENDIF}
-     ULog;
-
-function TScreenStatMain.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+uses
+  UGraphic,
+  UDataBase,
+  USongs,
+  USong,
+  ULanguage,
+  UCommon,
+  Classes,
+  {$IFDEF win32}
+  windows,
+  {$ELSE}
+  sysconst,
+  {$ENDIF}
+  ULog;
+
+function TScreenStatMain.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     // check normal keys
     case WideCharUpperCase(CharCode)[1] of
@@ -168,7 +169,7 @@ begin
 
   //Set Songs with Vid
   SongsWithVid := 0;
-  For I := 0 to Songs.SongList.Count -1 do
+  for I := 0 to Songs.SongList.Count -1 do
     if (TSong(Songs.SongList[I]).Video <> '') then
       Inc(SongsWithVid);
 end;
@@ -183,7 +184,7 @@ end;
 
 function TScreenStatMain.FormatOverviewIntro(FormatStr: string): string;
 var
-  Year, Month, Day: Word;
+  Year, Month, Day: word;
 begin
   {Format:
     %0:d Ultrastar Version
@@ -204,8 +205,8 @@ end;
 
 function TScreenStatMain.FormatSongOverview(FormatStr: string): string;
 var
-  CntSongs, CntSungSongs, CntVidSongs: Integer;
-  MostPopSongArtist, MostPopSongTitle: String;
+  CntSongs, CntSungSongs, CntVidSongs: integer;
+  MostPopSongArtist, MostPopSongTitle: string;
   StatList: TList;
   MostSungSong: TStatResultMostSungSong;
 begin
@@ -220,7 +221,7 @@ begin
   CntSungSongs := Database.GetTotalEntrys(stMostSungSong);
   CntVidSongs := SongsWithVid;
 
-  StatList := Database.GetStats(stMostSungSong, 1, 0, False);
+  StatList := Database.GetStats(stMostSungSong, 1, 0, false);
   if ((StatList <> nil) and (StatList.Count > 0)) then
   begin
     MostSungSong := StatList[0];
@@ -248,11 +249,11 @@ end;
 
 function TScreenStatMain.FormatPlayerOverview(FormatStr: string): string;
 var
-  CntPlayers: Integer;
+  CntPlayers: integer;
   BestScoreStat:    TStatResultBestScores;
   BestSingerStat:   TStatResultBestSingers;
-  BestPlayer, BestScorePlayer: String;
-  BestPlayerScore, BestScore: Integer;
+  BestPlayer, BestScorePlayer: string;
+  BestPlayerScore, BestScore: integer;
   SingerStats, ScoreStats: TList;
 begin
   {Format:
@@ -264,7 +265,7 @@ begin
 
   CntPlayers := Database.GetTotalEntrys(stBestSingers);
 
-  SingerStats := Database.GetStats(stBestSingers, 1, 0, False);
+  SingerStats := Database.GetStats(stBestSingers, 1, 0, false);
   if ((SingerStats <> nil) and (SingerStats.Count > 0)) then
   begin
     BestSingerStat := SingerStats[0];
@@ -278,7 +279,7 @@ begin
   end;
   Database.FreeStats(SingerStats);
 
-  ScoreStats  := Database.GetStats(stBestScores, 1, 0, False);
+  ScoreStats  := Database.GetStats(stBestScores, 1, 0, false);
   if ((ScoreStats <> nil) and (ScoreStats.Count > 0)) then
   begin
     BestScoreStat := ScoreStats[0];
@@ -306,7 +307,7 @@ end;
 
 procedure TScreenStatMain.SetOverview;
 var
-  Overview: String;
+  Overview: string;
 begin
   // Format overview
   Overview := FormatOverviewIntro(Language.Translate('STAT_OVERVIEW_INTRO')) + '\n \n' + 
@@ -315,11 +316,11 @@ begin
   Text[0].Text := Overview;
 end;
 
-
 procedure TScreenStatMain.SetAnimationProgress(Progress: real);
-var I: Integer;
+var
+  I: integer;
 begin
-  For I := 0 to high(Button) do
+  for I := 0 to high(Button) do
     Button[I].Texture.ScaleW := Progress;
 end;
 
diff --git a/src/screens/UScreenTop5.pas b/src/screens/UScreenTop5.pas
index c45f01bf..23405ebb 100644
--- a/src/screens/UScreenTop5.pas
+++ b/src/screens/UScreenTop5.pas
@@ -90,7 +90,7 @@ begin
       SDLK_RETURN:
         begin
           if (not Fadeout) then
-	  begin
+          begin
             FadeTo(@ScreenSong);
             Fadeout := true;
           end;
@@ -111,7 +111,6 @@ begin
 
   LoadFromTheme(Theme.Top5);
 
-
   TextLevel := AddText(Theme.Top5.TextLevel);
   TextArtistTitle := AddText(Theme.Top5.TextArtistTitle);
 
diff --git a/src/screens/UScreenWelcome.pas b/src/screens/UScreenWelcome.pas
index 485ebedb..a00a84e2 100644
--- a/src/screens/UScreenWelcome.pas
+++ b/src/screens/UScreenWelcome.pas
@@ -34,7 +34,10 @@ interface
 {$I switches.inc}
 
 uses
-  UMenu, SDL, SysUtils, UThemes;
+  UMenu,
+  SDL,
+  SysUtils,
+  UThemes;
 
 type
   TScreenWelcome = class(TMenu)
@@ -42,24 +45,29 @@ type
       Animation:    real;
       Fadeout:      boolean;
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       function Draw: boolean; override;
       procedure onShow; override;
   end;
 
 implementation
 
-uses UGraphic, UTime, USkins, UTexture;
+uses
+  UGraphic,
+  UTime,
+  USkins,
+  UTexture;
 
-function TScreenWelcome.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+function TScreenWelcome.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then begin
+  if (PressedDown) then
+  begin
     case PressedKey of
       SDLK_ESCAPE,
       SDLK_BACKSPACE :
         begin
-          Result := False;
+          Result := false;
         end;
       SDLK_RETURN:
         begin
@@ -102,12 +110,14 @@ begin
 
   // draw nothing
   Min := 0; Max := 1000;
-  if (Animation >= Min) and (Animation < Max) then begin
+  if (Animation >= Min) and (Animation < Max) then
+  begin
   end;
 
   // popup
   Min := 1000; Max := 1120;
-  if (Animation >= Min) and (Animation < Max) then begin
+  if (Animation >= Min) and (Animation < Max) then
+  begin
     Factor := (Animation - Min) / (Max - Min);
     Static[0].Texture.X := 600;
     Static[0].Texture.Y := 600 - Factor * 230;
@@ -117,7 +127,8 @@ begin
 
   // bounce
   Min := 1120; Max := 1200;
-  if (Animation >= Min) and (Animation < Max) then begin
+  if (Animation >= Min) and (Animation < Max) then
+  begin
     Factor := (Animation - Min) / (Max - Min);
     Static[0].Texture.Y := 370 + Factor * 50;
     Static[0].Texture.H := 230 - Factor * 50;
@@ -125,14 +136,15 @@ begin
 
   // run
   Min := 1500; Max := 3500;
-  if (Animation >= Min) and (Animation < Max) then begin
+  if (Animation >= Min) and (Animation < Max) then
+  begin
     Factor := (Animation - Min) / (Max - Min);
 
     Static[0].Texture.X := 600 - Factor * 1400;
     Static[0].Texture.H := 180;
 
-
-    for Count := 1 to 5 do begin
+    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;
@@ -140,7 +152,8 @@ begin
   end;
 
   Min := 3500;
-  if (Animation >= Min) and (not Fadeout) then begin
+  if (Animation >= Min) and (not Fadeout) then
+  begin
     FadeTo(@ScreenMain);
     Fadeout := true;
   end;