Profiles - Reworked profile system

Sidebar - Redesigned sidebar with customizable categories
Profiles - Added the ability to configure custom profile icons
Profiles - Added the ability to activate multiple profiles for modules at once
Profiles - Added the ability to create profiles for no modules
Profiles - Added the ability to suspend a profile or an entire category
Profiles - Added profile activation conditions
Profiles - Added file-based importing/exporting
Profile editor - Condensed UI, removed tabs 
Profile editor - Disable condition operators until a left-side is picked

src/Artemis.UI/Screens/ProfileEditor/Conditions/Abstract/DataModelConditionPredicateViewModel.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Media;
 using Artemis.Core;
+using Artemis.Core.Modules;
 using Artemis.Core.Services;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Input;
@@ -16,6 +17,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions.Abstract
     {
         private readonly IConditionOperatorService _conditionOperatorService;
         private readonly IDataModelUIService _dataModelUIService;
+        private readonly List<Module> _modules;
         private readonly IProfileEditorService _profileEditorService;
         private DataModelStaticViewModel _rightSideInputViewModel;
         private DataModelDynamicViewModel _rightSideSelectionViewModel;
@@ -25,11 +27,13 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions.Abstract
 
         protected DataModelConditionPredicateViewModel(
             DataModelConditionPredicate dataModelConditionPredicate,
+            List<Module> modules,
             IProfileEditorService profileEditorService,
             IDataModelUIService dataModelUIService,
             IConditionOperatorService conditionOperatorService,
             ISettingsService settingsService) : base(dataModelConditionPredicate)
         {
+            _modules = modules;
             _profileEditorService = profileEditorService;
             _dataModelUIService = dataModelUIService;
             _conditionOperatorService = conditionOperatorService;
@@ -44,6 +48,8 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions.Abstract
         public DataModelConditionPredicate DataModelConditionPredicate => (DataModelConditionPredicate) Model;
         public PluginSetting<bool> ShowDataModelValues { get; }
 
+        public bool CanSelectOperator => DataModelConditionPredicate.LeftPath is {IsValid: true};
+
         public BaseConditionOperator SelectedOperator
         {
             get => _selectedOperator;
@@ -75,12 +81,12 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions.Abstract
         public override void Delete()
         {
             base.Delete();
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         public virtual void Initialize()
         {
-            LeftSideSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_profileEditorService.GetCurrentModule());
+            LeftSideSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_modules);
             LeftSideSelectionViewModel.PropertySelected += LeftSideOnPropertySelected;
             if (LeftSideColor != null)
                 LeftSideSelectionViewModel.ButtonBrush = LeftSideColor;
@@ -107,10 +113,11 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions.Abstract
             else if (!Operators.Contains(DataModelConditionPredicate.Operator))
                 DataModelConditionPredicate.UpdateOperator(Operators.FirstOrDefault(o => o.Description == DataModelConditionPredicate.Operator.Description) ?? Operators.FirstOrDefault());
 
+            NotifyOfPropertyChange(nameof(CanSelectOperator));
             SelectedOperator = DataModelConditionPredicate.Operator;
 
             // Without a selected operator or one that supports a right side, leave the right side input empty
-            if (SelectedOperator == null || SelectedOperator.RightSideType == null)
+            if (SelectedOperator?.RightSideType == null)
             {
                 DisposeRightSideStaticViewModel();
                 DisposeRightSideDynamicViewModel();
@@ -132,7 +139,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions.Abstract
                 DisposeRightSideDynamicViewModel();
                 if (RightSideInputViewModel == null)
                     CreateRightSideInputViewModel();
-                
+
                 Type preferredType = DataModelConditionPredicate.GetPreferredRightSideType();
                 if (preferredType != null && RightSideInputViewModel.TargetType != preferredType)
                     RightSideInputViewModel.UpdateTargetType(preferredType);
@@ -149,7 +156,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions.Abstract
                 return;
 
             DataModelConditionPredicate.UpdateLeftSide(LeftSideSelectionViewModel.DataModelPath);
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
 
             SelectedOperator = DataModelConditionPredicate.Operator;
             Update();
@@ -158,7 +165,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions.Abstract
         public void ApplyRightSideDynamic()
         {
             DataModelConditionPredicate.UpdateRightSideDynamic(RightSideSelectionViewModel.DataModelPath);
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
 
             Update();
         }
@@ -166,7 +173,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions.Abstract
         public void ApplyRightSideStatic(object value)
         {
             DataModelConditionPredicate.UpdateRightSideStatic(value);
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
 
             Update();
         }
@@ -174,7 +181,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions.Abstract
         public void ApplyOperator()
         {
             DataModelConditionPredicate.UpdateOperator(SelectedOperator);
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
 
             Update();
         }
@@ -196,6 +203,26 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions.Abstract
             ApplyOperator();
         }
 
+        public override void UpdateModules()
+        {
+            if (LeftSideSelectionViewModel != null)
+            {
+                LeftSideSelectionViewModel.PropertySelected -= LeftSideOnPropertySelected;
+                LeftSideSelectionViewModel.Dispose();
+                LeftSideSelectionViewModel = null;
+            }
+            DisposeRightSideStaticViewModel();
+            DisposeRightSideDynamicViewModel();
+
+            // If the modules changed the paths may no longer be valid if they targeted a module no longer available, in that case clear the path
+            if (DataModelConditionPredicate.LeftPath?.Target != null && !DataModelConditionPredicate.LeftPath.Target.IsExpansion && !_modules.Contains(DataModelConditionPredicate.LeftPath.Target.Module))
+                DataModelConditionPredicate.UpdateLeftSide(null);
+            if (DataModelConditionPredicate.RightPath?.Target != null && !DataModelConditionPredicate.RightPath.Target.IsExpansion && !_modules.Contains(DataModelConditionPredicate.RightPath.Target.Module))
+                DataModelConditionPredicate.UpdateRightSideDynamic(null);
+
+            Initialize();
+        }
+
         #region IDisposable
 
         protected virtual void Dispose(bool disposing)
@@ -227,7 +254,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions.Abstract
 
         private void CreateRightSideSelectionViewModel()
         {
-            RightSideSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_profileEditorService.GetCurrentModule());
+            RightSideSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_modules);
             RightSideSelectionViewModel.ButtonBrush = (SolidColorBrush) Application.Current.FindResource("PrimaryHueMidBrush");
             RightSideSelectionViewModel.DisplaySwitchButton = true;
             RightSideSelectionViewModel.PropertySelected += RightSideOnPropertySelected;

src/Artemis.UI/Screens/ProfileEditor/Conditions/Abstract/DataModelConditionViewModel.cs

@@ -63,5 +63,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions.Abstract
             groupViewModel.ConvertToPredicate(this);
             return true;
         }
+
+        public abstract void UpdateModules();
     }
 }

src/Artemis.UI/Screens/ProfileEditor/Conditions/DataModelConditionEventViewModel.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Media;
 using Artemis.Core;
+using Artemis.Core.Modules;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.ProfileEditor.Conditions.Abstract;
 using Artemis.UI.Shared;
@@ -14,15 +15,18 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
     {
         private readonly IDataModelConditionsVmFactory _dataModelConditionsVmFactory;
         private readonly IDataModelUIService _dataModelUIService;
+        private readonly List<Module> _modules;
         private readonly IProfileEditorService _profileEditorService;
         private DateTime _lastTrigger;
         private string _triggerPastParticiple;
 
         public DataModelConditionEventViewModel(DataModelConditionEvent dataModelConditionEvent,
+            List<Module> modules,
             IProfileEditorService profileEditorService,
             IDataModelUIService dataModelUIService,
             IDataModelConditionsVmFactory dataModelConditionsVmFactory) : base(dataModelConditionEvent)
         {
+            _modules = modules;
             _profileEditorService = profileEditorService;
             _dataModelUIService = dataModelUIService;
             _dataModelConditionsVmFactory = dataModelConditionsVmFactory;
@@ -46,7 +50,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
 
         public void Initialize()
         {
-            LeftSideSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_profileEditorService.GetCurrentModule());
+            LeftSideSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_modules);
             LeftSideSelectionViewModel.PropertySelected += LeftSideSelectionViewModelOnPropertySelected;
             LeftSideSelectionViewModel.LoadEventChildren = false;
 
@@ -82,7 +86,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
                 if (!(childModel is DataModelConditionGroup dataModelConditionGroup))
                     continue;
 
-                DataModelConditionGroupViewModel viewModel = _dataModelConditionsVmFactory.DataModelConditionGroupViewModel(dataModelConditionGroup, ConditionGroupType.Event);
+                DataModelConditionGroupViewModel viewModel = _dataModelConditionsVmFactory.DataModelConditionGroupViewModel(dataModelConditionGroup, ConditionGroupType.Event, _modules);
                 viewModel.IsRootGroup = true;
                 viewModels.Add(viewModel);
             }
@@ -103,11 +107,18 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
         public void ApplyEvent()
         {
             DataModelConditionEvent.UpdateEvent(LeftSideSelectionViewModel.DataModelPath);
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
 
             Update();
         }
 
+        public override void UpdateModules()
+        {
+            LeftSideSelectionViewModel.Dispose();
+            LeftSideSelectionViewModel.PropertySelected -= LeftSideSelectionViewModelOnPropertySelected;
+            Initialize();
+        }
+
         protected override void OnInitialActivate()
         {
             Initialize();

src/Artemis.UI/Screens/ProfileEditor/Conditions/DataModelConditionGroupViewModel.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using Artemis.Core;
+using Artemis.Core.Modules;
+using Artemis.Core.Services;
 using Artemis.UI.Extensions;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.ProfileEditor.Conditions.Abstract;
@@ -14,17 +16,23 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
     public class DataModelConditionGroupViewModel : DataModelConditionViewModel
     {
         private readonly IDataModelConditionsVmFactory _dataModelConditionsVmFactory;
+        private readonly List<Module> _modules;
+        private readonly ICoreService _coreService;
         private readonly IProfileEditorService _profileEditorService;
         private bool _isEventGroup;
         private bool _isRootGroup;
 
         public DataModelConditionGroupViewModel(DataModelConditionGroup dataModelConditionGroup,
             ConditionGroupType groupType,
+            List<Module> modules,
+            ICoreService coreService,
             IProfileEditorService profileEditorService,
             IDataModelConditionsVmFactory dataModelConditionsVmFactory)
             : base(dataModelConditionGroup)
         {
             GroupType = groupType;
+            _modules = modules;
+            _coreService = coreService;
             _profileEditorService = profileEditorService;
             _dataModelConditionsVmFactory = dataModelConditionsVmFactory;
 
@@ -66,7 +74,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             DataModelConditionGroup.BooleanOperator = enumValue;
             NotifyOfPropertyChange(nameof(SelectedBooleanOperator));
 
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         public void AddCondition()
@@ -87,7 +95,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             }
 
             Update();
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         public void AddEventCondition()
@@ -104,7 +112,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             DataModelConditionGroup.AddChild(new DataModelConditionEvent(DataModelConditionGroup), index);
 
             Update();
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         public void AddGroup()
@@ -112,7 +120,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             DataModelConditionGroup.AddChild(new DataModelConditionGroup(DataModelConditionGroup));
 
             Update();
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         public override void Update()
@@ -131,22 +139,22 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
                 switch (childModel)
                 {
                     case DataModelConditionGroup dataModelConditionGroup:
-                        Items.Add(_dataModelConditionsVmFactory.DataModelConditionGroupViewModel(dataModelConditionGroup, GroupType));
+                        Items.Add(_dataModelConditionsVmFactory.DataModelConditionGroupViewModel(dataModelConditionGroup, GroupType, _modules));
                         break;
                     case DataModelConditionList dataModelConditionList:
-                        Items.Add(_dataModelConditionsVmFactory.DataModelConditionListViewModel(dataModelConditionList));
+                        Items.Add(_dataModelConditionsVmFactory.DataModelConditionListViewModel(dataModelConditionList, _modules));
                         break;
                     case DataModelConditionEvent dataModelConditionEvent:
-                        Items.Add(_dataModelConditionsVmFactory.DataModelConditionEventViewModel(dataModelConditionEvent));
+                        Items.Add(_dataModelConditionsVmFactory.DataModelConditionEventViewModel(dataModelConditionEvent, _modules));
                         break;
                     case DataModelConditionGeneralPredicate dataModelConditionGeneralPredicate:
-                        Items.Add(_dataModelConditionsVmFactory.DataModelConditionGeneralPredicateViewModel(dataModelConditionGeneralPredicate));
+                        Items.Add(_dataModelConditionsVmFactory.DataModelConditionGeneralPredicateViewModel(dataModelConditionGeneralPredicate, _modules));
                         break;
                     case DataModelConditionListPredicate dataModelConditionListPredicate:
-                        Items.Add(_dataModelConditionsVmFactory.DataModelConditionListPredicateViewModel(dataModelConditionListPredicate));
+                        Items.Add(_dataModelConditionsVmFactory.DataModelConditionListPredicateViewModel(dataModelConditionListPredicate, _modules));
                         break;
                     case DataModelConditionEventPredicate dataModelConditionEventPredicate:
-                        Items.Add(_dataModelConditionsVmFactory.DataModelConditionEventPredicateViewModel(dataModelConditionEventPredicate));
+                        Items.Add(_dataModelConditionsVmFactory.DataModelConditionEventPredicateViewModel(dataModelConditionEventPredicate, _modules));
                         break;
                 }
             }
@@ -173,6 +181,12 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
                 dataModelConditionViewModel.Evaluate();
         }
 
+        public override void UpdateModules()
+        {
+            foreach (DataModelConditionViewModel dataModelConditionViewModel in Items) 
+                dataModelConditionViewModel.UpdateModules();
+        }
+
         public void ConvertToConditionList(DataModelConditionViewModel predicateViewModel)
         {
             // Store the old index and remove the old predicate
@@ -203,8 +217,33 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             Update();
         }
 
+        private void CoreServiceOnFrameRendered(object? sender, FrameRenderedEventArgs e)
+        {
+            if (IsRootGroup)
+                Evaluate();
+        }
+
         public event EventHandler Updated;
 
+        #region Overrides of Screen
+
+        /// <inheritdoc />
+        protected override void OnInitialActivate()
+        {
+            base.OnInitialActivate();
+            Update();
+            _coreService.FrameRendered += CoreServiceOnFrameRendered;
+        }
+
+        /// <inheritdoc />
+        protected override void OnClose()
+        {
+            _coreService.FrameRendered -= CoreServiceOnFrameRendered;
+            base.OnClose();
+        }
+        
+        #endregion
+
         protected virtual void OnUpdated()
         {
             Updated?.Invoke(this, EventArgs.Empty);

src/Artemis.UI/Screens/ProfileEditor/Conditions/DataModelConditionListViewModel.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Windows.Forms.VisualStyles;
 using System.Windows.Media;
 using Artemis.Core;
+using Artemis.Core.Modules;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.ProfileEditor.Conditions.Abstract;
 using Artemis.UI.Shared;
@@ -16,14 +16,16 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
     {
         private readonly IDataModelConditionsVmFactory _dataModelConditionsVmFactory;
         private readonly IDataModelUIService _dataModelUIService;
+        private readonly List<Module> _modules;
         private readonly IProfileEditorService _profileEditorService;
 
-        public DataModelConditionListViewModel(
-            DataModelConditionList dataModelConditionList,
+        public DataModelConditionListViewModel(DataModelConditionList dataModelConditionList,
+            List<Module> modules,
             IProfileEditorService profileEditorService,
             IDataModelUIService dataModelUIService,
             IDataModelConditionsVmFactory dataModelConditionsVmFactory) : base(dataModelConditionList)
         {
+            _modules = modules;
             _profileEditorService = profileEditorService;
             _dataModelUIService = dataModelUIService;
             _dataModelConditionsVmFactory = dataModelConditionsVmFactory;
@@ -39,7 +41,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             DataModelConditionList.ListOperator = enumValue;
             NotifyOfPropertyChange(nameof(SelectedListOperator));
 
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         public void AddCondition()
@@ -47,7 +49,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             DataModelConditionList.AddChild(new DataModelConditionGeneralPredicate(DataModelConditionList, ProfileRightSideType.Dynamic));
 
             Update();
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         public void AddGroup()
@@ -55,25 +57,32 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             DataModelConditionList.AddChild(new DataModelConditionGroup(DataModelConditionList));
 
             Update();
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         public override void Evaluate()
         {
             IsConditionMet = DataModelConditionList.Evaluate();
-            foreach (DataModelConditionViewModel dataModelConditionViewModel in Items) 
+            foreach (DataModelConditionViewModel dataModelConditionViewModel in Items)
                 dataModelConditionViewModel.Evaluate();
         }
 
         public override void Delete()
         {
             base.Delete();
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
+        }
+
+        /// <inheritdoc />
+        public override void UpdateModules()
+        {
+            foreach (DataModelConditionViewModel dataModelConditionViewModel in Items) 
+                dataModelConditionViewModel.UpdateModules();
         }
 
         public void Initialize()
         {
-            LeftSideSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_profileEditorService.GetCurrentModule());
+            LeftSideSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_modules);
             LeftSideSelectionViewModel.PropertySelected += LeftSideSelectionViewModelOnPropertySelected;
 
             IReadOnlyCollection<DataModelVisualizationRegistration> editors = _dataModelUIService.RegisteredDataModelEditors;
@@ -96,7 +105,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
                 return;
 
             DataModelConditionList.UpdateList(LeftSideSelectionViewModel.DataModelPath);
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
 
             Update();
         }
@@ -120,7 +129,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
                 if (!(childModel is DataModelConditionGroup dataModelConditionGroup))
                     continue;
 
-                DataModelConditionGroupViewModel viewModel = _dataModelConditionsVmFactory.DataModelConditionGroupViewModel(dataModelConditionGroup, ConditionGroupType.List);
+                DataModelConditionGroupViewModel viewModel = _dataModelConditionsVmFactory.DataModelConditionGroupViewModel(dataModelConditionGroup, ConditionGroupType.List, _modules);
                 viewModel.IsRootGroup = true;
                 viewModels.Add(viewModel);
             }

src/Artemis.UI/Screens/ProfileEditor/Conditions/Predicate/DataModelConditionEventPredicateView.xaml

@@ -55,6 +55,7 @@
                 Background="#7B7B7B"
                 BorderBrush="#7B7B7B"
                 Content="{Binding SelectedOperator.Description}"
+                IsEnabled="{Binding CanSelectOperator}"
                 Click="PropertyButton_OnClick">
             <Button.ContextMenu>
                 <ContextMenu ItemsSource="{Binding Operators}">

src/Artemis.UI/Screens/ProfileEditor/Conditions/Predicate/DataModelConditionEventPredicateViewModel.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Media;
 using Artemis.Core;
+using Artemis.Core.Modules;
 using Artemis.Core.Services;
 using Artemis.UI.Extensions;
 using Artemis.UI.Screens.ProfileEditor.Conditions.Abstract;
@@ -16,11 +17,12 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
         private readonly IDataModelUIService _dataModelUIService;
 
         public DataModelConditionEventPredicateViewModel(DataModelConditionEventPredicate dataModelConditionEventPredicate,
+            List<Module> modules,
             IProfileEditorService profileEditorService,
             IDataModelUIService dataModelUIService,
             IConditionOperatorService conditionOperatorService,
             ISettingsService settingsService)
-            : base(dataModelConditionEventPredicate, profileEditorService, dataModelUIService, conditionOperatorService, settingsService)
+            : base(dataModelConditionEventPredicate, modules, profileEditorService, dataModelUIService, conditionOperatorService, settingsService)
         {
             _dataModelUIService = dataModelUIService;
 

src/Artemis.UI/Screens/ProfileEditor/Conditions/Predicate/DataModelConditionGeneralPredicateView.xaml

@@ -56,6 +56,7 @@
                 Background="#7B7B7B"
                 BorderBrush="#7B7B7B"
                 Content="{Binding SelectedOperator.Description}"
+                IsEnabled="{Binding CanSelectOperator}"
                 Click="PropertyButton_OnClick">
             <Button.ContextMenu>
                 <ContextMenu ItemsSource="{Binding Operators}">

src/Artemis.UI/Screens/ProfileEditor/Conditions/Predicate/DataModelConditionGeneralPredicateViewModel.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Artemis.Core;
+using Artemis.Core.Modules;
 using Artemis.Core.Services;
 using Artemis.UI.Screens.ProfileEditor.Conditions.Abstract;
 using Artemis.UI.Shared;
@@ -14,11 +15,12 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
         private readonly IDataModelUIService _dataModelUIService;
 
         public DataModelConditionGeneralPredicateViewModel(DataModelConditionGeneralPredicate dataModelConditionGeneralPredicate,
+            List<Module> modules,
             IProfileEditorService profileEditorService,
             IDataModelUIService dataModelUIService,
             IConditionOperatorService conditionOperatorService,
             ISettingsService settingsService)
-            : base(dataModelConditionGeneralPredicate, profileEditorService, dataModelUIService, conditionOperatorService, settingsService)
+            : base(dataModelConditionGeneralPredicate, modules, profileEditorService, dataModelUIService, conditionOperatorService, settingsService)
         {
             _dataModelUIService = dataModelUIService;
         }

src/Artemis.UI/Screens/ProfileEditor/Conditions/Predicate/DataModelConditionListPredicateView.xaml

@@ -55,6 +55,7 @@
                 Background="#7B7B7B"
                 BorderBrush="#7B7B7B"
                 Content="{Binding SelectedOperator.Description}"
+                IsEnabled="{Binding CanSelectOperator}"
                 Click="PropertyButton_OnClick">
             <Button.ContextMenu>
                 <ContextMenu ItemsSource="{Binding Operators}">

src/Artemis.UI/Screens/ProfileEditor/Conditions/Predicate/DataModelConditionListPredicateViewModel.cs

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Media;
 using Artemis.Core;
+using Artemis.Core.Modules;
 using Artemis.Core.Services;
-using Artemis.UI.Extensions;
 using Artemis.UI.Screens.ProfileEditor.Conditions.Abstract;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
@@ -16,11 +16,12 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
         private readonly IDataModelUIService _dataModelUIService;
 
         public DataModelConditionListPredicateViewModel(DataModelConditionListPredicate dataModelConditionListPredicate,
+            List<Module> modules,
             IProfileEditorService profileEditorService,
             IDataModelUIService dataModelUIService,
             IConditionOperatorService conditionOperatorService,
             ISettingsService settingsService)
-            : base(dataModelConditionListPredicate, profileEditorService, dataModelUIService, conditionOperatorService, settingsService)
+            : base(dataModelConditionListPredicate, modules, profileEditorService, dataModelUIService, conditionOperatorService, settingsService)
         {
             _dataModelUIService = dataModelUIService;
 
@@ -44,6 +45,17 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             }
         }
 
+        public override void Evaluate()
+        {
+            throw new NotImplementedException();
+        }
+
+        public override void UpdateModules()
+        {
+            foreach (DataModelConditionViewModel dataModelConditionViewModel in Items) 
+                dataModelConditionViewModel.UpdateModules();
+        }
+
         protected override void OnInitialActivate()
         {
             base.OnInitialActivate();
@@ -81,10 +93,5 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
 
             return wrapper.CreateViewModel(_dataModelUIService, new DataModelUpdateConfiguration(true));
         }
-
-        public override void Evaluate()
-        {
-            throw new NotImplementedException();
-        }
     }
 }

src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileCreateView.xaml

@@ -1,30 +0,0 @@
-<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.Dialogs.ProfileCreateView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:s="https://github.com/canton7/Stylet"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             mc:Ignorable="d"
-             d:DesignHeight="213.053" d:DesignWidth="254.425">
-    <StackPanel Margin="16">
-        <TextBlock Style="{StaticResource MaterialDesignHeadline6TextBlock}">
-            Add a new profile
-        </TextBlock>
-
-        <TextBox materialDesign:HintAssist.Hint="Profile name"
-                 Margin="0 8 0 16"
-                 Width="300"
-                 Style="{StaticResource MaterialDesignFilledTextBox}"
-                 Text="{Binding ProfileName, UpdateSourceTrigger=PropertyChanged}" />
-
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 8 0 0">
-            <Button Style="{StaticResource MaterialDesignFlatButton}" IsCancel="True" Margin="0 0 8 0" Command="{s:Action Cancel}">
-                CANCEL
-            </Button>
-            <Button Style="{StaticResource MaterialDesignFlatButton}" IsDefault="True" Margin="0 0 0 0" Command="{s:Action Accept}">
-                ACCEPT
-            </Button>
-        </StackPanel>
-    </StackPanel>
-</UserControl>

src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileCreateViewModel.cs

@@ -1,40 +0,0 @@
-using System.Threading.Tasks;
-using Artemis.UI.Shared.Services;
-using FluentValidation;
-using Stylet;
-
-namespace Artemis.UI.Screens.ProfileEditor.Dialogs
-{
-    public class ProfileCreateViewModel : DialogViewModelBase
-    {
-        private string _profileName;
-
-        public ProfileCreateViewModel(IModelValidator<ProfileCreateViewModel> validator) : base(validator)
-        {
-        }
-
-        public string ProfileName
-        {
-            get => _profileName;
-            set => SetAndNotify(ref _profileName, value);
-        }
-
-        public async Task Accept()
-        {
-            await ValidateAsync();
-
-            if (HasErrors)
-                return;
-
-            Session.Close(ProfileName);
-        }
-    }
-
-    public class ProfileCreateViewModelValidator : AbstractValidator<ProfileCreateViewModel>
-    {
-        public ProfileCreateViewModelValidator()
-        {
-            RuleFor(m => m.ProfileName).NotEmpty().WithMessage("Profile name may not be empty");
-        }
-    }
-}

src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileEditView.xaml

@@ -1,30 +0,0 @@
-<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.Dialogs.ProfileEditView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:s="https://github.com/canton7/Stylet"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             mc:Ignorable="d"
-             d:DesignHeight="213.053" d:DesignWidth="254.425">
-    <StackPanel Margin="16">
-        <TextBlock Style="{StaticResource MaterialDesignHeadline6TextBlock}">
-            Edit profile
-        </TextBlock>
-
-        <TextBox materialDesign:HintAssist.Hint="Profile name"
-                 Margin="0 8 0 16"
-                 Width="300"
-                 Style="{StaticResource MaterialDesignFilledTextBox}"
-                 Text="{Binding ProfileName, UpdateSourceTrigger=PropertyChanged}" />
-
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 8 0 0">
-            <Button Style="{StaticResource MaterialDesignFlatButton}" IsCancel="True" Margin="0 0 8 0" Command="{s:Action Cancel}">
-                CANCEL
-            </Button>
-            <Button Style="{StaticResource MaterialDesignFlatButton}" IsDefault="True" Margin="0 0 0 0" Command="{s:Action Accept}">
-                ACCEPT
-            </Button>
-        </StackPanel>
-    </StackPanel>
-</UserControl>

src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileEditViewModel.cs

@@ -1,42 +0,0 @@
-using System.Threading.Tasks;
-using Artemis.Core;
-using Artemis.UI.Shared.Services;
-using FluentValidation;
-using Stylet;
-
-namespace Artemis.UI.Screens.ProfileEditor.Dialogs
-{
-    public class ProfileEditViewModel : DialogViewModelBase
-    {
-        private string _profileName;
-
-        public ProfileEditViewModel(IModelValidator<ProfileEditViewModel> validator, Profile profile) : base(validator)
-        {
-            ProfileName = profile.Name;
-        }
-
-        public string ProfileName
-        {
-            get => _profileName;
-            set => SetAndNotify(ref _profileName, value);
-        }
-
-        public async Task Accept()
-        {
-            await ValidateAsync();
-
-            if (HasErrors)
-                return;
-
-            Session.Close(ProfileName);
-        }
-    }
-
-    public class ProfileEditViewModelValidator : AbstractValidator<ProfileEditViewModel>
-    {
-        public ProfileEditViewModelValidator()
-        {
-            RuleFor(m => m.ProfileName).NotEmpty().WithMessage("Profile name may not be empty");
-        }
-    }
-}

src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileExportView.xaml

@@ -1,44 +0,0 @@
-<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.Dialogs.ProfileExportView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:s="https://github.com/canton7/Stylet"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             mc:Ignorable="d"
-             d:DesignHeight="450" d:DesignWidth="800">
-  <Grid Margin="16" Width="500">
-    <Grid.RowDefinitions>
-      <RowDefinition Height="Auto" />
-      <RowDefinition Height="Auto" />
-      <RowDefinition Height="*" />
-    </Grid.RowDefinitions>
-    <TextBlock Style="{StaticResource MaterialDesignHeadline6TextBlock}" Grid.Row="0">
-      Export current profile
-    </TextBlock>
-
-    <TextBlock Grid.Row="1"
-               Margin="0 10"
-               TextWrapping="Wrap"
-               Style="{StaticResource MaterialDesignSubtitle1TextBlock}"
-               Foreground="{DynamicResource MaterialDesignBodyLight}">
-      It looks like you have not set up any profile adaption hints. This means Artemis can't do much to make your profile look good on a different surface other than try finding the same LEDs as you have.
-      <LineBreak/><LineBreak/>
-      To configure adaption hints, right-click on a layer and choose <materialDesign:PackIcon Kind="AutoFix" /> <Run FontWeight="Bold">View Adaption Hints</Run>.
-      <LineBreak/><LineBreak/>
-      To learn more about profile adaption, check out
-      <Hyperlink Style="{StaticResource ArtemisHyperlink}" RequestNavigate="{s:Action OpenHyperlink}" NavigateUri="https://wiki.artemis-rgb.com/guides/user/profiles/layers/adaption-hints">
-        this wiki article
-      </Hyperlink>.
-    </TextBlock>
-
-    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Grid.Row="2">
-      <Button Style="{StaticResource MaterialDesignFlatButton}" IsCancel="True" Margin="0 8 8 0" Command="{s:Action Cancel}">
-        CANCEL
-      </Button>
-      <Button Style="{StaticResource MaterialDesignFlatButton}" IsDefault="True" Margin="0 8 0 0" Command="{s:Action Accept}">
-        EXPORT ANYWAY
-      </Button>
-    </StackPanel>
-  </Grid>
-</UserControl>

src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileExportViewModel.cs

@@ -1,49 +0,0 @@
-using System.Windows;
-using System.Windows.Navigation;
-using Artemis.Core;
-using Artemis.Core.Services;
-using Artemis.UI.Shared.Services;
-
-namespace Artemis.UI.Screens.ProfileEditor.Dialogs
-{
-    public class ProfileExportViewModel : DialogViewModelBase
-    {
-        private readonly IProfileService _profileService;
-        private readonly IMessageService _messageService;
-
-        public ProfileExportViewModel(ProfileDescriptor profileDescriptor, IProfileService profileService, IMessageService messageService)
-        {
-            ProfileDescriptor = profileDescriptor;
-
-            _profileService = profileService;
-            _messageService = messageService;
-        }
-
-        public ProfileDescriptor ProfileDescriptor { get; }
-
-        #region Overrides of Screen
-
-        /// <inheritdoc />
-        protected override void OnActivate()
-        {
-            // TODO: If the profile has hints on all layers, call Accept
-            base.OnActivate();
-        }
-
-        #endregion
-
-        public void OpenHyperlink(object sender, RequestNavigateEventArgs e)
-        {
-            Core.Utilities.OpenUrl(e.Uri.AbsoluteUri);
-        }
-
-        public void Accept()
-        {
-            string encoded = _profileService.ExportProfile(ProfileDescriptor);
-            Clipboard.SetText(encoded);
-            _messageService.ShowMessage("Profile contents exported to clipboard.");
-
-            Session.Close();
-        }
-    }
-}

src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileImportView.xaml

@@ -1,61 +0,0 @@
-<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.Dialogs.ProfileImportView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:s="https://github.com/canton7/Stylet"
-             xmlns:avalonedit="http://icsharpcode.net/sharpdevelop/avalonedit"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             mc:Ignorable="d"
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Grid Margin="16" Width="800">
-        <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-        </Grid.RowDefinitions>
-        <TextBlock Style="{StaticResource MaterialDesignHeadline6TextBlock}" Grid.Row="0">
-            Import profile to current module
-        </TextBlock>
-
-        <TextBlock Grid.Row="1"
-                   Margin="0 10"
-                   TextWrapping="Wrap"
-                   Style="{StaticResource MaterialDesignSubtitle1TextBlock}"
-                   Foreground="{DynamicResource MaterialDesignBodyLight}">
-            Please note that importing profiles like this is placeholder functionality. The idea is that this will eventually happen via the workshop.
-        </TextBlock>
-
-        <TextBlock Grid.Row="2"
-                   Margin="0 10"
-                   TextWrapping="Wrap"
-                   Style="{StaticResource MaterialDesignSubtitle1TextBlock}"
-                   Foreground="{DynamicResource MaterialDesignBodyLight}">
-            The workshop will include tools to make profiles convert easily and look good on different layouts.
-            That means right now when you import this profile unless you have the exact same setup as
-            the person who exported it, you'll have to select LEDs for each layer in the profile.
-        </TextBlock>
-
-        <TextBox Grid.Row="3"
-                 Text="{Binding ProfileJson}"
-                 Style="{StaticResource MaterialDesignOutlinedTextBox}"
-                 FontFamily="Consolas"
-                 VerticalAlignment="Top"
-                 Height="400"
-                 AcceptsReturn="True"
-                 VerticalScrollBarVisibility="Auto"
-                 materialDesign:HintAssist.Hint="Paste profile JSON here"
-                 Margin="16" />
-
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="4">
-            <Button Style="{StaticResource MaterialDesignFlatButton}" IsCancel="True" Margin="0 8 8 0" Command="{s:Action Cancel}">
-                CANCEL
-            </Button>
-            <Button Style="{StaticResource MaterialDesignFlatButton}" IsDefault="True" Margin="0 8 0 0" Command="{s:Action Accept}">
-                I UNDERSTAND, IMPORT
-            </Button>
-        </StackPanel>
-    </Grid>
-</UserControl>

src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileImportViewModel.cs

@@ -1,37 +0,0 @@
-using Artemis.Core;
-using Artemis.Core.Modules;
-using Artemis.Core.Services;
-using Artemis.UI.Shared.Services;
-
-namespace Artemis.UI.Screens.ProfileEditor.Dialogs
-{
-    public class ProfileImportViewModel : DialogViewModelBase
-    {
-        private readonly IProfileService _profileService;
-        private readonly IMessageService _messageService;
-        private string _profileJson;
-
-        public ProfileImportViewModel(ProfileModule profileModule, IProfileService profileService, IMessageService messageService)
-        {
-            ProfileModule = profileModule;
-
-            _profileService = profileService;
-            _messageService = messageService;
-        }
-
-        public ProfileModule ProfileModule { get; }
-        
-        public string ProfileJson
-        {
-            get => _profileJson;
-            set => SetAndNotify(ref _profileJson, value);
-        }
-
-        public void Accept()
-        {
-            ProfileDescriptor descriptor = _profileService.ImportProfile(ProfileJson, ProfileModule);
-            _messageService.ShowMessage("Profile imported.");
-            Session.Close(descriptor);
-        }
-    }
-}

src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs

@@ -1,7 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using Artemis.Core;
+using Artemis.Core.Modules;
 using Artemis.Core.Services;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.ProfileEditor.Conditions;
@@ -14,17 +16,15 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
     public class DisplayConditionsViewModel : Conductor<DataModelConditionGroupViewModel>, IProfileEditorPanelViewModel
     {
         private readonly IDataModelConditionsVmFactory _dataModelConditionsVmFactory;
-        private readonly ICoreService _coreService;
         private readonly IProfileEditorService _profileEditorService;
         private RenderProfileElement _renderProfileElement;
         private bool _displayStartHint;
         private bool _isEventCondition;
 
-        public DisplayConditionsViewModel(IProfileEditorService profileEditorService, IDataModelConditionsVmFactory dataModelConditionsVmFactory, ICoreService coreService)
+        public DisplayConditionsViewModel(IProfileEditorService profileEditorService, IDataModelConditionsVmFactory dataModelConditionsVmFactory)
         {
             _profileEditorService = profileEditorService;
             _dataModelConditionsVmFactory = dataModelConditionsVmFactory;
-            _coreService = coreService;
         }
 
         public bool DisplayStartHint
@@ -59,7 +59,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
                 TimelinePlayMode playMode = value ? TimelinePlayMode.Repeat : TimelinePlayMode.Once;
                 if (RenderProfileElement == null || RenderProfileElement?.Timeline.PlayMode == playMode) return;
                 RenderProfileElement.Timeline.PlayMode = playMode;
-                _profileEditorService.UpdateSelectedProfileElement();
+                _profileEditorService.SaveSelectedProfileElement();
             }
         }
 
@@ -71,7 +71,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
                 TimelineStopMode stopMode = value ? TimelineStopMode.Finish : TimelineStopMode.SkipToEnd;
                 if (RenderProfileElement == null || RenderProfileElement?.Timeline.StopMode == stopMode) return;
                 RenderProfileElement.Timeline.StopMode = stopMode;
-                _profileEditorService.UpdateSelectedProfileElement();
+                _profileEditorService.SaveSelectedProfileElement();
             }
         }
 
@@ -82,7 +82,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             {
                 if (RenderProfileElement == null || RenderProfileElement?.Timeline.EventOverlapMode == value) return;
                 RenderProfileElement.Timeline.EventOverlapMode = value;
-                _profileEditorService.UpdateSelectedProfileElement();
+                _profileEditorService.SaveSelectedProfileElement();
             }
         }
 
@@ -90,19 +90,17 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 
         protected override void OnInitialActivate()
         {
-            _profileEditorService.ProfileElementSelected += ProfileEditorServiceOnProfileElementSelected;
-            _coreService.FrameRendered += CoreServiceOnFrameRendered;
+            _profileEditorService.SelectedProfileElementChanged += SelectedProfileEditorServiceOnSelectedProfileElementChanged;
             base.OnInitialActivate();
         }
 
         protected override void OnClose()
         {
-            _profileEditorService.ProfileElementSelected -= ProfileEditorServiceOnProfileElementSelected;
-            _coreService.FrameRendered -= CoreServiceOnFrameRendered;
+            _profileEditorService.SelectedProfileElementChanged -= SelectedProfileEditorServiceOnSelectedProfileElementChanged;
             base.OnClose();
         }
 
-        private void ProfileEditorServiceOnProfileElementSelected(object sender, RenderProfileElementEventArgs e)
+        private void SelectedProfileEditorServiceOnSelectedProfileElementChanged(object sender, RenderProfileElementEventArgs e)
         {
             if (RenderProfileElement != null)
             {
@@ -127,9 +125,11 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             if (e.RenderProfileElement.DisplayCondition == null)
                 e.RenderProfileElement.DisplayCondition = new DataModelConditionGroup(null);
 
-            ActiveItem = _dataModelConditionsVmFactory.DataModelConditionGroupViewModel(e.RenderProfileElement.DisplayCondition, ConditionGroupType.General);
+            List<Module> modules = new();
+            if (_profileEditorService.SelectedProfileConfiguration?.Module != null)
+                modules.Add(_profileEditorService.SelectedProfileConfiguration.Module);
+            ActiveItem = _dataModelConditionsVmFactory.DataModelConditionGroupViewModel(e.RenderProfileElement.DisplayCondition, ConditionGroupType.General, modules);
             ActiveItem.IsRootGroup = true;
-            ActiveItem.Update();
 
             DisplayStartHint = !RenderProfileElement.DisplayCondition.Children.Any();
             IsEventCondition = RenderProfileElement.DisplayCondition.Children.Any(c => c is DataModelConditionEvent);
@@ -146,11 +146,6 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             NotifyOfPropertyChange(nameof(EventOverlapMode));
         }
 
-        private void CoreServiceOnFrameRendered(object sender, FrameRenderedEventArgs e)
-        {
-            ActiveItem?.Evaluate();
-        }
-
         private void DisplayConditionOnChildrenModified(object sender, EventArgs e)
         {
             DisplayStartHint = !RenderProfileElement.DisplayCondition.Children.Any();
@@ -159,7 +154,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 
         public void EventTriggerModeSelected()
         {
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
     }
 }

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/ConditionalDataBinding/ConditionalDataBindingModeViewModel.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
 using Artemis.Core;
-using Artemis.Core.Services;
 using Artemis.UI.Extensions;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Shared.Services;
@@ -15,16 +14,13 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.Conditio
         IDataBindingModeViewModel
     {
         private readonly IDataBindingsVmFactory _dataBindingsVmFactory;
-        private readonly ICoreService _coreService;
         private readonly IProfileEditorService _profileEditorService;
         private bool _updating;
 
         public ConditionalDataBindingModeViewModel(ConditionalDataBinding<TLayerProperty, TProperty> conditionalDataBinding,
-            ICoreService coreService,
             IProfileEditorService profileEditorService,
             IDataBindingsVmFactory dataBindingsVmFactory)
         {
-            _coreService = coreService;
             _profileEditorService = profileEditorService;
             _dataBindingsVmFactory = dataBindingsVmFactory;
 
@@ -41,7 +37,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.Conditio
             DataBindingConditionViewModel<TLayerProperty, TProperty> viewModel = Items.First(c => c.DataBindingCondition == condition);
             viewModel.ActiveItem.AddCondition();
 
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         public void RemoveCondition(DataBindingCondition<TLayerProperty, TProperty> dataBindingCondition)
@@ -52,22 +48,9 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.Conditio
         protected override void OnInitialActivate()
         {
             Initialize();
-            _coreService.FrameRendered += CoreServiceOnFrameRendered;
             base.OnInitialActivate();
         }
 
-        protected override void OnClose()
-        {
-            _coreService.FrameRendered -= CoreServiceOnFrameRendered;
-            base.OnClose();
-        }
-
-        private void CoreServiceOnFrameRendered(object sender, FrameRenderedEventArgs e)
-        {
-            foreach (DataBindingConditionViewModel<TLayerProperty, TProperty> dataBindingConditionViewModel in Items)
-                dataBindingConditionViewModel.Evaluate();
-        }
-
         private void UpdateItems()
         {
             _updating = true;
@@ -111,7 +94,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.Conditio
 
             ConditionalDataBinding.ApplyOrder();
 
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         private void ConditionalDataBindingOnConditionsUpdated(object sender, EventArgs e)

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/ConditionalDataBinding/DataBindingConditionViewModel.cs

@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Artemis.Core;
+using Artemis.Core.Modules;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.ProfileEditor.Conditions;
 using Artemis.UI.Shared;
@@ -34,7 +36,10 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.Conditio
         protected override void OnInitialActivate()
         {
             base.OnInitialActivate();
-            ActiveItem = _dataModelConditionsVmFactory.DataModelConditionGroupViewModel(DataBindingCondition.Condition, ConditionGroupType.General);
+            List<Module> modules = new();
+            if (_profileEditorService.SelectedProfileConfiguration?.Module != null)
+                modules.Add(_profileEditorService.SelectedProfileConfiguration.Module);
+            ActiveItem = _dataModelConditionsVmFactory.DataModelConditionGroupViewModel(DataBindingCondition.Condition, ConditionGroupType.General, modules);
             ActiveItem.IsRootGroup = true;
             
             ActiveItem.Update();
@@ -54,12 +59,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.Conditio
         private void ValueViewModelOnValueUpdated(object sender, DataModelInputStaticEventArgs e)
         {
             DataBindingCondition.Value = (TProperty) Convert.ChangeType(e.Value, typeof(TProperty));
-            _profileEditorService.UpdateSelectedProfileElement();
-        }
-
-        public void Evaluate()
-        {
-            ActiveItem?.Evaluate();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         public void AddCondition()

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingViewModel.cs

@@ -178,7 +178,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
                 Registration.DataBinding.EasingFunction = SelectedEasingViewModel?.EasingFunction ?? Easings.Functions.Linear;
             }
 
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
             Update();
         }
 
@@ -198,7 +198,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             }
 
             CreateDataBindingModeModeViewModel();
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         private void UpdateTestResult()
@@ -243,7 +243,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
                 return;
 
             Registration.LayerProperty.EnableDataBinding(Registration);
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         private void RemoveDataBinding()
@@ -255,7 +255,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             Registration.LayerProperty.DisableDataBinding(Registration.DataBinding);
             Update();
 
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         public void CopyDataBinding()
@@ -282,7 +282,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             Update();
             
 
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         private void OnFrameRendered(object sender, FrameRenderedEventArgs e)

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DirectDataBinding/DataBindingModifierView.xaml

@@ -9,6 +9,7 @@
              xmlns:utilities="clr-namespace:Artemis.UI.Utilities"
              xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.DirectDataBinding"
              xmlns:modifierTypes="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.DirectDataBinding.ModifierTypes"
+             xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
@@ -16,7 +17,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/Artemis.UI;component/ResourceDictionaries/DataModelConditions.xaml" />
                 <ResourceDictionary>
-                    <converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
+                    <shared:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
                     <utilities:BindingProxy x:Key="DataContextProxy" Data="{Binding}" />
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DirectDataBinding/DataBindingModifierViewModel.cs

@@ -71,19 +71,19 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.DirectDa
         public void Delete()
         {
             Modifier.DirectDataBinding.RemoveModifier(Modifier);
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         private void ParameterSelectionViewModelOnPropertySelected(object sender, DataModelInputDynamicEventArgs e)
         {
             Modifier.UpdateParameterDynamic(e.DataModelPath);
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         private void StaticInputViewModelOnValueUpdated(object sender, DataModelInputStaticEventArgs e)
         {
             Modifier.UpdateParameterStatic(e.Value);
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         private void Update()
@@ -100,7 +100,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.DirectDa
             else if (Modifier.ParameterType == ProfileRightSideType.Dynamic)
             {
                 DisposeStaticInputViewModel();
-                DynamicSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_profileEditorService.GetCurrentModule());
+                DynamicSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_profileEditorService.SelectedProfileConfiguration.Module);
                 if (DynamicSelectionViewModel != null)
                 {
                     DynamicSelectionViewModel.DisplaySwitchButton = true;
@@ -149,7 +149,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.DirectDa
                 return;
 
             Modifier.UpdateModifierType(modifierTypeViewModel.ModifierType);
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
 
             Update();
         }

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DirectDataBinding/DirectDataBindingModeViewModel.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
 using Artemis.Core;
+using Artemis.Core.Modules;
 using Artemis.UI.Extensions;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Shared;
@@ -87,7 +88,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.DirectDa
         private void Initialize()
         {
             DirectDataBinding.ModifiersUpdated += DirectDataBindingOnModifiersUpdated;
-            TargetSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_profileEditorService.GetCurrentModule());
+            TargetSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_profileEditorService.SelectedProfileConfiguration.Module);
             TargetSelectionViewModel.PropertySelected += TargetSelectionViewModelOnPropertySelected;
             ModifierViewModels.CollectionChanged += ModifierViewModelsOnCollectionChanged;
             Update();
@@ -106,7 +107,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.DirectDa
 
             DirectDataBinding.ApplyOrder();
 
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         #region Target
@@ -116,7 +117,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.DirectDa
             DirectDataBinding.UpdateSource(e.DataModelPath);
             Update();
 
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         #endregion
@@ -126,7 +127,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.DirectDa
         public void AddModifier()
         {
             DirectDataBinding.AddModifier(ProfileRightSideType.Dynamic);
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         private void UpdateModifierViewModels()

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsViewModel.cs

@@ -70,7 +70,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.LayerEffects
                 {
                     await Task.Delay(500);
                     renderElement.AddLayerEffect(SelectedLayerEffectDescriptor);
-                    _profileEditorService.UpdateSelectedProfileElement();
+                    _profileEditorService.SaveSelectedProfileElement();
                 });
             }
         }

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesView.xaml

@@ -18,7 +18,7 @@
     d:DataContext="{d:DesignInstance {x:Type layerProperties:LayerPropertiesViewModel}}"
     behaviors:InputBindingBehavior.PropagateInputBindingsToWindow="True">
     <UserControl.Resources>
-        <Converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
+        <shared:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
         <Converters:NullToBooleanConverter x:Key="NullToBooleanConverter" />
         <utilities:BindingProxy x:Key="DataContextProxy" Data="{Binding}" />
         <Style x:Key="SvStyle" TargetType="{x:Type ScrollViewer}">

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs

@@ -187,7 +187,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties
         {
             PopulateProperties(ProfileEditorService.SelectedProfileElement);
 
-            ProfileEditorService.ProfileElementSelected += ProfileEditorServiceOnProfileElementSelected;
+            ProfileEditorService.SelectedProfileElementChanged += SelectedProfileEditorServiceOnSelectedProfileElementChanged;
             ProfileEditorService.CurrentTimeChanged += ProfileEditorServiceOnCurrentTimeChanged;
             ProfileEditorService.SelectedDataBindingChanged += ProfileEditorServiceOnSelectedDataBindingChanged;
             ProfileEditorService.PixelsPerSecondChanged += ProfileEditorServiceOnPixelsPerSecondChanged;
@@ -197,7 +197,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties
 
         protected override void OnClose()
         {
-            ProfileEditorService.ProfileElementSelected -= ProfileEditorServiceOnProfileElementSelected;
+            ProfileEditorService.SelectedProfileElementChanged -= SelectedProfileEditorServiceOnSelectedProfileElementChanged;
             ProfileEditorService.CurrentTimeChanged -= ProfileEditorServiceOnCurrentTimeChanged;
             ProfileEditorService.SelectedDataBindingChanged -= ProfileEditorServiceOnSelectedDataBindingChanged;
             ProfileEditorService.PixelsPerSecondChanged -= ProfileEditorServiceOnPixelsPerSecondChanged;
@@ -218,7 +218,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties
                 EffectsViewModel.PopulateDescriptors();
         }
 
-        private void ProfileEditorServiceOnProfileElementSelected(object sender, RenderProfileElementEventArgs e)
+        private void SelectedProfileEditorServiceOnSelectedProfileElementChanged(object sender, RenderProfileElementEventArgs e)
         {
             PopulateProperties(e.RenderProfileElement);
         }
@@ -419,7 +419,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties
                 MoveAfter(source, target);
 
             ApplyCurrentEffectsOrder();
-            ProfileEditorService.UpdateSelectedProfile();
+            ProfileEditorService.SaveSelectedProfileConfiguration();
         }
 
         private void MoveBefore(LayerPropertyGroupViewModel source, LayerPropertyGroupViewModel target)

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineKeyframeViewModel.cs

@@ -118,7 +118,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
             foreach (TimelineEasingViewModel propertyTrackEasingViewModel in EasingViewModels.Where(vm => vm != easingViewModel))
                 propertyTrackEasingViewModel.IsEasingModeSelected = false;
 
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         #endregion
@@ -174,7 +174,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
         {
             LayerPropertyKeyframe.LayerProperty.RemoveKeyframe(LayerPropertyKeyframe);
             if (save)
-                _profileEditorService.UpdateSelectedProfileElement();
+                _profileEditorService.SaveSelectedProfileElement();
         }
 
         #endregion

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineSegmentViewModel.cs

@@ -103,7 +103,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
                 if (Segment != SegmentViewModelType.Main || SelectedProfileElement == null)
                     return;
                 SelectedProfileElement.Timeline.PlayMode = value ? TimelinePlayMode.Repeat : TimelinePlayMode.Once;
-                ProfileEditorService.UpdateSelectedProfileElement();
+                ProfileEditorService.SaveSelectedProfileElement();
                 NotifyOfPropertyChange(nameof(RepeatSegment));
             }
         }
@@ -159,7 +159,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
         protected override void OnInitialActivate()
         {
             ProfileEditorService.PixelsPerSecondChanged += ProfileEditorServiceOnPixelsPerSecondChanged;
-            ProfileEditorService.ProfileElementSelected += ProfileEditorServiceOnProfileElementSelected;
+            ProfileEditorService.SelectedProfileElementChanged += SelectedProfileEditorServiceOnSelectedProfileElementChanged;
             if (ProfileEditorService.SelectedProfileElement != null)
                 ProfileEditorService.SelectedProfileElement.Timeline.PropertyChanged += TimelineOnPropertyChanged;
 
@@ -171,7 +171,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
         protected override void OnClose()
         {
             ProfileEditorService.PixelsPerSecondChanged -= ProfileEditorServiceOnPixelsPerSecondChanged;
-            ProfileEditorService.ProfileElementSelected -= ProfileEditorServiceOnProfileElementSelected;
+            ProfileEditorService.SelectedProfileElementChanged -= SelectedProfileEditorServiceOnSelectedProfileElementChanged;
             if (SelectedProfileElement != null)
                 SelectedProfileElement.Timeline.PropertyChanged -= TimelineOnPropertyChanged;
             base.OnClose();
@@ -263,7 +263,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
             }
 
             ShiftNextSegment(SegmentLength - oldSegmentLength);
-            ProfileEditorService.UpdateSelectedProfileElement();
+            ProfileEditorService.SaveSelectedProfileElement();
             Update();
         }
 
@@ -277,7 +277,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
             else if (Segment == SegmentViewModelType.End)
                 SelectedProfileElement.Timeline.EndSegmentLength = TimeSpan.FromSeconds(1);
 
-            ProfileEditorService.UpdateSelectedProfileElement();
+            ProfileEditorService.SaveSelectedProfileElement();
             Update();
         }
 
@@ -296,7 +296,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
             ((IInputElement) sender).ReleaseMouseCapture();
             _draggingSegment = false;
 
-            ProfileEditorService.UpdateSelectedProfileElement();
+            ProfileEditorService.SaveSelectedProfileElement();
         }
 
         public void SegmentMouseMove(object sender, MouseEventArgs e)
@@ -367,7 +367,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
 
         #region Event handlers
 
-        private void ProfileEditorServiceOnProfileElementSelected(object sender, RenderProfileElementEventArgs e)
+        private void SelectedProfileEditorServiceOnSelectedProfileElementChanged(object sender, RenderProfileElementEventArgs e)
         {
             if (e.PreviousRenderProfileElement != null)
                 e.PreviousRenderProfileElement.Timeline.PropertyChanged -= TimelineOnPropertyChanged;

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineViewModel.cs

@@ -84,7 +84,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
             Update();
         }
 
-        private void ProfileEditorServiceOnProfileElementSelected(object sender, RenderProfileElementEventArgs e)
+        private void SelectedProfileEditorServiceOnSelectedProfileElementChanged(object sender, RenderProfileElementEventArgs e)
         {
             if (e.PreviousRenderProfileElement != null)
                 e.PreviousRenderProfileElement.Timeline.PropertyChanged -= TimelineOnPropertyChanged;
@@ -100,7 +100,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
         protected override void OnInitialActivate()
         {
             _profileEditorService.PixelsPerSecondChanged += ProfileEditorServiceOnPixelsPerSecondChanged;
-            _profileEditorService.ProfileElementSelected += ProfileEditorServiceOnProfileElementSelected;
+            _profileEditorService.SelectedProfileElementChanged += SelectedProfileEditorServiceOnSelectedProfileElementChanged;
             if (_profileEditorService.SelectedProfileElement != null)
                 _profileEditorService.SelectedProfileElement.Timeline.PropertyChanged += TimelineOnPropertyChanged;
             Update();
@@ -111,7 +111,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
         protected override void OnClose()
         {
             _profileEditorService.PixelsPerSecondChanged -= ProfileEditorServiceOnPixelsPerSecondChanged;
-            _profileEditorService.ProfileElementSelected -= ProfileEditorServiceOnProfileElementSelected;
+            _profileEditorService.SelectedProfileElementChanged -= SelectedProfileEditorServiceOnSelectedProfileElementChanged;
             if (_profileEditorService.SelectedProfileElement != null)
                 _profileEditorService.SelectedProfileElement.Timeline.PropertyChanged -= TimelineOnPropertyChanged;
             base.OnClose();
@@ -142,7 +142,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
 
         public void KeyframeMouseUp(object sender, MouseButtonEventArgs e)
         {
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
             ReleaseSelectedKeyframes();
 
             ((IInputElement) sender).ReleaseMouseCapture();
@@ -200,7 +200,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
             foreach (ITimelineKeyframeViewModel keyframeViewModel in keyframeViewModels)
                 keyframeViewModel.Delete(false);
 
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         public void DuplicateKeyframes(object sender)
@@ -213,7 +213,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
             foreach (ITimelineKeyframeViewModel timelineKeyframeViewModel in GetAllKeyframeViewModels())
                 timelineKeyframeViewModel.IsSelected = newKeyframes.Contains(timelineKeyframeViewModel.Keyframe);
 
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         public void CopyKeyframes()
@@ -230,7 +230,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
             foreach (ITimelineKeyframeViewModel timelineKeyframeViewModel in GetAllKeyframeViewModels())
                 timelineKeyframeViewModel.IsSelected = newKeyframes.Contains(timelineKeyframeViewModel.Keyframe);
 
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         private TimeSpan GetPastePosition(ITimelineKeyframeViewModel viewModel)

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeGroupView.xaml

@@ -14,8 +14,8 @@
              d:DataContext="{d:DesignInstance local:TreeGroupViewModel}"
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
+        <shared:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
         <converters:InverseBooleanConverter x:Key="InverseBooleanConverter" />
-        <converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
         <converters:PropertyTreeMarginConverter Length="20" x:Key="PropertyTreeMarginConverter" />
     </UserControl.Resources>
 

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeGroupViewModel.cs

@@ -79,7 +79,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
                 _windowManager.ShowDialog(_layerBrushSettingsWindowVm);
                 
                 // Save changes after the dialog closes
-                _profileEditorService.UpdateSelectedProfile();
+                _profileEditorService.SaveSelectedProfileConfiguration();
             }
             catch (Exception e)
             {
@@ -109,7 +109,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
                 _windowManager.ShowDialog(_layerEffectSettingsWindowVm);
                 
                 // Save changes after the dialog closes
-                _profileEditorService.UpdateSelectedProfile();
+                _profileEditorService.SaveSelectedProfileConfiguration();
             }
             catch (Exception e)
             {
@@ -132,7 +132,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
             {
                 LayerPropertyGroup.LayerEffect.Name = newName;
                 LayerPropertyGroup.LayerEffect.HasBeenRenamed = true;
-                _profileEditorService.UpdateSelectedProfile();
+                _profileEditorService.SaveSelectedProfileConfiguration();
             }
         }
 
@@ -142,12 +142,12 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
                 return;
 
             LayerPropertyGroup.ProfileElement.RemoveLayerEffect(LayerPropertyGroup.LayerEffect);
-            _profileEditorService.UpdateSelectedProfile();
+            _profileEditorService.SaveSelectedProfileConfiguration();
         }
 
         public void SuspendedToggled()
         {
-            _profileEditorService.UpdateSelectedProfile();
+            _profileEditorService.SaveSelectedProfileConfiguration();
         }
 
         public double GetDepth()

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyViewModel.cs

@@ -48,7 +48,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
         public void ResetToDefault()
         {
             LayerProperty.ApplyDefaultValue();
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         private void ApplyKeyframesEnabled(bool enable)
@@ -67,7 +67,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
 
             LayerProperty.KeyframesEnabled = enable;
 
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
         }
 
         public bool HasDataBinding => LayerProperty.HasDataBinding;

src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml

@@ -21,30 +21,6 @@
                 <ResourceDictionary
                     Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.PopupBox.xaml" />
             </ResourceDictionary.MergedDictionaries>
-
-            <DataTemplate x:Key="SimpleTemplate">
-                <StackPanel d:DataContext="{d:DesignInstance {x:Type profile:ProfileDescriptor}}" Orientation="Horizontal">
-                    <TextBlock Text="{Binding Name}" />
-                </StackPanel>
-            </DataTemplate>
-            <DataTemplate x:Key="ExtendedTemplate">
-                <Grid d:DataContext="{d:DesignInstance {x:Type profile:ProfileDescriptor}}">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock Text="{Binding Name}" VerticalAlignment="Center" />
-                    <Button Grid.Column="1"
-                            Style="{StaticResource MaterialDesignIconForegroundButton}"
-                            Width="26"
-                            Height="26"
-                            VerticalAlignment="Top"
-                            Command="{s:Action DeleteProfile}"
-                            CommandParameter="{Binding}">
-                        <materialDesign:PackIcon Kind="Delete" Height="16" Width="16" HorizontalAlignment="Right" />
-                    </Button>
-                </Grid>
-            </DataTemplate>
         </ResourceDictionary>
     </UserControl.Resources>
 
@@ -53,7 +29,7 @@
         <KeyBinding Command="{s:Action Redo}" Modifiers="Control" Key="Y" />
     </UserControl.InputBindings>
 
-    <Grid Margin="16">
+    <Grid Margin="10">
         <Grid.ColumnDefinitions>
             <!-- Left side -->
             <ColumnDefinition Width="*" MinWidth="100" />
@@ -66,8 +42,6 @@
         <!-- Left side -->
         <Grid Grid.Row="0" Grid.Column="0">
             <Grid.RowDefinitions>
-                <!-- Introduction -->
-                <RowDefinition Height="35" />
                 <!-- Design area -->
                 <RowDefinition Height="*" MinHeight="200" />
                 <!-- Bottom panels resize -->
@@ -75,25 +49,17 @@
                 <!-- Bottom panels -->
                 <RowDefinition Height="{Binding BottomPanelsHeight.Value, Mode=TwoWay}" MinHeight="108" />
             </Grid.RowDefinitions>
-
-            <!-- Introduction -->
-            <StackPanel Grid.Row="0">
-                <TextBlock>
-                    <materialDesign:PackIcon Kind="AboutOutline" />  The profile defines what colors the LEDs will have. Multiple groups of LEDs are defined into layers. On these layers you can apply effects.
-                </TextBlock>
-                <Separator Style="{StaticResource MaterialDesignDarkSeparator}" Margin="0 -2.5 0 0" />
-            </StackPanel>
-
+            
             <!-- Design area -->
-            <materialDesign:Card Grid.Row="1" materialDesign:ShadowAssist.ShadowDepth="Depth1" VerticalAlignment="Stretch">
+            <materialDesign:Card Grid.Row="0" materialDesign:ShadowAssist.ShadowDepth="Depth1" VerticalAlignment="Stretch">
                 <ContentControl s:View.Model="{Binding ProfileViewModel, IsAsync=True}" />
             </materialDesign:Card>
 
             <!-- Bottom panels resize -->
-            <GridSplitter Grid.Row="2" Grid.Column="0" Height="5" HorizontalAlignment="Stretch" Cursor="SizeNS" Margin="0 5" />
+            <GridSplitter Grid.Row="1" Grid.Column="0" Height="5" HorizontalAlignment="Stretch" Cursor="SizeNS" Margin="0 5" />
 
             <!-- Bottom panels -->
-            <Grid Grid.Row="3">
+            <Grid Grid.Row="2">
                 <!-- Layer elements -->
                 <materialDesign:Card Grid.Column="0" materialDesign:ShadowAssist.ShadowDepth="Depth1" VerticalAlignment="Stretch">
                     <ContentControl s:View.Model="{Binding LayerPropertiesViewModel, IsAsync=True}" />
@@ -102,105 +68,29 @@
         </Grid>
 
         <!-- Side panels resize -->
-        <GridSplitter Grid.Row="0" Grid.Column="1" Width="5" HorizontalAlignment="Stretch" Cursor="SizeWE" Margin="5 35 5 0" />
+        <GridSplitter Grid.Row="0" Grid.Column="1" Width="5" HorizontalAlignment="Stretch" Cursor="SizeWE" Margin="5 0" />
 
         <!-- Side panels -->
         <Grid Grid.Row="0" Grid.Column="2">
             <Grid.RowDefinitions>
-                <!-- Profile selection -->
-                <RowDefinition Height="35" />
-                <!-- Profile elements -->
+               <!-- Profile elements -->
                 <RowDefinition Height="*" MinHeight="100" />
                 <!-- Conditions resize -->
                 <RowDefinition Height="Auto" />
                 <!-- Display conditions -->
                 <RowDefinition Height="{Binding DataModelConditionsHeight.Value, Mode=TwoWay}" MinHeight="100" />
             </Grid.RowDefinitions>
-
-            <!-- Profile selection -->
-            <Grid Grid.Row="0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <ComboBox Height="26"
-                          VerticalAlignment="Top"
-                          ItemsSource="{Binding Profiles}"
-                          SelectedItem="{Binding SelectedProfile}"
-                          ItemTemplateSelector="{dataTemplateSelectors:ComboBoxTemplateSelector
-                                         SelectedItemTemplate={StaticResource SimpleTemplate},
-                                         DropdownItemsTemplate={StaticResource ExtendedTemplate}}">
-                    <ComboBox.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <VirtualizingStackPanel />
-                        </ItemsPanelTemplate>
-                    </ComboBox.ItemsPanel>
-                </ComboBox>
-                <Button Style="{StaticResource MaterialDesignIconForegroundButton}"
-                        ToolTip="Add a new profile"
-                        Margin="5 0 0 0"
-                        Grid.Column="1"
-                        Width="26"
-                        Height="26"
-                        VerticalAlignment="Top"
-                        Command="{s:Action AddProfile}">
-                    <materialDesign:PackIcon Kind="Add" Height="20" Width="20" />
-                </Button>
-                <materialDesign:PopupBox Grid.Column="2" Margin="0 -10 0 0" PlacementMode="BottomAndAlignRightEdges">
-                    <StackPanel>
-                        <Button Command="{s:Action RenameActiveProfile}">
-                            <StackPanel Orientation="Horizontal">
-                                <materialDesign:PackIcon Kind="RenameBox" Margin="0 0 15 0" />
-                                <TextBlock>Rename profile</TextBlock>
-                            </StackPanel>
-                        </Button>
-                        <Button Command="{s:Action DuplicateActiveProfile}">
-                            <StackPanel Orientation="Horizontal">
-                                <materialDesign:PackIcon Kind="ContentDuplicate" Margin="0 0 15 0" />
-                                <TextBlock>Duplicate profile</TextBlock>
-                            </StackPanel>
-                        </Button>
-                        <Button Command="{s:Action DeleteActiveProfile}">
-                            <StackPanel Orientation="Horizontal">
-                                <materialDesign:PackIcon Kind="Trash" Margin="0 0 15 0" />
-                                <TextBlock>Delete profile</TextBlock>
-                            </StackPanel>
-                        </Button>
-                        <Separator />
-
-                        <Button Command="{s:Action AdaptActiveProfile}" ToolTip="Adapt the profile to the current surface">
-                            <StackPanel Orientation="Horizontal">
-                                <materialDesign:PackIcon Kind="AutoFix" Margin="0 0 15 0" />
-                                <TextBlock>Adapt profile</TextBlock>
-                            </StackPanel>
-                        </Button>
-                        <Button Command="{s:Action ExportActiveProfile}">
-                            <StackPanel Orientation="Horizontal">
-                                <materialDesign:PackIcon Kind="Upload" Margin="0 0 15 0" />
-                                <TextBlock>Export profile</TextBlock>
-                            </StackPanel>
-                        </Button>
-                        <Button Command="{s:Action ImportProfile}">
-                            <StackPanel Orientation="Horizontal">
-                                <materialDesign:PackIcon Kind="Download" Margin="0 0 15 0" />
-                                <TextBlock>Import profile</TextBlock>
-                            </StackPanel>
-                        </Button>
-                    </StackPanel>
-                </materialDesign:PopupBox>
-            </Grid>
-
+            
             <!-- Profile elements -->
-            <materialDesign:Card Grid.Row="1" materialDesign:ShadowAssist.ShadowDepth="Depth1" VerticalAlignment="Stretch">
+            <materialDesign:Card Grid.Row="0" materialDesign:ShadowAssist.ShadowDepth="Depth1" VerticalAlignment="Stretch">
                 <ContentControl s:View.Model="{Binding ProfileTreeViewModel, IsAsync=True}" Margin="0,-1,-0.2,1" />
             </materialDesign:Card>
 
             <!-- Conditions resize -->
-            <GridSplitter Grid.Row="2" Height="5" HorizontalAlignment="Stretch" Cursor="SizeNS" Margin="0 5" />
+            <GridSplitter Grid.Row="1" Height="5" HorizontalAlignment="Stretch" Cursor="SizeNS" Margin="0 5" />
 
             <!-- Display conditions -->
-            <materialDesign:Card Grid.Row="3" materialDesign:ShadowAssist.ShadowDepth="Depth1" VerticalAlignment="Stretch">
+            <materialDesign:Card Grid.Row="2" materialDesign:ShadowAssist.ShadowDepth="Depth1" VerticalAlignment="Stretch">
                 <ContentControl s:View.Model="{Binding DisplayConditionsViewModel, IsAsync=True}" />
             </materialDesign:Card>
         </Grid>

src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs

@@ -1,14 +1,10 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
 using Artemis.Core;
-using Artemis.Core.Modules;
 using Artemis.Core.Services;
-using Artemis.UI.Extensions;
-using Artemis.UI.Screens.ProfileEditor.Dialogs;
 using Artemis.UI.Screens.ProfileEditor.DisplayConditions;
 using Artemis.UI.Screens.ProfileEditor.LayerProperties;
 using Artemis.UI.Screens.ProfileEditor.ProfileTree;
@@ -18,9 +14,8 @@ using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor
 {
-    public class ProfileEditorViewModel : Screen
+    public class ProfileEditorViewModel : Screen, IMainScreenViewModel
     {
-        private readonly IModuleService _moduleService;
         private readonly IMessageService _messageService;
         private readonly IProfileEditorService _profileEditorService;
         private readonly IProfileService _profileService;
@@ -30,14 +25,11 @@ namespace Artemis.UI.Screens.ProfileEditor
         private DisplayConditionsViewModel _displayConditionsViewModel;
         private PluginSetting<GridLength> _elementPropertiesWidth;
         private LayerPropertiesViewModel _layerPropertiesViewModel;
-        private BindableCollection<ProfileDescriptor> _profiles;
         private ProfileTreeViewModel _profileTreeViewModel;
         private ProfileViewModel _profileViewModel;
-        private ProfileDescriptor _selectedProfile;
         private PluginSetting<GridLength> _sidePanelsWidth;
 
-        public ProfileEditorViewModel(ProfileModule module,
-            ProfileViewModel profileViewModel,
+        public ProfileEditorViewModel(ProfileViewModel profileViewModel,
             ProfileTreeViewModel profileTreeViewModel,
             DisplayConditionsViewModel dataModelConditionsViewModel,
             LayerPropertiesViewModel layerPropertiesViewModel,
@@ -45,21 +37,16 @@ namespace Artemis.UI.Screens.ProfileEditor
             IProfileService profileService,
             IDialogService dialogService,
             ISettingsService settingsService,
-            IModuleService moduleService,
             IMessageService messageService)
         {
             _profileEditorService = profileEditorService;
             _profileService = profileService;
             _settingsService = settingsService;
-            _moduleService = moduleService;
             _messageService = messageService;
 
-            DisplayName = "PROFILE EDITOR";
-            Module = module;
+            DisplayName = "Profile Editor";
             DialogService = dialogService;
 
-            Profiles = new BindableCollection<ProfileDescriptor>();
-
             // Populate the panels
             ProfileViewModel = profileViewModel;
             ProfileViewModel.ConductWith(this);
@@ -71,7 +58,6 @@ namespace Artemis.UI.Screens.ProfileEditor
             LayerPropertiesViewModel.ConductWith(this);
         }
 
-        public ProfileModule Module { get; }
         public IDialogService DialogService { get; }
 
         public DisplayConditionsViewModel DisplayConditionsViewModel
@@ -98,12 +84,6 @@ namespace Artemis.UI.Screens.ProfileEditor
             set => SetAndNotify(ref _profileViewModel, value);
         }
 
-        public BindableCollection<ProfileDescriptor> Profiles
-        {
-            get => _profiles;
-            set => SetAndNotify(ref _profiles, value);
-        }
-
         public PluginSetting<GridLength> SidePanelsWidth
         {
             get => _sidePanelsWidth;
@@ -128,89 +108,9 @@ namespace Artemis.UI.Screens.ProfileEditor
             set => SetAndNotify(ref _elementPropertiesWidth, value);
         }
 
-        public ProfileDescriptor SelectedProfile
-        {
-            get => _selectedProfile;
-            set
-            {
-                if (!SetAndNotify(ref _selectedProfile, value)) return;
-                NotifyOfPropertyChange(nameof(CanDeleteActiveProfile));
-                ActivateSelectedProfile();
-            }
-        }
-
-        public bool CanDeleteActiveProfile => SelectedProfile != null && Profiles.Count > 1;
-
-        public ProfileDescriptor CreateProfile(string name)
-        {
-            ProfileDescriptor profile = _profileService.CreateProfileDescriptor(Module, name);
-            Profiles.Add(profile);
-            return profile;
-        }
-
-        public async Task AddProfile()
-        {
-            object result = await DialogService.ShowDialog<ProfileCreateViewModel>();
-            if (result is string name)
-            {
-                ProfileDescriptor newProfile = CreateProfile(name);
-                SelectedProfile = newProfile;
-            }
-        }
-
-        public async Task DeleteProfile(ProfileDescriptor profileDescriptor)
-        {
-            bool result = await DialogService.ShowConfirmDialog(
-                "Delete profile",
-                $"Are you sure you want to delete '{profileDescriptor.Name}'? This cannot be undone."
-            );
-
-            if (result)
-                RemoveProfile(profileDescriptor);
-        }
-
-        public async Task DeleteActiveProfile()
-        {
-            bool result = await DialogService.ShowConfirmDialog(
-                "Delete active profile",
-                "Are you sure you want to delete your currently active profile? This cannot be undone."
-            );
-
-            if (result)
-                RemoveProfile(SelectedProfile);
-        }
-
-        public async Task RenameActiveProfile()
-        {
-            if (_profileEditorService.SelectedProfile == null)
-                return;
-
-            Profile profile = _profileEditorService.SelectedProfile;
-            object result = await DialogService.ShowDialog<ProfileEditViewModel>(new Dictionary<string, object> {{"profile", profile}});
-            if (result is string name)
-            {
-                profile.Name = name;
-                _profileEditorService.UpdateSelectedProfile();
-
-                // The descriptors are immutable and need to be reloaded to reflect the name change
-                LoadProfiles();
-                SelectedProfile = Profiles.FirstOrDefault(p => p.Id == _profileEditorService.SelectedProfile.EntityId) ?? Profiles.FirstOrDefault();
-            }
-        }
-
-        public void DuplicateActiveProfile()
-        {
-            string encoded = _profileService.ExportProfile(SelectedProfile);
-            ProfileDescriptor copy = _profileService.ImportProfile(encoded, Module, "copy");
-
-            Profiles.Add(copy);
-            Profiles.Sort(p => p.Name);
-            SelectedProfile = copy;
-        }
-
         public async Task AdaptActiveProfile()
         {
-            if (_profileEditorService.SelectedProfile == null)
+            if (_profileEditorService.SelectedProfileConfiguration?.Profile == null)
                 return;
 
             if (!await DialogService.ShowConfirmDialog(
@@ -219,30 +119,7 @@ namespace Artemis.UI.Screens.ProfileEditor
             ))
                 return;
 
-            _profileService.AdaptProfile(_profileEditorService.SelectedProfile);
-        }
-
-        public async Task ExportActiveProfile()
-        {
-            await DialogService.ShowDialog<ProfileExportViewModel>(new Dictionary<string, object>
-            {
-                {"profileDescriptor", SelectedProfile}
-            });
-        }
-
-        public async Task ImportProfile()
-        {
-            object result = await DialogService.ShowDialog<ProfileImportViewModel>(new Dictionary<string, object>
-            {
-                {"profileModule", Module}
-            });
-
-            if (result != null && result is ProfileDescriptor descriptor)
-            {
-                Profiles.Add(descriptor);
-                Profiles.Sort(p => p.Name);
-                SelectedProfile = descriptor;
-            }
+            _profileService.AdaptProfile(_profileEditorService.SelectedProfileConfiguration.Profile);
         }
 
         public void Undo()
@@ -253,7 +130,7 @@ namespace Artemis.UI.Screens.ProfileEditor
             // Store the focused element so we can restore it later
             IInputElement focusedElement = FocusManager.GetFocusedElement(Window.GetWindow(View));
 
-            if (!_profileEditorService.UndoUpdateProfile())
+            if (!_profileEditorService.UndoSaveProfile())
             {
                 _messageService.ShowMessage("Nothing to undo");
                 return;
@@ -280,7 +157,7 @@ namespace Artemis.UI.Screens.ProfileEditor
             // Store the focused element so we can restore it later
             IInputElement focusedElement = FocusManager.GetFocusedElement(Window.GetWindow(View));
 
-            if (!_profileEditorService.RedoUpdateProfile())
+            if (!_profileEditorService.RedoSaveProfile())
             {
                 _messageService.ShowMessage("Nothing to redo");
                 return;
@@ -302,71 +179,17 @@ namespace Artemis.UI.Screens.ProfileEditor
         protected override void OnInitialActivate()
         {
             LoadWorkspaceSettings();
-            Module.IsProfileUpdatingDisabled = true;
-            Module.ActiveProfile?.Reset();
-            Module.ActiveProfileChanged += ModuleOnActiveProfileChanged;
-            LoadProfiles();
-
-            // If the module already has an active profile use that, the override won't trigger a profile change
-            if (Module.ActiveProfile != null)
-                SelectedProfile = Profiles.FirstOrDefault(d => d.Id == Module.ActiveProfile.EntityId);
-
-            Task.Run(async () => { await _moduleService.SetActiveModuleOverride(Module); });
             base.OnInitialActivate();
         }
 
         protected override void OnClose()
         {
             SaveWorkspaceSettings();
-            Module.IsProfileUpdatingDisabled = false;
-            Module.ActiveProfile?.Reset();
-            Module.ActiveProfileChanged -= ModuleOnActiveProfileChanged;
+            _profileEditorService.ChangeSelectedProfileConfiguration(null);
 
-            _profileEditorService.ChangeSelectedProfile(null);
-            Task.Run(async () => { await _moduleService.SetActiveModuleOverride(null); });
             base.OnClose();
         }
 
-        private void RemoveProfile(ProfileDescriptor profileDescriptor)
-        {
-            if (SelectedProfile == profileDescriptor && !CanDeleteActiveProfile)
-                return;
-
-            int index = Profiles.IndexOf(profileDescriptor);
-
-            // Get a new active profile
-            ProfileDescriptor newActiveProfile = index - 1 > -1 ? Profiles[index - 1] : Profiles[index + 1];
-
-            // Activate the new active profile
-            SelectedProfile = newActiveProfile;
-
-            // Remove the old one
-            Profiles.Remove(profileDescriptor);
-            _profileService.DeleteProfile(profileDescriptor);
-        }
-
-        private void ActivateSelectedProfile()
-        {
-            Execute.PostToUIThread(async () =>
-            {
-                if (SelectedProfile == null)
-                    return;
-
-                Task<Profile> changeTask = _profileService.ActivateProfileAnimated(SelectedProfile);
-                _profileEditorService.ChangeSelectedProfile(null);
-                Profile profile = await changeTask;
-                _profileEditorService.ChangeSelectedProfile(profile);
-            });
-        }
-
-        private void ModuleOnActiveProfileChanged(object sender, EventArgs e)
-        {
-            if (Module.ActiveProfile == null)
-                SelectedProfile = null;
-            else
-                SelectedProfile = Profiles.FirstOrDefault(d => d.Id == Module.ActiveProfile.EntityId);
-        }
-
         private void LoadWorkspaceSettings()
         {
             SidePanelsWidth = _settingsService.GetSetting("ProfileEditor.SidePanelsWidth", new GridLength(385));
@@ -382,12 +205,5 @@ namespace Artemis.UI.Screens.ProfileEditor
             BottomPanelsHeight.Save();
             ElementPropertiesWidth.Save();
         }
-
-        private void LoadProfiles()
-        {
-            // Get all profiles from the database
-            Profiles.Clear();
-            Profiles.AddRange(_profileService.GetProfileDescriptors(Module).OrderBy(p => p.Name));
-        }
     }
 }

src/Artemis.UI/Screens/ProfileEditor/ProfileTree/Dialogs/LayerHintsDialogViewModel.cs

@@ -96,7 +96,7 @@ namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs
         /// <inheritdoc />
         protected override void OnClose()
         {
-            _profileEditorService.UpdateSelectedProfileElement();
+            _profileEditorService.SaveSelectedProfileElement();
             base.OnClose();
         }
 

src/Artemis.UI/Screens/ProfileEditor/ProfileTree/ProfileTreeViewModel.cs

@@ -59,13 +59,13 @@ namespace Artemis.UI.Screens.ProfileEditor.ProfileTree
         {
             _updatingTree = true;
             ProfileElement firstChild = _profileEditorService.SelectedProfile?.Children?.FirstOrDefault();
-            if (!(firstChild is Folder folder))
+            if (firstChild is not Folder folder)
             {
                 ActivateItem(null);
                 return;
             }
-
-            ActivateItem(_profileTreeVmFactory.FolderViewModel(folder));
+            
+            ActiveItem = _profileTreeVmFactory.FolderViewModel(folder);
             _updatingTree = false;
         }
 
@@ -141,7 +141,7 @@ namespace Artemis.UI.Screens.ProfileEditor.ProfileTree
             }
 
             Unsubscribe();
-            _profileEditorService.UpdateSelectedProfile();
+            _profileEditorService.SaveSelectedProfileConfiguration();
             Subscribe();
         }
 
@@ -177,17 +177,17 @@ namespace Artemis.UI.Screens.ProfileEditor.ProfileTree
 
         private void Subscribe()
         {
-            _profileEditorService.ProfileSelected += OnProfileSelected;
-            _profileEditorService.ProfileElementSelected += OnProfileElementSelected;
+            _profileEditorService.SelectedProfileChanged += OnSelectedProfileChanged;
+            _profileEditorService.SelectedProfileElementChanged += OnSelectedProfileElementChanged;
         }
 
         private void Unsubscribe()
         {
-            _profileEditorService.ProfileSelected -= OnProfileSelected;
-            _profileEditorService.ProfileElementSelected -= OnProfileElementSelected;
+            _profileEditorService.SelectedProfileChanged -= OnSelectedProfileChanged;
+            _profileEditorService.SelectedProfileElementChanged -= OnSelectedProfileElementChanged;
         }
 
-        private void OnProfileElementSelected(object sender, RenderProfileElementEventArgs e)
+        private void OnSelectedProfileElementChanged(object sender, RenderProfileElementEventArgs e)
         {
             if (e.RenderProfileElement == SelectedTreeItem?.ProfileElement)
                 return;
@@ -213,7 +213,7 @@ namespace Artemis.UI.Screens.ProfileEditor.ProfileTree
             }
         }
 
-        private void OnProfileSelected(object sender, EventArgs e)
+        private void OnSelectedProfileChanged(object sender, EventArgs e)
         {
             CreateRootFolderViewModel();
         }

src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/TreeItemViewModel.cs

@@ -129,7 +129,7 @@ namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem
                 throw new ArtemisUIException("Cannot add a folder to a profile element of type " + ProfileElement.GetType().Name);
 
             Folder _ = new(ProfileElement, "New folder");
-            _profileEditorService.UpdateSelectedProfile();
+            _profileEditorService.SaveSelectedProfileConfiguration();
         }
 
         public void AddLayer()
@@ -145,7 +145,7 @@ namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem
                 layer.ChangeLayerBrush(brush);
 
             layer.AddLeds(_rgbService.EnabledDevices.SelectMany(d => d.Leds));
-            _profileEditorService.UpdateSelectedProfile();
+            _profileEditorService.SaveSelectedProfileConfiguration();
             _profileEditorService.ChangeSelectedProfileElement(layer);
         }
 
@@ -163,7 +163,7 @@ namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem
             if (result is string newName)
             {
                 ProfileElement.Name = newName;
-                _profileEditorService.UpdateSelectedProfile();
+                _profileEditorService.SaveSelectedProfileConfiguration();
             }
         }
 
@@ -189,7 +189,7 @@ namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem
             ProfileElement.Parent?.RemoveChild(ProfileElement);
             parent.RemoveExistingElement(this);
 
-            _profileEditorService.UpdateSelectedProfile();
+            _profileEditorService.SaveSelectedProfileConfiguration();
             _profileEditorService.ChangeSelectedProfileElement(newSelection as RenderProfileElement);
         }
 
@@ -243,7 +243,7 @@ namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem
 
         public void SuspendedToggled()
         {
-            _profileEditorService.UpdateSelectedProfile();
+            _profileEditorService.SaveSelectedProfileConfiguration();
         }
 
         public void ContextMenuOpening(object sender, EventArgs e)

src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileLayerViewModel.cs

@@ -178,8 +178,8 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization
         {
             Update();
             Layer.RenderPropertiesUpdated += LayerOnRenderPropertiesUpdated;
-            _profileEditorService.ProfileElementSelected += OnProfileElementSelected;
-            _profileEditorService.SelectedProfileElementUpdated += OnSelectedProfileElementUpdated;
+            _profileEditorService.SelectedProfileElementChanged += OnSelectedProfileElementChanged;
+            _profileEditorService.SelectedProfileElementSaved += OnSelectedProfileElementSaved;
             _profileEditorService.ProfilePreviewUpdated += ProfileEditorServiceOnProfilePreviewUpdated;
             _panZoomViewModel.PropertyChanged += PanZoomViewModelOnPropertyChanged;
             base.OnInitialActivate();
@@ -189,8 +189,8 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization
         protected override void OnClose()
         {
             Layer.RenderPropertiesUpdated -= LayerOnRenderPropertiesUpdated;
-            _profileEditorService.ProfileElementSelected -= OnProfileElementSelected;
-            _profileEditorService.SelectedProfileElementUpdated -= OnSelectedProfileElementUpdated;
+            _profileEditorService.SelectedProfileElementChanged -= OnSelectedProfileElementChanged;
+            _profileEditorService.SelectedProfileElementSaved -= OnSelectedProfileElementSaved;
             _profileEditorService.ProfilePreviewUpdated -= ProfileEditorServiceOnProfilePreviewUpdated;
             _panZoomViewModel.PropertyChanged -= PanZoomViewModelOnPropertyChanged;
             base.OnClose();
@@ -205,12 +205,12 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization
             Update();
         }
 
-        private void OnProfileElementSelected(object sender, EventArgs e)
+        private void OnSelectedProfileElementChanged(object sender, EventArgs e)
         {
             IsSelected = _profileEditorService.SelectedProfileElement == Layer;
         }
 
-        private void OnSelectedProfileElementUpdated(object sender, EventArgs e)
+        private void OnSelectedProfileElementSaved(object sender, EventArgs e)
         {
             Update();
         }

src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileViewModel.cs

@@ -153,9 +153,9 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization
             FocusSelectedLayer.SettingChanged += HighlightSelectedLayerOnSettingChanged;
             _rgbService.DeviceAdded += RgbServiceOnDevicesModified;
             _rgbService.DeviceRemoved += RgbServiceOnDevicesModified;
-            _profileEditorService.ProfileSelected += OnProfileSelected;
-            _profileEditorService.ProfileElementSelected += OnProfileElementSelected;
-            _profileEditorService.SelectedProfileElementUpdated += OnSelectedProfileElementUpdated;
+            _profileEditorService.SelectedProfileChanged += OnSelectedProfileChanged;
+            _profileEditorService.SelectedProfileElementChanged += OnSelectedProfileElementChanged;
+            _profileEditorService.SelectedProfileElementSaved += OnSelectedProfileElementSaved;
 
             base.OnInitialActivate();
         }
@@ -166,9 +166,9 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization
             FocusSelectedLayer.SettingChanged -= HighlightSelectedLayerOnSettingChanged;
             _rgbService.DeviceAdded -= RgbServiceOnDevicesModified;
             _rgbService.DeviceRemoved -= RgbServiceOnDevicesModified;
-            _profileEditorService.ProfileSelected -= OnProfileSelected;
-            _profileEditorService.ProfileElementSelected -= OnProfileElementSelected;
-            _profileEditorService.SelectedProfileElementUpdated -= OnSelectedProfileElementUpdated;
+            _profileEditorService.SelectedProfileChanged -= OnSelectedProfileChanged;
+            _profileEditorService.SelectedProfileElementChanged -= OnSelectedProfileElementChanged;
+            _profileEditorService.SelectedProfileElementSaved -= OnSelectedProfileElementSaved;
             if (_previousSelectedLayer != null)
                 _previousSelectedLayer.LayerBrushUpdated -= SelectedLayerOnLayerBrushUpdated;
 
@@ -330,12 +330,12 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization
             UpdateLedsDimStatus();
         }
 
-        private void OnProfileSelected(object sender, EventArgs e)
+        private void OnSelectedProfileChanged(object sender, EventArgs e)
         {
             ApplyActiveProfile();
         }
 
-        private void OnProfileElementSelected(object sender, EventArgs e)
+        private void OnSelectedProfileElementChanged(object sender, EventArgs e)
         {
             if (_previousSelectedLayer != null)
             {
@@ -370,7 +370,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization
                 ActivateToolByIndex(1);
         }
 
-        private void OnSelectedProfileElementUpdated(object sender, EventArgs e)
+        private void OnSelectedProfileElementSaved(object sender, EventArgs e)
         {
             ApplyActiveProfile();
             UpdateLedsDimStatus();

src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/EditToolViewModel.cs

@@ -75,9 +75,9 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
         /// <inheritdoc />
         protected override void OnInitialActivate()
         {
-            ProfileEditorService.ProfileSelected += UpdateEventHandler;
-            ProfileEditorService.ProfileElementSelected += UpdateEventHandler;
-            ProfileEditorService.SelectedProfileElementUpdated += UpdateEventHandler;
+            ProfileEditorService.SelectedProfileChanged += UpdateEventHandler;
+            ProfileEditorService.SelectedProfileElementChanged += UpdateEventHandler;
+            ProfileEditorService.SelectedProfileElementSaved += UpdateEventHandler;
             ProfileEditorService.ProfilePreviewUpdated += UpdateEventHandler;
 
             Update();
@@ -92,9 +92,9 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
         /// <inheritdoc />
         protected override void OnClose()
         {
-            ProfileEditorService.ProfileSelected -= UpdateEventHandler;
-            ProfileEditorService.ProfileElementSelected -= UpdateEventHandler;
-            ProfileEditorService.SelectedProfileElementUpdated -= UpdateEventHandler;
+            ProfileEditorService.SelectedProfileChanged -= UpdateEventHandler;
+            ProfileEditorService.SelectedProfileElementChanged -= UpdateEventHandler;
+            ProfileEditorService.SelectedProfileElementSaved -= UpdateEventHandler;
             ProfileEditorService.ProfilePreviewUpdated -= UpdateEventHandler;
             base.OnClose();
         }
@@ -117,7 +117,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 
         public void RotateMouseUp(object sender, ShapeControlEventArgs e)
         {
-            ProfileEditorService.UpdateSelectedProfileElement();
+            ProfileEditorService.SaveSelectedProfileElement();
             _rotating = false;
         }
 
@@ -173,7 +173,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 
         public void ResizeMouseUp(object sender, ShapeControlEventArgs e)
         {
-            ProfileEditorService.UpdateSelectedProfileElement();
+            ProfileEditorService.SaveSelectedProfileElement();
             _isResizing = false;
         }
 
@@ -329,7 +329,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 
         public void MoveMouseUp(object sender, ShapeControlEventArgs e)
         {
-            ProfileEditorService.UpdateSelectedProfileElement();
+            ProfileEditorService.SaveSelectedProfileElement();
             _movingShape = false;
             _movingAnchor = false;
         }

src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionRemoveToolViewModel.cs

@@ -45,7 +45,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
                 layer.ClearLeds();
                 layer.AddLeds(remainingLeds);
 
-                ProfileEditorService.UpdateSelectedProfileElement();
+                ProfileEditorService.SaveSelectedProfileElement();
             }
         }
 

src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionToolViewModel.cs

@@ -55,7 +55,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
                     layer.AddLeds(selectedLeds);
                 }
 
-                ProfileEditorService.UpdateSelectedProfileElement();
+                ProfileEditorService.SaveSelectedProfileElement();
             }
             // If no layer selected, apply it to a new layer in the selected folder
             else if (ProfileEditorService.SelectedProfileElement is Folder folder)
@@ -94,7 +94,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 
             newLayer.AddLeds(selectedLeds);
             ProfileEditorService.ChangeSelectedProfileElement(newLayer);
-            ProfileEditorService.UpdateSelectedProfileElement();
+            ProfileEditorService.SaveSelectedProfileElement();
         }
     }
 }