Redid some of the surface editor and started working on layout saving

src/Artemis.Core/Artemis.Core.csproj

@@ -55,11 +55,15 @@
     <Reference Include="AppDomainToolkit, Version=1.0.4.1, Culture=neutral, PublicKeyToken=f2fc7ab5180cf5c4, processorArchitecture=MSIL">
       <HintPath>..\packages\AppDomainToolkit.1.0.4.3\lib\net\AppDomainToolkit.dll</HintPath>
     </Reference>
+    <Reference Include="Ben.Demystifier, Version=0.1.0.0, Culture=neutral, PublicKeyToken=a6d206e05440431a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ben.Demystifier.0.1.4\lib\net45\Ben.Demystifier.dll</HintPath>
+    </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Ninject, Version=3.3.4.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
       <HintPath>..\packages\Ninject.3.3.4\lib\net45\Ninject.dll</HintPath>
@@ -90,17 +94,44 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\RGB.NET\bin\net45\RGB.NET.Groups.dll</HintPath>
     </Reference>
-    <Reference Include="Stylet, Version=1.1.22.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Stylet.1.1.22\lib\net45\Stylet.dll</HintPath>
+    <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.2.8.0\lib\net46\Serilog.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Enrichers.Demystify, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Enrichers.Demystify.1.0.0-dev-00019\lib\net45\Serilog.Enrichers.Demystify.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
+    </Reference>
+    <Reference Include="Stylet, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Stylet.1.2.0\lib\net45\Stylet.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=1.2.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.1.6.0-preview8.19405.3\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
+    </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.3.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.5.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
+    </Reference>
     <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.0-preview5.19224.8\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata, Version=1.4.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reflection.Metadata.1.7.0-preview8.19405.3\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0-preview8.19405.3\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
     </Reference>
@@ -118,6 +149,9 @@
     <Compile Include="Extensions\RgbRectangleExtensions.cs" />
     <Compile Include="Extensions\TypeExtensions.cs" />
     <Compile Include="Models\DataModelDescription.cs" />
+    <Compile Include="Models\Surface\SurfaceConfiguration.cs" />
+    <Compile Include="Models\Surface\SurfaceDeviceConfiguration.cs" />
+    <Compile Include="Ninject\LoggerProvider.cs" />
     <Compile Include="Ninject\PluginSettingsProvider.cs" />
     <Compile Include="Plugins\Abstract\ModuleDataModel.cs" />
     <Compile Include="Plugins\Abstract\ModuleViewModel.cs" />
@@ -132,10 +166,10 @@
     <Compile Include="Plugins\Models\PluginInfo.cs" />
     <Compile Include="Plugins\Models\PluginSetting.cs" />
     <Compile Include="Plugins\Models\PluginSettings.cs" />
-    <Compile Include="ProfileElements\Folder.cs" />
-    <Compile Include="ProfileElements\Interfaces\IProfileElement.cs" />
-    <Compile Include="ProfileElements\Layer.cs" />
-    <Compile Include="ProfileElements\Profile.cs" />
+    <Compile Include="Models\Profile\Folder.cs" />
+    <Compile Include="Models\Profile\Interfaces\IProfileElement.cs" />
+    <Compile Include="Models\Profile\Layer.cs" />
+    <Compile Include="Models\Profile\Profile.cs" />
     <Compile Include="Ninject\CoreModule.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RGB.NET\DirectBitmap.cs" />
@@ -151,6 +185,7 @@
     <Compile Include="Events\PluginEventArgs.cs" />
     <Compile Include="Services\PluginService.cs" />
     <Compile Include="Services\StorageService.cs" />
+    <Compile Include="Services\Storage\SurfaceService.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
@@ -162,5 +197,8 @@
       <Name>Artemis.Storage</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="ProfileElements\Interfaces\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

src/Artemis.Core/Models/Profile/Folder.cs

@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+using System.Drawing;
+using Artemis.Core.Models.Profile.Interfaces;
+using Artemis.Core.Services.Interfaces;
+using Artemis.Storage.Entities;
+using RGB.NET.Core;
+
+namespace Artemis.Core.Models.Profile
+{
+    public class Folder : IProfileElement
+    {
+        public Folder(Profile profile)
+        {
+            Profile = profile;
+            Children = new List<IProfileElement>();
+        }
+
+        public Profile Profile { get; }
+        public List<IProfileElement> Children { get; set; }
+        public int Order { get; set; }
+        public string Name { get; set; }
+
+        public void Update(double deltaTime)
+        {
+            // Folders don't update but their children do
+            foreach (var profileElement in Children)
+                profileElement.Update(deltaTime);
+        }
+
+        public void Render(double deltaTime, RGBSurface surface, Graphics graphics)
+        {
+            // Folders don't render but their children do
+            foreach (var profileElement in Children)
+                profileElement.Render(deltaTime, surface, graphics);
+        }
+
+        public static Folder FromFolderEntity(Profile profile, FolderEntity folderEntity, IPluginService pluginService)
+        {
+            var folder = new Folder(profile)
+            {
+                Name = folderEntity.Name,
+                Order = folderEntity.Order
+            };
+
+            // Load child folders
+            foreach (var childFolder in folderEntity.Folders)
+                folder.Children.Add(FromFolderEntity(profile, childFolder, pluginService));
+            // Load child layers
+            foreach (var childLayer in folderEntity.Layers)
+                folder.Children.Add(Layer.FromLayerEntity(profile, childLayer, pluginService));
+
+            return folder;
+        }
+
+        public override string ToString()
+        {
+            return $"{nameof(Profile)}: {Profile}, {nameof(Order)}: {Order}, {nameof(Name)}: {Name}";
+        }
+    }
+}

src/Artemis.Core/Models/Profile/Interfaces/IProfileElement.cs

@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+using System.Drawing;
+using RGB.NET.Core;
+
+namespace Artemis.Core.Models.Profile.Interfaces
+{
+    public interface IProfileElement
+    {
+        /// <summary>
+        ///     The element's children
+        /// </summary>
+        List<IProfileElement> Children { get; set; }
+
+        /// <summary>
+        ///     The order in which this element appears in the update loop and editor
+        /// </summary>
+        int Order { get; set; }
+
+        /// <summary>
+        ///     The name which appears in the editor
+        /// </summary>
+        string Name { get; set; }
+
+        /// <summary>
+        ///     Updates the element
+        /// </summary>
+        /// <param name="deltaTime"></param>
+        void Update(double deltaTime);
+
+        /// <summary>
+        ///     Renders the element
+        /// </summary>
+        void Render(double deltaTime, RGBSurface surface, Graphics graphics);
+    }
+}

src/Artemis.Core/Models/Profile/Layer.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using Artemis.Core.Models.Profile.Interfaces;
+using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Interfaces;
+using Artemis.Core.Services.Interfaces;
+using Artemis.Storage.Entities;
+using RGB.NET.Core;
+
+namespace Artemis.Core.Models.Profile
+{
+    public class Layer : IProfileElement
+    {
+        public Layer(Profile profile)
+        {
+            Profile = profile;
+            Children = new List<IProfileElement>();
+        }
+
+        public Profile Profile { get; }
+        public LayerType LayerType { get; private set; }
+        public ILayerTypeConfiguration LayerTypeConfiguration { get; set; }
+        public List<IProfileElement> Children { get; set; }
+        public int Order { get; set; }
+        public string Name { get; set; }
+
+        public void Update(double deltaTime)
+        {
+            if (LayerType == null)
+                return;
+
+            lock (LayerType)
+            {
+                LayerType.Update(this);
+            }
+        }
+
+        public void Render(double deltaTime, RGBSurface surface, Graphics graphics)
+        {
+            if (LayerType == null)
+                return;
+
+            lock (LayerType)
+            {
+                LayerType.Render(this, surface, graphics);
+            }
+        }
+
+        public static Layer FromLayerEntity(Profile profile, LayerEntity layerEntity, IPluginService pluginService)
+        {
+            var layer = new Layer(profile)
+            {
+                Name = layerEntity.Name,
+                Order = layerEntity.Order,
+                LayerType = pluginService.GetLayerTypeByGuid(Guid.Parse(layerEntity.Guid))
+            };
+
+            return layer;
+        }
+
+        public void UpdateLayerType(LayerType layerType)
+        {
+            if (LayerType != null)
+            {
+                lock (LayerType)
+                {
+                    LayerType.Dispose();
+                }
+            }
+
+            LayerType = layerType;
+        }
+
+        public override string ToString()
+        {
+            return $"{nameof(Profile)}: {Profile}, {nameof(Order)}: {Order}, {nameof(Name)}: {Name}";
+        }
+    }
+}

src/Artemis.Core/Models/Profile/Profile.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using Artemis.Core.Exceptions;
+using Artemis.Core.Models.Profile.Interfaces;
+using Artemis.Core.Plugins.Models;
+using Artemis.Core.Services.Interfaces;
+using Artemis.Storage.Entities;
+using RGB.NET.Core;
+
+namespace Artemis.Core.Models.Profile
+{
+    public class Profile : IProfileElement
+    {
+        private Profile(PluginInfo pluginInfo)
+        {
+            PluginInfo = pluginInfo;
+        }
+
+        public PluginInfo PluginInfo { get; }
+        public bool IsActivated { get; private set; }
+        public int Order { get; set; }
+        public string Name { get; set; }
+        public List<IProfileElement> Children { get; set; }
+
+        public void Update(double deltaTime)
+        {
+            lock (this)
+            {
+                if (!IsActivated)
+                    throw new ArtemisCoreException($"Cannot update inactive profile: {this}");
+
+                foreach (var profileElement in Children)
+                    profileElement.Update(deltaTime);
+            }
+        }
+
+        public void Render(double deltaTime, RGBSurface surface, Graphics graphics)
+        {
+            lock (this)
+            {
+                if (!IsActivated)
+                    throw new ArtemisCoreException($"Cannot render inactive profile: {this}");
+
+                foreach (var profileElement in Children)
+                    profileElement.Render(deltaTime, surface, graphics);
+            }
+        }
+
+        public static Profile FromProfileEntity(PluginInfo pluginInfo, ProfileEntity profileEntity, IPluginService pluginService)
+        {
+            var profile = new Profile(pluginInfo) {Name = profileEntity.Name};
+            lock (profile)
+            {
+                // Populate the profile starting at the root, the rest is populated recursively
+                profile.Children.Add(Folder.FromFolderEntity(profile, profileEntity.RootFolder, pluginService));
+
+                return profile;
+            }
+        }
+
+        public void Activate()
+        {
+            lock (this)
+            {
+                if (IsActivated) return;
+
+                OnActivated();
+                IsActivated = true;
+            }
+        }
+
+        public void Deactivate()
+        {
+            lock (this)
+            {
+                if (!IsActivated) return;
+
+                IsActivated = false;
+                OnDeactivated();
+            }
+        }
+
+        public override string ToString()
+        {
+            return $"{nameof(Order)}: {Order}, {nameof(Name)}: {Name}, {nameof(PluginInfo)}: {PluginInfo}";
+        }
+
+        #region Events
+
+        /// <summary>
+        ///     Occurs when the profile is being activated.
+        /// </summary>
+        public event EventHandler Activated;
+
+        /// <summary>
+        ///     Occurs when the profile is being deactivated.
+        /// </summary>
+        public event EventHandler Deactivated;
+
+        private void OnActivated()
+        {
+            Activated?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void OnDeactivated()
+        {
+            Deactivated?.Invoke(this, EventArgs.Empty);
+        }
+
+        #endregion
+    }
+}

src/Artemis.Core/Models/Surface/SurfaceConfiguration.cs

@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using Artemis.Storage.Entities;
+
+namespace Artemis.Core.Models.Surface
+{
+    public class SurfaceConfiguration
+    {
+        public SurfaceConfiguration(string name)
+        {
+            Name = name;
+            DeviceConfigurations = new List<SurfaceDeviceConfiguration>();
+        }
+
+        internal SurfaceConfiguration(SurfaceEntity surfaceEntity)
+        {
+            Guid = surfaceEntity.Guid;
+            Name = surfaceEntity.Name;
+            IsActive = surfaceEntity.IsActive;
+            DeviceConfigurations = new List<SurfaceDeviceConfiguration>();
+
+            if (surfaceEntity.SurfacePositions == null)
+                return;
+            foreach (var position in surfaceEntity.SurfacePositions)
+                DeviceConfigurations.Add(new SurfaceDeviceConfiguration(position, this));
+        }
+
+        internal string Guid { get; set; }
+        public string Name { get; set; }
+        public bool IsActive { get; set; }
+        public List<SurfaceDeviceConfiguration> DeviceConfigurations { get; set; }
+    }
+}

src/Artemis.Core/Models/Surface/SurfaceDeviceConfiguration.cs

@@ -0,0 +1,47 @@
+using Artemis.Storage.Entities;
+using RGB.NET.Core;
+
+namespace Artemis.Core.Models.Surface
+{
+    public class SurfaceDeviceConfiguration
+    {
+        internal SurfaceDeviceConfiguration(int deviceId, IRGBDeviceInfo deviceInfo, SurfaceConfiguration surface)
+        {
+            DeviceId = deviceId;
+            DeviceName = deviceInfo.DeviceName;
+            DeviceModel = deviceInfo.Model;
+            DeviceManufacturer = deviceInfo.Manufacturer;
+
+            Surface = surface;
+        }
+
+        internal SurfaceDeviceConfiguration(SurfacePositionEntity position, SurfaceConfiguration surfaceConfiguration)
+        {
+            Guid = position.Guid;
+
+            DeviceId = position.DeviceId;
+            DeviceName = position.DeviceName;
+            DeviceModel = position.DeviceModel;
+            DeviceManufacturer = position.DeviceManufacturer;
+
+            X = position.X;
+            Y = position.Y;
+            Rotation = position.Rotation;
+
+            Surface = surfaceConfiguration;
+        }
+
+        internal string Guid { get; set; }
+
+        public int DeviceId { get; set; }
+        public string DeviceName { get; set; }
+        public string DeviceModel { get; set; }
+        public string DeviceManufacturer { get; set; }
+
+        public double X { get; set; }
+        public double Y { get; set; }
+        public double Rotation { get; set; }
+
+        public SurfaceConfiguration Surface { get; internal set; }
+    }
+}

src/Artemis.Core/Ninject/CoreModule.cs

@@ -1,8 +1,10 @@
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Exceptions;
+using Artemis.Core.Plugins.Models;
 using Artemis.Core.Services.Interfaces;
-using Artemis.Storage.Repositories;
+using Artemis.Storage.Repositories.Interfaces;
 using Ninject.Extensions.Conventions;
 using Ninject.Modules;
+using Serilog;
 
 namespace Artemis.Core.Ninject
 {
@@ -10,6 +12,9 @@ namespace Artemis.Core.Ninject
     {
         public override void Load()
         {
+            if (Kernel == null)
+                throw new ArtemisCoreException("Failed to bind Ninject Core module, kernel is null.");
+
             // Bind all services as singletons
             Kernel.Bind(x =>
             {
@@ -31,6 +36,7 @@ namespace Artemis.Core.Ninject
             });
 
             Kernel.Bind<PluginSettings>().ToProvider<PluginSettingsProvider>();
+            Kernel.Bind<ILogger>().ToProvider<LoggerProvider>();
         }
     }
 }

src/Artemis.Core/Ninject/LoggerProvider.cs

@@ -0,0 +1,25 @@
+using Ninject.Activation;
+using Serilog;
+
+namespace Artemis.Core.Ninject
+{
+    internal class LoggerProvider : Provider<ILogger>
+    {
+        private static readonly ILogger _logger = new LoggerConfiguration()
+            .Enrich.FromLogContext()
+            .Enrich.WithDemystifiedStackTraces()
+            .WriteTo.File("Artemis log-.txt", 
+                rollingInterval: RollingInterval.Day, 
+                outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] [{SourceContext:l}] {Message:lj}{NewLine}{Exception}")
+            .CreateLogger();
+
+        protected override ILogger CreateInstance(IContext context)
+        {
+            var requestingType = context.Request.ParentContext?.Plan?.Type;
+            if (requestingType != null)
+                return _logger.ForContext(requestingType);
+            return _logger;
+            
+        }
+    }
+}

src/Artemis.Core/Ninject/PluginSettingsProvider.cs

@@ -2,7 +2,7 @@
 using Artemis.Core.Exceptions;
 using Artemis.Core.Plugins.Abstract;
 using Artemis.Core.Plugins.Models;
-using Artemis.Storage.Repositories;
+using Artemis.Storage.Repositories.Interfaces;
 using Ninject.Activation;
 
 namespace Artemis.Core.Ninject

src/Artemis.Core/Plugins/Abstract/LayerType.cs

@@ -1,6 +1,6 @@
 using System.Drawing;
+using Artemis.Core.Models.Profile;
 using Artemis.Core.Plugins.Models;
-using Artemis.Core.ProfileElements;
 using RGB.NET.Core;
 
 namespace Artemis.Core.Plugins.Abstract

src/Artemis.Core/Plugins/Abstract/ProfileModule.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Drawing;
+using Artemis.Core.Models.Profile;
 using Artemis.Core.Plugins.Models;
-using Artemis.Core.ProfileElements;
 using RGB.NET.Core;
 
 namespace Artemis.Core.Plugins.Abstract

src/Artemis.Core/Plugins/Models/PluginSetting.cs

@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using Artemis.Storage.Entities;
 using Artemis.Storage.Repositories;
+using Artemis.Storage.Repositories.Interfaces;
 using Newtonsoft.Json;
 
 namespace Artemis.Core.Plugins.Models

src/Artemis.Core/Plugins/Models/PluginSettings.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using Artemis.Storage.Entities;
 using Artemis.Storage.Repositories;
+using Artemis.Storage.Repositories.Interfaces;
 using Newtonsoft.Json;
 
 namespace Artemis.Core.Plugins.Models

src/Artemis.Core/Services/CoreService.cs

@@ -4,6 +4,7 @@ using Artemis.Core.Exceptions;
 using Artemis.Core.Plugins.Abstract;
 using Artemis.Core.Services.Interfaces;
 using RGB.NET.Core;
+using Serilog;
 using Color = System.Drawing.Color;
 
 namespace Artemis.Core.Services
@@ -13,11 +14,13 @@ namespace Artemis.Core.Services
     /// </summary>
     public class CoreService : ICoreService
     {
+        private readonly ILogger _logger;
         private readonly IPluginService _pluginService;
         private readonly IRgbService _rgbService;
 
-        internal CoreService(IPluginService pluginService, IRgbService rgbService)
+        internal CoreService(ILogger logger, IPluginService pluginService, IRgbService rgbService)
         {
+            _logger = logger;
             _pluginService = pluginService;
             _rgbService = rgbService;
             _rgbService.Surface.Updating += SurfaceOnUpdating;
@@ -38,6 +41,8 @@ namespace Artemis.Core.Services
             if (IsInitialized)
                 throw new ArtemisCoreException("Cannot initialize the core as it is already initialized.");
 
+            _logger.Information("Initializing Artemis Core version {version}", typeof(CoreService).Assembly.GetName().Version);
+            
             // Initialize the services
             await Task.Run(() => _pluginService.CopyBuiltInPlugins());
             await Task.Run(() => _pluginService.LoadPlugins());

src/Artemis.Core/Services/RgbService.cs

@@ -1,13 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using Artemis.Core.Events;
+using Artemis.Core.Models.Surface;
 using Artemis.Core.RGB.NET;
 using Artemis.Core.Services.Interfaces;
+using Artemis.Core.Services.Storage;
+using Artemis.Storage.Entities;
 using RGB.NET.Brushes;
 using RGB.NET.Core;
 using RGB.NET.Groups;
+using Serilog;
 
 namespace Artemis.Core.Services
 {
@@ -17,10 +20,14 @@ namespace Artemis.Core.Services
     public class RgbService : IRgbService, IDisposable
     {
         private readonly List<IRGBDevice> _loadedDevices;
+        private readonly ILogger _logger;
+        private readonly ISurfaceService _surfaceService;
         private readonly TimerUpdateTrigger _updateTrigger;
 
-        internal RgbService()
+        internal RgbService(ILogger logger, ISurfaceService surfaceService)
         {
+            _logger = logger;
+            _surfaceService = surfaceService;
             Surface = RGBSurface.Instance;
             LoadingDevices = false;
 
@@ -33,7 +40,7 @@ namespace Artemis.Core.Services
         }
 
         /// <inheritdoc />
-        public bool LoadingDevices { get; private set; }
+        public bool LoadingDevices { get; }
 
         /// <inheritdoc />
         public RGBSurface Surface { get; set; }
@@ -43,9 +50,17 @@ namespace Artemis.Core.Services
         public void AddDeviceProvider(IRGBDeviceProvider deviceProvider)
         {
             Surface.LoadDevices(deviceProvider);
-            
+
             if (deviceProvider.Devices == null)
+            {
+                _logger.Warning("Device provider {deviceProvider} has no devices", deviceProvider.GetType().Name);
                 return;
+            }
+
+            // Get the currently active surface configuration
+            var surface = _surfaceService.GetActiveSurfaceConfiguration();
+            if (surface == null)
+                _logger.Information("No active surface configuration found, not positioning device");
 
             lock (_loadedDevices)
             {
@@ -54,10 +69,16 @@ namespace Artemis.Core.Services
                     if (!_loadedDevices.Contains(surfaceDevice))
                     {
                         _loadedDevices.Add(surfaceDevice);
+                        if (surface != null)
+                            ApplyDeviceConfiguration(surfaceDevice, surface);
                         OnDeviceLoaded(new DeviceEventArgs(surfaceDevice));
                     }
                     else
+                    {
+                        if (surface != null)
+                            ApplyDeviceConfiguration(surfaceDevice, surface);
                         OnDeviceReloaded(new DeviceEventArgs(surfaceDevice));
+                    }
                 }
             }
 
@@ -75,6 +96,31 @@ namespace Artemis.Core.Services
             Surface.Dispose();
         }
 
+        public void ApplyDeviceConfiguration(IRGBDevice rgbDevice, SurfaceConfiguration surface)
+        {
+            // Determine the device ID by assuming devices are always added to the loaded devices list in the same order
+            lock (_loadedDevices)
+            {
+                var deviceId = _loadedDevices.Where(d => d.DeviceInfo.DeviceName == rgbDevice.DeviceInfo.DeviceName &&
+                                                         d.DeviceInfo.Model == rgbDevice.DeviceInfo.Model &&
+                                                         d.DeviceInfo.Manufacturer == rgbDevice.DeviceInfo.Manufacturer)
+                                   .ToList()
+                                   .IndexOf(rgbDevice) + 1;
+
+                var deviceConfig = surface.DeviceConfigurations.FirstOrDefault(d => d.DeviceName == rgbDevice.DeviceInfo.DeviceName &&
+                                                                                       d.DeviceModel == rgbDevice.DeviceInfo.Model &&
+                                                                                       d.DeviceManufacturer == rgbDevice.DeviceInfo.Manufacturer &&
+                                                                                       d.DeviceId == deviceId);
+                if (deviceConfig == null)
+                {
+                    _logger.Information("No surface device config found for {deviceInfo}, device ID: {deviceId}", rgbDevice.DeviceInfo, deviceId);
+                    return;
+                }
+
+                rgbDevice.Location = new Point(deviceConfig.X, deviceConfig.Y);
+            }
+        }
+
         private void SurfaceOnException(ExceptionEventArgs args)
         {
             throw args.Exception;

src/Artemis.Core/Services/Storage/SurfaceService.cs

@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Artemis.Core.Models.Surface;
+using Artemis.Core.Services.Interfaces;
+using Artemis.Storage.Repositories.Interfaces;
+
+namespace Artemis.Core.Services.Storage
+{
+    public class SurfaceService : ISurfaceService
+    {
+        private readonly ISurfaceRepository _surfaceRepository;
+
+        public SurfaceService(ISurfaceRepository surfaceRepository)
+        {
+            _surfaceRepository = surfaceRepository;
+        }
+
+        public async Task<List<SurfaceConfiguration>> GetSurfaceConfigurations()
+        {
+            var surfaceEntities = await _surfaceRepository.GetAllAsync();
+            var configs = new List<SurfaceConfiguration>();
+            foreach (var surfaceEntity in surfaceEntities)
+                configs.Add(new SurfaceConfiguration(surfaceEntity));
+
+            return configs;
+        }
+
+        public SurfaceConfiguration GetActiveSurfaceConfiguration()
+        {
+            var entity = _surfaceRepository.GetAll().FirstOrDefault(d => d.IsActive);
+            return entity != null ? new SurfaceConfiguration(entity) : null;
+        }
+    }
+
+    public interface ISurfaceService : IArtemisService
+    {
+        Task<List<SurfaceConfiguration>> GetSurfaceConfigurations();
+        SurfaceConfiguration GetActiveSurfaceConfiguration();
+    }
+}

src/Artemis.Core/Services/StorageService.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Artemis.Core.Models.Profile;
 using Artemis.Core.Plugins.Models;
-using Artemis.Core.ProfileElements;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Storage.Repositories;
 

src/Artemis.Core/app.config

@@ -12,7 +12,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.4.0" newVersion="1.2.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
@@ -56,7 +56,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.4.2.0" newVersion="1.4.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.4.0" newVersion="1.4.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Console" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -84,7 +84,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -96,7 +96,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

src/Artemis.Core/packages.config

@@ -2,12 +2,14 @@
 <packages>
   <package id="AppDomainToolkit" version="1.0.4.3" targetFramework="net461" />
   <package id="Castle.Core" version="4.4.0" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net472" />
   <package id="Ninject" version="3.3.4" targetFramework="net461" />
   <package id="Ninject.Extensions.ChildKernel" version="3.3.0" targetFramework="net461" />
   <package id="Ninject.Extensions.Conventions" version="3.3.0" targetFramework="net461" />
   <package id="Ninject.Extensions.Factory" version="3.3.2" targetFramework="net461" />
-  <package id="Stylet" version="1.1.22" targetFramework="net461" />
+  <package id="Serilog" version="2.8.0" targetFramework="net472" />
+  <package id="Serilog.Sinks.File" version="4.0.0" targetFramework="net472" />
+  <package id="Stylet" version="1.2.0" targetFramework="net472" />
   <package id="System.Diagnostics.DiagnosticSource" version="4.5.1" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
 </packages>