Plugin features - Added PluginFeature attribute

Plugin features -Added PluginFeatureInfo to plugin features
Web server - Moved REST APIs to plugins

src/Artemis.Core/Artemis.Core.csproj.DotSettings

@@ -68,6 +68,7 @@
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=services_005Cwebserver_005Ccontrollers/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=services_005Cwebserver_005Cendpoints/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=services_005Cwebserver_005Cinterfaces/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=services_005Cwebserver_005Cjson/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=stores/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=stores_005Cregistrations/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=utilities/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/Artemis.Core/Plugins/DataModelExpansions/DataModel.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Reflection;
 using Artemis.Core.Modules;
 using Humanizer;
+using Newtonsoft.Json;
 
 namespace Artemis.Core.DataModelExpansions
 {
@@ -28,12 +29,14 @@ namespace Artemis.Core.DataModelExpansions
         /// <summary>
         ///     Gets the plugin feature this data model belongs to
         /// </summary>
+        [JsonIgnore]
         [DataModelIgnore]
         public DataModelPluginFeature Feature { get; internal set; }
 
         /// <summary>
         ///     Gets the <see cref="DataModelPropertyAttribute" /> describing this data model
         /// </summary>
+        [JsonIgnore]
         [DataModelIgnore]
         public DataModelPropertyAttribute DataModelDescription { get; internal set; }
 

src/Artemis.Core/Plugins/Plugin.cs

@@ -44,7 +44,6 @@ namespace Artemis.Core
         /// </summary>
         public DirectoryInfo Directory { get; }
 
-
         /// <summary>
         ///     Gets or sets a configuration dialog for this plugin that is accessible in the UI under Settings > Plugins
         /// </summary>

src/Artemis.Core/Plugins/PluginFeature.cs

@@ -13,6 +13,11 @@ namespace Artemis.Core
         private bool _isEnabled;
         private Exception? _loadException;
 
+        /// <summary>
+        ///     Gets the plugin feature info related to this feature
+        /// </summary>
+        public PluginFeatureInfo Info { get; internal set; } = null!; // Will be set right after construction
+
         /// <summary>
         ///     Gets the plugin that provides this feature
         /// </summary>

src/Artemis.Core/Plugins/PluginFeatureAttribute.cs

@@ -0,0 +1,27 @@
+using System;
+
+namespace Artemis.Core
+{
+    /// <summary>
+    ///     Represents an attribute that describes a plugin feature
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class)]
+    public class PluginFeatureAttribute : Attribute
+    {
+        /// <summary>
+        ///     Gets or sets the user-friendly name for this property, shown in the UI.
+        /// </summary>
+        public string? Name { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the user-friendly description for this property, shown in the UI.
+        /// </summary>
+        public string? Description { get; set; }
+
+        /// <summary>
+        ///     The plugins display icon that's shown in the settings see <see href="https://materialdesignicons.com" /> for
+        ///     available icons
+        /// </summary>
+        public string? Icon { get; set; }
+    }
+}

src/Artemis.Core/Plugins/PluginFeatureInfo.cs

@@ -0,0 +1,92 @@
+using Artemis.Core.DataModelExpansions;
+using Artemis.Core.DeviceProviders;
+using Artemis.Core.LayerBrushes;
+using Artemis.Core.LayerEffects;
+using Artemis.Core.Modules;
+using Humanizer;
+using Newtonsoft.Json;
+
+namespace Artemis.Core
+{
+    /// <summary>
+    ///     Represents basic info about a plugin feature and contains a reference to the instance of said feature
+    /// </summary>
+    [JsonObject(MemberSerialization.OptIn)]
+    public class PluginFeatureInfo : CorePropertyChanged
+    {
+        private string? _description;
+        private string? _icon;
+        private string _name = null!;
+        private PluginFeature _pluginFeature = null!;
+
+        internal PluginFeatureInfo()
+        {
+        }
+
+        internal PluginFeatureInfo(PluginFeature instance, PluginFeatureAttribute? attribute)
+        {
+            Name = attribute?.Name ?? instance.GetType().Name.Humanize(LetterCasing.Title);
+            Description = attribute?.Description;
+            Icon = attribute?.Icon;
+            PluginFeature = instance;
+
+            if (Icon != null) return;
+            Icon = PluginFeature switch
+            {
+                BaseDataModelExpansion => "TableAdd",
+                DeviceProvider => "Devices",
+                ProfileModule => "VectorRectangle",
+                Module => "GearBox",
+                LayerBrushProvider => "Brush",
+                LayerEffectProvider => "AutoAwesome",
+                _ => "Plugin"
+            };
+        }
+
+        /// <summary>
+        ///     The name of the plugin
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public string Name
+        {
+            get => _name;
+            internal set => SetAndNotify(ref _name, value);
+        }
+
+        /// <summary>
+        ///     A short description of the plugin
+        /// </summary>
+        [JsonProperty]
+        public string? Description
+        {
+            get => _description;
+            set => SetAndNotify(ref _description, value);
+        }
+
+        /// <summary>
+        ///     The plugins display icon that's shown in the settings see <see href="https://materialdesignicons.com" /> for
+        ///     available icons
+        /// </summary>
+        [JsonProperty]
+        public string? Icon
+        {
+            get => _icon;
+            set => SetAndNotify(ref _icon, value);
+        }
+
+        /// <summary>
+        ///     Gets the plugin this info is associated with
+        /// </summary>
+        public PluginFeature PluginFeature
+        {
+            get => _pluginFeature;
+            internal set => SetAndNotify(ref _pluginFeature, value);
+        }
+
+        /// <inheritdoc />
+        public override string ToString()
+        {
+            return PluginFeature.Id;
+        }
+    }
+}

src/Artemis.Core/Services/PluginManagementService.cs

@@ -9,6 +9,7 @@ using Artemis.Core.DeviceProviders;
 using Artemis.Core.Ninject;
 using Artemis.Storage.Entities.Plugins;
 using Artemis.Storage.Repositories.Interfaces;
+using Humanizer;
 using McMaster.NETCore.Plugins;
 using Ninject;
 using Ninject.Extensions.ChildKernel;
@@ -342,6 +343,10 @@ namespace Artemis.Core.Services
                     // Include Plugin as a parameter for the PluginSettingsProvider
                     IParameter[] parameters = {new Parameter("Plugin", plugin, false)};
                     PluginFeature instance = (PluginFeature) plugin.Kernel.Get(featureType, parameters);
+
+                    // Get the PluginFeature attribute which contains extra info on the feature
+                    PluginFeatureAttribute? pluginFeatureAttribute = (PluginFeatureAttribute?) Attribute.GetCustomAttribute(featureType, typeof(PluginFeatureAttribute));
+                    instance.Info = new PluginFeatureInfo(instance, pluginFeatureAttribute);
                     plugin.AddFeature(instance);
 
                     // Load the enabled state and if not found, default to true

src/Artemis.Core/Services/WebServer/Controllers/PluginsController.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EmbedIO;
-using EmbedIO.Routing;
-using EmbedIO.WebApi;
-
-namespace Artemis.Core.Services
-{
-    internal class PluginsController : WebApiController
-    {
-        private readonly IWebServerService _webServerService;
-
-        public PluginsController(IWebServerService webServerService)
-        {
-            _webServerService = webServerService;
-        }
-
-        [Route(HttpVerbs.Get, "/plugins/endpoints")]
-        public IReadOnlyCollection<PluginEndPoint> GetPluginEndPoints()
-        {
-            return _webServerService.PluginsModule.PluginEndPoints;
-        }
-
-        [Route(HttpVerbs.Get, "/plugins/endpoints/{plugin}/{endPoint}")]
-        public PluginEndPoint GetPluginEndPoint(Guid plugin, string endPoint)
-        {
-            PluginEndPoint? pluginEndPoint = _webServerService.PluginsModule.PluginEndPoints.FirstOrDefault(e => e.PluginFeature.Plugin.Guid == plugin && e.Name == endPoint);
-            if (pluginEndPoint == null)
-                throw HttpException.NotFound();
-
-            return pluginEndPoint;
-        }
-    }
-}

src/Artemis.Core/Services/WebServer/WebServerService.cs

@@ -52,8 +52,6 @@ namespace Artemis.Core.Services
                 .HandleHttpException((context, exception) => HandleHttpExceptionJson(context, exception))
                 .HandleUnhandledException(JsonExceptionHandlerCallback);
 
-            // Add built-in core controllers to the API module
-            apiModule.RegisterController(() => _kernel.Get<PluginsController>());
             // Add registered controllers to the API module
             foreach (WebApiControllerRegistration registration in _controllers)
                 apiModule.RegisterController(registration.ControllerType, (Func<WebApiController>) registration.UntypedFactory);
@@ -177,7 +175,8 @@ namespace Artemis.Core.Services
         {
             context.Response.ContentType = MimeType.Json;
             await using TextWriter writer = context.OpenResponseText();
-            await writer.WriteAsync(JsonConvert.SerializeObject(data));
+            string json = JsonConvert.SerializeObject(data, new JsonSerializerSettings {PreserveReferencesHandling = PreserveReferencesHandling.Objects});
+            await writer.WriteAsync(json);
         }
 
         private async Task HandleHttpExceptionJson(IHttpContext context, IHttpException httpException)

src/Artemis.UI/Bootstrapper.cs

@@ -87,8 +87,9 @@ namespace Artemis.UI
                 }
             });
 
-            Kernel.Get<IRegistrationService>().RegisterInputProvider();
+            IRegistrationService registrationService = Kernel.Get<IRegistrationService>();
-            Kernel.Get<IRemoteManagementService>();
+            registrationService.RegisterInputProvider();
+            registrationService.RegisterControllers();
         }
 
         protected override void ConfigureIoC(IKernel kernel)

src/Artemis.UI/Controllers/RemoteController.cs

@@ -5,7 +5,7 @@ using EmbedIO;
 using EmbedIO.Routing;
 using EmbedIO.WebApi;
 
-namespace Artemis.UI.Services
+namespace Artemis.UI.Controllers
 {
     public class RemoteController : WebApiController
     {

src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabView.xaml

@@ -59,6 +59,28 @@
                     </Grid>
                     <Separator Style="{StaticResource MaterialDesignSeparator}" Margin="-15 5" />
 
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <StackPanel Grid.Column="0">
+                            <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Startup delay</TextBlock>
+                            <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}" TextWrapping="Wrap">
+                                Set the amount of seconds to wait before running Artemis with Windows. <LineBreak/>
+                                If some devices don't work because Artemis starts before the manufacturer's software, try increasing this value.
+                            </TextBlock>
+                        </StackPanel>
+                        <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+                            <TextBox Text="{Binding AutoRunDelay}" IsEnabled="{Binding StartWithWindows}" Width="80" materialDesign:TextFieldAssist.SuffixText="sec"/>
+                        </StackPanel>
+                    </Grid>
+                    <Separator Style="{StaticResource MaterialDesignSeparator}" Margin="-15 5" />
+
                     <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition />
@@ -89,62 +111,14 @@
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
-                        <StackPanel Grid.Column="0" VerticalAlignment="Center">
+                        <StackPanel Grid.Column="0">
-                            <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Setup wizard</TextBlock>
+                            <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Log level</TextBlock>
-                            <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}">
+                            <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}" TextWrapping="Wrap">
-                                Opens the startup wizard usually shown when Artemis first starts.
+                                Sets the logging level, a higher logging level will result in more log files.
                             </TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
-                            <Button Style="{StaticResource MaterialDesignOutlinedButton}" Command="{s:Action ShowSetupWizard}" Width="150">
+                            <ComboBox Width="80" SelectedValue="{Binding SelectedLogLevel}" ItemsSource="{Binding LogLevels}" SelectedValuePath="Value" DisplayMemberPath="Description" />
-                                SHOW WIZARD
-                            </Button>
-                        </StackPanel>
-                    </Grid>
-                    <Separator Style="{StaticResource MaterialDesignSeparator}" Margin="-15 5" />
-
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition />
-                            <RowDefinition />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <StackPanel Grid.Column="0" VerticalAlignment="Center">
-                            <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Debugger</TextBlock>
-                            <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}">
-                                Use the debugger to see the raw image Artemis is rendering on the surface.
-                            </TextBlock>
-                        </StackPanel>
-                        <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
-                            <Button Style="{StaticResource MaterialDesignOutlinedButton}" Command="{s:Action ShowDebugger}" Width="150">
-                                SHOW DEBUGGER
-                            </Button>
-                        </StackPanel>
-                    </Grid>
-                    <Separator Style="{StaticResource MaterialDesignSeparator}" Margin="-15 5" />
-
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition />
-                            <RowDefinition />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <StackPanel Grid.Column="0" VerticalAlignment="Center">
-                            <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Application files</TextBlock>
-                            <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}">
-                                Opens the directory where application files like plugins and settings are stored.
-                            </TextBlock>
-                        </StackPanel>
-                        <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
-                            <Button Style="{StaticResource MaterialDesignOutlinedButton}" Command="{s:Action ShowDataFolder}" Width="150">
-                                SHOW APP FILES
-                            </Button>
                         </StackPanel>
                     </Grid>
                     <Separator Style="{StaticResource MaterialDesignSeparator}" Margin="-15 5" />
@@ -170,28 +144,6 @@
                             </Button>
                         </StackPanel>
                     </Grid>
-                    <Separator Style="{StaticResource MaterialDesignSeparator}" Margin="-15 5" />
-
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition />
-                            <RowDefinition />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <StackPanel Grid.Column="0">
-                            <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Log level</TextBlock>
-                            <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}" TextWrapping="Wrap">
-                                Sets the logging level, a higher logging level will result in more log files.
-                            </TextBlock>
-                        </StackPanel>
-                        <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
-                            <ComboBox Width="80" SelectedValue="{Binding SelectedLogLevel}" ItemsSource="{Binding LogLevels}" SelectedValuePath="Value" DisplayMemberPath="Description" />
-                        </StackPanel>
-                    </Grid>
-
                 </StackPanel>
             </materialDesign:Card>
 
@@ -418,6 +370,82 @@
                     </Grid>
                 </StackPanel>
             </materialDesign:Card>
+
+
+            <!-- Tools -->
+            <TextBlock Style="{StaticResource MaterialDesignHeadline5TextBlock}" Margin="0 15">Tools</TextBlock>
+            <materialDesign:Card materialDesign:ShadowAssist.ShadowDepth="Depth1" VerticalAlignment="Stretch" Margin="0,0,5,0">
+                <StackPanel Margin="15">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <StackPanel Grid.Column="0" VerticalAlignment="Center">
+                            <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Setup wizard</TextBlock>
+                            <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}">
+                                Opens the startup wizard usually shown when Artemis first starts.
+                            </TextBlock>
+                        </StackPanel>
+                        <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+                            <Button Style="{StaticResource MaterialDesignOutlinedButton}" Command="{s:Action ShowSetupWizard}" Width="150">
+                                SHOW WIZARD
+                            </Button>
+                        </StackPanel>
+                    </Grid>
+                    <Separator Style="{StaticResource MaterialDesignSeparator}" Margin="-15 5" />
+
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <StackPanel Grid.Column="0" VerticalAlignment="Center">
+                            <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Debugger</TextBlock>
+                            <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}">
+                                Use the debugger to see the raw image Artemis is rendering on the surface.
+                            </TextBlock>
+                        </StackPanel>
+                        <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+                            <Button Style="{StaticResource MaterialDesignOutlinedButton}" Command="{s:Action ShowDebugger}" Width="150">
+                                SHOW DEBUGGER
+                            </Button>
+                        </StackPanel>
+                    </Grid>
+                    <Separator Style="{StaticResource MaterialDesignSeparator}" Margin="-15 5" />
+
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <StackPanel Grid.Column="0" VerticalAlignment="Center">
+                            <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Application files</TextBlock>
+                            <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}">
+                                Opens the directory where application files like plugins and settings are stored.
+                            </TextBlock>
+                        </StackPanel>
+                        <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+                            <Button Style="{StaticResource MaterialDesignOutlinedButton}" Command="{s:Action ShowDataFolder}" Width="150">
+                                SHOW APP FILES
+                            </Button>
+                        </StackPanel>
+                    </Grid>
+                </StackPanel>
+            </materialDesign:Card>
+
         </StackPanel>
     </ScrollViewer>
 </UserControl>

src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabViewModel.cs

@@ -125,7 +125,19 @@ namespace Artemis.UI.Screens.Settings.Tabs.General
                 _settingsService.GetSetting("UI.AutoRun", false).Value = value;
                 _settingsService.GetSetting("UI.AutoRun", false).Save();
                 NotifyOfPropertyChange(nameof(StartWithWindows));
-                Task.Run(ApplyAutorun);
+                Task.Run(() => ApplyAutorun(false));
+            }
+        }
+
+        public int AutoRunDelay
+        {
+            get => _settingsService.GetSetting("UI.AutoRunDelay", 15).Value;
+            set
+            {
+                _settingsService.GetSetting("UI.AutoRunDelay", 15).Value = value;
+                _settingsService.GetSetting("UI.AutoRunDelay", 15).Save();
+                NotifyOfPropertyChange(nameof(AutoRunDelay));
+                Task.Run(() => ApplyAutorun(true));
             }
         }
 
@@ -293,11 +305,11 @@ namespace Artemis.UI.Screens.Settings.Tabs.General
 
         protected override void OnInitialActivate()
         {
-            Task.Run(ApplyAutorun);
+            Task.Run(() => ApplyAutorun(false));
             base.OnInitialActivate();
         }
 
-        private void ApplyAutorun()
+        private void ApplyAutorun(bool recreate)
         {
             if (!StartWithWindows)
                 StartMinimized = false;
@@ -307,23 +319,29 @@ namespace Artemis.UI.Screens.Settings.Tabs.General
             if (File.Exists(autoRunFile))
                 File.Delete(autoRunFile);
 
+            // TODO: Don't do anything if running a development build, only auto-run release builds
+            
             // Create or remove the task if necessary
             try
             {
-                Process schtasks = new()
+                bool taskCreated = false;
+                if (!recreate)
                 {
-                    StartInfo =
+                    Process schtasks = new()
                     {
-                        WindowStyle = ProcessWindowStyle.Hidden,
+                        StartInfo =
-                        UseShellExecute = true,
+                        {
-                        FileName = Path.Combine(Environment.SystemDirectory, "schtasks.exe"),
+                            WindowStyle = ProcessWindowStyle.Hidden,
-                        Arguments = "/TN \"Artemis 2 autorun\""
+                            UseShellExecute = true,
-                    }
+                            FileName = Path.Combine(Environment.SystemDirectory, "schtasks.exe"),
-                };
+                            Arguments = "/TN \"Artemis 2 autorun\""
+                        }
+                    };
 
-                schtasks.Start();
+                    schtasks.Start();
-                schtasks.WaitForExit();
+                    schtasks.WaitForExit();
-                bool taskCreated = schtasks.ExitCode == 0;
+                    taskCreated = schtasks.ExitCode == 0;
+                }
 
                 if (StartWithWindows && !taskCreated)
                     CreateAutoRunTask();
@@ -347,6 +365,9 @@ namespace Artemis.UI.Screens.Settings.Tabs.General
             task.Descendants().First(d => d.Name.LocalName == "RegistrationInfo").Descendants().First(d => d.Name.LocalName == "Author")
                 .SetValue(System.Security.Principal.WindowsIdentity.GetCurrent().Name);
 
+            task.Descendants().First(d => d.Name.LocalName == "Triggers").Descendants().First(d => d.Name.LocalName == "LogonTrigger").Descendants().First(d => d.Name.LocalName == "Delay")
+                .SetValue(TimeSpan.FromSeconds(AutoRunDelay));
+
             task.Descendants().First(d => d.Name.LocalName == "Principals").Descendants().First(d => d.Name.LocalName == "Principal").Descendants().First(d => d.Name.LocalName == "UserId")
                 .SetValue(System.Security.Principal.WindowsIdentity.GetCurrent().User.Value);
 
@@ -369,7 +390,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.General
                     UseShellExecute = true,
                     Verb = "runas",
                     FileName = Path.Combine(Environment.SystemDirectory, "schtasks.exe"),
-                    Arguments = $"/Create /XML \"{xmlPath}\" /tn \"Artemis 2 autorun\""
+                    Arguments = $"/Create /XML \"{xmlPath}\" /tn \"Artemis 2 autorun\" /F"
                 }
             };
 

src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginFeatureView.xaml

@@ -7,6 +7,7 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:s="https://github.com/canton7/Stylet"
              xmlns:converters="clr-namespace:Artemis.UI.Converters"
+             xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
              d:DataContext="{d:DesignInstance local:PluginFeatureViewModel}">
@@ -21,8 +22,9 @@
         </Grid.ColumnDefinitions>
 
         <!-- Icon column -->
-        <materialDesign:PackIcon Grid.Column="0"
+        <shared:ArtemisIcon Grid.Column="0"
-                                 Kind="{Binding Icon}"
+                                 Icon="{Binding Feature.Info.Icon}"
+                                 Width="20"
                                  VerticalAlignment="Center"
                                  HorizontalAlignment="Center"
                                  Visibility="{Binding LoadException, Converter={StaticResource NullToVisibilityConverter}, ConverterParameter=Inverted}" />
@@ -40,7 +42,7 @@
         </Button>
 
         <!-- Display name column -->
-        <TextBlock Grid.Column="1" Text="{Binding Name}" Style="{StaticResource MaterialDesignTextBlock}" VerticalAlignment="Center" />
+        <TextBlock Grid.Column="1" Text="{Binding Feature.Info.Name}" Style="{StaticResource MaterialDesignTextBlock}" VerticalAlignment="Center" ToolTip="{Binding Feature.Info.Description}" />
 
         <!-- Enable toggle column -->
         <StackPanel Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="8"

src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginFeatureViewModel.cs

@@ -3,15 +3,8 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 using Artemis.Core;
-using Artemis.Core.DataModelExpansions;
-using Artemis.Core.DeviceProviders;
-using Artemis.Core.LayerBrushes;
-using Artemis.Core.LayerEffects;
-using Artemis.Core.Modules;
 using Artemis.Core.Services;
 using Artemis.UI.Shared.Services;
-using Humanizer;
-using MaterialDesignThemes.Wpf;
 using Stylet;
 
 namespace Artemis.UI.Screens.Settings.Tabs.Plugins
@@ -20,9 +13,9 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins
     {
         private readonly IDialogService _dialogService;
         private readonly IPluginManagementService _pluginManagementService;
-        private IMessageService _messageService;
         private bool _enabling;
-        
+        private readonly IMessageService _messageService;
+
         public PluginFeatureViewModel(PluginFeature feature,
             IDialogService dialogService,
             IPluginManagementService pluginManagementService,
@@ -33,14 +26,9 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins
             _messageService = messageService;
 
             Feature = feature;
-            Icon = GetIconKind();
         }
 
         public PluginFeature Feature { get; }
-        public PackIconKind Icon { get; }
-
-        public string Name => Feature.GetType().Name.Humanize();
-
         public Exception LoadException => Feature.LoadException;
 
         public bool Enabling
@@ -109,7 +97,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins
                 }
                 catch (Exception e)
                 {
-                    _messageService.ShowMessage($"Failed to enable {Name}\r\n{e.Message}", "VIEW LOGS", ShowLogsFolder);
+                    _messageService.ShowMessage($"Failed to enable {Feature.Info.Name}\r\n{e.Message}", "VIEW LOGS", ShowLogsFolder);
                 }
                 finally
                 {
@@ -123,20 +111,6 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins
             }
         }
 
-        private PackIconKind GetIconKind()
-        {
-            return Feature switch
-            {
-                BaseDataModelExpansion => PackIconKind.TableAdd,
-                DeviceProvider => PackIconKind.Devices,
-                ProfileModule => PackIconKind.VectorRectangle,
-                Module => PackIconKind.GearBox,
-                LayerBrushProvider => PackIconKind.Brush,
-                LayerEffectProvider => PackIconKind.AutoAwesome,
-                _ => PackIconKind.Plugin
-            };
-        }
-
         #region Event handlers
 
         private void OnFeatureEnabling(object sender, PluginFeatureEventArgs e)

src/Artemis.UI/Services/RegistrationService.cs

@@ -1,6 +1,7 @@
 using System.Linq;
 using Artemis.Core;
 using Artemis.Core.Services;
+using Artemis.UI.Controllers;
 using Artemis.UI.DefaultTypes.DataModel.Display;
 using Artemis.UI.DefaultTypes.DataModel.Input;
 using Artemis.UI.InputProviders;
@@ -19,6 +20,7 @@ namespace Artemis.UI.Services
         private readonly IPluginManagementService _pluginManagementService;
         private readonly ISurfaceService _surfaceService;
         private readonly IInputService _inputService;
+        private readonly IWebServerService _webServerService;
         private bool _registeredBuiltInDataModelDisplays;
         private bool _registeredBuiltInDataModelInputs;
         private bool _registeredBuiltInPropertyEditors;
@@ -28,7 +30,8 @@ namespace Artemis.UI.Services
             IProfileEditorService profileEditorService,
             IPluginManagementService pluginManagementService,
             ISurfaceService surfaceService,
-            IInputService inputService)
+            IInputService inputService,
+            IWebServerService webServerService)
         {
             _logger = logger;
             _dataModelUIService = dataModelUIService;
@@ -36,6 +39,7 @@ namespace Artemis.UI.Services
             _pluginManagementService = pluginManagementService;
             _surfaceService = surfaceService;
             _inputService = inputService;
+            _webServerService = webServerService;
 
             LoadPluginModules();
             pluginManagementService.PluginEnabling += PluginServiceOnPluginEnabling;
@@ -91,6 +95,11 @@ namespace Artemis.UI.Services
             _inputService.AddInputProvider(new NativeWindowInputProvider(_logger, _inputService));
         }
 
+        public void RegisterControllers()
+        {
+            _webServerService.AddController<RemoteController>();
+        }
+
         private void PluginServiceOnPluginEnabling(object sender, PluginEventArgs e)
         {
             e.Plugin.Kernel.Load(new[] {new PluginUIModule(e.Plugin)});
@@ -109,5 +118,6 @@ namespace Artemis.UI.Services
         void RegisterBuiltInDataModelInputs();
         void RegisterBuiltInPropertyEditors();
         void RegisterInputProvider();
+        void RegisterControllers();
     }
 }

src/Artemis.UI/Services/RemoteManagement/Interfaces/IRemoteManagementService.cs

@@ -1,6 +0,0 @@
-namespace Artemis.UI.Services
-{
-    public interface IRemoteManagementService : IArtemisUIService
-    {
-    }
-}

src/Artemis.UI/Services/RemoteManagement/RemoteManagementService.cs

@@ -1,12 +0,0 @@
-using Artemis.Core.Services;
-
-namespace Artemis.UI.Services
-{
-    public class RemoteManagementService : IRemoteManagementService
-    {
-        public RemoteManagementService(IWebServerService webServerService)
-        {
-            webServerService.AddController<RemoteController>();
-        }
-    }
-}