1 files changed, 55 insertions, 58 deletions
diff --git a/src/base/UThemes.pas b/src/base/UThemes.pas
index 38bd3ca4..3ee2798e 100644
--- a/src/base/UThemes.pas
+++ b/src/base/UThemes.pas
@@ -863,7 +863,7 @@ begin
   
   Log.LogStatus('Loading: '+ FileName, 'TTheme.LoadTheme');
 
-  FileName := AdaptFilePaths( FileName );
+  FileName := AdaptFilePaths(FileName);
 
   if not FileExists(FileName) then
   begin
@@ -2211,91 +2211,88 @@ end;
 
 procedure TTheme.create_theme_objects();
 begin
-  freeandnil( Loading       );
-  Loading       := TThemeLoading.Create;
-
-  freeandnil( Main      );
-  Main      := TThemeMain.Create;
-
-  freeandnil( Name      );
-  Name      := TThemeName.Create;
+  freeandnil(Loading);
+  Loading := TThemeLoading.Create;
 
-  freeandnil( Level       );
-  Level       := TThemeLevel.Create;
+  freeandnil(Main);
+  Main := TThemeMain.Create;
 
-  freeandnil( Song      );
-  Song      := TThemeSong.Create;
+  freeandnil(Name);
+  Name := TThemeName.Create;
 
-  freeandnil( Sing      );
-  Sing      := TThemeSing.Create;
+  freeandnil(Level);
+  Level := TThemeLevel.Create;
 
-  freeandnil( Score       );
-  Score       := TThemeScore.Create;
+  freeandnil(Song);
+  Song := TThemeSong.Create;
 
-  freeandnil( Top5      );
-  Top5      := TThemeTop5.Create;
+  freeandnil(Sing);
+  Sing := TThemeSing.Create;
 
-  freeandnil( Options       );
-  Options       := TThemeOptions.Create;
+  freeandnil(Score);
+  Score := TThemeScore.Create;
 
-  freeandnil( OptionsGame       );
-  OptionsGame       := TThemeOptionsGame.Create;
+  freeandnil(Top5);
+  Top5 := TThemeTop5.Create;
 
-  freeandnil( OptionsGraphics       );
-  OptionsGraphics       := TThemeOptionsGraphics.Create;
+  freeandnil(Options);
+  Options := TThemeOptions.Create;
 
-  freeandnil( OptionsSound      );
-  OptionsSound      := TThemeOptionsSound.Create;
+  freeandnil(OptionsGame);
+  OptionsGame := TThemeOptionsGame.Create;
 
-  freeandnil( OptionsLyrics       );
-  OptionsLyrics       := TThemeOptionsLyrics.Create;
+  freeandnil(OptionsGraphics);
+  OptionsGraphics := TThemeOptionsGraphics.Create;
 
-  freeandnil( OptionsThemes       );
-  OptionsThemes       := TThemeOptionsThemes.Create;
+  freeandnil(OptionsSound);
+  OptionsSound := TThemeOptionsSound.Create;
 
-  freeandnil( OptionsRecord       );
-  OptionsRecord       := TThemeOptionsRecord.Create;
+  freeandnil(OptionsLyrics);
+  OptionsLyrics := TThemeOptionsLyrics.Create;
 
-  freeandnil( OptionsAdvanced       );
-  OptionsAdvanced       := TThemeOptionsAdvanced.Create;
+  freeandnil(OptionsThemes);
+  OptionsThemes := TThemeOptionsThemes.Create;
 
+  freeandnil(OptionsRecord);
+  OptionsRecord := TThemeOptionsRecord.Create;
 
-  freeandnil( ErrorPopup      );
-  ErrorPopup      := TThemeError.Create;
+  freeandnil(OptionsAdvanced);
+  OptionsAdvanced := TThemeOptionsAdvanced.Create;
 
-  freeandnil( CheckPopup      );
-  CheckPopup      := TThemeCheck.Create;
+  freeandnil(ErrorPopup);
+  ErrorPopup := TThemeError.Create;
 
+  freeandnil(CheckPopup);
+  CheckPopup := TThemeCheck.Create;
 
-  freeandnil( SongMenu      );
-  SongMenu      := TThemeSongMenu.Create;
+  freeandnil(SongMenu);
+  SongMenu := TThemeSongMenu.Create;
 
-  freeandnil( SongJumpto      );
-  SongJumpto      := TThemeSongJumpto.Create;
+  freeandnil(SongJumpto);
+  SongJumpto := TThemeSongJumpto.Create;
 
   //Party Screens
-  freeandnil( PartyNewRound       );
-  PartyNewRound       := TThemePartyNewRound.Create;
-
-  freeandnil( PartyWin      );
-  PartyWin      := TThemePartyWin.Create;
+  freeandnil(PartyNewRound);
+  PartyNewRound := TThemePartyNewRound.Create;
 
-  freeandnil( PartyScore      );
-  PartyScore      := TThemePartyScore.Create;
+  freeandnil(PartyWin);
+  PartyWin := TThemePartyWin.Create;
 
-  freeandnil( PartyOptions      );
-  PartyOptions      := TThemePartyOptions.Create;
+  freeandnil(PartyScore);
+  PartyScore := TThemePartyScore.Create;
 
-  freeandnil( PartyPlayer       );
-  PartyPlayer       := TThemePartyPlayer.Create;
+  freeandnil(PartyOptions);
+  PartyOptions := TThemePartyOptions.Create;
 
+  freeandnil(PartyPlayer);
+  PartyPlayer := TThemePartyPlayer.Create;
 
   //Stats Screens:
-  freeandnil( StatMain      );
-  StatMain :=        TThemeStatMain.Create;
+  freeandnil(StatMain);
+  StatMain := TThemeStatMain.Create;
 
-  freeandnil( StatDetail      );
-  StatDetail      := TThemeStatDetail.Create;
+  freeandnil(StatDetail);
+  StatDetail := TThemeStatDetail.Create;
 
  end;