diff --git a/src/Artemis.Core/Constants.cs b/src/Artemis.Core/Constants.cs
index e978e8598..7921af0bc 100644
--- a/src/Artemis.Core/Constants.cs
+++ b/src/Artemis.Core/Constants.cs
@@ -27,7 +27,7 @@ namespace Artemis.Core
         /// <summary>
         ///     The full path to the Artemis data folder
         /// </summary>
-        public static readonly string DataFolder = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) + "\\Artemis\\";
+        public static readonly string DataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Artemis");
         
         /// <summary>
         ///     The plugin info used by core components of Artemis
diff --git a/src/Artemis.Core/Models/Surface/Layout/ArtemisLayout.cs b/src/Artemis.Core/Models/Surface/Layout/ArtemisLayout.cs
index 8d46099e0..245b9eeb1 100644
--- a/src/Artemis.Core/Models/Surface/Layout/ArtemisLayout.cs
+++ b/src/Artemis.Core/Models/Surface/Layout/ArtemisLayout.cs
@@ -169,29 +169,29 @@ namespace Artemis.Core
 
         internal static ArtemisLayout? GetDefaultLayout(ArtemisDevice device)
         {
-            string layoutFolder = Path.Combine(Constants.ApplicationFolder, "DefaultLayouts\\Artemis");
+            string layoutFolder = Path.Combine(Constants.ApplicationFolder, "DefaultLayouts", "Artemis");
             if (device.DeviceType == RGBDeviceType.Keyboard)
             {
                 // XL layout is defined by its programmable macro keys
                 if (device.Leds.Any(l => l.RgbLed.Id >= LedId.Keyboard_Programmable1 && l.RgbLed.Id <= LedId.Keyboard_Programmable32))
                 {
                     if (device.PhysicalLayout == KeyboardLayoutType.ANSI)
-                        return new ArtemisLayout(layoutFolder + "\\Keyboard\\Artemis XL keyboard-ANSI.xml", LayoutSource.Default);
-                    return new ArtemisLayout(layoutFolder + "\\Keyboard\\Artemis XL keyboard-ISO.xml", LayoutSource.Default);
+                        return new ArtemisLayout(Path.Combine(layoutFolder, "Keyboard", "Artemis XL keyboard-ANSI.xml"), LayoutSource.Default);
+                    return new ArtemisLayout(Path.Combine(layoutFolder, "Keyboard", "Artemis XL keyboard-ISO.xml"), LayoutSource.Default);
                 }
 
                 // L layout is defined by its numpad
                 if (device.Leds.Any(l => l.RgbLed.Id >= LedId.Keyboard_NumLock && l.RgbLed.Id <= LedId.Keyboard_NumPeriodAndDelete))
                 {
                     if (device.PhysicalLayout == KeyboardLayoutType.ANSI)
-                        return new ArtemisLayout(layoutFolder + "\\Keyboard\\Artemis L keyboard-ANSI.xml", LayoutSource.Default);
-                    return new ArtemisLayout(layoutFolder + "\\Keyboard\\Artemis L keyboard-ISO.xml", LayoutSource.Default);
+                        return new ArtemisLayout(Path.Combine(layoutFolder + "Keyboard","Artemis L keyboard-ANSI.xml"), LayoutSource.Default);
+                    return new ArtemisLayout(Path.Combine(layoutFolder + "Keyboard","Artemis L keyboard-ISO.xml"), LayoutSource.Default);
                 }
 
                 // No numpad will result in TKL
                 if (device.PhysicalLayout == KeyboardLayoutType.ANSI)
-                    return new ArtemisLayout(layoutFolder + "\\Keyboard\\Artemis TKL keyboard-ANSI.xml", LayoutSource.Default);
-                return new ArtemisLayout(layoutFolder + "\\Keyboard\\Artemis TKL keyboard-ISO.xml", LayoutSource.Default);
+                    return new ArtemisLayout(Path.Combine(layoutFolder + "Keyboard","Artemis TKL keyboard-ANSI.xml"), LayoutSource.Default);
+                return new ArtemisLayout(Path.Combine(layoutFolder + "Keyboard","Artemis TKL keyboard-ISO.xml"), LayoutSource.Default);
             }
 
             // if (device.DeviceType == RGBDeviceType.Mouse)
@@ -199,21 +199,21 @@ namespace Artemis.Core
             //     if (device.Leds.Count == 1)
             //     {
             //         if (device.Leds.Any(l => l.RgbLed.Id == LedId.Logo))
-            //             return new ArtemisLayout(layoutFolder + "\\Mouse\\1 LED mouse logo.xml", LayoutSource.Default);
-            //         return new ArtemisLayout(layoutFolder + "\\Mouse\\1 LED mouse.xml", LayoutSource.Default);
+            //             return new ArtemisLayout(Path.Combine(layoutFolder + "Mouse", "1 LED mouse logo.xml"), LayoutSource.Default);
+            //         return new ArtemisLayout(Path.Combine(layoutFolder + "Mouse", "1 LED mouse.xml"), LayoutSource.Default);
             //     }
             //     if (device.Leds.Any(l => l.RgbLed.Id == LedId.Logo))
-            //         return new ArtemisLayout(layoutFolder + "\\Mouse\\4 LED mouse logo.xml", LayoutSource.Default);
-            //     return new ArtemisLayout(layoutFolder + "\\Mouse\\4 LED mouse.xml", LayoutSource.Default);
+            //         return new ArtemisLayout(Path.Combine(layoutFolder + "Mouse", "4 LED mouse logo.xml"), LayoutSource.Default);
+            //     return new ArtemisLayout(Path.Combine(layoutFolder + "Mouse", "4 LED mouse.xml"), LayoutSource.Default);
             // }
 
             if (device.DeviceType == RGBDeviceType.Headset)
             {
                 if (device.Leds.Count == 1)
-                    return new ArtemisLayout(layoutFolder + "\\Headset\\Artemis 1 LED headset.xml", LayoutSource.Default);
+                    return new ArtemisLayout(Path.Combine(layoutFolder + "Headset", "Artemis 1 LED headset.xml"), LayoutSource.Default);
                 if (device.Leds.Count == 2)
-                    return new ArtemisLayout(layoutFolder + "\\Headset\\Artemis 2 LED headset.xml", LayoutSource.Default);
-                return new ArtemisLayout(layoutFolder + "\\Headset\\Artemis 4 LED headset.xml", LayoutSource.Default);
+                    return new ArtemisLayout(Path.Combine(layoutFolder + "Headset", "Artemis 2 LED headset.xml"), LayoutSource.Default);
+                return new ArtemisLayout(Path.Combine(layoutFolder + "Headset", "Artemis 4 LED headset.xml"), LayoutSource.Default);
             }
 
             return null;
diff --git a/src/Artemis.Core/Models/Surface/Layout/ArtemisLedLayout.cs b/src/Artemis.Core/Models/Surface/Layout/ArtemisLedLayout.cs
index 838c62881..01fcce12d 100644
--- a/src/Artemis.Core/Models/Surface/Layout/ArtemisLedLayout.cs
+++ b/src/Artemis.Core/Models/Surface/Layout/ArtemisLedLayout.cs
@@ -61,7 +61,6 @@ namespace Artemis.Core
             if (LayoutCustomLedData.LogicalLayouts == null || !LayoutCustomLedData.LogicalLayouts.Any())
                 return;
 
-            Uri layoutDirectory = new(Path.GetDirectoryName(DeviceLayout.FilePath)! + "\\", UriKind.Absolute);
             // Prefer a matching layout or else a default layout (that has no name)
             LayoutCustomLedDataLogicalLayout logicalLayout = LayoutCustomLedData.LogicalLayouts
                 .OrderBy(l => l.Name == artemisDevice.LogicalLayout)
@@ -69,7 +68,7 @@ namespace Artemis.Core
                 .First();
 
             LogicalName = logicalLayout.Name;
-            Image = new Uri(layoutDirectory, logicalLayout.Image);
+            Image = new Uri(Path.Combine(Path.GetDirectoryName(DeviceLayout.FilePath)!, logicalLayout.Image!), UriKind.Absolute);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.Core/Ninject/LoggerProvider.cs b/src/Artemis.Core/Ninject/LoggerProvider.cs
index c39f7bace..64f5efcf3 100644
--- a/src/Artemis.Core/Ninject/LoggerProvider.cs
+++ b/src/Artemis.Core/Ninject/LoggerProvider.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using Ninject.Activation;
 using Serilog;
 using Serilog.Core;
@@ -12,7 +13,7 @@ namespace Artemis.Core.Ninject
 
         private static readonly ILogger Logger = new LoggerConfiguration()
             .Enrich.FromLogContext()
-            .WriteTo.File(Constants.DataFolder + "logs/Artemis log-.log",
+            .WriteTo.File(Path.Combine(Constants.DataFolder, "logs", "Artemis log-.log"),
                 rollingInterval: RollingInterval.Day,
                 outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff} [{Level:u3}] [{SourceContext}] {Message:lj}{NewLine}{Exception}")
             .WriteTo.Console()
diff --git a/src/Artemis.Core/Utilities/Utilities.cs b/src/Artemis.Core/Utilities/Utilities.cs
index 8577185bc..c55b07c93 100644
--- a/src/Artemis.Core/Utilities/Utilities.cs
+++ b/src/Artemis.Core/Utilities/Utilities.cs
@@ -18,8 +18,8 @@ namespace Artemis.Core
         public static void PrepareFirstLaunch()
         {
             CreateAccessibleDirectory(Constants.DataFolder);
-            CreateAccessibleDirectory(Constants.DataFolder + "plugins");
-            CreateAccessibleDirectory(Constants.DataFolder + "user layouts");
+            CreateAccessibleDirectory(Path.Combine(Constants.DataFolder ,"plugins"));
+            CreateAccessibleDirectory(Path.Combine(Constants.DataFolder ,"user layouts"));
         }
 
         /// <summary>
diff --git a/src/Artemis.Storage/StorageManager.cs b/src/Artemis.Storage/StorageManager.cs
index 267f86fea..93775b16d 100644
--- a/src/Artemis.Storage/StorageManager.cs
+++ b/src/Artemis.Storage/StorageManager.cs
@@ -19,11 +19,11 @@ namespace Artemis.Storage
             if (_inUse)
                 throw new Exception("Storage is already in use, can't backup now.");
 
-            string database = $"{dataFolder}\\database.db";
+            string database = Path.Combine(dataFolder, "database.db");
             if (!File.Exists(database))
                 return;
 
-            string backupFolder = $"{dataFolder}\\database backups";
+            string backupFolder = Path.Combine(dataFolder, "database backups");
             Directory.CreateDirectory(backupFolder);
             FileSystemInfo[] files = new DirectoryInfo(backupFolder).GetFileSystemInfos();
             if (files.Length >= 5)
@@ -36,7 +36,7 @@ namespace Artemis.Storage
                 oldest.Delete();
             }
 
-            File.Copy(database, $"{backupFolder}\\database-{DateTime.Now:yyyy-dd-M--HH-mm-ss}.db");
+            File.Copy(database, Path.Combine(backupFolder, $"database-{DateTime.Now:yyyy-dd-M--HH-mm-ss}.db"));
         }
 
         /// <summary>
@@ -51,7 +51,7 @@ namespace Artemis.Storage
             try
             {
                 _inUse = true;
-                return new LiteRepository($"FileName={dataFolder}\\database.db");
+                return new LiteRepository($"FileName={Path.Combine(dataFolder, "database.db")}");
             }
             catch (LiteException e)
             {