made USDX function when file paths differ from previous expectations..

( most of the software was still using hard coded paths )

also added ability to have multiple song directories.

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

10 files changed, 1183 insertions, 1078 deletions

diff --git a/Game/Code/Classes/UIni.pas b/Game/Code/Classes/UIni.pas
index f1b73d38..0e84c506 100644
--- a/Game/Code/Classes/UIni.pas
+++ b/Game/Code/Classes/UIni.pas
@@ -1,794 +1,799 @@
-unit UIni;

-

-interface

-

-{$IFDEF FPC}

-  {$MODE Delphi}

-{$ENDIF}

-

-{$I switches.inc}

-

-uses IniFiles, ULog, SysUtils;

-

-type

-  TIni = class

-    Name:           array[0..11] of string;

-

-    // Templates for Names Mod

-    NameTeam:       array[0..2] of string;

-    NameTemplate:   array[0..11] of string;

-

-    //Filename of the opened iniFile

-    Filename:       string;

-

-    // Game

-    Players:        integer;

-    Difficulty:     integer;

-    Language:       integer;

-    Tabs:           integer;

-    Tabs_at_startup:integer; //Tabs at Startup fix

-    Sorting:        integer;

-    Debug:          integer;

-

-    // Graphics

-    Screens:        integer;

-    Resolution:     integer;

-    Depth:          integer;

-    FullScreen:     integer;

-    TextureSize:    integer;

-    SingWindow:     integer;

-    Oscilloscope:   integer;

-    Spectrum:       integer;

-    Spectrograph:   integer;

-    MovieSize:      integer;

-

-    // Sound

-    MicBoost:       integer;

-    ClickAssist:    integer;

-    BeatClick:      integer;

-    SavePlayback:   integer;

-    Threshold:      integer;

-

-    //Song Preview

-    PreviewVolume: integer;

-    PreviewFading: integer;

-

-    // Lyrics

-    LyricsFont:     integer;

-    LyricsEffect:   integer;

-    Solmization:    integer;

-

-    // Themes

-    Theme:          integer;

-    SkinNo:           integer;

-    Color:          integer;

-

-    // Record

-    Card:           integer; // not saved in config.ini

-

-    CardList:       array of record

-      Name:           string;

-      Input:          integer;

-      ChannelL:       integer;

-      ChannelR:       integer;

-    end;

-

-    // Advanced

-    LoadAnimation:  integer;

-    EffectSing:     integer;

-    ScreenFade:     integer;

-    AskbeforeDel:   integer;

-    OnSongClick:    integer;

-    LineBonus:      integer;

-    PartyPopup:     integer;

-

-    // Controller

-    Joypad:         integer;

-

-    // Soundcards

-    SoundCard:      array[0..7, 1..2] of integer;

-

-    // Devices

-    LPT:            integer;

-

-    procedure Load;

-    procedure Save;

-    procedure SaveNames;

-    procedure SaveLevel;

-  end;

-

-

-var

-  Ini:    TIni;

-  IResolution:    array of string;

-  ILanguage:      array of string;

-  ITheme:         array of string;

-  ISkin:          array of string;

-  ICard:          array of string;

-  IInput:         array of string;

-

-const

-  IPlayers:       array[0..4] of string = ('1', '2', '3', '4', '6');

-  IDifficulty:    array[0..2] of string = ('Easy', 'Medium', 'Hard');

-  ITabs:          array[0..1] of string = ('Off', 'On');

-

-  ISorting:       array[0..7] of string = ('Edition', 'Genre', 'Language', 'Folder', 'Title', 'Artist', 'Title2', 'Artist2');

-  sEdition = 0;

-  sGenre = 1;

-  sLanguage = 2;

-  sFolder = 3;

-  sTitle = 4;

-  sArtist = 5;

-  sTitle2 = 6;

-  sArtist2 = 7;

-

-  IDebug:         array[0..1] of string = ('Off', 'On');

-

-  IScreens:       array[0..1] of string = ('1', '2');

-  IFullScreen:    array[0..1] of string = ('Off', 'On');

-  IDepth:         array[0..1] of string = ('16 bit', '32 bit');

-  ITextureSize:   array[0..2] of string = ('128', '256', '512');

-  ISingWindow:    array[0..1] of string = ('Small', 'Big');

-

-  //SingBar Mod

-  IOscilloscope:  array[0..2] of string = ('Off', 'Osci', 'Bar');

-  //IOscilloscope:  array[0..1] of string = ('Off', 'On');

-

-  ISpectrum:      array[0..1] of string = ('Off', 'On');

-  ISpectrograph:  array[0..1] of string = ('Off', 'On');

-  IMovieSize:     array[0..2] of string = ('Half', 'Full [Vid]', 'Full [BG+Vid]');

-

-  IMicBoost:      array[0..3] of string = ('Off', '+6dB', '+12dB', '+18dB');

-  IClickAssist:   array[0..1] of string = ('Off', 'On');

-  IBeatClick:     array[0..1] of string = ('Off', 'On');

-  ISavePlayback:  array[0..1] of string = ('Off', 'On');

-  IThreshold:     array[0..3] of string = ('5%', '10%', '15%', '20%');

-  //Song Preview

-  IPreviewVolume: array[0..10] of string = ('Off', '10%', '20%', '30%', '40%', '50%', '60%', '70%', '80%', '90%', '100%');

-  IPreviewFading: array[0..5] of string  = ('Off', '1 Sec', '2 Secs', '3 Secs', '4 Secs', '5 Secs');

-

-

-  ILyricsFont:    array[0..2] of string = ('Plain', 'OLine1', 'OLine2');

-  ILyricsEffect:  array[0..3] of string = ('Simple', 'Zoom', 'Slide', 'Ball');

-  ISolmization:   array[0..3] of string = ('Off', 'Euro', 'Jap', 'American');

-

-  IColor:         array[0..8] of string = ('Blue', 'Green', 'Pink', 'Red', 'Violet', 'Orange', 'Yellow', 'Brown', 'Black');

-

-  // Advanced

-  ILoadAnimation: array[0..1] of string = ('Off', 'On');

-  IEffectSing:    array[0..1] of string = ('Off', 'On');

-  IScreenFade: array [0..1] of String =('Off', 'On');

-  IAskbeforeDel:  array[0..1] of string = ('Off', 'On');

-  IOnSongClick:   array[0..2] of string = ('Sing', 'Select Players', 'Open Menu');

-  ILineBonus:  array[0..2] of string = ('Off', 'At Score', 'At Notes');

-  IPartyPopup: array[0..1] of string = ('Off', 'On');

-

-  IJoypad:        array[0..1] of string = ('Off', 'On');

-  ILPT:           array[0..2] of string = ('Off', 'LCD', 'Lights');

-

-  IChannel:       array[0..6] of string = ('Off', '1', '2', '3', '4', '5', '6');

-

-implementation

-

-uses //UFiles,

-     UMain,

-     SDL,

-     ULanguage,

-     USkins,

-     URecord,

-     UCommandLine;

-

-procedure TIni.Load;

-var

-  IniFile:    TMemIniFile;

-  ThemeIni:   TMemIniFile;

-  Tekst:      string;

-  Pet:        integer;

-  B: boolean;

-  I, I2, I3:          integer;

-  S:          string;

-  Modes:      PPSDL_Rect;

-  SR: TSearchRec; //Skin List Patch

-

-  function GetFileName (S: String):String;

-  begin

-  //Result := copy (S,0,StrRScan (PChar(S),char('.'))+1);

-    Result := copy (S,0,Pos ('.ini',S)-1);

-  end;

-

-begin

-  GamePath := ExtractFilePath(ParamStr(0));

-

-  if (Params.ConfigFile <> '') then

-    try

-      IniFile := TMemIniFile.Create(Params.ConfigFile);

-    except

-      IniFile := TMemIniFile.Create(GamePath + 'config.ini');

-    end

-  else

-    IniFile := TMemIniFile.Create(GamePath + 'config.ini');

-

-

-  // Name

-  for I := 0 to 11 do

-    Ini.Name[I] := IniFile.ReadString('Name', 'P'+IntToStr(I+1), 'Player'+IntToStr(I+1));

-

-

-  // Templates for Names Mod

-  for I := 0 to 2 do

-    Ini.NameTeam[I] := IniFile.ReadString('NameTeam', 'T'+IntToStr(I+1), 'Team'+IntToStr(I+1));

-  for I := 0 to 11 do

-    Ini.NameTemplate[I] := IniFile.ReadString('NameTemplate', 'Name'+IntToStr(I+1), 'Template'+IntToStr(I+1));

-

-  // Players

-  Tekst := IniFile.ReadString('Game', 'Players', IPlayers[0]);

-  for Pet := 0 to High(IPlayers) do

-    if Tekst = IPlayers[Pet] then Ini.Players := Pet;

-

-  // Difficulty

-  Tekst := IniFile.ReadString('Game', 'Difficulty', 'Easy');

-  for Pet := 0 to High(IDifficulty) do

-    if Tekst = IDifficulty[Pet] then Ini.Difficulty := Pet;

-

-  // Language

-  Tekst := IniFile.ReadString('Game', 'Language', 'English');

-  for Pet := 0 to High(ILanguage) do

-    if Tekst = ILanguage[Pet] then Ini.Language := Pet;

-

-//  Language.ChangeLanguage(ILanguage[Ini.Language]);

-

-  // Tabs

-  Tekst := IniFile.ReadString('Game', 'Tabs', ITabs[0]);

-  for Pet := 0 to High(ITabs) do

-    if Tekst = ITabs[Pet] then Ini.Tabs := Pet;

-

-  //Tabs at Startup fix

-  Ini.Tabs_at_startup := Ini.Tabs;

-

-  // Sorting

-  Tekst := IniFile.ReadString('Game', 'Sorting', ISorting[0]);

-  for Pet := 0 to High(ISorting) do

-    if Tekst = ISorting[Pet] then Ini.Sorting := Pet;

-

-  // Debug

-  Tekst := IniFile.ReadString('Game', 'Debug', IDebug[0]);

-  for Pet := 0 to High(IDebug) do

-    if Tekst = IDebug[Pet] then Ini.Debug := Pet;

-

-  //if Ini.Debug = 1 then SongPath := 'E:\UltraStar 03\Songs\';

-

-  // Screens

-  Tekst := IniFile.ReadString('Graphics', 'Screens', IScreens[0]);

-  for Pet := 0 to High(IScreens) do

-    if Tekst = IScreens[Pet] then Ini.Screens := Pet;

-

-  // FullScreen

-  Tekst := IniFile.ReadString('Graphics', 'FullScreen', 'On');

-  for Pet := 0 to High(IFullScreen) do

-    if Tekst = IFullScreen[Pet] then Ini.FullScreen := Pet;

-

-

-  // Resolution

-  SetLength(IResolution, 0);

-

-  Modes  := SDL_ListModes(nil, SDL_OPENGL or SDL_FULLSCREEN); // Check if there are any modes available

-  while assigned( Modes^ ) do //this should solve the biggest wine problem | THANKS Linnex (11.11.07)

-  begin

-    SetLength(IResolution, Length(IResolution) + 1);

-    IResolution[High(IResolution)] := IntToStr(Modes^.w) + 'x' + IntToStr(Modes^.h);

-    Inc(Modes);

-  end;

-

-  // if no modes were set, then failback to 800x600

-  // as per http://sourceforge.net/forum/message.php?msg_id=4544965

-  // THANKS : linnex at users.sourceforge.net

-  if Length(IResolution) < 1 then

-  begin

-    SetLength(IResolution, Length(IResolution) + 1);

-    IResolution[High(IResolution)] := IntToStr(800) + 'x' + IntToStr(600);

-    Log.LogStatus('SDL_ListModes Defaulted Res To : ' + IResolution[High(IResolution)] , 'Graphics - Resolutions');

-

-    // Default to fullscreen OFF, in this case !

-    Ini.FullScreen := 0;

-  end;

-

-  // reverse order

-  for I := 0 to (Length(IResolution) div 2) - 1 do begin

-    S := IResolution[I];

-    IResolution[I] := IResolution[High(IResolution)-I];

-    IResolution[High(IResolution)-I] := S;

-  end;

-

-  Tekst := IniFile.ReadString('Graphics', 'Resolution', '800x600');

-  for Pet := 0 to High(IResolution) do

-    if Tekst = IResolution[Pet] then Ini.Resolution := Pet;

-

-

-  // Resolution

-  Tekst := IniFile.ReadString('Graphics', 'Depth', '32 bit');

-  for Pet := 0 to High(IDepth) do

-    if Tekst = IDepth[Pet] then Ini.Depth := Pet;

-

-  // Texture Size

-  Tekst := IniFile.ReadString('Graphics', 'TextureSize', ITextureSize[1]);

-  for Pet := 0 to High(ITextureSize) do

-    if Tekst = ITextureSize[Pet] then Ini.TextureSize := Pet;

-

-  // SingWindow

-  Tekst := IniFile.ReadString('Graphics', 'SingWindow', 'Big');

-  for Pet := 0 to High(ISingWindow) do

-    if Tekst = ISingWindow[Pet] then Ini.SingWindow := Pet;

-

-  // Oscilloscope

-  Tekst := IniFile.ReadString('Graphics', 'Oscilloscope', 'Bar');

-  for Pet := 0 to High(IOscilloscope) do

-    if Tekst = IOscilloscope[Pet] then Ini.Oscilloscope := Pet;

-

-  // Spectrum

-  Tekst := IniFile.ReadString('Graphics', 'Spectrum', 'Off');

-  for Pet := 0 to High(ISpectrum) do

-    if Tekst = ISpectrum[Pet] then Ini.Spectrum := Pet;

-

-  // Spectrograph

-  Tekst := IniFile.ReadString('Graphics', 'Spectrograph', 'Off');

-  for Pet := 0 to High(ISpectrograph) do

-    if Tekst = ISpectrograph[Pet] then Ini.Spectrograph := Pet;

-

-  // MovieSize

-  Tekst := IniFile.ReadString('Graphics', 'MovieSize', IMovieSize[2]);

-  for Pet := 0 to High(IMovieSize) do

-    if Tekst = IMovieSize[Pet] then Ini.MovieSize := Pet;

-

-  // MicBoost

-  Tekst := IniFile.ReadString('Sound',    'MicBoost',    'Off');

-  for Pet := 0 to High(IMicBoost) do

-    if Tekst = IMicBoost[Pet] then Ini.MicBoost := Pet;

-

-  // ClickAssist

-  Tekst := IniFile.ReadString('Sound',    'ClickAssist', 'Off');

-  for Pet := 0 to High(IClickAssist) do

-    if Tekst = IClickAssist[Pet] then Ini.ClickAssist := Pet;

-

-  // BeatClick

-  Tekst := IniFile.ReadString('Sound',    'BeatClick', IBeatClick[0]);

-  for Pet := 0 to High(IBeatClick) do

-    if Tekst = IBeatClick[Pet] then Ini.BeatClick := Pet;

-

-  // SavePlayback

-  Tekst := IniFile.ReadString('Sound',    'SavePlayback', ISavePlayback[0]);

-  for Pet := 0 to High(ISavePlayback) do

-    if Tekst = ISavePlayback[Pet] then Ini.SavePlayback := Pet;

-

-  // Threshold

-  Tekst := IniFile.ReadString('Sound', 'Threshold', IThreshold[2]);

-  for Pet := 0 to High(IThreshold) do

-    if Tekst = IThreshold[Pet] then Ini.Threshold := Pet;

-

-  //Song Preview

-  Tekst := IniFile.ReadString('Sound', 'PreviewVolume', IPreviewVolume[7]);

-  for Pet := 0 to High(IPreviewVolume) do

-    if Tekst = IPreviewVolume[Pet] then Ini.PreviewVolume := Pet;

-

-  Tekst := IniFile.ReadString('Sound', 'PreviewFading', IPreviewFading[1]);

-  for Pet := 0 to High(IPreviewFading) do

-    if Tekst = IPreviewFading[Pet] then Ini.PreviewFading := Pet;

-

-  // Lyrics Font

-  Tekst := IniFile.ReadString('Lyrics',    'LyricsFont',   ILyricsFont[1]);

-  for Pet := 0 to High(ILyricsFont) do

-    if Tekst = ILyricsFont[Pet] then Ini.LyricsFont := Pet;

-

-  // Lyrics Effect

-  Tekst := IniFile.ReadString('Lyrics',    'LyricsEffect',   ILyricsEffect[1]);

-  for Pet := 0 to High(ILyricsEffect) do

-    if Tekst = ILyricsEffect[Pet] then Ini.LyricsEffect := Pet;

-

-  // Solmization

-  Tekst := IniFile.ReadString('Lyrics',    'Solmization',   ISolmization[0]);

-  for Pet := 0 to High(ISolmization) do

-    if Tekst = ISolmization[Pet] then Ini.Solmization := Pet;

-

-  // Theme

-

-  //Theme List Patch

-

-    //I2 Saves the no of the Deluxe (Standard-) Theme

-    I2 := 0;

-    //I counts is the cur. Theme no

-    I := 0;

-

-    SetLength(ITheme, 0);

-    FindFirst('Themes' + PathDelim + '*.ini',faAnyFile,SR);

-    Repeat

-      //Read Themename from Theme

-      ThemeIni := TMemIniFile.Create(SR.Name);

-      Tekst := UpperCase(ThemeIni.ReadString('Theme','Name',GetFileName(SR.Name)));

-      ThemeIni.Free;

-

-      //if Deluxe Theme then save Themeno to I2

-      if (Tekst = 'DELUXE') then

-        I2 := I;

-

-      //Search for Skins for this Theme

-      for Pet := low(Skin.Skin) to high(Skin.Skin) do

-      begin

-        if UpperCase(Skin.Skin[Pet].Theme) = Tekst then

-        begin

-          SetLength(ITheme, Length(ITheme)+1);

-          ITheme[High(ITheme)] := GetFileName(SR.Name);

-          break;

-        end;

-      end;

-

-      Inc(I);

-    Until FindNext(SR) <> 0;

-    FindClose(SR);

-  //Theme List Patch End }

-

-  //No Theme Found

-  if (Length(ITheme)=0) then

-  begin

-    Log.CriticalError('Could not find any valid Themes.');

-  end;

-

-

-  Tekst := IniFile.ReadString('Themes',    'Theme',   ITheme[I2]);

-  Ini.Theme := 0;

-  for Pet := 0 to High(ITheme) do

-    if Uppercase(Tekst) = Uppercase(ITheme[Pet]) then Ini.Theme := Pet;

-

-  // Skin

-  Skin.onThemeChange;

-  Ini.SkinNo := 0;

-

-  Tekst := IniFile.ReadString('Themes',    'Skin',   ISkin[0]);

-  for Pet := 0 to High(ISkin) do

-    if Tekst = ISkin[Pet] then Ini.SkinNo := Pet;

-

-  // Color

-  Tekst := IniFile.ReadString('Themes',    'Color',   IColor[0]);

-  for Pet := 0 to High(IColor) do

-    if Tekst = IColor[Pet] then Ini.Color := Pet;

-

-  // Record - load ini list

-  SetLength(CardList, 0);

-  I := 1;

-  while (IniFile.ValueExists('Record', 'DeviceName' + IntToStr(I)) = true) do begin

-    //Automatically Delete not Existing Sound Cards

-    S := IniFile.ReadString('Record', 'DeviceName' + IntToStr(I), '');

-    //{

-    B := False;

-    //Look for Soundcard

-    for I2 := 0 to High(Recording.SoundCard) do

-    begin

-      if (S = Trim(Recording.SoundCard[I2].Description)) then

-      begin

-      B := True;

-      Break;

-      end;

-    end;

-

-    if B then

-    begin //}

-      I3 := Length(CardList);

-      SetLength(CardList, I3+1);

-      Ini.CardList[I3].Name := S;

-      Ini.CardList[I3].Input := IniFile.ReadInteger('Record', 'Input' + IntToStr(I), 0);

-      Ini.CardList[I3].ChannelL := IniFile.ReadInteger('Record', 'ChannelL' + IntToStr(I), 0);

-      Ini.CardList[I3].ChannelR := IniFile.ReadInteger('Record', 'ChannelR' + IntToStr(I), 0);

-    end;

-    Inc(I);

-  end;

-

-  // Record - append detected soundcards

-  for I := 0 to High(Recording.SoundCard) do

-  begin

-    B := False;

-    For I2 := 0 to High(CardList) do

-    begin //Search for Card in List

-      if (CardList[I2].Name = Trim(Recording.SoundCard[I].Description)) then

-      begin

-        B := True;

-        Break;

-      end;

-    end;

-

-    //If not in List -> Add

-    If not B then

-    begin

-      I3 := Length(CardList);

-      SetLength(CardList, I3+1);

-      CardList[I3].Name := Trim(Recording.SoundCard[I].Description);

-      CardList[I3].Input := 0;

-      CardList[I3].ChannelL := 0;

-      CardList[I3].ChannelR := 0;

-      // default for new users

-      if (Length(CardList) = 1) then

-        CardList[I].ChannelL := 1;

-    end;

-  end;

-

-  //Advanced Settings

-

-  // LoadAnimation

-  Tekst := IniFile.ReadString('Advanced', 'LoadAnimation', 'On');

-  for Pet := 0 to High(ILoadAnimation) do

-    if Tekst = ILoadAnimation[Pet] then Ini.LoadAnimation := Pet;

-

-  // ScreenFade

-  Tekst := IniFile.ReadString('Advanced', 'ScreenFade', 'On');

-  for Pet := 0 to High(IScreenFade) do

-    if Tekst = IScreenFade[Pet] then Ini.ScreenFade := Pet;

-

-  // EffectSing

-  Tekst := IniFile.ReadString('Advanced', 'EffectSing', 'On');

-  for Pet := 0 to High(IEffectSing) do

-    if Tekst = IEffectSing[Pet] then Ini.EffectSing := Pet;

-

-  // AskbeforeDel

-  Tekst := IniFile.ReadString('Advanced', 'AskbeforeDel', 'On');

-  for Pet := 0 to High(IAskbeforeDel) do

-    if Tekst = IAskbeforeDel[Pet] then Ini.AskbeforeDel := Pet;

-

-  // OnSongClick

-  Tekst := IniFile.ReadString('Advanced', 'OnSongClick', 'Sing');

-  for Pet := 0 to High(IOnSongClick) do

-    if Tekst = IOnSongClick[Pet] then Ini.OnSongClick := Pet;

-

-  // Linebonus

-  Tekst := IniFile.ReadString('Advanced', 'LineBonus', 'At Score');

-  for Pet := 0 to High(ILineBonus) do

-    if Tekst = ILineBonus[Pet] then Ini.LineBonus := Pet;

-

-  // PartyPopup

-  Tekst := IniFile.ReadString('Advanced', 'PartyPopup', 'On');

-  for Pet := 0 to High(IPartyPopup) do

-    if Tekst = IPartyPopup[Pet] then Ini.PartyPopup := Pet;

-

-

-  // Joypad

-  Tekst := IniFile.ReadString('Controller',    'Joypad',   IJoypad[0]);

-  for Pet := 0 to High(IJoypad) do

-    if Tekst = IJoypad[Pet] then Ini.Joypad := Pet;

-

-  // LCD

-  Tekst := IniFile.ReadString('Devices',    'LPT',   ILPT[0]);

-  for Pet := 0 to High(ILPT) do

-    if Tekst = ILPT[Pet] then Ini.LPT := Pet;

-

-

-  // SongPath

-  if (Params.SongPath <> '') then

-    SongPath := IncludeTrailingPathDelimiter(Params.SongPath)

-  else

-    SongPath := IncludeTrailingPathDelimiter(IniFile.ReadString('Path', 'Songs', SongPath));

-

-  Filename := IniFile.FileName;

-  IniFile.Free;

-end;

-

-procedure TIni.Save;

-var

-  IniFile:    TIniFile;

-  Tekst:      string;

-  I: Integer;

-  S: String;

-begin

-  //if not (FileExists(GamePath + 'config.ini') and FileIsReadOnly(GamePath + 'config.ini')) then begin

-  if not (FileExists(Filename) and FileIsReadOnly(Filename)) then begin

-

-    IniFile := TIniFile.Create(Filename);

-

-    // Players

-    Tekst := IPlayers[Ini.Players];

-    IniFile.WriteString('Game',     'Players',   Tekst);

-

-    // Difficulty

-    Tekst := IDifficulty[Ini.Difficulty];

-    IniFile.WriteString('Game',     'Difficulty',   Tekst);

-

-    // Language

-    Tekst := ILanguage[Ini.Language];

-    IniFile.WriteString('Game',     'Language',   Tekst);

-

-    // Tabs

-    Tekst := ITabs[Ini.Tabs];

-    IniFile.WriteString('Game',     'Tabs',   Tekst);

-

-    // Sorting

-    Tekst := ISorting[Ini.Sorting];

-    IniFile.WriteString('Game',     'Sorting',   Tekst);

-

-    // Debug

-    Tekst := IDebug[Ini.Debug];

-    IniFile.WriteString('Game',     'Debug',   Tekst);

-

-    // Screens

-    Tekst := IScreens[Ini.Screens];

-    IniFile.WriteString('Graphics', 'Screens', Tekst);

-

-    // FullScreen

-    Tekst := IFullScreen[Ini.FullScreen];

-    IniFile.WriteString('Graphics', 'FullScreen', Tekst);

-

-    // Resolution

-    Tekst := IResolution[Ini.Resolution];

-    IniFile.WriteString('Graphics', 'Resolution', Tekst);

-

-    // Depth

-    Tekst := IDepth[Ini.Depth];

-    IniFile.WriteString('Graphics', 'Depth', Tekst);

-

-    // Resolution

-    Tekst := ITextureSize[Ini.TextureSize];

-    IniFile.WriteString('Graphics', 'TextureSize', Tekst);

-

-    // Sing Window

-    Tekst := ISingWindow[Ini.SingWindow];

-    IniFile.WriteString('Graphics', 'SingWindow', Tekst);

-

-    // Oscilloscope

-    Tekst := IOscilloscope[Ini.Oscilloscope];

-    IniFile.WriteString('Graphics', 'Oscilloscope', Tekst);

-

-    // Spectrum

-    Tekst := ISpectrum[Ini.Spectrum];

-    IniFile.WriteString('Graphics', 'Spectrum', Tekst);

-

-    // Spectrograph

-    Tekst := ISpectrograph[Ini.Spectrograph];

-    IniFile.WriteString('Graphics', 'Spectrograph', Tekst);

-

-    // Movie Size

-    Tekst := IMovieSize[Ini.MovieSize];

-    IniFile.WriteString('Graphics', 'MovieSize', Tekst);

-

-    // MicBoost

-    Tekst := IMicBoost[Ini.MicBoost];

-    IniFile.WriteString('Sound',    'MicBoost',    Tekst);

-

-    // ClickAssist

-    Tekst := IClickAssist[Ini.ClickAssist];

-    IniFile.WriteString('Sound',    'ClickAssist',    Tekst);

-

-    // BeatClick

-    Tekst := IBeatClick[Ini.BeatClick];

-    IniFile.WriteString('Sound',    'BeatClick',    Tekst);

-

-    // Threshold

-    Tekst := IThreshold[Ini.Threshold];

-    IniFile.WriteString('Sound',    'Threshold',    Tekst);

-

-    // Song Preview

-    Tekst := IPreviewVolume[Ini.PreviewVolume];

-    IniFile.WriteString('Sound',    'PreviewVolume',    Tekst);

-

-    Tekst := IPreviewFading[Ini.PreviewFading];

-    IniFile.WriteString('Sound',    'PreviewFading',    Tekst);

-

-    // SavePlayback

-    Tekst := ISavePlayback[Ini.SavePlayback];

-    IniFile.WriteString('Sound',    'SavePlayback',    Tekst);

-

-    // Lyrics Font

-    Tekst := ILyricsFont[Ini.LyricsFont];

-    IniFile.WriteString('Lyrics',    'LyricsFont',    Tekst);

-

-    // Lyrics Effect

-    Tekst := ILyricsEffect[Ini.LyricsEffect];

-    IniFile.WriteString('Lyrics',    'LyricsEffect',    Tekst);

-

-    // Solmization

-    Tekst := ISolmization[Ini.Solmization];

-    IniFile.WriteString('Lyrics',    'Solmization',    Tekst);

-

-    // Theme

-    Tekst := ITheme[Ini.Theme];

-    IniFile.WriteString('Themes',    'Theme',    Tekst);

-

-    // Skin

-    Tekst := ISkin[Ini.SkinNo];

-    IniFile.WriteString('Themes',    'Skin',    Tekst);

-

-    // Color

-    Tekst := IColor[Ini.Color];

-    IniFile.WriteString('Themes',    'Color',    Tekst);

-

-    // Record

-      for I := 0 to High(CardList) do begin

-        S := IntToStr(I+1);

-

-        Tekst := CardList[I].Name;

-        IniFile.WriteString('Record', 'DeviceName' + S, Tekst);

-

-        Tekst := IntToStr(CardList[I].Input);

-        IniFile.WriteString('Record', 'Input' + S, Tekst);

-

-        Tekst := IntToStr(CardList[I].ChannelL);

-        IniFile.WriteString('Record', 'ChannelL' + S, Tekst);

-

-        Tekst := IntToStr(CardList[I].ChannelR);

-        IniFile.WriteString('Record', 'ChannelR' + S, Tekst);

-      end;

-

-      //Log.LogError(InttoStr(Length(CardList)) + ' Cards Saved');

-

-    //Advanced Settings

-

-    //LoadAnimation

-    Tekst := ILoadAnimation[Ini.LoadAnimation];

-    IniFile.WriteString('Advanced', 'LoadAnimation', Tekst);

-

-    //EffectSing

-    Tekst := IEffectSing[Ini.EffectSing];

-    IniFile.WriteString('Advanced', 'EffectSing', Tekst);

-

-    //ScreenFade

-    Tekst := IScreenFade[Ini.ScreenFade];

-    IniFile.WriteString('Advanced', 'ScreenFade', Tekst);

-

-    //AskbeforeDel

-    Tekst := IAskbeforeDel[Ini.AskbeforeDel];

-    IniFile.WriteString('Advanced', 'AskbeforeDel', Tekst);

-

-    //OnSongClick

-    Tekst := IOnSongClick[Ini.OnSongClick];

-    IniFile.WriteString('Advanced', 'OnSongClick', Tekst);

-

-    //Line Bonus

-    Tekst := ILineBonus[Ini.LineBonus];

-    IniFile.WriteString('Advanced', 'LineBonus', Tekst);

-

-    //Party Popup

-    Tekst := IPartyPopup[Ini.PartyPopup];

-    IniFile.WriteString('Advanced', 'PartyPopup', Tekst);

-

-    // Joypad

-    Tekst := IJoypad[Ini.Joypad];

-    IniFile.WriteString('Controller',    'Joypad',    Tekst);

-

-    IniFile.Free;

-  end;

-end;

-

-procedure TIni.SaveNames;

-var

-  IniFile:    TIniFile;

-  I:          integer;

-begin

-  //if not FileIsReadOnly(GamePath + 'config.ini') then begin

-    //IniFile := TIniFile.Create(GamePath + 'config.ini');

-  if not FileIsReadOnly(Filename) then begin

-    IniFile := TIniFile.Create(Filename);

-

-    //Name

-      // Templates for Names Mod

-    for I := 1 to 12 do

-      IniFile.WriteString('Name', 'P' + IntToStr(I), Ini.Name[I-1]);

-    for I := 1 to 3 do

-      IniFile.WriteString('NameTeam', 'T' + IntToStr(I), Ini.NameTeam[I-1]);

-    for I := 1 to 12 do

-      IniFile.WriteString('NameTemplate', 'Name' + IntToStr(I), Ini.NameTemplate[I-1]);

-

-    IniFile.Free;

-  end;

-end;

-

-procedure TIni.SaveLevel;

-var

-  IniFile:    TIniFile;

-  I:          integer;

-begin

-  //if not FileIsReadOnly(GamePath + 'config.ini') then begin

-    //IniFile := TIniFile.Create(GamePath + 'config.ini');

-  if not FileIsReadOnly(Filename) then begin

-    IniFile := TIniFile.Create(Filename);

-

-    // Difficulty

-    IniFile.WriteString('Game', 'Difficulty', IDifficulty[Ini.Difficulty]);

-

-    IniFile.Free;

-  end;

-end;

-

-end.
\ No newline at end of file
+unit UIni;
+
+interface
+
+{$IFDEF FPC}
+  {$MODE Delphi}
+{$ENDIF}
+
+{$I switches.inc}
+
+uses IniFiles, ULog, SysUtils;
+
+type
+  TIni = class
+    Name:           array[0..11] of string;
+
+    // Templates for Names Mod
+    NameTeam:       array[0..2] of string;
+    NameTemplate:   array[0..11] of string;
+
+    //Filename of the opened iniFile
+    Filename:       string;
+
+    // Game
+    Players:        integer;
+    Difficulty:     integer;
+    Language:       integer;
+    Tabs:           integer;
+    Tabs_at_startup:integer; //Tabs at Startup fix
+    Sorting:        integer;
+    Debug:          integer;
+
+    // Graphics
+    Screens:        integer;
+    Resolution:     integer;
+    Depth:          integer;
+    FullScreen:     integer;
+    TextureSize:    integer;
+    SingWindow:     integer;
+    Oscilloscope:   integer;
+    Spectrum:       integer;
+    Spectrograph:   integer;
+    MovieSize:      integer;
+
+    // Sound
+    MicBoost:       integer;
+    ClickAssist:    integer;
+    BeatClick:      integer;
+    SavePlayback:   integer;
+    Threshold:      integer;
+
+    //Song Preview
+    PreviewVolume: integer;
+    PreviewFading: integer;
+
+    // Lyrics
+    LyricsFont:     integer;
+    LyricsEffect:   integer;
+    Solmization:    integer;
+
+    // Themes
+    Theme:          integer;
+    SkinNo:           integer;
+    Color:          integer;
+
+    // Record
+    Card:           integer; // not saved in config.ini
+
+    CardList:       array of record
+      Name:           string;
+      Input:          integer;
+      ChannelL:       integer;
+      ChannelR:       integer;
+    end;
+
+    // Advanced
+    LoadAnimation:  integer;
+    EffectSing:     integer;
+    ScreenFade:     integer;
+    AskbeforeDel:   integer;
+    OnSongClick:    integer;
+    LineBonus:      integer;
+    PartyPopup:     integer;
+
+    // Controller
+    Joypad:         integer;
+
+    // Soundcards
+    SoundCard:      array[0..7, 1..2] of integer;
+
+    // Devices
+    LPT:            integer;
+
+    procedure Load;
+    procedure Save;
+    procedure SaveNames;
+    procedure SaveLevel;
+  end;
+
+
+var
+  Ini:    TIni;
+  IResolution:    array of string;
+  ILanguage:      array of string;
+  ITheme:         array of string;
+  ISkin:          array of string;
+  ICard:          array of string;
+  IInput:         array of string;
+
+const
+  IPlayers:       array[0..4] of string = ('1', '2', '3', '4', '6');
+  IDifficulty:    array[0..2] of string = ('Easy', 'Medium', 'Hard');
+  ITabs:          array[0..1] of string = ('Off', 'On');
+
+  ISorting:       array[0..7] of string = ('Edition', 'Genre', 'Language', 'Folder', 'Title', 'Artist', 'Title2', 'Artist2');
+  sEdition = 0;
+  sGenre = 1;
+  sLanguage = 2;
+  sFolder = 3;
+  sTitle = 4;
+  sArtist = 5;
+  sTitle2 = 6;
+  sArtist2 = 7;
+
+  IDebug:         array[0..1] of string = ('Off', 'On');
+
+  IScreens:       array[0..1] of string = ('1', '2');
+  IFullScreen:    array[0..1] of string = ('Off', 'On');
+  IDepth:         array[0..1] of string = ('16 bit', '32 bit');
+  ITextureSize:   array[0..2] of string = ('128', '256', '512');
+  ISingWindow:    array[0..1] of string = ('Small', 'Big');
+
+  //SingBar Mod
+  IOscilloscope:  array[0..2] of string = ('Off', 'Osci', 'Bar');
+  //IOscilloscope:  array[0..1] of string = ('Off', 'On');
+
+  ISpectrum:      array[0..1] of string = ('Off', 'On');
+  ISpectrograph:  array[0..1] of string = ('Off', 'On');
+  IMovieSize:     array[0..2] of string = ('Half', 'Full [Vid]', 'Full [BG+Vid]');
+
+  IMicBoost:      array[0..3] of string = ('Off', '+6dB', '+12dB', '+18dB');
+  IClickAssist:   array[0..1] of string = ('Off', 'On');
+  IBeatClick:     array[0..1] of string = ('Off', 'On');
+  ISavePlayback:  array[0..1] of string = ('Off', 'On');
+  IThreshold:     array[0..3] of string = ('5%', '10%', '15%', '20%');
+  //Song Preview
+  IPreviewVolume: array[0..10] of string = ('Off', '10%', '20%', '30%', '40%', '50%', '60%', '70%', '80%', '90%', '100%');
+  IPreviewFading: array[0..5] of string  = ('Off', '1 Sec', '2 Secs', '3 Secs', '4 Secs', '5 Secs');
+
+
+  ILyricsFont:    array[0..2] of string = ('Plain', 'OLine1', 'OLine2');
+  ILyricsEffect:  array[0..3] of string = ('Simple', 'Zoom', 'Slide', 'Ball');
+  ISolmization:   array[0..3] of string = ('Off', 'Euro', 'Jap', 'American');
+
+  IColor:         array[0..8] of string = ('Blue', 'Green', 'Pink', 'Red', 'Violet', 'Orange', 'Yellow', 'Brown', 'Black');
+
+  // Advanced
+  ILoadAnimation: array[0..1] of string = ('Off', 'On');
+  IEffectSing:    array[0..1] of string = ('Off', 'On');
+  IScreenFade: array [0..1] of String =('Off', 'On');
+  IAskbeforeDel:  array[0..1] of string = ('Off', 'On');
+  IOnSongClick:   array[0..2] of string = ('Sing', 'Select Players', 'Open Menu');
+  ILineBonus:  array[0..2] of string = ('Off', 'At Score', 'At Notes');
+  IPartyPopup: array[0..1] of string = ('Off', 'On');
+
+  IJoypad:        array[0..1] of string = ('Off', 'On');
+  ILPT:           array[0..2] of string = ('Off', 'LCD', 'Lights');
+
+  IChannel:       array[0..6] of string = ('Off', '1', '2', '3', '4', '5', '6');
+
+implementation
+
+uses //UFiles,
+     UMain,
+     SDL,
+     ULanguage,
+     USkins,
+     URecord,
+     UCommandLine;
+
+procedure TIni.Load;
+var
+  IniFile:    TMemIniFile;
+  ThemeIni:   TMemIniFile;
+  Tekst:      string;
+  Pet:        integer;
+  B: boolean;
+  I, I2, I3:          integer;
+  S:          string;
+  Modes:      PPSDL_Rect;
+  SR: TSearchRec; //Skin List Patch
+
+  function GetFileName (S: String):String;
+  begin
+  //Result := copy (S,0,StrRScan (PChar(S),char('.'))+1);
+    Result := copy (S,0,Pos ('.ini',S)-1);
+  end;
+
+begin
+  GamePath := ExtractFilePath(ParamStr(0));
+
+  if (Params.ConfigFile <> '') then
+    try
+      IniFile := TMemIniFile.Create(Params.ConfigFile);
+    except
+      IniFile := TMemIniFile.Create(GamePath + 'config.ini');
+    end
+  else
+    IniFile := TMemIniFile.Create(GamePath + 'config.ini');
+
+
+  // Name
+  for I := 0 to 11 do
+    Ini.Name[I] := IniFile.ReadString('Name', 'P'+IntToStr(I+1), 'Player'+IntToStr(I+1));
+
+
+  // Templates for Names Mod
+  for I := 0 to 2 do
+    Ini.NameTeam[I] := IniFile.ReadString('NameTeam', 'T'+IntToStr(I+1), 'Team'+IntToStr(I+1));
+  for I := 0 to 11 do
+    Ini.NameTemplate[I] := IniFile.ReadString('NameTemplate', 'Name'+IntToStr(I+1), 'Template'+IntToStr(I+1));
+
+  // Players
+  Tekst := IniFile.ReadString('Game', 'Players', IPlayers[0]);
+  for Pet := 0 to High(IPlayers) do
+    if Tekst = IPlayers[Pet] then Ini.Players := Pet;
+
+  // Difficulty
+  Tekst := IniFile.ReadString('Game', 'Difficulty', 'Easy');
+  for Pet := 0 to High(IDifficulty) do
+    if Tekst = IDifficulty[Pet] then Ini.Difficulty := Pet;
+
+  // Language
+  Tekst := IniFile.ReadString('Game', 'Language', 'English');
+  for Pet := 0 to High(ILanguage) do
+    if Tekst = ILanguage[Pet] then Ini.Language := Pet;
+
+//  Language.ChangeLanguage(ILanguage[Ini.Language]);
+
+  // Tabs
+  Tekst := IniFile.ReadString('Game', 'Tabs', ITabs[0]);
+  for Pet := 0 to High(ITabs) do
+    if Tekst = ITabs[Pet] then Ini.Tabs := Pet;
+
+  //Tabs at Startup fix
+  Ini.Tabs_at_startup := Ini.Tabs;
+
+  // Sorting
+  Tekst := IniFile.ReadString('Game', 'Sorting', ISorting[0]);
+  for Pet := 0 to High(ISorting) do
+    if Tekst = ISorting[Pet] then Ini.Sorting := Pet;
+
+  // Debug
+  Tekst := IniFile.ReadString('Game', 'Debug', IDebug[0]);
+  for Pet := 0 to High(IDebug) do
+    if Tekst = IDebug[Pet] then Ini.Debug := Pet;
+
+  //if Ini.Debug = 1 then SongPath := 'E:\UltraStar 03\Songs\';
+
+  // Screens
+  Tekst := IniFile.ReadString('Graphics', 'Screens', IScreens[0]);
+  for Pet := 0 to High(IScreens) do
+    if Tekst = IScreens[Pet] then Ini.Screens := Pet;
+
+  // FullScreen
+  Tekst := IniFile.ReadString('Graphics', 'FullScreen', 'On');
+  for Pet := 0 to High(IFullScreen) do
+    if Tekst = IFullScreen[Pet] then Ini.FullScreen := Pet;
+
+
+  // Resolution
+  SetLength(IResolution, 0);
+
+  Modes  := SDL_ListModes(nil, SDL_OPENGL or SDL_FULLSCREEN); // Check if there are any modes available
+  while assigned( Modes^ ) do //this should solve the biggest wine problem | THANKS Linnex (11.11.07)
+  begin
+    SetLength(IResolution, Length(IResolution) + 1);
+    IResolution[High(IResolution)] := IntToStr(Modes^.w) + 'x' + IntToStr(Modes^.h);
+    Inc(Modes);
+  end;
+
+  // if no modes were set, then failback to 800x600
+  // as per http://sourceforge.net/forum/message.php?msg_id=4544965
+  // THANKS : linnex at users.sourceforge.net
+  if Length(IResolution) < 1 then
+  begin
+    SetLength(IResolution, Length(IResolution) + 1);
+    IResolution[High(IResolution)] := IntToStr(800) + 'x' + IntToStr(600);
+    Log.LogStatus('SDL_ListModes Defaulted Res To : ' + IResolution[High(IResolution)] , 'Graphics - Resolutions');
+
+    // Default to fullscreen OFF, in this case !
+    Ini.FullScreen := 0;
+  end;
+
+  // reverse order
+  for I := 0 to (Length(IResolution) div 2) - 1 do begin
+    S := IResolution[I];
+    IResolution[I] := IResolution[High(IResolution)-I];
+    IResolution[High(IResolution)-I] := S;
+  end;
+
+  Tekst := IniFile.ReadString('Graphics', 'Resolution', '800x600');
+  for Pet := 0 to High(IResolution) do
+    if Tekst = IResolution[Pet] then Ini.Resolution := Pet;
+
+
+  // Resolution
+  Tekst := IniFile.ReadString('Graphics', 'Depth', '32 bit');
+  for Pet := 0 to High(IDepth) do
+    if Tekst = IDepth[Pet] then Ini.Depth := Pet;
+
+  // Texture Size
+  Tekst := IniFile.ReadString('Graphics', 'TextureSize', ITextureSize[1]);
+  for Pet := 0 to High(ITextureSize) do
+    if Tekst = ITextureSize[Pet] then Ini.TextureSize := Pet;
+
+  // SingWindow
+  Tekst := IniFile.ReadString('Graphics', 'SingWindow', 'Big');
+  for Pet := 0 to High(ISingWindow) do
+    if Tekst = ISingWindow[Pet] then Ini.SingWindow := Pet;
+
+  // Oscilloscope
+  Tekst := IniFile.ReadString('Graphics', 'Oscilloscope', 'Bar');
+  for Pet := 0 to High(IOscilloscope) do
+    if Tekst = IOscilloscope[Pet] then Ini.Oscilloscope := Pet;
+
+  // Spectrum
+  Tekst := IniFile.ReadString('Graphics', 'Spectrum', 'Off');
+  for Pet := 0 to High(ISpectrum) do
+    if Tekst = ISpectrum[Pet] then Ini.Spectrum := Pet;
+
+  // Spectrograph
+  Tekst := IniFile.ReadString('Graphics', 'Spectrograph', 'Off');
+  for Pet := 0 to High(ISpectrograph) do
+    if Tekst = ISpectrograph[Pet] then Ini.Spectrograph := Pet;
+
+  // MovieSize
+  Tekst := IniFile.ReadString('Graphics', 'MovieSize', IMovieSize[2]);
+  for Pet := 0 to High(IMovieSize) do
+    if Tekst = IMovieSize[Pet] then Ini.MovieSize := Pet;
+
+  // MicBoost
+  Tekst := IniFile.ReadString('Sound',    'MicBoost',    'Off');
+  for Pet := 0 to High(IMicBoost) do
+    if Tekst = IMicBoost[Pet] then Ini.MicBoost := Pet;
+
+  // ClickAssist
+  Tekst := IniFile.ReadString('Sound',    'ClickAssist', 'Off');
+  for Pet := 0 to High(IClickAssist) do
+    if Tekst = IClickAssist[Pet] then Ini.ClickAssist := Pet;
+
+  // BeatClick
+  Tekst := IniFile.ReadString('Sound',    'BeatClick', IBeatClick[0]);
+  for Pet := 0 to High(IBeatClick) do
+    if Tekst = IBeatClick[Pet] then Ini.BeatClick := Pet;
+
+  // SavePlayback
+  Tekst := IniFile.ReadString('Sound',    'SavePlayback', ISavePlayback[0]);
+  for Pet := 0 to High(ISavePlayback) do
+    if Tekst = ISavePlayback[Pet] then Ini.SavePlayback := Pet;
+
+  // Threshold
+  Tekst := IniFile.ReadString('Sound', 'Threshold', IThreshold[2]);
+  for Pet := 0 to High(IThreshold) do
+    if Tekst = IThreshold[Pet] then Ini.Threshold := Pet;
+
+  //Song Preview
+  Tekst := IniFile.ReadString('Sound', 'PreviewVolume', IPreviewVolume[7]);
+  for Pet := 0 to High(IPreviewVolume) do
+    if Tekst = IPreviewVolume[Pet] then Ini.PreviewVolume := Pet;
+
+  Tekst := IniFile.ReadString('Sound', 'PreviewFading', IPreviewFading[1]);
+  for Pet := 0 to High(IPreviewFading) do
+    if Tekst = IPreviewFading[Pet] then Ini.PreviewFading := Pet;
+
+  // Lyrics Font
+  Tekst := IniFile.ReadString('Lyrics',    'LyricsFont',   ILyricsFont[1]);
+  for Pet := 0 to High(ILyricsFont) do
+    if Tekst = ILyricsFont[Pet] then Ini.LyricsFont := Pet;
+
+  // Lyrics Effect
+  Tekst := IniFile.ReadString('Lyrics',    'LyricsEffect',   ILyricsEffect[1]);
+  for Pet := 0 to High(ILyricsEffect) do
+    if Tekst = ILyricsEffect[Pet] then Ini.LyricsEffect := Pet;
+
+  // Solmization
+  Tekst := IniFile.ReadString('Lyrics',    'Solmization',   ISolmization[0]);
+  for Pet := 0 to High(ISolmization) do
+    if Tekst = ISolmization[Pet] then Ini.Solmization := Pet;
+
+  // Theme
+
+  //Theme List Patch
+
+    //I2 Saves the no of the Deluxe (Standard-) Theme
+    I2 := 0;
+    //I counts is the cur. Theme no
+    I := 0;
+
+    SetLength(ITheme, 0);
+    writeln( 'Searching for Theme : '+ ThemePath + '*.ini' );
+    FindFirst(ThemePath + '*.ini',faAnyFile,SR);
+    Repeat
+      writeln( SR.Name );
+
+      //Read Themename from Theme
+      ThemeIni := TMemIniFile.Create(SR.Name);
+      Tekst    := UpperCase(ThemeIni.ReadString('Theme','Name',GetFileName(SR.Name)));
+      ThemeIni.Free;
+
+      //if Deluxe Theme then save Themeno to I2
+      if (Tekst = 'DELUXE') then
+        I2 := I;
+
+      //Search for Skins for this Theme
+      for Pet := low(Skin.Skin) to high(Skin.Skin) do
+      begin
+        writeln( 'forloop' );
+        if UpperCase(Skin.Skin[Pet].Theme) = Tekst then
+        begin
+        writeln( 'match' );
+          SetLength(ITheme, Length(ITheme)+1);
+          ITheme[High(ITheme)] := GetFileName(SR.Name);
+          break;
+        end;
+      end;
+
+      Inc(I);
+    Until FindNext(SR) <> 0;
+    FindClose(SR);
+  //Theme List Patch End }
+
+  //No Theme Found
+  if (Length(ITheme)=0) then
+  begin
+    Log.CriticalError('Could not find any valid Themes.');
+  end;
+
+
+  Tekst := IniFile.ReadString('Themes',    'Theme',   ITheme[I2]);
+  Ini.Theme := 0;
+  for Pet := 0 to High(ITheme) do
+    if Uppercase(Tekst) = Uppercase(ITheme[Pet]) then Ini.Theme := Pet;
+
+  // Skin
+  Skin.onThemeChange;
+  Ini.SkinNo := 0;
+
+  Tekst := IniFile.ReadString('Themes',    'Skin',   ISkin[0]);
+  for Pet := 0 to High(ISkin) do
+    if Tekst = ISkin[Pet] then Ini.SkinNo := Pet;
+
+  // Color
+  Tekst := IniFile.ReadString('Themes',    'Color',   IColor[0]);
+  for Pet := 0 to High(IColor) do
+    if Tekst = IColor[Pet] then Ini.Color := Pet;
+
+  // Record - load ini list
+  SetLength(CardList, 0);
+  I := 1;
+  while (IniFile.ValueExists('Record', 'DeviceName' + IntToStr(I)) = true) do begin
+    //Automatically Delete not Existing Sound Cards
+    S := IniFile.ReadString('Record', 'DeviceName' + IntToStr(I), '');
+    //{
+    B := False;
+    //Look for Soundcard
+    for I2 := 0 to High(Recording.SoundCard) do
+    begin
+      if (S = Trim(Recording.SoundCard[I2].Description)) then
+      begin
+      B := True;
+      Break;
+      end;
+    end;
+
+    if B then
+    begin //}
+      I3 := Length(CardList);
+      SetLength(CardList, I3+1);
+      Ini.CardList[I3].Name := S;
+      Ini.CardList[I3].Input := IniFile.ReadInteger('Record', 'Input' + IntToStr(I), 0);
+      Ini.CardList[I3].ChannelL := IniFile.ReadInteger('Record', 'ChannelL' + IntToStr(I), 0);
+      Ini.CardList[I3].ChannelR := IniFile.ReadInteger('Record', 'ChannelR' + IntToStr(I), 0);
+    end;
+    Inc(I);
+  end;
+
+  // Record - append detected soundcards
+  for I := 0 to High(Recording.SoundCard) do
+  begin
+    B := False;
+    For I2 := 0 to High(CardList) do
+    begin //Search for Card in List
+      if (CardList[I2].Name = Trim(Recording.SoundCard[I].Description)) then
+      begin
+        B := True;
+        Break;
+      end;
+    end;
+
+    //If not in List -> Add
+    If not B then
+    begin
+      I3 := Length(CardList);
+      SetLength(CardList, I3+1);
+      CardList[I3].Name := Trim(Recording.SoundCard[I].Description);
+      CardList[I3].Input := 0;
+      CardList[I3].ChannelL := 0;
+      CardList[I3].ChannelR := 0;
+      // default for new users
+      if (Length(CardList) = 1) then
+        CardList[I].ChannelL := 1;
+    end;
+  end;
+
+  //Advanced Settings
+
+  // LoadAnimation
+  Tekst := IniFile.ReadString('Advanced', 'LoadAnimation', 'On');
+  for Pet := 0 to High(ILoadAnimation) do
+    if Tekst = ILoadAnimation[Pet] then Ini.LoadAnimation := Pet;
+
+  // ScreenFade
+  Tekst := IniFile.ReadString('Advanced', 'ScreenFade', 'On');
+  for Pet := 0 to High(IScreenFade) do
+    if Tekst = IScreenFade[Pet] then Ini.ScreenFade := Pet;
+
+  // EffectSing
+  Tekst := IniFile.ReadString('Advanced', 'EffectSing', 'On');
+  for Pet := 0 to High(IEffectSing) do
+    if Tekst = IEffectSing[Pet] then Ini.EffectSing := Pet;
+
+  // AskbeforeDel
+  Tekst := IniFile.ReadString('Advanced', 'AskbeforeDel', 'On');
+  for Pet := 0 to High(IAskbeforeDel) do
+    if Tekst = IAskbeforeDel[Pet] then Ini.AskbeforeDel := Pet;
+
+  // OnSongClick
+  Tekst := IniFile.ReadString('Advanced', 'OnSongClick', 'Sing');
+  for Pet := 0 to High(IOnSongClick) do
+    if Tekst = IOnSongClick[Pet] then Ini.OnSongClick := Pet;
+
+  // Linebonus
+  Tekst := IniFile.ReadString('Advanced', 'LineBonus', 'At Score');
+  for Pet := 0 to High(ILineBonus) do
+    if Tekst = ILineBonus[Pet] then Ini.LineBonus := Pet;
+
+  // PartyPopup
+  Tekst := IniFile.ReadString('Advanced', 'PartyPopup', 'On');
+  for Pet := 0 to High(IPartyPopup) do
+    if Tekst = IPartyPopup[Pet] then Ini.PartyPopup := Pet;
+
+
+  // Joypad
+  Tekst := IniFile.ReadString('Controller',    'Joypad',   IJoypad[0]);
+  for Pet := 0 to High(IJoypad) do
+    if Tekst = IJoypad[Pet] then Ini.Joypad := Pet;
+
+  // LCD
+  Tekst := IniFile.ReadString('Devices',    'LPT',   ILPT[0]);
+  for Pet := 0 to High(ILPT) do
+    if Tekst = ILPT[Pet] then Ini.LPT := Pet;
+
+
+  // SongPath
+  if (Params.SongPath <> '') then
+    SongPath := IncludeTrailingPathDelimiter(Params.SongPath)
+  else
+    SongPath := IncludeTrailingPathDelimiter(IniFile.ReadString('Path', 'Songs', SongPath));
+
+  Filename := IniFile.FileName;
+  IniFile.Free;
+end;
+
+procedure TIni.Save;
+var
+  IniFile:    TIniFile;
+  Tekst:      string;
+  I: Integer;
+  S: String;
+begin
+  //if not (FileExists(GamePath + 'config.ini') and FileIsReadOnly(GamePath + 'config.ini')) then begin
+  if not (FileExists(Filename) and FileIsReadOnly(Filename)) then begin
+
+    IniFile := TIniFile.Create(Filename);
+
+    // Players
+    Tekst := IPlayers[Ini.Players];
+    IniFile.WriteString('Game',     'Players',   Tekst);
+
+    // Difficulty
+    Tekst := IDifficulty[Ini.Difficulty];
+    IniFile.WriteString('Game',     'Difficulty',   Tekst);
+
+    // Language
+    Tekst := ILanguage[Ini.Language];
+    IniFile.WriteString('Game',     'Language',   Tekst);
+
+    // Tabs
+    Tekst := ITabs[Ini.Tabs];
+    IniFile.WriteString('Game',     'Tabs',   Tekst);
+
+    // Sorting
+    Tekst := ISorting[Ini.Sorting];
+    IniFile.WriteString('Game',     'Sorting',   Tekst);
+
+    // Debug
+    Tekst := IDebug[Ini.Debug];
+    IniFile.WriteString('Game',     'Debug',   Tekst);
+
+    // Screens
+    Tekst := IScreens[Ini.Screens];
+    IniFile.WriteString('Graphics', 'Screens', Tekst);
+
+    // FullScreen
+    Tekst := IFullScreen[Ini.FullScreen];
+    IniFile.WriteString('Graphics', 'FullScreen', Tekst);
+
+    // Resolution
+    Tekst := IResolution[Ini.Resolution];
+    IniFile.WriteString('Graphics', 'Resolution', Tekst);
+
+    // Depth
+    Tekst := IDepth[Ini.Depth];
+    IniFile.WriteString('Graphics', 'Depth', Tekst);
+
+    // Resolution
+    Tekst := ITextureSize[Ini.TextureSize];
+    IniFile.WriteString('Graphics', 'TextureSize', Tekst);
+
+    // Sing Window
+    Tekst := ISingWindow[Ini.SingWindow];
+    IniFile.WriteString('Graphics', 'SingWindow', Tekst);
+
+    // Oscilloscope
+    Tekst := IOscilloscope[Ini.Oscilloscope];
+    IniFile.WriteString('Graphics', 'Oscilloscope', Tekst);
+
+    // Spectrum
+    Tekst := ISpectrum[Ini.Spectrum];
+    IniFile.WriteString('Graphics', 'Spectrum', Tekst);
+
+    // Spectrograph
+    Tekst := ISpectrograph[Ini.Spectrograph];
+    IniFile.WriteString('Graphics', 'Spectrograph', Tekst);
+
+    // Movie Size
+    Tekst := IMovieSize[Ini.MovieSize];
+    IniFile.WriteString('Graphics', 'MovieSize', Tekst);
+
+    // MicBoost
+    Tekst := IMicBoost[Ini.MicBoost];
+    IniFile.WriteString('Sound',    'MicBoost',    Tekst);
+
+    // ClickAssist
+    Tekst := IClickAssist[Ini.ClickAssist];
+    IniFile.WriteString('Sound',    'ClickAssist',    Tekst);
+
+    // BeatClick
+    Tekst := IBeatClick[Ini.BeatClick];
+    IniFile.WriteString('Sound',    'BeatClick',    Tekst);
+
+    // Threshold
+    Tekst := IThreshold[Ini.Threshold];
+    IniFile.WriteString('Sound',    'Threshold',    Tekst);
+
+    // Song Preview
+    Tekst := IPreviewVolume[Ini.PreviewVolume];
+    IniFile.WriteString('Sound',    'PreviewVolume',    Tekst);
+
+    Tekst := IPreviewFading[Ini.PreviewFading];
+    IniFile.WriteString('Sound',    'PreviewFading',    Tekst);
+
+    // SavePlayback
+    Tekst := ISavePlayback[Ini.SavePlayback];
+    IniFile.WriteString('Sound',    'SavePlayback',    Tekst);
+
+    // Lyrics Font
+    Tekst := ILyricsFont[Ini.LyricsFont];
+    IniFile.WriteString('Lyrics',    'LyricsFont',    Tekst);
+
+    // Lyrics Effect
+    Tekst := ILyricsEffect[Ini.LyricsEffect];
+    IniFile.WriteString('Lyrics',    'LyricsEffect',    Tekst);
+
+    // Solmization
+    Tekst := ISolmization[Ini.Solmization];
+    IniFile.WriteString('Lyrics',    'Solmization',    Tekst);
+
+    // Theme
+    Tekst := ITheme[Ini.Theme];
+    IniFile.WriteString('Themes',    'Theme',    Tekst);
+
+    // Skin
+    Tekst := ISkin[Ini.SkinNo];
+    IniFile.WriteString('Themes',    'Skin',    Tekst);
+
+    // Color
+    Tekst := IColor[Ini.Color];
+    IniFile.WriteString('Themes',    'Color',    Tekst);
+
+    // Record
+      for I := 0 to High(CardList) do begin
+        S := IntToStr(I+1);
+
+        Tekst := CardList[I].Name;
+        IniFile.WriteString('Record', 'DeviceName' + S, Tekst);
+
+        Tekst := IntToStr(CardList[I].Input);
+        IniFile.WriteString('Record', 'Input' + S, Tekst);
+
+        Tekst := IntToStr(CardList[I].ChannelL);
+        IniFile.WriteString('Record', 'ChannelL' + S, Tekst);
+
+        Tekst := IntToStr(CardList[I].ChannelR);
+        IniFile.WriteString('Record', 'ChannelR' + S, Tekst);
+      end;
+
+      //Log.LogError(InttoStr(Length(CardList)) + ' Cards Saved');
+
+    //Advanced Settings
+
+    //LoadAnimation
+    Tekst := ILoadAnimation[Ini.LoadAnimation];
+    IniFile.WriteString('Advanced', 'LoadAnimation', Tekst);
+
+    //EffectSing
+    Tekst := IEffectSing[Ini.EffectSing];
+    IniFile.WriteString('Advanced', 'EffectSing', Tekst);
+
+    //ScreenFade
+    Tekst := IScreenFade[Ini.ScreenFade];
+    IniFile.WriteString('Advanced', 'ScreenFade', Tekst);
+
+    //AskbeforeDel
+    Tekst := IAskbeforeDel[Ini.AskbeforeDel];
+    IniFile.WriteString('Advanced', 'AskbeforeDel', Tekst);
+
+    //OnSongClick
+    Tekst := IOnSongClick[Ini.OnSongClick];
+    IniFile.WriteString('Advanced', 'OnSongClick', Tekst);
+
+    //Line Bonus
+    Tekst := ILineBonus[Ini.LineBonus];
+    IniFile.WriteString('Advanced', 'LineBonus', Tekst);
+
+    //Party Popup
+    Tekst := IPartyPopup[Ini.PartyPopup];
+    IniFile.WriteString('Advanced', 'PartyPopup', Tekst);
+
+    // Joypad
+    Tekst := IJoypad[Ini.Joypad];
+    IniFile.WriteString('Controller',    'Joypad',    Tekst);
+
+    IniFile.Free;
+  end;
+end;
+
+procedure TIni.SaveNames;
+var
+  IniFile:    TIniFile;
+  I:          integer;
+begin
+  //if not FileIsReadOnly(GamePath + 'config.ini') then begin
+    //IniFile := TIniFile.Create(GamePath + 'config.ini');
+  if not FileIsReadOnly(Filename) then begin
+    IniFile := TIniFile.Create(Filename);
+
+    //Name
+      // Templates for Names Mod
+    for I := 1 to 12 do
+      IniFile.WriteString('Name', 'P' + IntToStr(I), Ini.Name[I-1]);
+    for I := 1 to 3 do
+      IniFile.WriteString('NameTeam', 'T' + IntToStr(I), Ini.NameTeam[I-1]);
+    for I := 1 to 12 do
+      IniFile.WriteString('NameTemplate', 'Name' + IntToStr(I), Ini.NameTemplate[I-1]);
+
+    IniFile.Free;
+  end;
+end;
+
+procedure TIni.SaveLevel;
+var
+  IniFile:    TIniFile;
+  I:          integer;
+begin
+  //if not FileIsReadOnly(GamePath + 'config.ini') then begin
+    //IniFile := TIniFile.Create(GamePath + 'config.ini');
+  if not FileIsReadOnly(Filename) then begin
+    IniFile := TIniFile.Create(Filename);
+
+    // Difficulty
+    IniFile.WriteString('Game', 'Difficulty', IDifficulty[Ini.Difficulty]);
+
+    IniFile.Free;
+  end;
+end;
+
+end.
diff --git a/Game/Code/Classes/UMain.pas b/Game/Code/Classes/UMain.pas
index 18bed197..06c4824a 100644
--- a/Game/Code/Classes/UMain.pas
+++ b/Game/Code/Classes/UMain.pas
@@ -86,12 +86,17 @@ var
   SongPath:         string;
   LogPath:          string;
   ThemePath:        string;
+  SkinsPath:        string;
   ScreenshotsPath:  string;
   CoversPath:       string;
   LanguagesPath:    string;
   PluginPath:       string;
   PlayListPath:     string;
 
+  UserSongPath:     string = '';
+  UserCoversPath:   string = '';
+  UserPlaylistPath: string = '';
+
   OGL:      Boolean;
   Done:     Boolean;
   Event:    TSDL_event;
@@ -246,7 +251,7 @@ begin
     // Theme
     Log.BenchmarkStart(1);
     Log.LogStatus('Load Themes', 'Initialization');
-    Theme := TTheme.Create('Themes\' + ITheme[Ini.Theme] + '.ini', Ini.Color);
+    Theme := TTheme.Create(ThemePath + ITheme[Ini.Theme] + '.ini', Ini.Color);
     Log.BenchmarkEnd(1);
     Log.LogBenchmark('Loading Themes', 1);
 
@@ -1023,17 +1028,24 @@ procedure InitializePaths;
 
 begin
 
-  GamePath := Platform.GetGamePath;
-
-  initialize_path( LogPath         , GamePath                             );
-  initialize_path( SoundPath       , GamePath + 'Sounds'      + PathDelim );
-  initialize_path( SongPath        , GamePath + 'Songs'       + PathDelim );
-  initialize_path( ThemePath       , GamePath + 'Themes'      + PathDelim );
-  initialize_path( ScreenshotsPath , GamePath + 'Screenshots' + PathDelim );
-  initialize_path( CoversPath      , GamePath + 'Covers'      + PathDelim );
-  initialize_path( LanguagesPath   , GamePath + 'Languages'   + PathDelim );
-  initialize_path( PluginPath      , GamePath + 'Plugins'     + PathDelim );
-  initialize_path( PlaylistPath    , GamePath + 'Playlists'   + PathDelim );
+  initialize_path( LogPath         , Platform.GetLogPath                             );
+  initialize_path( SoundPath       , Platform.GetGameSharedPath + 'Sounds'      + PathDelim );
+  initialize_path( ThemePath       , Platform.GetGameSharedPath + 'Themes'      + PathDelim );
+  initialize_path( SkinsPath       , Platform.GetGameSharedPath + 'Skins'      + PathDelim );
+  initialize_path( LanguagesPath   , Platform.GetGameSharedPath + 'Languages'   + PathDelim );
+  initialize_path( PluginPath      , Platform.GetGameSharedPath + 'Plugins'     + PathDelim );
+
+  initialize_path( ScreenshotsPath , Platform.GetGameUserPath + 'Screenshots' + PathDelim );
+
+  // Users Song Path ....
+  initialize_path( UserSongPath        , Platform.GetGameUserPath + 'Songs'       + PathDelim );
+  initialize_path( UserCoversPath      , Platform.GetGameUserPath + 'Covers'      + PathDelim );
+  initialize_path( UserPlaylistPath    , Platform.GetGameUserPath + 'Playlists'   + PathDelim );
+
+  // Shared Song Path ....
+  initialize_path( SongPath        , Platform.GetGameSharedPath + 'Songs'       + PathDelim );
+  initialize_path( CoversPath      , Platform.GetGameSharedPath + 'Covers'      + PathDelim );
+  initialize_path( PlaylistPath    , Platform.GetGameSharedPath + 'Playlists'   + PathDelim );
 
   DecimalSeparator := ',';
 end;
diff --git a/Game/Code/Classes/UPlatform.pas b/Game/Code/Classes/UPlatform.pas
index a06914d0..bdd6cf78 100644
--- a/Game/Code/Classes/UPlatform.pas
+++ b/Game/Code/Classes/UPlatform.pas
@@ -25,7 +25,17 @@ type
  
   TDirectoryEntryArray = Array of TDirectoryEntry;
 	
-  TPlatform = class
+  IPlatform = Interface
+  ['{63A5EBC3-3F4D-4F23-8DFB-B5165FCA23DF}']
+    Function DirectoryFindFiles(Dir, Filter : WideString; ReturnAllSubDirs : Boolean) : TDirectoryEntryArray;
+    function TerminateIfAlreadyRunning(var WndTitle : String) : Boolean;
+
+    function GetLogPath        : WideString;
+    function GetGameSharedPath : WideString;
+    function GetGameUserPath   : WideString;
+  end;
+ 
+  TPlatform = class( TInterfacedOBject, IPlatform )
 
 	  // DirectoryFindFiles returns all files matching the filter. Do not use '*' in the filter.
 	  // If you set ReturnAllSubDirs = true all directories will be returned, if yout set it to false
@@ -34,11 +44,16 @@ type
 
     function TerminateIfAlreadyRunning(var WndTitle : String) : Boolean; virtual;
 
-    function GetGamePath : WideString; virtual;
+//    function GetGamePath       : WideString; virtual;
+    function GetLogPath        : WideString; virtual;
+    function GetGameSharedPath : WideString; virtual;
+    function GetGameUserPath   : WideString; virtual;
+
   end;
 
+
 var
-  Platform : TPlatform;
+  Platform : IPlatform;
 
 implementation
 
@@ -55,19 +70,37 @@ uses
   {$ENDIF}
 
 { TPlatform }
-

+
+(*
 function TPlatform.GetGamePath: WideString;
-begin

-  // Windows and Linux use this:

-  Result := ExtractFilePath(ParamStr(0));

-end;

-

+begin
+  // Windows and Linux use this:
+  Result := ExtractFilePath(ParamStr(0));
+end;
+*)
+function TPlatform.GetLogPath        : WideString;
+begin
+  result := ExtractFilePath(ParamStr(0));
+end;
+
+function TPlatform.GetGameSharedPath : WideString;
+begin
+  result := ExtractFilePath(ParamStr(0));
+end;
+
+function TPlatform.GetGameUserPath   : WideString;
+begin
+  result := ExtractFilePath(ParamStr(0));
+end;
+
+
+
 function TPlatform.TerminateIfAlreadyRunning(var WndTitle : String) : Boolean;
-begin

-  // Linux and Mac don't check for running apps at the moment

-  Result := false;

-end;

-

+begin
+  // Linux and Mac don't check for running apps at the moment
+  Result := false;
+end;
+
 initialization
 
   {$IFDEF MSWINDOWS}
@@ -81,5 +114,5 @@ initialization
   {$ENDIF}
 
 finalization
-    freeandnil( Platform );
+    Platform := nil;
 end.
diff --git a/Game/Code/Classes/UPlatformLinux.pas b/Game/Code/Classes/UPlatformLinux.pas
index 8119346e..03e04560 100644
--- a/Game/Code/Classes/UPlatformLinux.pas
+++ b/Game/Code/Classes/UPlatformLinux.pas
@@ -13,13 +13,20 @@ uses Classes, UPlatform;
 type
 
   TPlatformLinux = class(TPlatform)
+    function get_homedir(): string;
   public
     Function DirectoryFindFiles(Dir, Filter : WideString; ReturnAllSubDirs : Boolean) : TDirectoryEntryArray; override;
+    function TerminateIfAlreadyRunning(var WndTitle : String) : Boolean; override;
+    
+    function GetLogPath        : WideString; override;
+    function GetGameSharedPath : WideString; override;
+    function GetGameUserPath   : WideString; override;
   end;
 
 implementation
 
 uses 
+  libc,
 {$IFNDEF FPC_V220}
   oldlinux,
 {$ELSE}
@@ -113,4 +120,35 @@ begin
 end;
 {$ENDIF}
 
+
+function TPlatformLinux.GetLogPath        : WideString;
+begin
+  result := '/var/log/UltraStarDeluxe/';
+end;
+
+function TPlatformLinux.GetGameSharedPath : WideString;
+begin
+  result := '/usr/share/UltraStarDeluxe/';
+end;
+
+function TPlatformLinux.GetGameUserPath   : WideString;
+begin
+  result := get_homedir()+'/.UltraStarDeluxe/';
+end;
+
+function TPlatformLinux.get_homedir(): string;
+var
+  pPasswdEntry : Ppasswd;
+  lUserName    : String;
+begin
+  pPasswdEntry := getpwuid( getuid() );
+  result       := pPasswdEntry^.pw_dir;
+end;
+
+function TPlatformLinux.TerminateIfAlreadyRunning(var WndTitle : String) : Boolean;
+begin
+  // Linux and Mac don't check for running apps at the moment
+  Result := false;
+end;
+
 end.
diff --git a/Game/Code/Classes/USkins.pas b/Game/Code/Classes/USkins.pas
index 2237c22a..6a022153 100644
--- a/Game/Code/Classes/USkins.pas
+++ b/Game/Code/Classes/USkins.pas
@@ -42,7 +42,12 @@ var
 
 implementation
 
-uses IniFiles, Classes, SysUtils, ULog, UIni;
+uses IniFiles,
+     Classes,
+     SysUtils,
+     UMain,
+     ULog,
+     UIni;
 
 constructor TSkin.Create;
 begin
@@ -54,13 +59,11 @@ end;
 procedure TSkin.LoadList;
 var
   SR:     TSearchRec;
-//  SR2:    TSearchRec;
-//  SLen:   integer;
 begin
-  if FindFirst('Skins'+PathDelim+'*', faDirectory, SR) = 0 then begin
+  if FindFirst(SkinsPath+'*', faDirectory, SR) = 0 then begin
     repeat
       if (SR.Name <> '.') and (SR.Name <> '..') then
-        ParseDir('Skins'+PathDelim + SR.Name + PathDelim);
+        ParseDir(SkinsPath + SR.Name + PathDelim);
     until FindNext(SR) <> 0;
   end; // if
   FindClose(SR);
@@ -69,13 +72,13 @@ end;
 procedure TSkin.ParseDir(Dir: string);
 var
   SR:     TSearchRec;
-//  SLen:   integer;
 begin
   if FindFirst(Dir + '*.ini', faAnyFile, SR) = 0 then begin
     repeat
+
       if (SR.Name <> '.') and (SR.Name <> '..') then
         LoadHeader(Dir + SR.Name);
-        //Log.LogError(SR.Name);
+        
     until FindNext(SR) <> 0;
   end;
 end;
@@ -89,11 +92,12 @@ begin
 
   S := Length(Skin);
   SetLength(Skin, S+1);
-  Skin[S].Path := IncludeTrailingBackslash(ExtractFileDir(FileName));
+  
+  Skin[S].Path     := IncludeTrailingBackslash(ExtractFileDir(FileName));
   Skin[S].FileName := ExtractFileName(FileName);
-  Skin[S].Theme :=    SkinIni.ReadString('Skin', 'Theme', '');
-  Skin[S].Name :=     SkinIni.ReadString('Skin', 'Name', '');
-  Skin[S].Creator :=  SkinIni.ReadString('Skin', 'Creator', '');
+  Skin[S].Theme    := SkinIni.ReadString('Skin', 'Theme', '');
+  Skin[S].Name     := SkinIni.ReadString('Skin', 'Name', '');
+  Skin[S].Creator  := SkinIni.ReadString('Skin', 'Creator', '');
 
   SkinIni.Free;
 end;
@@ -105,17 +109,18 @@ var
   T:          integer;
   S:          integer;
 begin
-  S := GetSkinNumber(Name);
+  S        := GetSkinNumber(Name);
   SkinPath := Skin[S].Path;
 
-  SkinIni := TMemIniFile.Create(SkinPath + Skin[S].FileName);
+  SkinIni  := TMemIniFile.Create(SkinPath + Skin[S].FileName);
 
   SL := TStringList.Create;
   SkinIni.ReadSection('Textures', SL);
 
   SetLength(SkinTexture, SL.Count);
-  for T := 0 to SL.Count-1 do begin
-    SkinTexture[T].Name := SL.Strings[T];
+  for T := 0 to SL.Count-1 do
+  begin
+    SkinTexture[T].Name     := SL.Strings[T];
     SkinTexture[T].FileName := SkinIni.ReadString('Textures', SL.Strings[T], '');
   end;
 
diff --git a/Game/Code/Classes/USongs.pas b/Game/Code/Classes/USongs.pas
index 3ac32dda..31db883d 100644
--- a/Game/Code/Classes/USongs.pas
+++ b/Game/Code/Classes/USongs.pas
@@ -265,7 +265,10 @@ begin
     BrowsePos := 0;
     // browse directories
     BrowseDir(SongPath);
-
+    
+    if UserSongPath <> SongPath then
+      BrowseDir(UserSongPath);
+      
     //Set Correct SongArray Length
     SetLength(Song, BrowsePos);
 
@@ -306,6 +309,7 @@ var
   i : Integer;
   Files : TDirectoryEntryArray;
 begin
+
 	  Files := Platform.DirectoryFindFiles( Dir, '.txt', true);
 		for i := 0 to Length(Files)-1 do
 		begin
@@ -318,7 +322,8 @@ begin
 				SLen := BrowsePos;
 
 				Song[SLen].Path     := Dir;
-				Song[SLen].Folder   := Copy(Dir, Length(SongPath)+1, 10000);
+//				Song[SLen].Folder   := Copy(Dir, Length(SongPath)+1, 10000);
+				Song[SLen].Folder   := Copy(Dir, Length(Dir)+1, 10000);
 				Song[SLen].Folder   := Copy(Song[SLen].Folder, 1, Pos( PathDelim , Song[SLen].Folder)-1);
 				Song[SLen].FileName := Files[i].Name;
 
diff --git a/Game/Code/Classes/UThemes.pas b/Game/Code/Classes/UThemes.pas
index 1c731ce0..bfffb26a 100644
--- a/Game/Code/Classes/UThemes.pas
+++ b/Game/Code/Classes/UThemes.pas
@@ -807,6 +807,8 @@ begin
 
   create_theme_objects();
   
+  writeln( 'TTheme.LoadTheme : '+ FileName );
+
   FileName := AdaptFilePaths( FileName );
 
   if not FileExists(FileName) then
@@ -828,7 +830,8 @@ begin
     ThemeIni := TMemIniFile.Create(FileName);
     {$ENDIF}
 
-    if ThemeIni.ReadString('Theme', 'Name', '') <> '' then begin
+    if ThemeIni.ReadString('Theme', 'Name', '') <> '' then
+    begin
 
       {Skin.SkinName := ThemeIni.ReadString('Theme', 'Name', 'Singstar');
       Skin.SkinPath := 'Skins\' + Skin.SkinName + '\';
@@ -2218,93 +2221,93 @@ begin
 end;
 
 procedure TTheme.create_theme_objects();
-begin

-  freeandnil( Loading       );

-  Loading       := TThemeLoading.Create;

-

-  freeandnil( Main      );

-  Main      := TThemeMain.Create;

-

-  freeandnil( Name      );

-  Name      := TThemeName.Create;

-

-  freeandnil( Level       );

-  Level       := TThemeLevel.Create;

-

-  freeandnil( Song      );

-  Song      := TThemeSong.Create;

-

-  freeandnil( Sing      );

-  Sing      := TThemeSing.Create;

-

-  freeandnil( Score       );

-  Score       := TThemeScore.Create;

-

-  freeandnil( Top5      );

-  Top5      := TThemeTop5.Create;

-

-  freeandnil( Options       );

-  Options       := TThemeOptions.Create;

-

-  freeandnil( OptionsGame       );

-  OptionsGame       := TThemeOptionsGame.Create;

-

-  freeandnil( OptionsGraphics       );

-  OptionsGraphics       := TThemeOptionsGraphics.Create;

-

-  freeandnil( OptionsSound      );

-  OptionsSound      := TThemeOptionsSound.Create;

-

-  freeandnil( OptionsLyrics       );

-  OptionsLyrics       := TThemeOptionsLyrics.Create;

-

-  freeandnil( OptionsThemes       );

-  OptionsThemes       := TThemeOptionsThemes.Create;

-

-  freeandnil( OptionsRecord       );

-  OptionsRecord       := TThemeOptionsRecord.Create;

-

-  freeandnil( OptionsAdvanced       );

-  OptionsAdvanced       := TThemeOptionsAdvanced.Create;

-

-

-  freeandnil( ErrorPopup      );

-  ErrorPopup      := TThemeError.Create;

-

-  freeandnil( CheckPopup      );

-  CheckPopup      := TThemeCheck.Create;

-

-

-  freeandnil( SongMenu      );

-  SongMenu      := TThemeSongMenu.Create;

-

-  freeandnil( SongJumpto      );

-  SongJumpto      := TThemeSongJumpto.Create;

-

-  //Party Screens

-  freeandnil( PartyNewRound       );

-  PartyNewRound       := TThemePartyNewRound.Create;

-

-  freeandnil( PartyWin      );

-  PartyWin      := TThemePartyWin.Create;

-

-  freeandnil( PartyScore      );

-  PartyScore      := TThemePartyScore.Create;

-

-  freeandnil( PartyOptions      );

-  PartyOptions      := TThemePartyOptions.Create;

-

-  freeandnil( PartyPlayer       );

-  PartyPlayer       := TThemePartyPlayer.Create;

-

-

-  //Stats Screens:

-  freeandnil( StatMain      );

-  StatMain :=        TThemeStatMain.Create;

-

-  freeandnil( StatDetail      );

-  StatDetail      := TThemeStatDetail.Create;

-

+begin
+  freeandnil( Loading       );
+  Loading       := TThemeLoading.Create;
+
+  freeandnil( Main      );
+  Main      := TThemeMain.Create;
+
+  freeandnil( Name      );
+  Name      := TThemeName.Create;
+
+  freeandnil( Level       );
+  Level       := TThemeLevel.Create;
+
+  freeandnil( Song      );
+  Song      := TThemeSong.Create;
+
+  freeandnil( Sing      );
+  Sing      := TThemeSing.Create;
+
+  freeandnil( Score       );
+  Score       := TThemeScore.Create;
+
+  freeandnil( Top5      );
+  Top5      := TThemeTop5.Create;
+
+  freeandnil( Options       );
+  Options       := TThemeOptions.Create;
+
+  freeandnil( OptionsGame       );
+  OptionsGame       := TThemeOptionsGame.Create;
+
+  freeandnil( OptionsGraphics       );
+  OptionsGraphics       := TThemeOptionsGraphics.Create;
+
+  freeandnil( OptionsSound      );
+  OptionsSound      := TThemeOptionsSound.Create;
+
+  freeandnil( OptionsLyrics       );
+  OptionsLyrics       := TThemeOptionsLyrics.Create;
+
+  freeandnil( OptionsThemes       );
+  OptionsThemes       := TThemeOptionsThemes.Create;
+
+  freeandnil( OptionsRecord       );
+  OptionsRecord       := TThemeOptionsRecord.Create;
+
+  freeandnil( OptionsAdvanced       );
+  OptionsAdvanced       := TThemeOptionsAdvanced.Create;
+
+
+  freeandnil( ErrorPopup      );
+  ErrorPopup      := TThemeError.Create;
+
+  freeandnil( CheckPopup      );
+  CheckPopup      := TThemeCheck.Create;
+
+
+  freeandnil( SongMenu      );
+  SongMenu      := TThemeSongMenu.Create;
+
+  freeandnil( SongJumpto      );
+  SongJumpto      := TThemeSongJumpto.Create;
+
+  //Party Screens
+  freeandnil( PartyNewRound       );
+  PartyNewRound       := TThemePartyNewRound.Create;
+
+  freeandnil( PartyWin      );
+  PartyWin      := TThemePartyWin.Create;
+
+  freeandnil( PartyScore      );
+  PartyScore      := TThemePartyScore.Create;
+
+  freeandnil( PartyOptions      );
+  PartyOptions      := TThemePartyOptions.Create;
+
+  freeandnil( PartyPlayer       );
+  PartyPlayer       := TThemePartyPlayer.Create;
+
+
+  //Stats Screens:
+  freeandnil( StatMain      );
+  StatMain :=        TThemeStatMain.Create;
+
+  freeandnil( StatDetail      );
+  StatDetail      := TThemeStatDetail.Create;
+
  end;
 
 end.
diff --git a/Game/Code/Classes/Ulazjpeg.pas b/Game/Code/Classes/Ulazjpeg.pas
index d63ce753..003e9ab0 100644
--- a/Game/Code/Classes/Ulazjpeg.pas
+++ b/Game/Code/Classes/Ulazjpeg.pas
@@ -1,149 +1,151 @@
-{ Copyright (C) 2003 Mattias Gaertner

-

-  This library is free software; you can redistribute it and/or modify it

-  under the terms of the GNU Library General Public License as published by

-  the Free Software Foundation; either version 2 of the License, or (at your

-  option) any later version.

-

-  This program is distributed in the hope that it will be useful, but WITHOUT

-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-  FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License

-  for more details.

-

-  You should have received a copy of the GNU Library General Public License

-  along with this library; if not, write to the Free Software Foundation,

-  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-}

-unit Ulazjpeg;

-

-{$mode objfpc}{$H+}

-{$I switches.inc}

-

-interface

-

-uses

-  SysUtils, Classes, FPImage, IntfGraphics, Graphics, FPReadJPEG, FPWriteJPEG;

-

-type

-  TJPEGQualityRange = TFPJPEGCompressionQuality;

-  TJPEGPerformance = TJPEGReadPerformance;

-

-  TJPEGImage = class(TFPImageBitmap)

-  private

-    FPerformance: TJPEGPerformance;

-    FProgressiveEncoding: boolean;

-    FQuality: TJPEGQualityRange;

-  protected

-{$IFDEF LAZARUS_V0924}

-    procedure InitFPImageReader(IntfImg: TLazIntfImage; ImgReader: TFPCustomImageReader); override;

-{$ELSE}

-    procedure InitFPImageReader(ImgReader: TFPCustomImageReader); override;

-{$ENDIF}

-    procedure FinalizeFPImageReader(ImgReader: TFPCustomImageReader); override;

-{$IFDEF LAZARUS_V0924}

-    procedure InitFPImageWriter(IntfImg: TLazIntfImage; ImgWriter: TFPCustomImageWriter); override;

-{$ELSE}

-    procedure InitFPImageWriter(ImgWriter: TFPCustomImageWriter); override;

-{$ENDIF}

-  public

-    constructor Create; override;

-    class function GetFileExtensions: string; override;

-    class function GetDefaultFPReader: TFPCustomImageReaderClass; override;

-    class function GetDefaultFPWriter: TFPCustomImageWriterClass; override;

-  public

-    property CompressionQuality: TJPEGQualityRange read FQuality write FQuality;

-    property ProgressiveEncoding: boolean read FProgressiveEncoding;

-    property Performance: TJPEGPerformance read FPerformance write FPerformance;

-  end;

-

-const

-  DefaultJPEGMimeType = 'image/jpeg';

-

-

-implementation

-

-

-{ TJPEGImage }

-

-{$IFDEF LAZARUS_V0924}

-procedure TJPEGImage.InitFPImageReader(IntfImg: TLazIntfImage; ImgReader: TFPCustomImageReader);

-{$ELSE}

-procedure TJPEGImage.InitFPImageReader(ImgReader: TFPCustomImageReader);

-{$ENDIF}

-var

-  JPEGReader: TFPReaderJPEG;

-begin

-  if ImgReader is TFPReaderJPEG then begin

-    JPEGReader:=TFPReaderJPEG(ImgReader);

-    JPEGReader.Performance:=Performance;

-{$IFDEF LAZARUS_V0924}

-    JPEGReader.OnProgress:=@Progress;

-{$ENDIF}

-  end;

-{$IFDEF LAZARUS_V0924}

-  inherited InitFPImageReader(IntfImg, ImgReader);

-{$ELSE}

-  inherited InitFPImageReader(ImgReader);

-{$ENDIF}

-end;

-

-procedure TJPEGImage.FinalizeFPImageReader(ImgReader: TFPCustomImageReader);

-var

-  JPEGReader: TFPReaderJPEG;

-begin

-  if ImgReader is TFPReaderJPEG then begin

-    JPEGReader:=TFPReaderJPEG(ImgReader);

-    FProgressiveEncoding:=JPEGReader.ProgressiveEncoding;

-  end;

-  inherited FinalizeFPImageReader(ImgReader);

-end;

-

-{$IFDEF LAZARUS_V0924}

-procedure TJPEGImage.InitFPImageWriter(IntfImg: TLazIntfImage; ImgWriter: TFPCustomImageWriter);

-{$ELSE}

-procedure TJPEGImage.InitFPImageWriter(ImgWriter: TFPCustomImageWriter);

-{$ENDIF}

-var

-  JPEGWriter: TFPWriterJPEG;

-begin

-  if ImgWriter is TFPWriterJPEG then begin

-    JPEGWriter:=TFPWriterJPEG(ImgWriter);

-    if JPEGWriter<>nil then ;

-    JPEGWriter.ProgressiveEncoding:=ProgressiveEncoding;

-    JPEGWriter.CompressionQuality:=CompressionQuality;

-{$IFDEF LAZARUS_V0924}

-    JPEGWriter.OnProgress:=@Progress;

-{$ENDIF}

-  end;

-{$IFDEF LAZARUS_V0924}

-  inherited InitFPImageWriter(IntfImg, ImgWriter);

-{$ELSE}

-  inherited InitFPImageWriter(ImgWriter);

-{$ENDIF}

-end;

-

-class function TJPEGImage.GetDefaultFPReader: TFPCustomImageReaderClass;

-begin

-  Result:=TFPReaderJPEG;

-end;

-

-class function TJPEGImage.GetDefaultFPWriter: TFPCustomImageWriterClass;

-begin

-  Result:=TFPWriterJPEG;

-end;

-

-constructor TJPEGImage.Create;

-begin

-  inherited Create;

-  FPerformance:=jpBestQuality;

-  FProgressiveEncoding:=false;

-  FQuality:=75;

-end;

-

-class function TJPEGImage.GetFileExtensions: string;

-begin

-  Result:='jpg;jpeg';

-end;

-

-end.

-

+{ Copyright (C) 2003 Mattias Gaertner
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License
+  for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+}
+unit Ulazjpeg;
+
+{$mode objfpc}{$H+}
+{$I switches.inc}
+
+{$DEFINE LAZARUS_V0924}
+
+interface
+
+uses
+  SysUtils, Classes, FPImage, IntfGraphics, Graphics, FPReadJPEG, FPWriteJPEG;
+
+type
+  TJPEGQualityRange = TFPJPEGCompressionQuality;
+  TJPEGPerformance = TJPEGReadPerformance;
+
+  TJPEGImage = class(TFPImageBitmap)
+  private
+    FPerformance: TJPEGPerformance;
+    FProgressiveEncoding: boolean;
+    FQuality: TJPEGQualityRange;
+  protected
+{$IFDEF LAZARUS_V0924}
+    procedure InitFPImageReader(IntfImg: TLazIntfImage; ImgReader: TFPCustomImageReader); override;
+{$ELSE}
+    procedure InitFPImageReader(ImgReader: TFPCustomImageReader); override;
+{$ENDIF}
+    procedure FinalizeFPImageReader(ImgReader: TFPCustomImageReader); override;
+{$IFDEF LAZARUS_V0924}
+    procedure InitFPImageWriter(IntfImg: TLazIntfImage; ImgWriter: TFPCustomImageWriter); override;
+{$ELSE}
+    procedure InitFPImageWriter(ImgWriter: TFPCustomImageWriter); override;
+{$ENDIF}
+  public
+    constructor Create; override;
+    class function GetFileExtensions: string; override;
+    class function GetDefaultFPReader: TFPCustomImageReaderClass; override;
+    class function GetDefaultFPWriter: TFPCustomImageWriterClass; override;
+  public
+    property CompressionQuality: TJPEGQualityRange read FQuality write FQuality;
+    property ProgressiveEncoding: boolean read FProgressiveEncoding;
+    property Performance: TJPEGPerformance read FPerformance write FPerformance;
+  end;
+
+const
+  DefaultJPEGMimeType = 'image/jpeg';
+
+
+implementation
+
+
+{ TJPEGImage }
+
+{$IFDEF LAZARUS_V0924}
+procedure TJPEGImage.InitFPImageReader(IntfImg: TLazIntfImage; ImgReader: TFPCustomImageReader);
+{$ELSE}
+procedure TJPEGImage.InitFPImageReader(ImgReader: TFPCustomImageReader);
+{$ENDIF}
+var
+  JPEGReader: TFPReaderJPEG;
+begin
+  if ImgReader is TFPReaderJPEG then begin
+    JPEGReader:=TFPReaderJPEG(ImgReader);
+    JPEGReader.Performance:=Performance;
+{$IFDEF LAZARUS_V0924}
+    JPEGReader.OnProgress:=@Progress;
+{$ENDIF}
+  end;
+{$IFDEF LAZARUS_V0924}
+  inherited InitFPImageReader(IntfImg, ImgReader);
+{$ELSE}
+  inherited InitFPImageReader(ImgReader);
+{$ENDIF}
+end;
+
+procedure TJPEGImage.FinalizeFPImageReader(ImgReader: TFPCustomImageReader);
+var
+  JPEGReader: TFPReaderJPEG;
+begin
+  if ImgReader is TFPReaderJPEG then begin
+    JPEGReader:=TFPReaderJPEG(ImgReader);
+    FProgressiveEncoding:=JPEGReader.ProgressiveEncoding;
+  end;
+  inherited FinalizeFPImageReader(ImgReader);
+end;
+
+{$IFDEF LAZARUS_V0924}
+procedure TJPEGImage.InitFPImageWriter(IntfImg: TLazIntfImage; ImgWriter: TFPCustomImageWriter);
+{$ELSE}
+procedure TJPEGImage.InitFPImageWriter(ImgWriter: TFPCustomImageWriter);
+{$ENDIF}
+var
+  JPEGWriter: TFPWriterJPEG;
+begin
+  if ImgWriter is TFPWriterJPEG then begin
+    JPEGWriter:=TFPWriterJPEG(ImgWriter);
+    if JPEGWriter<>nil then ;
+    JPEGWriter.ProgressiveEncoding:=ProgressiveEncoding;
+    JPEGWriter.CompressionQuality:=CompressionQuality;
+{$IFDEF LAZARUS_V0924}
+    JPEGWriter.OnProgress:=@Progress;
+{$ENDIF}
+  end;
+{$IFDEF LAZARUS_V0924}
+  inherited InitFPImageWriter(IntfImg, ImgWriter);
+{$ELSE}
+  inherited InitFPImageWriter(ImgWriter);
+{$ENDIF}
+end;
+
+class function TJPEGImage.GetDefaultFPReader: TFPCustomImageReaderClass;
+begin
+  Result:=TFPReaderJPEG;
+end;
+
+class function TJPEGImage.GetDefaultFPWriter: TFPCustomImageWriterClass;
+begin
+  Result:=TFPWriterJPEG;
+end;
+
+constructor TJPEGImage.Create;
+begin
+  inherited Create;
+  FPerformance:=jpBestQuality;
+  FProgressiveEncoding:=false;
+  FQuality:=75;
+end;
+
+class function TJPEGImage.GetFileExtensions: string;
+begin
+  Result:='jpg;jpeg';
+end;
+
+end.
+
diff --git a/Game/Code/Screens/UScreenOptionsThemes.pas b/Game/Code/Screens/UScreenOptionsThemes.pas
index 06444dfe..114a5e45 100644
--- a/Game/Code/Screens/UScreenOptionsThemes.pas
+++ b/Game/Code/Screens/UScreenOptionsThemes.pas
@@ -28,7 +28,9 @@ type
 
 implementation
 
-uses UGraphic, USkins;
+uses UMain,
+     UGraphic,
+     USkins;
 
 function TScreenOptionsThemes.ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean;
 begin
@@ -147,7 +149,7 @@ end;
 
 procedure TScreenOptionsThemes.ReloadTheme;
 begin
-  Theme.LoadTheme('Themes\' + ITheme[Ini.Theme] + '.ini', Ini.Color);
+  Theme.LoadTheme(ThemePath + ITheme[Ini.Theme] + '.ini', Ini.Color);
 
   ScreenOptionsThemes := TScreenOptionsThemes.create();
   ScreenOptionsThemes.onshow;
diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr
index b442b3bc..b15c5bbf 100644
--- a/Game/Code/UltraStar.dpr
+++ b/Game/Code/UltraStar.dpr
@@ -149,7 +149,7 @@ uses
   UAudio_portaudio in 'Classes\UAudio_portaudio.pas',
 {$endif}
 {$ifdef UseFFMpegAudio}
-  UAudio_FFMpeg   in 'Classes\UAudio_FFMpeg.pas',
+    UAudio_FFMpeg     in 'Classes\UAudio_FFMpeg.pas',
 {$endif}