15 files changed, 152 insertions, 131 deletions
diff --git a/unicode/src/screens/UScreenCredits.pas b/unicode/src/screens/UScreenCredits.pas
index af1eea53..4e1dc5f1 100644
--- a/unicode/src/screens/UScreenCredits.pas
+++ b/unicode/src/screens/UScreenCredits.pas
@@ -35,15 +35,16 @@ interface
 
 uses
   SysUtils,
-  UMenu,
   SDL,
   SDL_Image,
+  gl,
+  UMenu,
   UDisplay,
   UTexture,
-  gl,
   UMusic,
   UFiles,
   UThemes,
+  UPath,
   UGraphicClasses;
 
 type
@@ -204,38 +205,38 @@ end;
 
 constructor TScreenCredits.Create;
 var
-  CreditsPath: string;
+  CreditsPath: IPath;
 begin
   inherited Create;
 
-  CreditsPath := ResourcesPath + 'credits/';
-
-  credits_bg_tex := Texture.LoadTexture(CreditsPath + CRDTS_BG_FILE, TEXTURE_TYPE_PLAIN, 0);
-  credits_bg_ovl := Texture.LoadTexture(CreditsPath + CRDTS_OVL_FILE, TEXTURE_TYPE_TRANSPARENT, 0);
-
-  credits_blindguard  := Texture.LoadTexture(CreditsPath + CRDTS_blindguard_FILE,  TEXTURE_TYPE_TRANSPARENT, 0);
-  credits_blindy      := Texture.LoadTexture(CreditsPath + CRDTS_blindy_FILE,      TEXTURE_TYPE_TRANSPARENT, 0);
-  credits_canni       := Texture.LoadTexture(CreditsPath + CRDTS_canni_FILE,       TEXTURE_TYPE_TRANSPARENT, 0);
-  credits_commandio   := Texture.LoadTexture(CreditsPath + CRDTS_commandio_FILE,   TEXTURE_TYPE_TRANSPARENT, 0);
-  credits_lazyjoker   := Texture.LoadTexture(CreditsPath + CRDTS_lazyjoker_FILE,   TEXTURE_TYPE_TRANSPARENT, 0);
-  credits_mog         := Texture.LoadTexture(CreditsPath + CRDTS_mog_FILE,         TEXTURE_TYPE_TRANSPARENT, 0);
-  credits_mota        := Texture.LoadTexture(CreditsPath + CRDTS_mota_FILE,        TEXTURE_TYPE_TRANSPARENT, 0);
-  credits_skillmaster := Texture.LoadTexture(CreditsPath + CRDTS_skillmaster_FILE, TEXTURE_TYPE_TRANSPARENT, 0);
-  credits_whiteshark  := Texture.LoadTexture(CreditsPath + CRDTS_whiteshark_FILE,  TEXTURE_TYPE_TRANSPARENT, 0);
-
-  intro_layer01 := Texture.LoadTexture(CreditsPath + INTRO_L01_FILE, TEXTURE_TYPE_TRANSPARENT, 0);
-  intro_layer02 := Texture.LoadTexture(CreditsPath + INTRO_L02_FILE, TEXTURE_TYPE_TRANSPARENT, 0);
-  intro_layer03 := Texture.LoadTexture(CreditsPath + INTRO_L03_FILE, TEXTURE_TYPE_TRANSPARENT, 0);
-  intro_layer04 := Texture.LoadTexture(CreditsPath + INTRO_L04_FILE, TEXTURE_TYPE_TRANSPARENT, 0);
-  intro_layer05 := Texture.LoadTexture(CreditsPath + INTRO_L05_FILE, TEXTURE_TYPE_TRANSPARENT, 0);
-  intro_layer06 := Texture.LoadTexture(CreditsPath + INTRO_L06_FILE, TEXTURE_TYPE_TRANSPARENT, 0);
-  intro_layer07 := Texture.LoadTexture(CreditsPath + INTRO_L07_FILE, TEXTURE_TYPE_TRANSPARENT, 0);
-  intro_layer08 := Texture.LoadTexture(CreditsPath + INTRO_L08_FILE, TEXTURE_TYPE_TRANSPARENT, 0);
-  intro_layer09 := Texture.LoadTexture(CreditsPath + INTRO_L09_FILE, TEXTURE_TYPE_TRANSPARENT, 0);
-
-  outro_bg  := Texture.LoadTexture(CreditsPath + OUTRO_BG_FILE,  TEXTURE_TYPE_PLAIN, 0);
-  outro_esc := Texture.LoadTexture(CreditsPath + OUTRO_ESC_FILE, TEXTURE_TYPE_TRANSPARENT, 0);
-  outro_exd := Texture.LoadTexture(CreditsPath + OUTRO_EXD_FILE, TEXTURE_TYPE_TRANSPARENT, 0);
+  CreditsPath := ResourcesPath.Append('credits', pdAppend);
+
+  credits_bg_tex := Texture.LoadTexture(CreditsPath.Append(CRDTS_BG_FILE), TEXTURE_TYPE_PLAIN, 0);
+  credits_bg_ovl := Texture.LoadTexture(CreditsPath.Append(CRDTS_OVL_FILE), TEXTURE_TYPE_TRANSPARENT, 0);
+
+  credits_blindguard  := Texture.LoadTexture(CreditsPath.Append(CRDTS_blindguard_FILE),  TEXTURE_TYPE_TRANSPARENT, 0);
+  credits_blindy      := Texture.LoadTexture(CreditsPath.Append(CRDTS_blindy_FILE),      TEXTURE_TYPE_TRANSPARENT, 0);
+  credits_canni       := Texture.LoadTexture(CreditsPath.Append(CRDTS_canni_FILE),       TEXTURE_TYPE_TRANSPARENT, 0);
+  credits_commandio   := Texture.LoadTexture(CreditsPath.Append(CRDTS_commandio_FILE),   TEXTURE_TYPE_TRANSPARENT, 0);
+  credits_lazyjoker   := Texture.LoadTexture(CreditsPath.Append(CRDTS_lazyjoker_FILE),   TEXTURE_TYPE_TRANSPARENT, 0);
+  credits_mog         := Texture.LoadTexture(CreditsPath.Append(CRDTS_mog_FILE),         TEXTURE_TYPE_TRANSPARENT, 0);
+  credits_mota        := Texture.LoadTexture(CreditsPath.Append(CRDTS_mota_FILE),        TEXTURE_TYPE_TRANSPARENT, 0);
+  credits_skillmaster := Texture.LoadTexture(CreditsPath.Append(CRDTS_skillmaster_FILE), TEXTURE_TYPE_TRANSPARENT, 0);
+  credits_whiteshark  := Texture.LoadTexture(CreditsPath.Append(CRDTS_whiteshark_FILE),  TEXTURE_TYPE_TRANSPARENT, 0);
+
+  intro_layer01 := Texture.LoadTexture(CreditsPath.Append(INTRO_L01_FILE), TEXTURE_TYPE_TRANSPARENT, 0);
+  intro_layer02 := Texture.LoadTexture(CreditsPath.Append(INTRO_L02_FILE), TEXTURE_TYPE_TRANSPARENT, 0);
+  intro_layer03 := Texture.LoadTexture(CreditsPath.Append(INTRO_L03_FILE), TEXTURE_TYPE_TRANSPARENT, 0);
+  intro_layer04 := Texture.LoadTexture(CreditsPath.Append(INTRO_L04_FILE), TEXTURE_TYPE_TRANSPARENT, 0);
+  intro_layer05 := Texture.LoadTexture(CreditsPath.Append(INTRO_L05_FILE), TEXTURE_TYPE_TRANSPARENT, 0);
+  intro_layer06 := Texture.LoadTexture(CreditsPath.Append(INTRO_L06_FILE), TEXTURE_TYPE_TRANSPARENT, 0);
+  intro_layer07 := Texture.LoadTexture(CreditsPath.Append(INTRO_L07_FILE), TEXTURE_TYPE_TRANSPARENT, 0);
+  intro_layer08 := Texture.LoadTexture(CreditsPath.Append(INTRO_L08_FILE), TEXTURE_TYPE_TRANSPARENT, 0);
+  intro_layer09 := Texture.LoadTexture(CreditsPath.Append(INTRO_L09_FILE), TEXTURE_TYPE_TRANSPARENT, 0);
+
+  outro_bg  := Texture.LoadTexture(CreditsPath.Append(OUTRO_BG_FILE),  TEXTURE_TYPE_PLAIN, 0);
+  outro_esc := Texture.LoadTexture(CreditsPath.Append(OUTRO_ESC_FILE), TEXTURE_TYPE_TRANSPARENT, 0);
+  outro_exd := Texture.LoadTexture(CreditsPath.Append(OUTRO_EXD_FILE), TEXTURE_TYPE_TRANSPARENT, 0);
 
   CRDTS_Stage:=InitialDelay;
 end;
@@ -255,7 +256,7 @@ begin
   deluxe_slidein := 0;
   Credits_Alpha  := 0;
 //  Music.SetLoop(true); loop loops not, shit
-  AudioPlayback.Open(soundpath + 'wome-credits-tune.mp3'); // thank you wetue
+  AudioPlayback.Open(soundpath.Append('wome-credits-tune.mp3')); // thank you wetue
 //  Music.Play;
   CTime := 0;
 //  setlength(CTime_hold,0);
@@ -1386,7 +1387,7 @@ begin
       begin
         CTime_hold := 0;
         AudioPlayback.Stop;
-        AudioPlayback.Open(soundpath + 'credits-outro-tune.mp3');
+        AudioPlayback.Open(SoundPath.Append('credits-outro-tune.mp3'));
         AudioPlayback.SetVolume(0.2);
         AudioPlayback.SetLoop(true);
         AudioPlayback.Play;
diff --git a/unicode/src/screens/UScreenEditConvert.pas b/unicode/src/screens/UScreenEditConvert.pas
index 5dfa3b43..28182097 100644
--- a/unicode/src/screens/UScreenEditConvert.pas
+++ b/unicode/src/screens/UScreenEditConvert.pas
@@ -55,7 +55,8 @@ uses
   USongs,
   USong,
   UMusic,
-  UThemes;
+  UThemes,
+  UPath;
 
 type
   TMidiNote = record
@@ -128,7 +129,7 @@ type
   end;
 
 var
-  ConversionFileName: string;
+  ConversionFileName: IPath;
 
 implementation
 
@@ -220,7 +221,7 @@ begin
             if CountSelectedTracks > 0 then
             begin
               Extract;
-              SResult := SaveSong(Song, Lines, ChangeFileExt(ConversionFileName, '.txt'),
+              SResult := SaveSong(Song, Lines, ConversionFileName.SetExtension('.txt'),
                        false);
               if (SResult <> ssrOK) then
               begin
@@ -499,7 +500,7 @@ begin
   AddButton(500, 20, 100, 40, Skin.GetTextureFileName('ButtonF'));
   AddButtonText(20, 5, 0, 0, 0, 'Save');
 
-  ConversionFileName := 'D:/daten/africa.mid';//GamePath + 'file.mid';
+  ConversionFileName := GamePath.Append('file.mid');
 
   for P := 0 to 100 do
   begin
@@ -525,7 +526,7 @@ begin
   MidiOut.Open;
   MidiFile := nil;
 
-  if FileExists(ConversionFileName) then
+  if ConversionFileName.Exists then
   begin
     MidiFile := TMidiFile.Create(nil);
     MidiFile.Filename := ConversionFileName;
diff --git a/unicode/src/screens/UScreenEditHeader.pas b/unicode/src/screens/UScreenEditHeader.pas
index d57f69f7..0ca98ca6 100644
--- a/unicode/src/screens/UScreenEditHeader.pas
+++ b/unicode/src/screens/UScreenEditHeader.pas
@@ -38,6 +38,7 @@ uses
   SDL,
   USongs,
   USong,
+  UPath,
   UThemes;
 
 type
@@ -224,18 +225,18 @@ begin
   TextGAP   :=  AddText(340, 110 + 13*30, 0, 30, 0, 0, 0, '');
   TextBPM   :=  AddText(340, 110 + 14*30, 0, 30, 0, 0, 0, '');
 
-  StaticTitle      := AddStatic(130, 115 + 0*30, 20, 20, 1, 1, 1, 'RoundButton', TEXTURE_TYPE_TRANSPARENT, $FF00FF);
-  StaticArtist     := AddStatic(130, 115 + 1*30, 20, 20, 1, 1, 1, 'RoundButton', TEXTURE_TYPE_TRANSPARENT, $FF00FF);
-  StaticMp3        := AddStatic(130, 115 + 2*30, 20, 20, 1, 1, 1, 'RoundButton', TEXTURE_TYPE_TRANSPARENT, $FF00FF);
-  StaticBackground := AddStatic(130, 115 + 4*30, 20, 20, 1, 1, 1, 'RoundButton', TEXTURE_TYPE_TRANSPARENT, $FF00FF);
-  StaticVideo      := AddStatic(130, 115 + 5*30, 20, 20, 1, 1, 1, 'RoundButton', TEXTURE_TYPE_TRANSPARENT, $FF00FF);
-  StaticVideoGAP   := AddStatic(130, 115 + 6*30, 20, 20, 1, 1, 1, 'RoundButton', TEXTURE_TYPE_TRANSPARENT, $FF00FF);
-  StaticRelative   := AddStatic(130, 115 + 8*30, 20, 20, 1, 1, 1, 'RoundButton', TEXTURE_TYPE_TRANSPARENT, $FF00FF);
-  StaticResolution := AddStatic(130, 115 + 9*30, 20, 20, 1, 1, 1, 'RoundButton', TEXTURE_TYPE_TRANSPARENT, $FF00FF);
-  StaticNotesGAP   := AddStatic(130, 115 + 10*30, 20, 20, 1, 1, 1, 'RoundButton', TEXTURE_TYPE_TRANSPARENT, $FF00FF);
-  StaticStart      := AddStatic(130, 115 + 12*30, 20, 20, 1, 1, 1, 'RoundButton', TEXTURE_TYPE_TRANSPARENT, $FF00FF);
-  StaticGAP        := AddStatic(130, 115 + 13*30, 20, 20, 1, 1, 1, 'RoundButton', TEXTURE_TYPE_TRANSPARENT, $FF00FF);
-  StaticBPM        := AddStatic(130, 115 + 14*30, 20, 20, 1, 1, 1, 'RoundButton', TEXTURE_TYPE_TRANSPARENT, $FF00FF);
+  StaticTitle      := AddStatic(130, 115 + 0*30, 20, 20, 1, 1, 1, Path('RoundButton'), TEXTURE_TYPE_TRANSPARENT, $FF00FF);
+  StaticArtist     := AddStatic(130, 115 + 1*30, 20, 20, 1, 1, 1, Path('RoundButton'), TEXTURE_TYPE_TRANSPARENT, $FF00FF);
+  StaticMp3        := AddStatic(130, 115 + 2*30, 20, 20, 1, 1, 1, Path('RoundButton'), TEXTURE_TYPE_TRANSPARENT, $FF00FF);
+  StaticBackground := AddStatic(130, 115 + 4*30, 20, 20, 1, 1, 1, Path('RoundButton'), TEXTURE_TYPE_TRANSPARENT, $FF00FF);
+  StaticVideo      := AddStatic(130, 115 + 5*30, 20, 20, 1, 1, 1, Path('RoundButton'), TEXTURE_TYPE_TRANSPARENT, $FF00FF);
+  StaticVideoGAP   := AddStatic(130, 115 + 6*30, 20, 20, 1, 1, 1, Path('RoundButton'), TEXTURE_TYPE_TRANSPARENT, $FF00FF);
+  StaticRelative   := AddStatic(130, 115 + 8*30, 20, 20, 1, 1, 1, Path('RoundButton'), TEXTURE_TYPE_TRANSPARENT, $FF00FF);
+  StaticResolution := AddStatic(130, 115 + 9*30, 20, 20, 1, 1, 1, Path('RoundButton'), TEXTURE_TYPE_TRANSPARENT, $FF00FF);
+  StaticNotesGAP   := AddStatic(130, 115 + 10*30, 20, 20, 1, 1, 1, Path('RoundButton'), TEXTURE_TYPE_TRANSPARENT, $FF00FF);
+  StaticStart      := AddStatic(130, 115 + 12*30, 20, 20, 1, 1, 1, Path('RoundButton'), TEXTURE_TYPE_TRANSPARENT, $FF00FF);
+  StaticGAP        := AddStatic(130, 115 + 13*30, 20, 20, 1, 1, 1, Path('RoundButton'), TEXTURE_TYPE_TRANSPARENT, $FF00FF);
+  StaticBPM        := AddStatic(130, 115 + 14*30, 20, 20, 1, 1, 1, Path('RoundButton'), TEXTURE_TYPE_TRANSPARENT, $FF00FF);
 
   AddInteraction(iText, TextTitle);
   AddInteraction(iText, TextArtist);
diff --git a/unicode/src/screens/UScreenEditSub.pas b/unicode/src/screens/UScreenEditSub.pas
index 6bf9ea51..1d0649b4 100644
--- a/unicode/src/screens/UScreenEditSub.pas
+++ b/unicode/src/screens/UScreenEditSub.pas
@@ -132,7 +132,8 @@ uses
   USkins,
   ULanguage,
   UTextEncoding,
-  UUnicodeUtils;
+  UUnicodeUtils,
+  UPath;
 
 
 procedure OnSaveEncodingError(Value: boolean; Data: Pointer);
@@ -142,7 +143,7 @@ begin
   if (Value) then
   begin
     CurrentSong.Encoding := encUTF8;
-    SResult := SaveSong(CurrentSong, Lines[0], CurrentSong.Path + CurrentSong.FileName,
+    SResult := SaveSong(CurrentSong, Lines[0], CurrentSong.Path.Append(CurrentSong.FileName),
              boolean(Data));
   end;
 end;
@@ -179,7 +180,7 @@ begin
       Ord('S'):
         begin
           // Save Song
-          SResult := SaveSong(CurrentSong, Lines[0], CurrentSong.Path + CurrentSong.FileName,
+          SResult := SaveSong(CurrentSong, Lines[0], CurrentSong.Path.Append(CurrentSong.FileName),
                    (SDL_ModState = KMOD_LSHIFT));
           if (SResult = ssrEncodingError) then
           begin
@@ -1258,6 +1259,8 @@ begin
 end;
 
 procedure TScreenEditSub.onShow;
+var
+  FileExt: IPath;
 begin
   inherited;
 
@@ -1267,11 +1270,12 @@ begin
   ResetSingTemp;
 
   try 
-  //Check if File is XML
-   if copy(CurrentSong.FileName,length(CurrentSong.FileName)-3,4) = '.xml' then
-     Error := not CurrentSong.LoadXMLSong()
-   else
-     Error := not CurrentSong.LoadSong();
+    //Check if File is XML
+    FileExt := CurrentSong.FileName.GetExtension;
+    if FileExt.ToUTF8 = '.xml' then
+      Error := not CurrentSong.LoadXMLSong()
+    else
+      Error := not CurrentSong.LoadSong();
   except
     Error := true;
   end;
@@ -1293,12 +1297,12 @@ begin
   {$ENDIF}
     Text[TextTitle].Text :=   CurrentSong.Title;
     Text[TextArtist].Text :=  CurrentSong.Artist;
-    Text[TextMp3].Text :=     CurrentSong.Mp3;
+    Text[TextMp3].Text :=     CurrentSong.Mp3.ToUTF8;
 
     Lines[0].Current := 0;
     CurrentNote := 0;
     Lines[0].Line[0].Note[0].Color := 1;
-    AudioPlayback.Open(CurrentSong.Path + CurrentSong.Mp3);
+    AudioPlayback.Open(CurrentSong.Path.Append(CurrentSong.Mp3));
     //Set Down Music Volume for Better hearability of Midi Sounds
     //Music.SetVolume(0.4);
 
diff --git a/unicode/src/screens/UScreenOpen.pas b/unicode/src/screens/UScreenOpen.pas
index a25356ec..08024a22 100644
--- a/unicode/src/screens/UScreenOpen.pas
+++ b/unicode/src/screens/UScreenOpen.pas
@@ -34,10 +34,13 @@ interface
 {$I switches.inc}
 
 uses
+  Math,
+  SysUtils,
+  gl,
+  SDL,
+  UPath,
   UMenu,
   UMusic,
-  SDL,
-  SysUtils,
   UFiles,
   UTime,
   USongs,
@@ -46,8 +49,6 @@ uses
   UTexture,
   UMenuText,
   ULyrics,
-  Math,
-  gl,
   UThemes;
 
 type
@@ -55,10 +56,10 @@ type
     private
       TextF:          array[0..1] of integer;
       TextN:          integer;
+      fPath:          IPath;
     public
       Tex_Background: TTexture;
       FadeOut:        boolean;
-      Path:           string;
       BackScreen:     pointer;
       procedure AddBox(X, Y, W, H: real);
       constructor Create; override;
@@ -107,7 +108,7 @@ begin
       SDLK_ESCAPE:
         begin
           //Empty Filename and go to last Screen
-          ConversionFileName := '';
+          ConversionFileName := PATH_NONE;
           AudioPlayback.PlaySound(SoundLib.Back);
           FadeTo(BackScreen);
         end;
@@ -117,14 +118,14 @@ begin
           if (Interaction = 2) then
           begin
             //Update Filename and go to last Screen
-            ConversionFileName := Text[TextN].Text;
+            ConversionFileName := Path(Text[TextN].Text);
             AudioPlayback.PlaySound(SoundLib.Back);
             FadeTo(BackScreen);
           end
           else if (Interaction = 1) then
           begin
             //Empty Filename and go to last Screen
-            ConversionFileName := '';
+            ConversionFileName := PATH_NONE;
             AudioPlayback.PlaySound(SoundLib.Back);
             FadeTo(BackScreen);
           end;
@@ -176,7 +177,7 @@ begin
 
   // file name
   AddBox(20, 540, 500, 40);
-  TextN := AddText(50, 548, 0, 24, 0, 0, 0, ConversionFileName);
+  TextN := AddText(50, 548, 0, 24, 0, 0, 0, ConversionFileName.ToUTF8);
   AddInteraction(iText, TextN);
 
   // buttons
diff --git a/unicode/src/screens/UScreenOptionsRecord.pas b/unicode/src/screens/UScreenOptionsRecord.pas
index cdacd5f6..d1b62e2b 100644
--- a/unicode/src/screens/UScreenOptionsRecord.pas
+++ b/unicode/src/screens/UScreenOptionsRecord.pas
@@ -61,8 +61,8 @@ type
       PreviewDeviceIndex: integer;
 
       // string arrays for select-slide options
-      InputSourceNames: array of string;
-      InputDeviceNames: array of string;
+      InputSourceNames: array of UTF8String;
+      InputDeviceNames: array of UTF8String;
 
       // dynamic generated themes for channel select-sliders
       SelectSlideChannelTheme: array of TThemeSelectSlide;
diff --git a/unicode/src/screens/UScreenOptionsThemes.pas b/unicode/src/screens/UScreenOptionsThemes.pas
index 163d8af9..e40ba664 100644
--- a/unicode/src/screens/UScreenOptionsThemes.pas
+++ b/unicode/src/screens/UScreenOptionsThemes.pas
@@ -136,7 +136,7 @@ begin
   if (SelInteraction = 0) then
   begin
     Skin.OnThemeChange;
-    UpdateSelectSlideOptions (Theme.OptionsThemes.SelectSkin, SkinSelect, ISkin, Ini.SkinNo);
+    UpdateSelectSlideOptions(Theme.OptionsThemes.SelectSkin, SkinSelect, ISkin, Ini.SkinNo);
   end;
 
   ReloadTheme();
@@ -188,7 +188,7 @@ end;
 
 procedure TScreenOptionsThemes.ReloadTheme;
 begin
-  Theme.LoadTheme(ThemePath + ITheme[Ini.Theme] + '.ini', Ini.Color);
+  Theme.LoadTheme(ThemePath.Append(ITheme[Ini.Theme] + '.ini'), Ini.Color);
 
   ScreenOptionsThemes := TScreenOptionsThemes.create();
   ScreenOptionsThemes.onshow;
diff --git a/unicode/src/screens/UScreenPartyOptions.pas b/unicode/src/screens/UScreenPartyOptions.pas
index b7226a5e..007956d6 100644
--- a/unicode/src/screens/UScreenPartyOptions.pas
+++ b/unicode/src/screens/UScreenPartyOptions.pas
@@ -68,13 +68,13 @@ type
   end;
 
 var
-  IPlaylist: array[0..2] of string;
-  IPlaylist2: array of string;
+  IPlaylist: array[0..2] of UTF8String;
+  IPlaylist2: array of UTF8String;
 
   const
-  ITeams:   array[0..1] of string = ('2', '3');
-  IPlayers: array[0..3] of string = ('1', '2', '3', '4');
-  IRounds:  array[0..5] of string = ('2', '3', '4', '5', '6', '7');
+  ITeams:   array[0..1] of UTF8String = ('2', '3');
+  IPlayers: array[0..3] of UTF8String = ('1', '2', '3', '4');
+  IRounds:  array[0..5] of UTF8String = ('2', '3', '4', '5', '6', '7');
 
 implementation
 
@@ -240,14 +240,14 @@ begin
   //Load Screen From Theme
   LoadFromTheme(Theme.PartyOptions);
 
-  SelectLevel     := AddSelectSlide (Theme.PartyOptions.SelectLevel, Ini.Difficulty, Theme.ILevel);
-  SelectPlayList  := AddSelectSlide (Theme.PartyOptions.SelectPlayList, PlayList, IPlaylist);
-  SelectPlayList2 := AddSelectSlide (Theme.PartyOptions.SelectPlayList2, PlayList2, IPlaylist2);
-  SelectRounds    := AddSelectSlide (Theme.PartyOptions.SelectRounds, Rounds, IRounds);
-  SelectTeams     := AddSelectSlide (Theme.PartyOptions.SelectTeams, NumTeams, ITeams);
-  SelectPlayers1  := AddSelectSlide (Theme.PartyOptions.SelectPlayers1, NumPlayer1, IPlayers);
-  SelectPlayers2  := AddSelectSlide (Theme.PartyOptions.SelectPlayers2, NumPlayer2, IPlayers);
-  SelectPlayers3  := AddSelectSlide (Theme.PartyOptions.SelectPlayers3, NumPlayer3, IPlayers);
+  SelectLevel     := AddSelectSlide(Theme.PartyOptions.SelectLevel, Ini.Difficulty, Theme.ILevel);
+  SelectPlayList  := AddSelectSlide(Theme.PartyOptions.SelectPlayList, PlayList, IPlaylist);
+  SelectPlayList2 := AddSelectSlide(Theme.PartyOptions.SelectPlayList2, PlayList2, IPlaylist2);
+  SelectRounds    := AddSelectSlide(Theme.PartyOptions.SelectRounds, Rounds, IRounds);
+  SelectTeams     := AddSelectSlide(Theme.PartyOptions.SelectTeams, NumTeams, ITeams);
+  SelectPlayers1  := AddSelectSlide(Theme.PartyOptions.SelectPlayers1, NumPlayer1, IPlayers);
+  SelectPlayers2  := AddSelectSlide(Theme.PartyOptions.SelectPlayers2, NumPlayer2, IPlayers);
+  SelectPlayers3  := AddSelectSlide(Theme.PartyOptions.SelectPlayers3, NumPlayer3, IPlayers);
 
   Interaction := 0;
 
diff --git a/unicode/src/screens/UScreenPartyScore.pas b/unicode/src/screens/UScreenPartyScore.pas
index 6b6d98e6..9e090715 100644
--- a/unicode/src/screens/UScreenPartyScore.pas
+++ b/unicode/src/screens/UScreenPartyScore.pas
@@ -166,7 +166,9 @@ begin
     DecoColor[0].B := B;
 
     //Load Texture
-    Tex := Texture.LoadTexture(pchar(Skin.GetTextureFileName(Theme.PartyScore.DecoTextures.FirstTexture)), Theme.PartyScore.DecoTextures.FirstTyp, Color);
+    Tex := Texture.LoadTexture(
+      Skin.GetTextureFileName(Theme.PartyScore.DecoTextures.FirstTexture),
+      Theme.PartyScore.DecoTextures.FirstTyp, Color);
     DecoTex[0] := Tex.TexNum;
 
     //Get Second Color
@@ -177,7 +179,9 @@ begin
     DecoColor[1].B := B;
 
     //Load Second Texture
-    Tex := Texture.LoadTexture(pchar(Skin.GetTextureFileName(Theme.PartyScore.DecoTextures.SecondTexture)), Theme.PartyScore.DecoTextures.SecondTyp, Color);
+    Tex := Texture.LoadTexture(
+      Skin.GetTextureFileName(Theme.PartyScore.DecoTextures.SecondTexture),
+      Theme.PartyScore.DecoTextures.SecondTyp, Color);
     DecoTex[1] := Tex.TexNum;
 
     //Get Third Color
@@ -188,7 +192,9 @@ begin
     DecoColor[2].B := B;
 
     //Load Third Texture
-    Tex := Texture.LoadTexture(pchar(Skin.GetTextureFileName(Theme.PartyScore.DecoTextures.ThirdTexture)), Theme.PartyScore.DecoTextures.ThirdTyp, Color);
+    Tex := Texture.LoadTexture(
+      Skin.GetTextureFileName(Theme.PartyScore.DecoTextures.ThirdTexture),
+      Theme.PartyScore.DecoTextures.ThirdTyp, Color);
     DecoTex[2] := Tex.TexNum;
   end;
 
diff --git a/unicode/src/screens/UScreenPopup.pas b/unicode/src/screens/UScreenPopup.pas
index 906335e7..2f6d981d 100644
--- a/unicode/src/screens/UScreenPopup.pas
+++ b/unicode/src/screens/UScreenPopup.pas
@@ -55,7 +55,7 @@ type
       constructor Create; override;
       function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
       procedure OnShow; override;
-      procedure ShowPopup(Msg: string; Handler: TPopupCheckHandler;
+      procedure ShowPopup(const Msg: UTF8String; Handler: TPopupCheckHandler;
           HandlerData: Pointer; DefaultValue: boolean = false);
       function Draw: boolean; override;
   end;
@@ -73,7 +73,7 @@ type
       function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
       procedure OnShow; override;
       procedure OnHide; override;
-      procedure ShowPopup(msg: string);
+      procedure ShowPopup(const Msg: UTF8String);
       function Draw: boolean; override;
   end;
 
@@ -165,7 +165,7 @@ begin
   inherited;
 end;
 
-procedure TScreenPopupCheck.ShowPopup(Msg: string; Handler: TPopupCheckHandler;
+procedure TScreenPopupCheck.ShowPopup(const Msg: UTF8String; Handler: TPopupCheckHandler;
     HandlerData: Pointer; DefaultValue: boolean);
 begin
   if (DefaultValue) then
@@ -253,7 +253,7 @@ procedure TScreenPopupError.onHide;
 begin
 end;
 
-procedure TScreenPopupError.ShowPopup(msg: string);
+procedure TScreenPopupError.ShowPopup(const Msg: UTF8String);
 begin
   Interaction := 0; //Reset Interaction
   Visible := true;  //Set Visible
diff --git a/unicode/src/screens/UScreenSing.pas b/unicode/src/screens/UScreenSing.pas
index dc3d5f5f..b8d0d9b7 100644
--- a/unicode/src/screens/UScreenSing.pas
+++ b/unicode/src/screens/UScreenSing.pas
@@ -49,6 +49,7 @@ uses
   USongs,
   UTexture,
   UThemes,
+  UPath,
   UTime;
 
 type
@@ -217,6 +218,8 @@ end;
 
 // pause mod
 procedure TScreenSing.Pause;
+var
+  VideoFile: IPath;
 begin
   if (not Paused) then  // enable pause
   begin
@@ -229,8 +232,8 @@ begin
     AudioPlayback.Pause;
 
     // pause video
-    if (CurrentSong.Video <> '') and FileExists(CurrentSong.Path +
-      CurrentSong.Video) then
+    VideoFile := CurrentSong.Path.Append(CurrentSong.Video);
+    if (CurrentSong.Video.IsSet) and VideoFile.Exists then
       fCurrentVideoPlaybackEngine.Pause;
 
   end
@@ -242,8 +245,8 @@ begin
     AudioPlayback.Play;
 
     // video
-    if (CurrentSong.Video <> '') and FileExists(CurrentSong.Path +
-      CurrentSong.Video) then
+    VideoFile := CurrentSong.Path.Append(CurrentSong.Video);
+    if (CurrentSong.Video.IsSet) and VideoFile.Exists then
       fCurrentVideoPlaybackEngine.Pause;
 
     Paused := false;
@@ -318,7 +321,7 @@ var
   V2M:    boolean;
   V3R:    boolean;
   Color: TRGB;
-
+  VideoFile, BgFile: IPath;
   success: boolean;
 begin
   inherited;
@@ -424,7 +427,7 @@ begin
   // FIXME: bad style, put the try-except into loadsong() and not here
   try
     // check if file is xml
-    if copy(CurrentSong.FileName, length(CurrentSong.FileName) - 3, 4) = '.xml' then
+    if CurrentSong.FileName.GetExtension.ToUTF8 = '.xml' then
       success := CurrentSong.LoadXMLSong()
     else
       success := CurrentSong.LoadSong();
@@ -468,9 +471,10 @@ begin
    *}
   VideoLoaded := false;
   fShowVisualization := false;
-  if (CurrentSong.Video <> '') and FileExists(CurrentSong.Path + CurrentSong.Video) then
+  VideoFile := CurrentSong.Path.Append(CurrentSong.Video);
+  if (CurrentSong.Video.IsSet) and VideoFile.IsFile then
   begin
-    if (fCurrentVideoPlaybackEngine.Open(CurrentSong.Path + CurrentSong.Video)) then
+    if (fCurrentVideoPlaybackEngine.Open(VideoFile)) then
     begin
       fShowVisualization := false;
       fCurrentVideoPlaybackEngine := VideoPlayback;
@@ -483,15 +487,17 @@ begin
   {*
    * set background to: picture
    *}
-  if (CurrentSong.Background <> '') and (VideoLoaded = false)
+  if (CurrentSong.Background.IsSet) and (VideoLoaded = false)
     and (TVisualizerOption(Ini.VisualizerOption) = voOff)  then
+  begin
+    BgFile := CurrentSong.Path.Append(CurrentSong.Background);
     try
-      Tex_Background := Texture.LoadTexture(CurrentSong.Path + CurrentSong.Background);
+      Tex_Background := Texture.LoadTexture(BgFile);
     except
-      Log.LogError('Background could not be loaded: ' + CurrentSong.Path +
-        CurrentSong.Background);
+      Log.LogError('Background could not be loaded: ' + BgFile.ToNative);
       Tex_Background.TexNum := 0;
     end
+  end
   else
   begin
     Tex_Background.TexNum := 0;
diff --git a/unicode/src/screens/UScreenSingModi.pas b/unicode/src/screens/UScreenSingModi.pas
index d361943e..ad116a62 100644
--- a/unicode/src/screens/UScreenSingModi.pas
+++ b/unicode/src/screens/UScreenSingModi.pas
@@ -47,7 +47,7 @@ uses
   ULyrics,
   TextGL,
   gl,
-
+  UPath,
   UThemes,
   UScreenSing,
   ModiSDK;
@@ -71,7 +71,7 @@ type
 
 type
   TCustomSoundEntry = record
-    Filename : string;
+    Filename : IPath;
     Stream   : TAudioPlaybackStream;
   end;
 
@@ -503,19 +503,20 @@ end;
 
 function LoadTex(const Name: PChar; Typ: TTextureType): TsmallTexture;
 var
-  Texname, EXT: string;
+  TexName: IPath;
+  Ext: UTF8String;
   Tex: TTexture;
 begin
   //Get texture Name
   TexName := Skin.GetTextureFileName(string(Name));
   //Get File Typ
-  Ext := ExtractFileExt(TexName);
-  if (uppercase(Ext) = '.JPG') then
+  Ext := TexName.GetExtension().ToUTF8;
+  if (UpperCase(Ext) = '.JPG') then
     Ext := 'JPG'
   else
     Ext := 'BMP';
 
-  Tex := Texture.LoadTexture(false, PChar(TexName), UTEXTURE.TTextureType(Typ), 0);
+  Tex := Texture.LoadTexture(false, TexName, UTexture.TTextureType(Typ), 0);
 
   Result.TexNum := Tex.TexNum;
   Result.W := Tex.W;
@@ -544,20 +545,21 @@ function LoadSound(const Name: PChar): cardinal;
 var
   Stream: TAudioPlaybackStream;
   i: integer;
-  Filename: string;
+  Filename: IPath;
+  SoundFile: IPath;
 begin
   //Search for Sound in already loaded Sounds
-  Filename := UpperCase(SoundPath + Name);
+  SoundFile := SoundPath.Append(Name);
   for i := 0 to High(CustomSounds) do
   begin
-    if (UpperCase(CustomSounds[i].Filename) = Filename) then
+    if (SoundFile.Equals(CustomSounds[i].Filename, true)) then
     begin
       Result := i;
       Exit;
     end;
   end;
 
-  Stream := AudioPlayback.OpenSound(SoundPath + string(Name));
+  Stream := AudioPlayback.OpenSound(SoundFile);
   if (Stream = nil) then
   begin
     Result := 0;
diff --git a/unicode/src/screens/UScreenSong.pas b/unicode/src/screens/UScreenSong.pas
index 00d90930..60938887 100644
--- a/unicode/src/screens/UScreenSong.pas
+++ b/unicode/src/screens/UScreenSong.pas
@@ -38,6 +38,7 @@ uses
   SDL,
   UCommon,
   UDisplay,
+  UPath,
   UFiles,
   UIni,
   ULanguage,
@@ -842,9 +843,9 @@ var
   I: integer;
   CoverButtonIndex: integer;
   CoverButton: TButton;
-  CoverName: string;
   CoverTexture: TTexture;
   Cover: TCover;
+  CoverFile: IPath;
   Song: TSong;
 begin
   if (Length(CatSongs.Song) <= 0) then
@@ -859,7 +860,7 @@ begin
     CoverButton := nil;
 
     // create a clickable cover
-    CoverButtonIndex := AddButton(300 + I*250, 140, 200, 200, '', TEXTURE_TYPE_PLAIN, Theme.Song.Cover.Reflections);
+    CoverButtonIndex := AddButton(300 + I*250, 140, 200, 200, PATH_NONE, TEXTURE_TYPE_PLAIN, Theme.Song.Cover.Reflections);
     if (CoverButtonIndex > -1) then
       CoverButton := Button[CoverButtonIndex];
     if (CoverButton = nil) then
@@ -868,18 +869,16 @@ begin
     Song := CatSongs.Song[I];
 
     // if cover-image is not found then show 'no cover'
-    if (not FileExists(Song.Path + Song.Cover)) then
-      Song.Cover := '';
-
-    if (Song.Cover = '') then
-      CoverName := Skin.GetTextureFileName('SongCover')
-    else
-      CoverName := Song.Path + Song.Cover;
+    CoverFile := Song.Path.Append(Song.Cover);
+    if (not CoverFile.IsFile()) then
+      Song.Cover := PATH_NONE;
+    if (Song.Cover.IsUnset) then
+      CoverFile := Skin.GetTextureFileName('SongCover');
 
     // load cover and cache its texture
-    Cover := Covers.FindCover(CoverName);
+    Cover := Covers.FindCover(CoverFile);
     if (Cover = nil) then
-      Cover := Covers.AddCover(CoverName);
+      Cover := Covers.AddCover(CoverFile);
 
     // use the cached texture
     // TODO: this is a workaround until the new song-loading works.
@@ -919,7 +918,7 @@ begin
     end;
 
     // Set visibility of video icon
-    Static[VideoIcon].Visible := (CatSongs.Song[Interaction].Video <> '');
+    Static[VideoIcon].Visible := CatSongs.Song[Interaction].Video.IsSet;
 
     // Set texts
     Text[TextArtist].Text := CatSongs.Song[Interaction].Artist;
@@ -1472,7 +1471,7 @@ begin
 
   // if preview is deactivated: load musicfile now
   if (IPreviewVolumeVals[Ini.PreviewVolume] = 0) then
-    AudioPlayback.Open(CatSongs.Song[Interaction].Path + CatSongs.Song[Interaction].Mp3);
+    AudioPlayback.Open(CatSongs.Song[Interaction].Path.Append(CatSongs.Song[Interaction].Mp3));
 
   // if hide then stop music (for party mode popup on exit)
   if (Display.NextScreen <> @ScreenSing) and
@@ -1651,7 +1650,7 @@ begin
   if not assigned(Song) then
     Exit;
 
-  if AudioPlayback.Open(Song.Path + Song.Mp3) then
+  if AudioPlayback.Open(Song.Path.Append(Song.Mp3)) then
   begin
     AudioPlayback.Position := AudioPlayback.Length / 4;
     // set preview volume
diff --git a/unicode/src/screens/UScreenSongMenu.pas b/unicode/src/screens/UScreenSongMenu.pas
index e09dd9b5..788611a1 100644
--- a/unicode/src/screens/UScreenSongMenu.pas
+++ b/unicode/src/screens/UScreenSongMenu.pas
@@ -73,7 +73,7 @@ const
   SM_Party_Joker      = 128 or 2;
 
 var
-  ISelections: array of string;
+  ISelections: array of UTF8String;
   SelectValue: integer;
 
 implementation
diff --git a/unicode/src/screens/UScreenStatMain.pas b/unicode/src/screens/UScreenStatMain.pas
index 6d4d3f5b..17810cd6 100644
--- a/unicode/src/screens/UScreenStatMain.pas
+++ b/unicode/src/screens/UScreenStatMain.pas
@@ -166,7 +166,7 @@ begin
   //Set Songs with Vid
   SongsWithVid := 0;
   for I := 0 to Songs.SongList.Count -1 do
-    if (TSong(Songs.SongList[I]).Video <> '') then
+    if (TSong(Songs.SongList[I]).Video.IsSet) then
       Inc(SongsWithVid);
 end;