4 files changed, 35 insertions, 20 deletions
diff --git a/src/screens/UScreenCredits.pas b/src/screens/UScreenCredits.pas
index 6d410a97..6e5c5ba7 100644
--- a/src/screens/UScreenCredits.pas
+++ b/src/screens/UScreenCredits.pas
@@ -34,6 +34,7 @@ interface
 {$I switches.inc}
 
 uses
+    SysUtils,
     UMenu,
     SDL,
     SDL_Image,
@@ -42,7 +43,6 @@ uses
     gl,
     UMusic,
     UFiles,
-    SysUtils,
     UThemes,
     UGraphicClasses;
 
@@ -167,16 +167,16 @@ const
 implementation
 
 uses
-     ULog,
-     UGraphic,
-     UMain,
-     UIni,
-     USongs,
-     Textgl,
-     ULanguage,
-     UCommon,
-     Math;
-
+  Math,
+  ULog,
+  UGraphic,
+  UMain,
+  UIni,
+  USongs,
+  Textgl,
+  ULanguage,
+  UCommon,
+  UPath;
 
 function TScreenCredits.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
 begin
diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index 56afdefd..8ef43770 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -119,14 +119,15 @@ type
 implementation
 
 uses
-  UGraphic,
   SysUtils,
-  UDrawTexture,
   TextGL,
+  gl,
+  UDrawTexture,
   UFiles,
-  UMain,
+  UGraphic,
   UIni,
-  gl,
+  UMain,
+  UPath,
   USkins;
 
 function TScreenEditConvert.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
diff --git a/src/screens/UScreenOptionsThemes.pas b/src/screens/UScreenOptionsThemes.pas
index ec6fe014..4970de21 100644
--- a/src/screens/UScreenOptionsThemes.pas
+++ b/src/screens/UScreenOptionsThemes.pas
@@ -57,10 +57,12 @@ type
 
 implementation
 
-uses UMain,
-     UGraphic,
-     USkins,
-     SysUtils;
+uses 
+  SysUtils,
+  UGraphic,
+  UMain,
+  UPath,
+  USkins;
 
 function TScreenOptionsThemes.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
 begin
diff --git a/src/screens/UScreenSingModi.pas b/src/screens/UScreenSingModi.pas
index 75c7195e..9c48104e 100644
--- a/src/screens/UScreenSingModi.pas
+++ b/src/screens/UScreenSingModi.pas
@@ -119,7 +119,19 @@ procedure PlaySound (const Index: Cardinal); stdcall;       //Plays a Custom Sou
 function ToSentences(Const Lines: TLines): TSentences;
 
 implementation
-uses UGraphic, UDraw, UMain, Classes, URecord, ULanguage, math, UDLLManager, USkins, UGraphicClasses;
+
+uses
+  Classes, 
+  Math,
+  UDLLManager,
+  UDraw,
+  UGraphic,
+  UGraphicClasses,
+  ULanguage,
+  UMain,
+  UPath,
+  URecord, 
+  USkins;
 
 // Method for input parsing. If False is returned, GetNextWindow
 // should be checked to know the next window to load;