why use for loops when you can just import system.io also fixed some paths, stopped for the skinning problem

4 files changed, 106 insertions, 92 deletions

diff --git a/ShiftOS/File Skimmer.vb b/ShiftOS/File Skimmer.vb
index 9d242cc..0cc9085 100644
--- a/ShiftOS/File Skimmer.vb
+++ b/ShiftOS/File Skimmer.vb
@@ -589,16 +589,28 @@ Public Class File_Skimmer
                 infobox.textinfo = "Unable to move into a higher directory due to error reading the requested folder on the drive." & Environment.NewLine & Environment.NewLine & "You can only enter directories formatted in the ShiftOS file system (ShiftFS)"
                 infobox.Show()
             Else
-                Dim endloop As Boolean = False
-                lbllocation.Text = lbllocation.Text.Substring(0, lbllocation.Text.Length - 1)
-
-                While endloop = False
-                    If lbllocation.Text.Substring(lbllocation.Text.Length - 1) = "/" Then
-                        endloop = True
-                    Else
-                        lbllocation.Text = lbllocation.Text.Substring(0, lbllocation.Text.Length - 1)
-                    End If
-                End While
+                Dim directoryInfo As System.IO.DirectoryInfo
+                directoryInfo = System.IO.Directory.GetParent(lbllocation.Text)
+                If (directoryInfo.FullName = "C:\") Then Dim errerror As String = "an error" Else lbllocation.Text = directoryInfo.FullName
+
+                'Dim endloop As Boolean = False
+                'lbllocation.Text = lbllocation.Text.Substring(0, lbllocation.Text.Length - 1)
+
+                'While endloop = False
+                '    Try
+                '        If lbllocation.Text.Substring(lbllocation.Text.Length - 1) = "/" Then
+                '            endloop = True
+                '        Else
+                '            lbllocation.Text = lbllocation.Text.Substring(0, lbllocation.Text.Length - 1)
+                '        End If
+                '    Catch
+                '        infobox.title = "File Skimmer - Error!"
+                '        infobox.textinfo = "Unable to move into a higher directory due to error reading the requested folder on the drive." & Environment.NewLine & Environment.NewLine & "An error occured going up"
+                '        infobox.Show()
+                '    End Try
+                'End While
+
+
                 showcontents()
             End If
         Else
diff --git a/ShiftOS/Paths.vb b/ShiftOS/Paths.vb
index beb1477..e5c75ff 100644
--- a/ShiftOS/Paths.vb
+++ b/ShiftOS/Paths.vb
@@ -11,8 +11,9 @@
     '      Download Manager Data - Paths.dnldata - Not sure what this does
     '    Save Data - Paths.savedata - The game has it's save file in here
     '      Skin Directory - Paths.skindir - Self explanatory.
-    '        Loaded Skin Directory - Paths.loadedSkin - Where the contents of .skn files are extracted to.
+    '        Loaded Skin Directory - Paths.loadedskin - Where the contents of .skn files are extracted to.
     '          Sound Directory - Paths.sounddir - Where sound files (such as Infobox chime) are stored, coming soon.
+    '        Current Skin Directory - Paths.currentskin - ??????????
     '    Home Directory - Paths.home - This is the folder that contains all the user's files
     '      Desktop - Paths.desktop - All the files that appear on your desktop should be stored here
     '      Documents - Paths.documents - The documents folder is where the user puts their documents
@@ -39,6 +40,7 @@
     Public skindir As String = savedata & "Skins\"
 
     Public loadedskin As String = skindir & "Loaded\"
+    Public currentskin As String = skindir & "Current\"
 
     Public sounddir As String = loadedskin & "Sound Files\"
 
diff --git a/ShiftOS/ShiftOSDesktop.vb b/ShiftOS/ShiftOSDesktop.vb
index 51ba848..0e9be0f 100644
--- a/ShiftOS/ShiftOSDesktop.vb
+++ b/ShiftOS/ShiftOSDesktop.vb
@@ -1588,9 +1588,9 @@
             boughtadvapplauncher = False
         End Try
         Viruses.startactiveviruses()
-        If IO.File.Exists(ShiftOSPath + "Shiftum42\Skins\Current\skindata.dat") Then loadcurrentskin()
-        If My.Computer.FileSystem.DirectoryExists(ShiftOSPath + "Shiftum42\Icons") Then setupicons()
-        If IO.File.Exists(ShiftOSPath & "SoftwareData\DownloadManager\Downloadhistory.lst") Then downloadmanagerhistory = IO.File.ReadAllText(ShiftOSPath & "SoftwareData\DownloadManager\Downloadhistory.lst")
+        If IO.File.Exists(Paths.loadedskin & "skindata.dat") Then loadcurrentskin() ' FIXME (ShiftOSPath + "Shiftum42\Skins\Current\skindata.dat")
+        If My.Computer.FileSystem.DirectoryExists(Paths.savedata & "Icons") Then setupicons()
+        If IO.File.Exists(Paths.dnldata & "Downloadhistory.lst") Then downloadmanagerhistory = IO.File.ReadAllText(ShiftOSPath & "\SoftwareData\DownloadManager\Downloadhistory.lst")
     End Sub
 
     Private Sub ShiftOSDesktop_Load(sender As Object, e As EventArgs) Handles MyBase.Load
@@ -1599,7 +1599,7 @@
             savegame()
         Else
             loadgame()
-            Terminal.runterminalfile(ShiftOSPath + "Shiftum42\autorun.trm")
+            Terminal.runterminalfile(ShiftOSPath + "\Shiftum42\autorun.trm")
         End If
 
         If Not My.Computer.FileSystem.DirectoryExists(ShiftOSPath + "\SoftwareData\AdvStart\Recent") Then
@@ -1617,7 +1617,7 @@
     End Sub
 
     Public Sub loadcurrentskin()
-        skinlines = IO.File.ReadAllLines(ShiftOSPath + "Shiftum42\Skins\Current\skindata.dat")
+        skinlines = IO.File.ReadAllLines(Paths.loadedskin & "skindata.dat")
         titlebarcolour = Color.FromArgb(skinlines(0))
         windowbordercolour = Color.FromArgb(skinlines(1))
         windowbordersize = skinlines(2)
@@ -1811,8 +1811,8 @@
         If Labyrinth.Visible Then Labyrinth.setupall()
         If VirusScanner.Visible Then VirusScanner.setupall()
         If terminalfullscreen = False Then Terminal.setupall()
-        If Not My.Computer.FileSystem.DirectoryExists(ShiftOSPath & "/Home/Desktop") Then
-            IO.Directory.CreateDirectory(ShiftOSPath & "/Home/Desktop")
+        If Not My.Computer.FileSystem.DirectoryExists(ShiftOSPath & "\Home\Desktop") Then
+            IO.Directory.CreateDirectory(ShiftOSPath & "\Home\Desktop")
         End If
         'Desktop Icons
         If unitymode = False Then
@@ -4098,14 +4098,14 @@
     'End Sub
 
     Public Sub setupiconprocess(ByVal location As String, ByRef imagetochange As Image)
-        If IO.File.Exists(ShiftOSPath + "Shiftum42\Icons\" & location & ".pic") Then
-            imagetochange = GetImage(ShiftOSPath + "Shiftum42\Icons\" & location & ".pic")
+        If IO.File.Exists(ShiftOSPath + "\Shiftum42\Icons\" & location & ".pic") Then
+            imagetochange = GetImage(ShiftOSPath + "\Shiftum42\Icons\" & location & ".pic")
         End If
     End Sub
 
     Public Sub setupicons()
 
-        iconmanagericondatalines = IO.File.ReadAllLines(ShiftOSPath + "Shiftum42\Icons\icondata.dat")
+        iconmanagericondatalines = IO.File.ReadAllLines(ShiftOSPath + "\Shiftum42\Icons\icondata.dat")
         titlebariconsize = iconmanagericondatalines(0)
         panelbuttoniconsize = iconmanagericondatalines(1)
         launchericonsize = iconmanagericondatalines(2)
@@ -4725,7 +4725,7 @@
             desktopicons.LargeImageList = File_Skimmer.ImageList1
             desktopicons.SmallImageList = File_Skimmer.ImageList1
 
-            Dim dir As New IO.DirectoryInfo("C:\ShiftOS\Home\Desktop")
+            Dim dir As New IO.DirectoryInfo(Paths.desktop)
             Dim files As IO.FileInfo() = dir.GetFiles()
             Dim file As IO.FileInfo
             Dim folders As IO.DirectoryInfo() = dir.GetDirectories()
@@ -4770,7 +4770,7 @@
         lvadvplaces.SmallImageList = File_Skimmer.ImageList1
         lvadvplaces.LargeImageList = File_Skimmer.ImageList1
 
-        For Each folder In My.Computer.FileSystem.GetDirectories("C:\ShiftOS\Home")
+        For Each folder In My.Computer.FileSystem.GetDirectories(Paths.home)
             Dim placeinfo As New IO.DirectoryInfo(folder)
             Dim place As New ListViewItem
             place.Text = placeinfo.Name
@@ -4781,7 +4781,7 @@
         lvadvfiles.Items.Clear()
         lvadvfiles.LargeImageList = File_Skimmer.ImageList1
         lvadvfiles.SmallImageList = File_Skimmer.ImageList1
-        For Each File In My.Computer.FileSystem.GetFiles("C:\ShiftOS\SoftwareData\AdvStart\Recent")
+        For Each File In My.Computer.FileSystem.GetFiles(Paths.advdata & "Recent")
             Dim fileinfo As New IO.FileInfo(File)
             Dim item As New ListViewItem
             item.Text = fileinfo.Name
diff --git a/ShiftOS/skins.vb b/ShiftOS/skins.vb
index b6cbd2d..5cafc04 100644
--- a/ShiftOS/skins.vb
+++ b/ShiftOS/skins.vb
@@ -184,119 +184,119 @@ Module Skins
 
     ' LOAD SKIN FROM SKN FILE
     Public Sub loadsknfile(ByVal filepath As String)
-        If Directory.Exists(savepath + "Shiftum42\Skins\Loaded\") Then My.Computer.FileSystem.DeleteDirectory(savepath + "Shiftum42\Skins\Loaded", FileIO.DeleteDirectoryOption.DeleteAllContents)
-        Directory.CreateDirectory(savepath + "Shiftum42\Skins\Loaded")
-        System.IO.Compression.ZipFile.ExtractToDirectory(filepath, savepath + "Shiftum42\Skins\Loaded")
+        If Directory.Exists(savepath + "\Shiftum42\Skins\Loaded\") Then My.Computer.FileSystem.DeleteDirectory(savepath + "\Shiftum42\Skins\Loaded", FileIO.DeleteDirectoryOption.DeleteAllContents)
+        Directory.CreateDirectory(savepath + "\Shiftum42\Skins\Loaded")
+        System.IO.Compression.ZipFile.ExtractToDirectory(filepath, savepath + "\Shiftum42\Skins\Loaded")
         loadimages()
     End Sub
     ' LOAD SKIN FROM SAVE FOLDER
     Public Sub loadimages()
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\userbar") Then
-            userNamePanelBackground = GetImage(savepath + "Shiftum42\Skins\Loaded\userbar")
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\userbar") Then
+            userNamePanelBackground = GetImage(savepath + "\Shiftum42\Skins\Loaded\userbar")
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\powerbar") Then
-            powerPanelBackgroundImage = GetImage(savepath + "Shiftum42\Skins\Loaded\powerbar")
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\powerbar") Then
+            powerPanelBackgroundImage = GetImage(savepath + "\Shiftum42\Skins\Loaded\powerbar")
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\titlebar") Then
-            titlebar = GetImage(savepath + "Shiftum42\Skins\Loaded\titlebar")
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\titlebar") Then
+            titlebar = GetImage(savepath + "\Shiftum42\Skins\Loaded\titlebar")
         Else : titlebar = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\borderleft") Then
-            borderleft = GetImage(savepath + "Shiftum42\Skins\Loaded\borderleft")
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\borderleft") Then
+            borderleft = GetImage(savepath + "\Shiftum42\Skins\Loaded\borderleft")
         Else : borderleft = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\borderright") Then
-            borderright = GetImage(savepath + "Shiftum42\Skins\Loaded\borderright".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\borderright") Then
+            borderright = GetImage(savepath + "\Shiftum42\Skins\Loaded\borderright".Clone)
         Else : borderright = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\borderbottom") Then
-            borderbottom = GetImage(savepath + "Shiftum42\Skins\Loaded\borderbottom".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\borderbottom") Then
+            borderbottom = GetImage(savepath + "\Shiftum42\Skins\Loaded\borderbottom".Clone)
         Else : borderbottom = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\closebtn") Then
-            closebtn = GetImage(savepath + "Shiftum42\Skins\Loaded\closebtn".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\closebtn") Then
+            closebtn = GetImage(savepath + "\Shiftum42\Skins\Loaded\closebtn".Clone)
         Else : closebtn = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\closebtnhover") Then
-            closebtnhover = GetImage(savepath + "Shiftum42\Skins\Loaded\closebtnhover".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\closebtnhover") Then
+            closebtnhover = GetImage(savepath + "\Shiftum42\Skins\Loaded\closebtnhover".Clone)
         Else : closebtnhover = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\closebtnclick") Then
-            closebtnclick = GetImage(savepath + "Shiftum42\Skins\Loaded\closebtnclick".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\closebtnclick") Then
+            closebtnclick = GetImage(savepath + "\Shiftum42\Skins\Loaded\closebtnclick".Clone)
         Else : closebtnclick = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\rollbtn") Then
-            rollbtn = GetImage(savepath + "Shiftum42\Skins\Loaded\rollbtn".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\rollbtn") Then
+            rollbtn = GetImage(savepath + "\Shiftum42\Skins\Loaded\rollbtn".Clone)
         Else : rollbtn = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\rollbtnhover") Then
-            rollbtnhover = GetImage(savepath + "Shiftum42\Skins\Loaded\rollbtnhover".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\rollbtnhover") Then
+            rollbtnhover = GetImage(savepath + "\Shiftum42\Skins\Loaded\rollbtnhover".Clone)
         Else : rollbtnhover = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\rollbtnclick") Then
-            rollbtnclick = GetImage(savepath + "Shiftum42\Skins\Loaded\rollbtnclick".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\rollbtnclick") Then
+            rollbtnclick = GetImage(savepath + "\Shiftum42\Skins\Loaded\rollbtnclick".Clone)
         Else : rollbtnclick = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\minbtn") Then
-            minbtn = GetImage(savepath + "Shiftum42\Skins\Loaded\minbtn".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\minbtn") Then
+            minbtn = GetImage(savepath + "\Shiftum42\Skins\Loaded\minbtn".Clone)
         Else : minbtn = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\minbtnhover") Then
-            minbtnhover = GetImage(savepath + "Shiftum42\Skins\Loaded\minbtnhover".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\minbtnhover") Then
+            minbtnhover = GetImage(savepath + "\Shiftum42\Skins\Loaded\minbtnhover".Clone)
         Else : minbtnhover = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\minbtnclick") Then
-            minbtnclick = GetImage(savepath + "Shiftum42\Skins\Loaded\minbtnclick".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\minbtnclick") Then
+            minbtnclick = GetImage(savepath + "\Shiftum42\Skins\Loaded\minbtnclick".Clone)
         Else : minbtnclick = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\rightcorner") Then
-            rightcorner = GetImage(savepath + "Shiftum42\Skins\Loaded\rightcorner".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\rightcorner") Then
+            rightcorner = GetImage(savepath + "\Shiftum42\Skins\Loaded\rightcorner".Clone)
         Else : rightcorner = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\leftcorner") Then
-            leftcorner = GetImage(savepath + "Shiftum42\Skins\Loaded\leftcorner".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\leftcorner") Then
+            leftcorner = GetImage(savepath + "\Shiftum42\Skins\Loaded\leftcorner".Clone)
         Else : leftcorner = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\desktoppanel") Then
-            desktoppanel = GetImage(savepath + "Shiftum42\Skins\Loaded\desktoppanel".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\desktoppanel") Then
+            desktoppanel = GetImage(savepath + "\Shiftum42\Skins\Loaded\desktoppanel".Clone)
         Else : desktoppanel = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\desktopbackground") Then
-            desktopbackground = GetImage(savepath + "Shiftum42\Skins\Loaded\desktopbackground".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\desktopbackground") Then
+            desktopbackground = GetImage(savepath + "\Shiftum42\Skins\Loaded\desktopbackground".Clone)
         Else : desktopbackground = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\panelbutton") Then
-            panelbutton = GetImage(savepath + "Shiftum42\Skins\Loaded\panelbutton".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\panelbutton") Then
+            panelbutton = GetImage(savepath + "\Shiftum42\Skins\Loaded\panelbutton".Clone)
         Else : panelbutton = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\applaunchermouseover") Then
-            applaunchermouseover = GetImage(savepath + "Shiftum42\Skins\Loaded\applaunchermouseover".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\applaunchermouseover") Then
+            applaunchermouseover = GetImage(savepath + "\Shiftum42\Skins\Loaded\applaunchermouseover".Clone)
         Else : applaunchermouseover = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\applauncher") Then
-            applauncher = GetImage(savepath + "Shiftum42\Skins\Loaded\applauncher".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\applauncher") Then
+            applauncher = GetImage(savepath + "\Shiftum42\Skins\Loaded\applauncher".Clone)
         Else : applauncher = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\applauncherclick") Then
-            applauncherclick = GetImage(savepath + "Shiftum42\Skins\Loaded\applauncherclick".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\applauncherclick") Then
+            applauncherclick = GetImage(savepath + "\Shiftum42\Skins\Loaded\applauncherclick".Clone)
         Else : applauncherclick = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\panelclock") Then
-            panelclock = GetImage(savepath + "Shiftum42\Skins\Loaded\panelclock".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\panelclock") Then
+            panelclock = GetImage(savepath + "\Shiftum42\Skins\Loaded\panelclock".Clone)
         Else : panelclock = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\bottomleftcorner") Then
-            bottomleftcorner = GetImage(savepath + "Shiftum42\Skins\Loaded\bottomleftcorner".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\bottomleftcorner") Then
+            bottomleftcorner = GetImage(savepath + "\Shiftum42\Skins\Loaded\bottomleftcorner".Clone)
         Else : bottomleftcorner = Nothing
         End If
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\bottomrightcorner") Then
-            bottomrightcorner = GetImage(savepath + "Shiftum42\Skins\Loaded\bottomrightcorner".Clone)
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\bottomrightcorner") Then
+            bottomrightcorner = GetImage(savepath + "\Shiftum42\Skins\Loaded\bottomrightcorner".Clone)
         Else : bottomrightcorner = Nothing
         End If
         'load settings
         Dim loaddata(200) As String
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\data.dat") Then
-            Dim sr As StreamReader = New StreamReader(savepath + "Shiftum42\Skins\Loaded\data.dat")
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\data.dat") Then
+            Dim sr As StreamReader = New StreamReader(savepath + "\Shiftum42\Skins\Loaded\data.dat")
 
             For i As Integer = 0 To 200 Step 1
                 loaddata(i) = sr.ReadLine
@@ -466,24 +466,24 @@ Module Skins
     ' SAVE TO SKN FILE
     Public Sub saveskin(ByVal path As String)
         If Not File.Exists(path) Then
-            Dim sw As StreamWriter = New StreamWriter(savepath + "Shiftum42\Skins\Loaded\SKN-version") 'tells skin loader which system to use when openning the file
+            Dim sw As StreamWriter = New StreamWriter(savepath + "\Shiftum42\Skins\Loaded\SKN-version") 'tells skin loader which system to use when openning the file
             sw.WriteLine("Name of skinning system used to create this skn file:")
             sw.WriteLine("2.0 disposal-free skinning")
             sw.WriteLine("Skinning system created by william.1008 on December 2014, based on 1.0 system by DevX")
             sw.Close()
             saveskinfiles(False)
-            Compression.ZipFile.CreateFromDirectory(savepath + "Shiftum42\Skins\Loaded", path)
-            File.Delete(savepath + "Shiftum42\Skins\Loaded\SKN-version")
+            Compression.ZipFile.CreateFromDirectory(savepath + "\Shiftum42\Skins\Loaded", path)
+            File.Delete(savepath + "\Shiftum42\Skins\Loaded\SKN-version")
         Else
             infobox.showinfo("File Exists", "That file location is already taken, please choose another.")
         End If
     End Sub
     ' SAVE TO SAVE FOLDER
     Public Sub saveskinfiles(ByVal apply As Boolean)
-        If File.Exists(savepath + "Shiftum42\Skins\Loaded\") Then
-            Directory.Delete(savepath + "Shiftum42\Skins\Loaded\")
+        If File.Exists(savepath + "\Shiftum42\Skins\Loaded\") Then
+            Directory.Delete(savepath + "\Shiftum42\Skins\Loaded\")
         End If
-        Directory.CreateDirectory(savepath + "Shiftum42\Skins\Loaded\")
+        Directory.CreateDirectory(savepath + "\Shiftum42\Skins\Loaded\")
         saveimage(titlebar, "titlebar")
         saveimage(borderleft, "borderleft")
         saveimage(borderright, "borderright")
@@ -645,7 +645,7 @@ Module Skins
 
         ' End of skin data text was at line 110, if adding future items, check for "End of skin data" on line 110
         savedata(200) = "End of skin data"
-        File.WriteAllLines(savepath + "Shiftum42\Skins\Loaded\data.dat", savedata)
+        File.WriteAllLines(savepath + "\Shiftum42\Skins\Loaded\data.dat", savedata)
         If apply = True Then
             applyskin()
         End If
@@ -776,14 +776,14 @@ Module Skins
     End Sub
     Private Sub saveimage(ByVal img As Image, ByVal name As String)
         If Not IsNothing(img) Then
-            If File.Exists(savepath + "Shiftum42\Skins\Loaded\" & name) Then File.Delete(savepath + "Shiftum42\Skins\Loaded\" & name)
+            If File.Exists(savepath + "\Shiftum42\Skins\Loaded\" & name) Then File.Delete(savepath + "\Shiftum42\Skins\Loaded\" & name)
             Try
-                img.Save(savepath + "Shiftum42\Skins\Loaded\" & name, System.Drawing.Imaging.ImageFormat.Png)
+                img.Save(savepath + "\Shiftum42\Skins\Loaded\" & name, System.Drawing.Imaging.ImageFormat.Png)
             Catch ex As Exception
-                infobox.showinfo("Saving Error", "Opps, an error occured when saving the file " & savepath + "Shiftum42\Skins\Loaded\" & name & ". Please contact DevX to report the problem.")
+                infobox.showinfo("Saving Error", "Opps, an error occured when saving the file " & savepath + "\Shiftum42\Skins\Loaded\" & name & ". Please contact DevX to report the problem.")
             End Try
         Else
-            If File.Exists(savepath + "Shiftum42\Skins\Loaded\" & name) Then File.Delete(savepath + "Shiftum42\Skins\Loaded\" & name)
+            If File.Exists(savepath + "\Shiftum42\Skins\Loaded\" & name) Then File.Delete(savepath + "\Shiftum42\Skins\Loaded\" & name)
         End If
     End Sub
 End Module
\ No newline at end of file