Added layer shapes, editor is still WIP

2026-11-12 11:56:30 +00:00 · 2019-12-15 22:52:04 +01:00
1 parent 70bf0e1c43
commit ddce69e8f0
@@ -174,7 +174,48 @@
    <Compile Include="Events\MainWindowFocusChangedEvent.cs" />
    <Compile Include="Events\WindowsThemeEventArgs.cs" />
    <Compile Include="Screens\GradientEditor\GradientEditorViewModel.cs" />
-    <Compile Include="Screens\Module\ProfileEditor\LayerElements\Dialogs\AddLayerElementViewModel.cs" />
+    <Compile Include="Screens\Module\ProfileEditor\LayerProperties\LayerPropertiesView.xaml.cs">
+      <DependentUpon>LayerPropertiesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Screens\Module\ProfileEditor\LayerProperties\LayerPropertiesViewModel.cs" />
+    <Compile Include="Screens\Module\ProfileEditor\LayerProperties\Timeline\LayerPropertiesTimelineView.xaml.cs">
+      <DependentUpon>LayerPropertiesTimelineView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Screens\Module\ProfileEditor\LayerProperties\Timeline\LayerPropertiesTimelineViewModel.cs" />
+    <Compile Include="Screens\Module\ProfileEditor\Visualization\CanvasViewModel.cs" />
+    <Compile Include="Screens\Module\ProfileEditor\Visualization\Tools\EllipseToolView.xaml.cs">
+      <DependentUpon>EllipseToolView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Screens\Module\ProfileEditor\Visualization\Tools\EllipseToolViewModel.cs" />
+    <Compile Include="Screens\Module\ProfileEditor\Visualization\Tools\FillToolView.xaml.cs">
+      <DependentUpon>FillToolView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Screens\Module\ProfileEditor\Visualization\Tools\FillToolViewModel.cs" />
+    <Compile Include="Screens\Module\ProfileEditor\Visualization\Tools\PolygonToolView.xaml.cs">
+      <DependentUpon>PolygonToolView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Screens\Module\ProfileEditor\Visualization\Tools\PolygonToolViewModel.cs" />
+    <Compile Include="Screens\Module\ProfileEditor\Visualization\Tools\RectangleToolView.xaml.cs">
+      <DependentUpon>RectangleToolView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Screens\Module\ProfileEditor\Visualization\Tools\RectangleToolViewModel.cs" />
+    <Compile Include="Screens\Module\ProfileEditor\Visualization\Tools\SelectionAddToolView.xaml.cs">
+      <DependentUpon>SelectionAddToolView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Screens\Module\ProfileEditor\Visualization\Tools\SelectionAddToolViewModel.cs" />
+    <Compile Include="Screens\Module\ProfileEditor\Visualization\Tools\SelectionRemoveToolView.xaml.cs">
+      <DependentUpon>SelectionRemoveToolView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Screens\Module\ProfileEditor\Visualization\Tools\SelectionRemoveToolViewModel.cs" />
+    <Compile Include="Screens\Module\ProfileEditor\Visualization\Tools\SelectionToolView.xaml.cs">
+      <DependentUpon>SelectionToolView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Screens\Module\ProfileEditor\Visualization\Tools\SelectionToolViewModel.cs" />
+    <Compile Include="Screens\Module\ProfileEditor\Visualization\Tools\ViewpointMoveToolView.xaml.cs">
+      <DependentUpon>ViewpointMoveToolView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Screens\Module\ProfileEditor\Visualization\Tools\ViewpointMoveToolViewModel.cs" />
+    <Compile Include="Screens\Module\ProfileEditor\Visualization\Tools\VisualizationToolViewModel.cs" />
    <Compile Include="Screens\Sidebar\SidebarView.xaml.cs">
      <DependentUpon>SidebarView.xaml</DependentUpon>
    </Compile>
@@ -202,9 +243,6 @@
    <Compile Include="Screens\Module\ProfileEditor\Dialogs\ProfileElementRenameViewModel.cs" />
    <Compile Include="Screens\Module\ProfileEditor\DisplayConditions\DisplayConditionsViewModel.cs" />
    <Compile Include="Screens\Module\ProfileEditor\DisplayConditions\DisplayConditionViewModel.cs" />
-    <Compile Include="Screens\Module\ProfileEditor\ElementProperties\ElementPropertiesViewModel.cs" />
-    <Compile Include="Screens\Module\ProfileEditor\LayerElements\LayerElementsViewModel.cs" />
-    <Compile Include="Screens\Module\ProfileEditor\LayerElements\LayerElementViewModel.cs" />
    <Compile Include="Screens\Module\ProfileEditor\ProfileTree\TreeItem\FolderViewModel.cs" />
    <Compile Include="Screens\Module\ProfileEditor\ProfileTree\TreeItem\LayerViewModel.cs" />
    <Compile Include="Screens\Module\ProfileEditor\ProfileTree\ProfileTreeViewModel.cs" />
@@ -269,15 +307,11 @@
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
-    <Page Include="Screens\Module\ProfileEditor\ElementProperties\ElementPropertiesView.xaml">
+    <Page Include="Screens\Module\ProfileEditor\LayerProperties\LayerPropertiesView.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
-    <Page Include="Screens\Module\ProfileEditor\LayerElements\Dialogs\AddLayerElementView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Screens\Module\ProfileEditor\LayerElements\LayerElementsView.xaml">
+    <Page Include="Screens\Module\ProfileEditor\LayerProperties\Timeline\LayerPropertiesTimelineView.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
@@ -301,6 +335,38 @@
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
+    <Page Include="Screens\Module\ProfileEditor\Visualization\Tools\EllipseToolView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Screens\Module\ProfileEditor\Visualization\Tools\FillToolView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Screens\Module\ProfileEditor\Visualization\Tools\PolygonToolView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Screens\Module\ProfileEditor\Visualization\Tools\RectangleToolView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Screens\Module\ProfileEditor\Visualization\Tools\SelectionAddToolView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Screens\Module\ProfileEditor\Visualization\Tools\SelectionRemoveToolView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Screens\Module\ProfileEditor\Visualization\Tools\SelectionToolView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Screens\Module\ProfileEditor\Visualization\Tools\ViewpointMoveToolView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="Screens\News\NewsView.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
@@ -436,7 +502,24 @@
  <ItemGroup>
    <None Include="Resources\aero_rotate_br.cur" />
  </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="Resources\aero_crosshair.cur" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\aero_crosshair_minus.cur" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\aero_crosshair_plus.cur" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\aero_pen_min.cur" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\aero_pen_plus.cur" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\aero_fill.cur" />
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <PropertyGroup>
    <PostBuildEvent>
@@ -1,4 +1,4 @@
-using Artemis.Core.Models.Profile.Abstract;
+using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Surface;
 using Artemis.Core.Plugins.Abstract;
 using Artemis.UI.Screens.Module;
@@ -60,6 +60,66 @@ namespace Artemis.UI.Properties {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] aero_crosshair {
+            get {
+                object obj = ResourceManager.GetObject("aero_crosshair", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] aero_crosshair_minus {
+            get {
+                object obj = ResourceManager.GetObject("aero_crosshair_minus", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] aero_crosshair_plus {
+            get {
+                object obj = ResourceManager.GetObject("aero_crosshair_plus", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] aero_fill {
+            get {
+                object obj = ResourceManager.GetObject("aero_fill", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] aero_pen_min {
+            get {
+                object obj = ResourceManager.GetObject("aero_pen_min", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] aero_pen_plus {
+            get {
+                object obj = ResourceManager.GetObject("aero_pen_plus", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized resource of type System.Byte[].
        /// </summary>
@@ -118,6 +118,24 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="aero_crosshair" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\aero_crosshair.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="aero_crosshair_minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\aero_crosshair_minus.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="aero_crosshair_plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\aero_crosshair_plus.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="aero_fill" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\aero_fill.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="aero_pen_min" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\aero_pen_min.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="aero_pen_plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\aero_pen_plus.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
  <data name="aero_rotate_bl" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\aero_rotate_bl.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Artemis.Core.Models.Profile.Abstract;
+using Artemis.Core.Models.Profile;
 using Artemis.UI.ViewModels.Dialogs;
 using FluentValidation;
 using Stylet;
@@ -1,27 +0,0 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.ElementProperties.ElementPropertiesView"
-             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:elementProperties="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.ElementProperties"
-             xmlns:s="https://github.com/canton7/Stylet"
-             mc:Ignorable="d"
-             d:DesignHeight="450" d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance {x:Type elementProperties:ElementPropertiesViewModel}}">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0">
-            <TextBlock Style="{StaticResource MaterialDesignSubheadingTextBlock}" Margin="10 5 0 -4">
-                Layer element properties
-            </TextBlock>
-            <Separator Style="{StaticResource MaterialDesignDarkSeparator}" Margin="8 0" />
-        </StackPanel>
-        <ScrollViewer Grid.Row="1">
-            <ContentControl s:View.Model="{Binding LayerElementViewModel}" Margin="0 0 10 0"/>
-        </ScrollViewer>
-    </Grid>
-
-</UserControl>
@@ -1,37 +0,0 @@
-using System;
-using System.ComponentModel;
-using Artemis.Core.Plugins.LayerElement;
-using Artemis.UI.Services.Interfaces;
-
-namespace Artemis.UI.Screens.Module.ProfileEditor.ElementProperties
-{
-    public class ElementPropertiesViewModel : ProfileEditorPanelViewModel
-    {
-        private readonly IProfileEditorService _profileEditorService;
-
-        public ElementPropertiesViewModel(IProfileEditorService profileEditorService)
-        {
-            _profileEditorService = profileEditorService;
-
-            _profileEditorService.SelectedLayerElementChanged += OnSelectedLayerElementChanged;
-        }
-
-        public LayerElementViewModel LayerElementViewModel { get; set; }
-
-        private void OnSelectedLayerElementChanged(object sender, EventArgs e)
-        {
-            if (LayerElementViewModel?.LayerElement?.Settings != null)
-                LayerElementViewModel.LayerElement.Settings.PropertyChanged -= SettingsOnPropertyChanged;
-
-            LayerElementViewModel = _profileEditorService.SelectedLayerElement?.GetViewModel();
-
-            if (LayerElementViewModel?.LayerElement?.Settings != null)
-                LayerElementViewModel.LayerElement.Settings.PropertyChanged += SettingsOnPropertyChanged;
-        }
-
-        private void SettingsOnPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            _profileEditorService.UpdateSelectedProfileElement();
-        }
-    }
-}
@@ -1,45 +0,0 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.LayerElements.Dialogs.AddLayerElementView"
-             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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:layerElement="clr-namespace:Artemis.Core.Plugins.LayerElement;assembly=Artemis.Core"
-             xmlns:layerElements="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.LayerElements.Dialogs"
-             xmlns:s="https://github.com/canton7/Stylet"
-             mc:Ignorable="d"
-             d:DataContext="{d:DesignInstance {x:Type layerElements:AddLayerElementViewModel}}">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-
-        <TextBlock Margin="15">Select a new layer element below</TextBlock>
-        <ListBox Grid.Row="1" ItemsSource="{Binding LayerElementDescriptors}" SelectedItem="{Binding SelectedLayerElementDescriptor}" HorizontalContentAlignment="Stretch">
-            <ListBox.ItemTemplate>
-                <DataTemplate DataType="{x:Type layerElement:LayerElementDescriptor}">
-                    <Border Padding="8" BorderThickness="0 0 0 1" BorderBrush="{DynamicResource MaterialDesignDivider}" VerticalAlignment="Stretch" MouseDown="{s:Action ListBoxItemMouseClick}">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <materialDesign:PackIcon Kind="{Binding Icon}" Width="20" Height="20" VerticalAlignment="Center" />
-                            <StackPanel Margin="8 0 0 0" Grid.Column="1" VerticalAlignment="Stretch">
-                                <TextBlock FontWeight="Bold" Text="{Binding DisplayName}" />
-                                <TextBlock Text="{Binding Description}" />
-                            </StackPanel>
-                        </Grid>
-                    </Border>
-                </DataTemplate>
-            </ListBox.ItemTemplate>
-        </ListBox>
-
-        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="10 15">
-            <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 8 0" Command="{s:Action Accept}">ACCEPT</Button>
-        </StackPanel>
-    </Grid>
-</UserControl>
@@ -1,57 +0,0 @@
-using System.Windows.Input;
-using Artemis.Core.Models.Profile;
-using Artemis.Core.Plugins.LayerElement;
-using Artemis.Core.Services.Interfaces;
-using Artemis.UI.ViewModels.Dialogs;
-using Stylet;
-
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerElements.Dialogs
-{
-    public class AddLayerElementViewModel : DialogViewModelBase
-    {
-        private readonly ILayerService _layerService;
-
-
-        public AddLayerElementViewModel(IPluginService pluginService, ILayerService layerService, Layer layer)
-        {
-            _layerService = layerService;
-            Layer = layer;
-
-            LayerElementDescriptors = new BindableCollection<LayerElementDescriptor>();
-            var layerElementProviders = pluginService.GetPluginsOfType<LayerElementProvider>();
-            foreach (var layerElementProvider in layerElementProviders)
-                LayerElementDescriptors.AddRange(layerElementProvider.LayerElementDescriptors);
-        }
-
-        public Layer Layer { get; }
-
-        public LayerElementDescriptor SelectedLayerElementDescriptor { get; set; }
-        public BindableCollection<LayerElementDescriptor> LayerElementDescriptors { get; set; }
-        public bool CanAccept => SelectedLayerElementDescriptor != null;
-
-        public void Accept()
-        {
-            if (Session.IsEnded)
-                return;
-            var layerElement = _layerService.InstantiateLayerElement(Layer, SelectedLayerElementDescriptor);
-            Session.Close(layerElement);
-        }
-
-        public void Cancel()
-        {
-            if (Session.IsEnded)
-                return;
-            Session.Close();
-        }
-
-        #region View event handlers
-
-        public void ListBoxItemMouseClick(object sender, MouseButtonEventArgs args)
-        {
-            if (args.ClickCount > 1 && SelectedLayerElementDescriptor != null)
-                Accept();
-        }
-
-        #endregion
-    }
-}
@@ -1,19 +0,0 @@
-using Artemis.Core.Models.Profile;
-using Artemis.Core.Plugins.LayerElement;
-
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerElements
-{
-    public class LayerElementViewModel
-    {
-        public LayerElementViewModel(LayerElement layerElement)
-        {
-            Layer = layerElement.Layer;
-            LayerElement = layerElement;
-            LayerElementDescriptor = layerElement.Descriptor;
-        }
-
-        public Layer Layer { get; set; }
-        public LayerElement LayerElement { get; set; }
-        public LayerElementDescriptor LayerElementDescriptor { get; set; }
-    }
-}
@@ -1,71 +0,0 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.LayerElements.LayerElementsView"
-             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:layerElements="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.LayerElements"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:s="https://github.com/canton7/Stylet"
-             mc:Ignorable="d"
-             d:DesignHeight="450" d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance {x:Type layerElements:LayerElementsViewModel}}">
-
-    <materialDesign:DialogHost Identifier="LayerElementsDialogHost" CloseOnClickAway="True">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-            <StackPanel Grid.Row="0">
-                <TextBlock Style="{StaticResource MaterialDesignSubheadingTextBlock}" Margin="10 5 0 -4">
-                    Layer elements
-                </TextBlock>
-                <Separator Style="{StaticResource MaterialDesignDarkSeparator}" Margin="8 0" />
-            </StackPanel>
-            <Grid Grid.Row="1">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <ListBox ItemsSource="{Binding LayerElements}" SelectedItem="{Binding SelectedLayerElement}" HorizontalContentAlignment="Stretch">
-                    <ListBox.ItemTemplate>
-                        <DataTemplate DataType="{x:Type layerElements:LayerElementViewModel}">
-                            <Border Padding="8" BorderThickness="0 0 0 1" BorderBrush="{DynamicResource MaterialDesignDivider}">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="*" />
-                                    </Grid.ColumnDefinitions>
-                                    <materialDesign:PackIcon Kind="{Binding LayerElementDescriptor.Icon}" Width="20" Height="20" VerticalAlignment="Center" />
-                                    <StackPanel Margin="8 0 0 0" Grid.Column="1">
-                                        <TextBlock FontWeight="Bold" Text="{Binding LayerElementDescriptor.DisplayName}" />
-                                        <TextBlock Text="{Binding LayerElementDescriptor.Description}" />
-                                    </StackPanel>
-                                </Grid>
-                            </Border>
-                        </DataTemplate>
-                    </ListBox.ItemTemplate>
-                </ListBox>
-                <StackPanel VerticalAlignment="Bottom" Grid.Column="1" Orientation="Vertical" Margin="8">
-                    <Button Style="{StaticResource MaterialDesignToolButton}"
-                            Width="30"
-                            Padding="2 0 2 0"
-                            materialDesign:RippleAssist.IsCentered="True"
-                            ToolTip="Add a new layer element"
-                            Command="{s:Action AddLayerElement}">
-                        <materialDesign:PackIcon Kind="LibraryAdd" />
-                    </Button>
-                    <Button Style="{StaticResource MaterialDesignToolButton}"
-                            Width="30"
-                            Padding="2 0 2 0"
-                            materialDesign:RippleAssist.IsCentered="True"
-                            ToolTip="Delete selected layer element"
-                            Command="{s:Action DeleteSelectedLayerElement}">
-                        <materialDesign:PackIcon Kind="Delete" />
-                    </Button>
-                </StackPanel>
-            </Grid>
-        </Grid>
-    </materialDesign:DialogHost>
-
-</UserControl>
@@ -1,111 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Artemis.Core.Models.Profile;
-using Artemis.Core.Models.Profile.Abstract;
-using Artemis.Core.Plugins.LayerElement;
-using Artemis.Core.Services.Interfaces;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerElements.Dialogs;
-using Artemis.UI.Services.Interfaces;
-using Stylet;
-
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerElements
-{
-    public class LayerElementsViewModel : ProfileEditorPanelViewModel
-    {
-        private readonly IDialogService _dialogService;
-        private readonly IProfileEditorService _profileEditorService;
-        private readonly ILayerService _layerService;
-        private LayerElementViewModel _selectedLayerElement;
-
-        public LayerElementsViewModel(IProfileEditorService profileEditorService, ILayerService layerService, IDialogService dialogService)
-        {
-            _profileEditorService = profileEditorService;
-            _layerService = layerService;
-            _dialogService = dialogService;
-
-            LayerElements = new BindableCollection<LayerElementViewModel>();
-            SelectedProfileElement = _profileEditorService.SelectedProfileElement;
-            PopulateLayerElements();
-
-            _profileEditorService.SelectedProfileElementChanged += OnSelectedProfileElementChanged;
-            _profileEditorService.SelectedLayerElementChanged += OnSelectedLayerElementChanged;
-        }
-
-        public ProfileElement SelectedProfileElement { get; private set; }
-        public BindableCollection<LayerElementViewModel> LayerElements { get; set; }
-
-        public LayerElementViewModel SelectedLayerElement
-        {
-            get => _selectedLayerElement;
-            set
-            {
-                _selectedLayerElement = value;
-                _profileEditorService.ChangeSelectedLayerElement(value?.LayerElement);
-            }
-        }
-
-        public bool CanAddLayerElement => SelectedProfileElement is Layer;
-        public bool CanDeleteSelectedLayerElement => SelectedLayerElement != null;
-
-        private void OnSelectedLayerElementChanged(object sender, EventArgs e)
-        {
-            _selectedLayerElement = LayerElements.FirstOrDefault(l => l.LayerElement == _profileEditorService.SelectedLayerElement);
-            NotifyOfPropertyChange(() => SelectedLayerElement);
-        }
-
-        private void OnSelectedProfileElementChanged(object sender, EventArgs e)
-        {
-            SelectedProfileElement = _profileEditorService.SelectedProfileElement;
-            PopulateLayerElements();
-        }
-
-        private void PopulateLayerElements()
-        {
-            LayerElements.Clear();
-            if (SelectedProfileElement is Layer layer)
-            {
-                foreach (var layerElement in layer.LayerElements)
-                    LayerElements.Add(new LayerElementViewModel(layerElement));
-            }
-        }
-
-        public async void AddLayerElement()
-        {
-            var result = await _dialogService.ShowDialogAt<AddLayerElementViewModel>(
-                "LayerElementsDialogHost",
-                new Dictionary<string, object> {{"layer", (Layer) SelectedProfileElement}}
-            );
-
-            if (!(result is LayerElement layerElement))
-                return;
-
-            LayerElements.Add(new LayerElementViewModel(layerElement));
-            _profileEditorService.UpdateSelectedProfileElement();
-        }
-
-        public async void DeleteSelectedLayerElement()
-        {
-            if (SelectedLayerElement == null)
-                return;
-
-            var result = await _dialogService.ShowConfirmDialogAt(
-                "LayerElementsDialogHost",
-                "Delete layer element",
-                "Are you sure you want to delete the selected layer element?"
-            );
-
-            if (!result)
-                return;
-
-            var layerElement = SelectedLayerElement.LayerElement;
-            var layer = (Layer) SelectedProfileElement;
-
-            LayerElements.Remove(SelectedLayerElement);
-            SelectedLayerElement = null;
-
-            _layerService.RemoveLayerElement(layer, layerElement);
-            _profileEditorService.UpdateSelectedProfileElement();
-        }
-    }
-}
@@ -0,0 +1,12 @@
+<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.LayerPropertiesView"
+             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:local="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.LayerProperties"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
+{
+    /// <summary>
+    /// Interaction logic for LayerPropertiesView.xaml
+    /// </summary>
+    public partial class LayerPropertiesView : UserControl
+    {
+        public LayerPropertiesView()
+        {
+            InitializeComponent();
+        }
+    }
+}
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
+{
+    public class LayerPropertiesViewModel : ProfileEditorPanelViewModel
+    {
+    }
+}
@@ -0,0 +1,12 @@
+<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline.LayerPropertiesTimelineView"
+             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:local="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
+{
+    /// <summary>
+    /// Interaction logic for LayerPropertiesTimelineView.xaml
+    /// </summary>
+    public partial class LayerPropertiesTimelineView : UserControl
+    {
+        public LayerPropertiesTimelineView()
+        {
+            InitializeComponent();
+        }
+    }
+}
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
+{
+    class LayerPropertiesTimelineViewModel
+    {
+    }
+}
@@ -80,7 +80,7 @@

                <!-- Element properties -->
                <materialDesign:Card Grid.Column="2" materialDesign:ShadowAssist.ShadowDepth="Depth1" VerticalAlignment="Stretch">
-                    <ContentControl s:View.Model="{Binding ElementPropertiesViewModel}" />
+                    <ContentControl s:View.Model="{Binding LayerPropertiesViewModel}" />
                </materialDesign:Card>
            </Grid>
        </Grid>
@@ -10,8 +10,7 @@ using Artemis.Core.Services;
 using Artemis.Core.Services.Storage.Interfaces;
 using Artemis.UI.Screens.Module.ProfileEditor.Dialogs;
 using Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions;
-using Artemis.UI.Screens.Module.ProfileEditor.ElementProperties;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerElements;
+using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties;
 using Artemis.UI.Screens.Module.ProfileEditor.ProfileTree;
 using Artemis.UI.Screens.Module.ProfileEditor.Visualization;
 using Artemis.UI.Services.Interfaces;
@@ -41,8 +40,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor
            DialogService = dialogService;

            DisplayConditionsViewModel = (DisplayConditionsViewModel) viewModels.First(vm => vm is DisplayConditionsViewModel);
-            ElementPropertiesViewModel = (ElementPropertiesViewModel) viewModels.First(vm => vm is ElementPropertiesViewModel);
-            LayerElementsViewModel = (LayerElementsViewModel) viewModels.First(vm => vm is LayerElementsViewModel);
+            LayerPropertiesViewModel = (LayerPropertiesViewModel) viewModels.First(vm => vm is LayerPropertiesViewModel);
            ProfileTreeViewModel = (ProfileTreeViewModel) viewModels.First(vm => vm is ProfileTreeViewModel);
            ProfileViewModel = (ProfileViewModel) viewModels.First(vm => vm is ProfileViewModel);
            Profiles = new BindableCollection<Profile>();
@@ -55,8 +53,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor
        public ProfileModule Module { get; }
        public IDialogService DialogService { get; }
        public DisplayConditionsViewModel DisplayConditionsViewModel { get; }
-        public ElementPropertiesViewModel ElementPropertiesViewModel { get; }
-        public LayerElementsViewModel LayerElementsViewModel { get; }
+        public LayerPropertiesViewModel LayerPropertiesViewModel { get; }
        public ProfileTreeViewModel ProfileTreeViewModel { get; }
        public ProfileViewModel ProfileViewModel { get; }
        public BindableCollection<Profile> Profiles { get; set; }
@@ -1,4 +1,4 @@
-using Artemis.Core.Models.Profile.Abstract;
+using Artemis.Core.Models.Profile;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Services.Interfaces;

@@ -1,4 +1,4 @@
-using Artemis.Core.Models.Profile.Abstract;
+using Artemis.Core.Models.Profile;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Services.Interfaces;

@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Artemis.Core.Models.Profile;
-using Artemis.Core.Models.Profile.Abstract;
 using Artemis.UI.Exceptions;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.Module.ProfileEditor.Dialogs;
@@ -0,0 +1,10 @@
+using Stylet;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
+{
+    public class CanvasViewModel : PropertyChangedBase
+    {
+        public double X { get; set; }
+        public double Y { get; set; }
+    }
+}
@@ -21,8 +21,8 @@
        </Grid.LayoutTransform>

        <!-- Device image with fallback -->
-        <Image VerticalAlignment="Top"
-               HorizontalAlignment="Left"
+        <Image VerticalAlignment="Stretch"
+               HorizontalAlignment="Stretch"
               Source="{Binding Device.RgbDevice.DeviceInfo.Image, Converter={StaticResource NullToImageConverter}}" />

        <Rectangle Fill="{DynamicResource MaterialDesignCardBackground}"
@@ -7,7 +7,7 @@ using Stylet;

 namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
 {
-    public class ProfileDeviceViewModel : PropertyChangedBase
+    public class ProfileDeviceViewModel : CanvasViewModel 
    {
        public ProfileDeviceViewModel(ArtemisDevice device)
        {
@@ -21,13 +21,13 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
        public ArtemisDevice Device { get; set; }
        public bool AddedLeds { get; private set; }

-        public double X
+        public new double X
        {
            get => Device.X;
            set => Device.X = value;
        }

-        public double Y
+        public new double Y
        {
            get => Device.Y;
            set => Device.Y = value;
@@ -23,7 +23,7 @@
                                    </DoubleAnimation.EasingFunction>
                                </DoubleAnimation>
                                <ObjectAnimationUsingKeyFrames BeginTime="0:0:0.5" Storyboard.TargetProperty="Visibility">
-                                    <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{x:Static Visibility.Hidden}"/>
+                                    <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{x:Static Visibility.Hidden}" />
                                </ObjectAnimationUsingKeyFrames>
                            </Storyboard>
                        </BeginStoryboard>
@@ -39,164 +39,151 @@
            </Style.Triggers>
        </Style>
    </UserControl.Resources>
-    <Grid ClipToBounds="True"
-          KeyUp="{s:Action EditorGridKeyUp}"
-          KeyDown="{s:Action EditorGridKeyDown}"
-          MouseWheel="{s:Action EditorGridMouseWheel}"
-          MouseUp="{s:Action EditorGridMouseClick}"
-          MouseDown="{s:Action EditorGridMouseClick}"
-          MouseMove="{s:Action EditorGridMouseMove}"
-          Cursor="{Binding Cursor}"
-          utilities:SizeObserver.Observe="True"
-          utilities:SizeObserver.ObservedWidth="{Binding PanZoomViewModel.CanvasWidth, Mode=OneWayToSource}"
-          utilities:SizeObserver.ObservedHeight="{Binding PanZoomViewModel.CanvasHeight, Mode=OneWayToSource}">

-        <Grid.Background>
-            <VisualBrush TileMode="Tile" Stretch="Uniform" Viewport="{Binding PanZoomViewModel.BackgroundViewport}" ViewportUnits="Absolute">
-                <VisualBrush.Visual>
-                    <Grid Width="25" Height="25">
-                        <Grid.RowDefinitions>
-                            <RowDefinition />
-                            <RowDefinition />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition />
-                            <ColumnDefinition />
-                        </Grid.ColumnDefinitions>
-                        <Rectangle Grid.Row="0" Grid.Column="0" Fill="{DynamicResource MaterialDesignPaper}" />
-                        <Rectangle Grid.Row="0" Grid.Column="1" />
-                        <Rectangle Grid.Row="1" Grid.Column="0"  />
-                        <Rectangle Grid.Row="1" Grid.Column="1" Fill="{DynamicResource MaterialDesignPaper}" />
-                    </Grid>
-                </VisualBrush.Visual>
-            </VisualBrush>
-        </Grid.Background>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <ToolBarTray Orientation="Vertical" Width="58">
+            <ToolBar Style="{DynamicResource MaterialDesignToolBar}" ClipToBounds="False" ToolBarTray.IsLocked="True" >
+                <ListBox SelectedIndex="{Binding ActiveToolIndex}" ToolBar.OverflowMode="Never">
+                    <ListBox.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <StackPanel Orientation="Vertical"/>
+                        </ItemsPanelTemplate>
+                    </ListBox.ItemsPanel>
+                    <ListBoxItem ToolTip="Pan over different parts of the surface" >
+                        <materialDesign:PackIcon Kind="HandLeft" />
+                    </ListBoxItem>
+                    <ListBoxItem ToolTip="Change layer selection" >
+                        <materialDesign:PackIcon Kind="SelectionDrag" />
+                    </ListBoxItem>
+                    <ListBoxItem ToolTip="Add to layer selection">
+                        <materialDesign:PackIcon Kind="PencilPlusOutline" />
+                    </ListBoxItem>
+                    <ListBoxItem ToolTip="Remove from layer selection">
+                        <materialDesign:PackIcon Kind="PencilMinusOutline" />
+                    </ListBoxItem>
+                    <Separator />
+                    <ListBoxItem ToolTip="Create round shape in layer">
+                        <materialDesign:PackIcon Kind="ShapeCirclePlus" />
+                    </ListBoxItem>
+                    <ListBoxItem ToolTip="Create rectangular shape in layer">
+                        <materialDesign:PackIcon Kind="ShapeRectanglePlus" />
+                    </ListBoxItem>
+                    <ListBoxItem ToolTip="Create polygonal shape in layer">
+                        <materialDesign:PackIcon Kind="ShapePolygonPlus" />
+                    </ListBoxItem>
+                    <ListBoxItem ToolTip="Fill entire layer">
+                        <materialDesign:PackIcon Kind="FormatColourFill" />
+                    </ListBoxItem>
+                </ListBox>
+               
+            </ToolBar>
+        </ToolBarTray>
+        <Grid Grid.Column="1"
+              ClipToBounds="True"
+              KeyUp="{s:Action CanvasKeyUp}"
+              KeyDown="{s:Action CanvasKeyDown}"
+              MouseWheel="{s:Action CanvasMouseWheel}"
+              MouseUp="{s:Action CanvasMouseDown}"
+              MouseDown="{s:Action CanvasMouseUp}"
+              MouseMove="{s:Action CanvasMouseMove}"
+              Cursor="{Binding ActiveToolViewModel.Cursor}"
+              utilities:SizeObserver.Observe="True"
+              utilities:SizeObserver.ObservedWidth="{Binding PanZoomViewModel.CanvasWidth, Mode=OneWayToSource}"
+              utilities:SizeObserver.ObservedHeight="{Binding PanZoomViewModel.CanvasHeight, Mode=OneWayToSource}">

-        <Grid.Triggers>
-            <EventTrigger RoutedEvent="Grid.MouseLeftButtonDown">
-                <BeginStoryboard>
-                    <Storyboard TargetName="MultiSelectionPath" TargetProperty="Opacity">
-                        <DoubleAnimation From="0" To="1" Duration="0:0:0.1" />
-                    </Storyboard>
-                </BeginStoryboard>
-            </EventTrigger>
-            <EventTrigger RoutedEvent="Grid.MouseLeftButtonUp">
-                <BeginStoryboard>
-                    <Storyboard TargetName="MultiSelectionPath" TargetProperty="Opacity">
-                        <DoubleAnimation From="1" To="0" Duration="0:0:0.2" />
-                    </Storyboard>
-                </BeginStoryboard>
-            </EventTrigger>
-        </Grid.Triggers>
-
-        <Grid.ContextMenu>
-            <ContextMenu>
-                <MenuItem Header="Create new layer for selection" Command="{s:Action CreateLayer}" CommandParameter="{Binding}">
-                    <MenuItem.Icon>
-                        <materialDesign:PackIcon Kind="LayersPlus" />
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="Apply selection to layer" Command="{s:Action ApplyToLayer}" CommandParameter="{Binding}">
-                    <MenuItem.Icon>
-                        <materialDesign:PackIcon Kind="Selection" />
-                    </MenuItem.Icon>
-                </MenuItem>
-                <Separator />
-                <MenuItem Header="Select all" Command="{s:Action SelectAll}" CommandParameter="{Binding}">
-                    <MenuItem.Icon>
-                        <materialDesign:PackIcon Kind="SelectAll" />
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="Inverse selection" Command="{s:Action InverseSelection}" CommandParameter="{Binding}">
-                    <MenuItem.Icon>
-                        <materialDesign:PackIcon Kind="SelectInverse" />
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="Clear selection" Command="{s:Action ClearSelection}" CommandParameter="{Binding}">
-                    <MenuItem.Icon>
-                        <materialDesign:PackIcon Kind="SelectOff" />
-                    </MenuItem.Icon>
-                </MenuItem>
-            </ContextMenu>
-        </Grid.ContextMenu>
-
-        <Grid Name="EditorDisplayGrid">
-            <Grid.RenderTransform>
-                <TransformGroup>
-                    <ScaleTransform ScaleX="{Binding PanZoomViewModel.Zoom}" ScaleY="{Binding PanZoomViewModel.Zoom}" />
-                    <TranslateTransform X="{Binding PanZoomViewModel.PanX}" Y="{Binding PanZoomViewModel.PanY}" />
-                </TransformGroup>
-            </Grid.RenderTransform>
-            <ItemsControl ItemsSource="{Binding Devices}">
-                <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <Canvas />
-                    </ItemsPanelTemplate>
-                </ItemsControl.ItemsPanel>
-                <ItemsControl.ItemContainerStyle>
-                    <Style TargetType="ContentPresenter">
-                        <Setter Property="Canvas.Left" Value="{Binding X}" />
-                        <Setter Property="Canvas.Top" Value="{Binding Y}" />
-                    </Style>
-                </ItemsControl.ItemContainerStyle>
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <ContentControl s:View.Model="{Binding}" />
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-        </Grid>
-
-        <!-- Multi-selection rectangle -->
-        <Path Data="{Binding SelectionRectangle}" Opacity="0"
-              Stroke="{DynamicResource PrimaryHueLightBrush}"
-              StrokeThickness="1"
-              Name="MultiSelectionPath"
-              IsHitTestVisible="False">
-            <Path.Fill>
-                <SolidColorBrush Color="{DynamicResource Primary400}" Opacity="0.25" />
-            </Path.Fill>
-        </Path>
-
-        <StackPanel ZIndex="1" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="10">
-            <materialDesign:Card Padding="8">
-                <StackPanel Orientation="Horizontal">
-                    <CheckBox Style="{StaticResource MaterialDesignCheckBox}" IsChecked="{Binding HighlightSelectedLayer.Value}">
-                        Highlight selected layer
-                    </CheckBox>
-                    <CheckBox Style="{StaticResource MaterialDesignCheckBox}" Margin="10 0 0 0" IsChecked="{Binding PauseRenderingOnFocusLoss.Value}">
-                        Pause visualization on focus loss
-                    </CheckBox>
-                </StackPanel>
-            </materialDesign:Card>
-        </StackPanel>
-
-        <StackPanel Orientation="Vertical" VerticalAlignment="Bottom" HorizontalAlignment="Right"
-                    Margin="10" ZIndex="1">
-            <Slider Margin="0,0,14,0"
-                    Orientation="Vertical"
-                    Minimum="10"
-                    Maximum="400"
-                    Height="100"
-                    FocusVisualStyle="{x:Null}"
-                    Value="{Binding PanZoomViewModel.ZoomPercentage}"
-                    Style="{StaticResource MaterialDesignDiscreteSlider}" />
-            <Button Command="{s:Action ResetZoomAndPan}"
-                    Style="{StaticResource MaterialDesignFloatingActionMiniButton}"
-                    HorizontalAlignment="Right"
-                    ToolTip="Reset zoom &amp; position">
-                <materialDesign:PackIcon Kind="ImageFilterCenterFocus" Height="24" Width="24" />
-            </Button>
-        </StackPanel>
-
-        <!-- Loading indicator -->
-        <Grid Background="{StaticResource MaterialDesignPaper}" Style="{StaticResource InitializingFade}">
-            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                <TextBlock FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center">
-                    Initializing LED visualization...
-                </TextBlock>
-                <ProgressBar Style="{StaticResource MaterialDesignCircularProgressBar}" Value="0" IsIndeterminate="True" />
+            <Grid.Background>
+                <VisualBrush TileMode="Tile" Stretch="Uniform" Viewport="{Binding PanZoomViewModel.BackgroundViewport}" ViewportUnits="Absolute">
+                    <VisualBrush.Visual>
+                        <Grid Width="25" Height="25">
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <Rectangle Grid.Row="0" Grid.Column="0" Fill="{DynamicResource MaterialDesignPaper}" />
+                            <Rectangle Grid.Row="0" Grid.Column="1" />
+                            <Rectangle Grid.Row="1" Grid.Column="0" />
+                            <Rectangle Grid.Row="1" Grid.Column="1" Fill="{DynamicResource MaterialDesignPaper}" />
+                        </Grid>
+                    </VisualBrush.Visual>
+                </VisualBrush>
+            </Grid.Background>
+            
+            <Grid Name="EditorDisplayGrid">
+                <Grid.RenderTransform>
+                    <TransformGroup>
+                        <ScaleTransform ScaleX="{Binding PanZoomViewModel.Zoom}" ScaleY="{Binding PanZoomViewModel.Zoom}" />
+                        <TranslateTransform X="{Binding PanZoomViewModel.PanX}" Y="{Binding PanZoomViewModel.PanY}" />
+                    </TransformGroup>
+                </Grid.RenderTransform>
+                <ItemsControl ItemsSource="{Binding Devices}">
+                    <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <Canvas />
+                        </ItemsPanelTemplate>
+                    </ItemsControl.ItemsPanel>
+                    <ItemsControl.ItemContainerStyle>
+                        <Style TargetType="ContentPresenter">
+                            <Setter Property="Canvas.Left" Value="{Binding X}" />
+                            <Setter Property="Canvas.Top" Value="{Binding Y}" />
+                        </Style>
+                    </ItemsControl.ItemContainerStyle>
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <ContentControl s:View.Model="{Binding}" />
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </Grid>
+          
+            <StackPanel ZIndex="1" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="10">
+                <materialDesign:Card Padding="8">
+                    <StackPanel Orientation="Horizontal">
+                        <CheckBox Style="{StaticResource MaterialDesignCheckBox}" IsChecked="{Binding HighlightSelectedLayer.Value}">
+                            Highlight selected layer
+                        </CheckBox>
+                        <CheckBox Style="{StaticResource MaterialDesignCheckBox}" Margin="10 0 0 0" IsChecked="{Binding PauseRenderingOnFocusLoss.Value}">
+                            Pause visualization on focus loss
+                        </CheckBox>
+                    </StackPanel>
+                </materialDesign:Card>
            </StackPanel>
+
+            <StackPanel Orientation="Vertical" VerticalAlignment="Bottom" HorizontalAlignment="Right"
+                        Margin="10" ZIndex="1">
+                <Slider Margin="0,0,14,0"
+                        Orientation="Vertical"
+                        Minimum="10"
+                        Maximum="400"
+                        Height="100"
+                        FocusVisualStyle="{x:Null}"
+                        Value="{Binding PanZoomViewModel.ZoomPercentage}"
+                        Style="{StaticResource MaterialDesignDiscreteSlider}" />
+                <Button Command="{s:Action ResetZoomAndPan}"
+                        Style="{StaticResource MaterialDesignFloatingActionMiniButton}"
+                        HorizontalAlignment="Right"
+                        ToolTip="Reset zoom &amp; position">
+                    <materialDesign:PackIcon Kind="ImageFilterCenterFocus" Height="24" Width="24" />
+                </Button>
+            </StackPanel>
+
+            <!-- Loading indicator -->
+            <Grid Background="{StaticResource MaterialDesignPaper}" Style="{StaticResource InitializingFade}" d:IsHidden="True">
+                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                    <TextBlock FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center">
+                        Initializing LED visualization...
+                    </TextBlock>
+                    <ProgressBar Style="{StaticResource MaterialDesignCircularProgressBar}" Value="0" IsIndeterminate="True" />
+                </StackPanel>
+            </Grid>
        </Grid>
    </Grid>
+
 </UserControl>
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
 using Artemis.Core.Events;
@@ -12,13 +11,11 @@ using Artemis.Core.Plugins.Models;
 using Artemis.Core.Services;
 using Artemis.Core.Services.Storage.Interfaces;
 using Artemis.UI.Events;
-using Artemis.UI.Extensions;
+using Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools;
 using Artemis.UI.Screens.Shared;
-using Artemis.UI.Screens.SurfaceEditor;
 using Artemis.UI.Services.Interfaces;
 using RGB.NET.Core;
 using Stylet;
-using Point = System.Windows.Point;

 namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
 {
@@ -29,25 +26,21 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
        private readonly ISurfaceService _surfaceService;
        private TimerUpdateTrigger _updateTrigger;

-        public ProfileViewModel(IProfileEditorService profileEditorService,
-            ISurfaceService surfaceService,
-            ISettingsService settingsService,
-            IEventAggregator eventAggregator)
+        public ProfileViewModel(IProfileEditorService profileEditorService, ISurfaceService surfaceService, ISettingsService settingsService, IEventAggregator eventAggregator)
        {
            _profileEditorService = profileEditorService;
            _surfaceService = surfaceService;
            _settingsService = settingsService;
-            Devices = new ObservableCollection<ProfileDeviceViewModel>();
-            Cursor = null;

-            Execute.PostToUIThread(() =>
+            Execute.OnUIThreadSync(() =>
            {
-                SelectionRectangle = new RectangleGeometry();
+                CanvasViewModels = new ObservableCollection<CanvasViewModel>();
                PanZoomViewModel = new PanZoomViewModel();
            });

            ApplySurfaceConfiguration(surfaceService.ActiveSurface);
            CreateUpdateTrigger();
+            ActivateToolByIndex(0);

            _profileEditorService.SelectedProfileElementChanged += OnSelectedProfileElementChanged;
            _profileEditorService.SelectedProfileElementUpdated += OnSelectedProfileElementChanged;
@@ -55,13 +48,42 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
        }

        public bool IsInitializing { get; private set; }
-        public ObservableCollection<ProfileDeviceViewModel> Devices { get; set; }
-        public RectangleGeometry SelectionRectangle { get; set; }
+        public ObservableCollection<CanvasViewModel> CanvasViewModels { get; set; }
        public PanZoomViewModel PanZoomViewModel { get; set; }
        public PluginSetting<bool> HighlightSelectedLayer { get; set; }
        public PluginSetting<bool> PauseRenderingOnFocusLoss { get; set; }

-        public Cursor Cursor { get; set; }
+        public ReadOnlyCollection<ProfileDeviceViewModel> Devices => CanvasViewModels
+            .Where(vm => vm is ProfileDeviceViewModel)
+            .Cast<ProfileDeviceViewModel>()
+            .ToList()
+            .AsReadOnly();
+
+        public VisualizationToolViewModel ActiveToolViewModel
+        {
+            get => _activeToolViewModel;
+            set
+            {
+                // Remove the tool from the canvas
+                if (_activeToolViewModel != null)
+                    CanvasViewModels.Remove(_activeToolViewModel);
+                // Set the new tool
+                _activeToolViewModel = value;
+                // Add the new tool to the canvas
+                if (_activeToolViewModel != null)
+                    CanvasViewModels.Add(_activeToolViewModel);
+            }
+        }
+
+        public int ActiveToolIndex
+        {
+            get => _activeToolIndex;
+            set
+            {
+                _activeToolIndex = value;
+                ActivateToolByIndex(value);
+            }
+        }

        private void CreateUpdateTrigger()
        {
@@ -82,12 +104,8 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization

        private void ApplySurfaceConfiguration(ArtemisSurface surface)
        {
-            List<ArtemisDevice> devices;
-            lock (Devices)
-            {
-                devices = new List<ArtemisDevice>();
-                devices.AddRange(surface.Devices);
-            }
+            var devices = new List<ArtemisDevice>();
+            devices.AddRange(surface.Devices);

            // Make sure all devices have an up-to-date VM
            foreach (var surfaceDeviceConfiguration in devices)
@@ -102,9 +120,9 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
                    {
                        // Gotta call IsInitializing on the UI thread or its never gets picked up
                        IsInitializing = true;
-                        lock (Devices)
+                        lock (CanvasViewModels)
                        {
-                            Devices.Add(profileDeviceViewModel);
+                            CanvasViewModels.Add(profileDeviceViewModel);
                        }
                    });
                }
@@ -112,21 +130,22 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
                else
                    viewModel.Device = surfaceDeviceConfiguration;
            }
-            
+
+
            // Sort the devices by ZIndex
            Execute.PostToUIThread(() =>
            {
-                lock (Devices)
+                lock (CanvasViewModels)
                {
                    foreach (var device in Devices.OrderBy(d => d.ZIndex).ToList())
-                        Devices.Move(Devices.IndexOf(device), device.ZIndex - 1);
+                        CanvasViewModels.Move(CanvasViewModels.IndexOf(device), device.ZIndex - 1);
                }
            });
        }

        private void UpdateLeds(object sender, CustomUpdateData customUpdateData)
        {
-            lock (Devices)
+            lock (CanvasViewModels)
            {
                if (IsInitializing)
                    IsInitializing = Devices.Any(d => !d.AddedLeds);
@@ -165,11 +184,83 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
        {
            HighlightSelectedLayer.Save();
            PauseRenderingOnFocusLoss.Save();
-            
-            _updateTrigger.Stop();
+
+            try
+            {
+                _updateTrigger.Stop();
+            }
+            catch (NullReferenceException)
+            {
+                // TODO: Remove when fixed in RGB.NET, or avoid double stopping
+            }
+
            base.OnDeactivate();
        }

+        #region Buttons
+
+        private void ActivateToolByIndex(int value)
+        {
+            switch (value)
+            {
+                case 0:
+                    ActiveToolViewModel = new ViewpointMoveToolViewModel(this, _profileEditorService);
+                    break;
+                case 1:
+                    ActiveToolViewModel = new SelectionToolViewModel(this, _profileEditorService);
+                    break;
+                case 2:
+                    ActiveToolViewModel = new SelectionAddToolViewModel(this, _profileEditorService);
+                    break;
+                case 3:
+                    ActiveToolViewModel = new SelectionRemoveToolViewModel(this, _profileEditorService);
+                    break;
+                case 4:
+                    ActiveToolViewModel = new EllipseToolViewModel(this, _profileEditorService);
+                    break;
+                case 5:
+                    ActiveToolViewModel = new RectangleToolViewModel(this, _profileEditorService);
+                    break;
+                case 6:
+                    ActiveToolViewModel = new PolygonToolViewModel(this, _profileEditorService);
+                    break;
+                case 7:
+                    ActiveToolViewModel = new FillToolViewModel(this, _profileEditorService);
+                    break;
+            }
+        }
+
+        public void ResetZoomAndPan()
+        {
+            PanZoomViewModel.Reset();
+        }
+
+        #endregion
+
+        #region Mouse
+
+        public void CanvasMouseDown(object sender, MouseButtonEventArgs e)
+        {
+            ActiveToolViewModel?.MouseDown(sender, e);
+        }
+
+        public void CanvasMouseUp(object sender, MouseButtonEventArgs e)
+        {
+            ActiveToolViewModel?.MouseUp(sender, e);
+        }
+
+        public void CanvasMouseMove(object sender, MouseEventArgs e)
+        {
+            ActiveToolViewModel?.MouseMove(sender, e);
+        }
+
+        public void CanvasMouseWheel(object sender, MouseWheelEventArgs e)
+        {
+            ActiveToolViewModel?.MouseWheel(sender, e);
+        }
+
+        #endregion
+
        #region Context menu actions

        public bool CanApplyToLayer { get; set; }
@@ -209,123 +300,23 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization

        #endregion

-        #region Selection
+        #region Keys

-        private MouseDragStatus _mouseDragStatus;
-        private Point _mouseDragStartPoint;
+        private int _previousTool;
+        private int _activeToolIndex;
+        private VisualizationToolViewModel _activeToolViewModel;

-        // ReSharper disable once UnusedMember.Global - Called from view
-        public void EditorGridMouseClick(object sender, MouseButtonEventArgs e)
-        {
-            if (IsPanKeyDown() || e.ChangedButton == MouseButton.Right)
-                return;
-
-            var position = e.GetPosition((IInputElement) sender);
-            var relative = PanZoomViewModel.GetRelativeMousePosition(sender, e);
-            if (e.LeftButton == MouseButtonState.Pressed)
-                StartMouseDrag(position, relative);
-            else
-                StopMouseDrag(position);
-        }
-
-        // ReSharper disable once UnusedMember.Global - Called from view
-        public void EditorGridMouseMove(object sender, MouseEventArgs e)
-        {
-            // If holding down Ctrl, pan instead of move/select
-            if (IsPanKeyDown())
-            {
-                Pan(sender, e);
-                return;
-            }
-
-            var position = e.GetPosition((IInputElement) sender);
-            if (_mouseDragStatus == MouseDragStatus.Selecting)
-                UpdateSelection(position);
-        }
-
-        private void StartMouseDrag(Point position, Point relative)
-        {
-            _mouseDragStatus = MouseDragStatus.Selecting;
-            _mouseDragStartPoint = position;
-
-            // Any time dragging starts, start with a new rect
-            SelectionRectangle.Rect = new Rect();
-        }
-
-        private void StopMouseDrag(Point position)
-        {
-            var selectedRect = new Rect(_mouseDragStartPoint, position);
-            foreach (var device in Devices)
-            {
-                foreach (var profileLedViewModel in device.Leds)
-                {
-                    if (PanZoomViewModel.TransformContainingRect(profileLedViewModel.Led.RgbLed.AbsoluteLedRectangle.ToWindowsRect(1)).IntersectsWith(selectedRect))
-                        profileLedViewModel.IsSelected = true;
-                    else if (!Keyboard.IsKeyDown(Key.LeftShift) && !Keyboard.IsKeyDown(Key.RightShift))
-                        profileLedViewModel.IsSelected = false;
-                }
-            }
-
-            _mouseDragStatus = MouseDragStatus.None;
-        }
-
-        private void UpdateSelection(Point position)
-        {
-            if (IsPanKeyDown())
-                return;
-
-            var selectedRect = new Rect(_mouseDragStartPoint, position);
-            SelectionRectangle.Rect = selectedRect;
-
-            foreach (var device in Devices)
-            {
-                foreach (var profileLedViewModel in device.Leds)
-                {
-                    if (PanZoomViewModel.TransformContainingRect(profileLedViewModel.Led.RgbLed.AbsoluteLedRectangle.ToWindowsRect(1)).IntersectsWith(selectedRect))
-                        profileLedViewModel.IsSelected = true;
-                    else if (!Keyboard.IsKeyDown(Key.LeftShift) && !Keyboard.IsKeyDown(Key.RightShift))
-                        profileLedViewModel.IsSelected = false;
-                }
-            }
-        }
-
-        #endregion
-
-        #region Panning and zooming
-
-        public void EditorGridMouseWheel(object sender, MouseWheelEventArgs e)
-        {
-            PanZoomViewModel.ProcessMouseScroll(sender, e);
-        }
-
-        public void EditorGridKeyDown(object sender, KeyEventArgs e)
+        public void CanvasKeyDown(object sender, KeyEventArgs e)
        {
+            _previousTool = ActiveToolIndex;
            if ((e.Key == Key.LeftCtrl || e.Key == Key.RightCtrl) && e.IsDown)
-                Cursor = Cursors.ScrollAll;
+                ActiveToolViewModel = new ViewpointMoveToolViewModel(this, _profileEditorService);
        }

-        public void EditorGridKeyUp(object sender, KeyEventArgs e)
+        public void CanvasKeyUp(object sender, KeyEventArgs e)
        {
            if ((e.Key == Key.LeftCtrl || e.Key == Key.RightCtrl) && e.IsUp)
-                Cursor = null;
-        }
-
-        public void Pan(object sender, MouseEventArgs e)
-        {
-            PanZoomViewModel.ProcessMouseMove(sender, e);
-
-            // Empty the selection rect since it's shown while mouse is down
-            SelectionRectangle.Rect = Rect.Empty;
-        }
-
-        public void ResetZoomAndPan()
-        {
-            PanZoomViewModel.Reset();
-        }
-
-        private bool IsPanKeyDown()
-        {
-            return Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl);
+                ActivateToolByIndex(_previousTool);
        }

        #endregion
@@ -348,10 +339,17 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
            if (PauseRenderingOnFocusLoss == null || ScreenState != ScreenState.Active)
                return;

-            if (PauseRenderingOnFocusLoss.Value && !message.IsFocused)
-                _updateTrigger.Stop();
-            else if (PauseRenderingOnFocusLoss.Value && message.IsFocused)
-                _updateTrigger.Start();
+            try
+            {
+                if (PauseRenderingOnFocusLoss.Value && !message.IsFocused)
+                    _updateTrigger.Stop();
+                else if (PauseRenderingOnFocusLoss.Value && message.IsFocused)
+                    _updateTrigger.Start();
+            }
+            catch (NullReferenceException)
+            {
+                // TODO: Remove when fixed in RGB.NET, or avoid double stopping
+            }
        }

        #endregion
@@ -0,0 +1,48 @@
+<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools.EllipseToolView"
+             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:local="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools"
+             xmlns:s="https://github.com/canton7/Stylet"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d"
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Canvas>
+        <Canvas.Triggers>
+            <EventTrigger RoutedEvent="Canvas.MouseLeftButtonDown">
+                <BeginStoryboard>
+                    <Storyboard TargetName="Preview" TargetProperty="Opacity">
+                        <DoubleAnimation From="0" To="1" Duration="0:0:0.1" />
+                    </Storyboard>
+                </BeginStoryboard>
+            </EventTrigger>
+            <EventTrigger RoutedEvent="Canvas.MouseLeftButtonUp">
+                <BeginStoryboard>
+                    <Storyboard TargetName="Preview" TargetProperty="Opacity">
+                        <DoubleAnimation From="1" To="0" Duration="0:0:0.2" />
+                    </Storyboard>
+                </BeginStoryboard>
+            </EventTrigger>
+        </Canvas.Triggers>
+        <Canvas.ContextMenu>
+            <ContextMenu>
+                <MenuItem Header="Ellipse action 1" Command="{s:Action CreateLayer}" CommandParameter="{Binding}">
+                    <MenuItem.Icon>
+                        <materialDesign:PackIcon Kind="LayersPlus" />
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Ellipse action 2" Command="{s:Action ApplyToLayer}" CommandParameter="{Binding}">
+                    <MenuItem.Icon>
+                        <materialDesign:PackIcon Kind="Selection" />
+                    </MenuItem.Icon>
+                </MenuItem>
+            </ContextMenu>
+        </Canvas.ContextMenu>
+        <Ellipse Stroke="{DynamicResource PrimaryHueLightBrush}" StrokeThickness="1" IsHitTestVisible="False" x:Name="Preview" Opacity="1" Width="100" Height="100">
+            <Ellipse.Fill>
+                <SolidColorBrush Color="{DynamicResource Primary400}" Opacity="0.25" />
+            </Ellipse.Fill>
+        </Ellipse>
+    </Canvas>
+</UserControl>
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+{
+    /// <summary>
+    /// Interaction logic for EllipseToolView.xaml
+    /// </summary>
+    public partial class EllipseToolView : UserControl
+    {
+        public EllipseToolView()
+        {
+            InitializeComponent();
+        }
+    }
+}
@@ -0,0 +1,18 @@
+using System.IO;
+using System.Windows.Input;
+using Artemis.UI.Properties;
+using Artemis.UI.Services.Interfaces;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+{
+    public class EllipseToolViewModel : VisualizationToolViewModel
+    {
+        public EllipseToolViewModel(ProfileViewModel profileViewModel, IProfileEditorService profileEditorService) : base(profileViewModel, profileEditorService)
+        {
+            using (var stream = new MemoryStream(Resources.aero_crosshair))
+            {
+                Cursor = new Cursor(stream);
+            }
+        }
+    }
+}
@@ -0,0 +1,9 @@
+<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools.FillToolView"
+             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:local="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+</UserControl>
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+{
+    /// <summary>
+    /// Interaction logic for FillToolView.xaml
+    /// </summary>
+    public partial class FillToolView : UserControl
+    {
+        public FillToolView()
+        {
+            InitializeComponent();
+        }
+    }
+}
@@ -0,0 +1,39 @@
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Input;
+using Artemis.Core.Models.Profile.LayerShapes;
+using Artemis.UI.Properties;
+using Artemis.UI.Services.Interfaces;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+{
+    public class FillToolViewModel : VisualizationToolViewModel
+    {
+        public FillToolViewModel(ProfileViewModel profileViewModel, IProfileEditorService profileEditorService) : base(profileViewModel, profileEditorService)
+        {
+            using (var stream = new MemoryStream(Resources.aero_fill))
+            {
+                Cursor = new Cursor(stream);
+            }
+        }
+
+        public override void MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            base.MouseUp(sender, e);
+
+            // Find out if the click is inside a layer and if so, fill it
+            var position = e.GetPosition((IInputElement) sender);
+            var panZoomVm = ProfileViewModel.PanZoomViewModel;
+
+            var layer = ProfileEditorService.SelectedProfile
+                .GetAllLayers()
+                .FirstOrDefault(l => l.Leds.Any(
+                    led => panZoomVm.TransformContainingRect(led.RgbLed.AbsoluteLedRectangle).Contains(position))
+                );
+
+            if (layer != null)
+                layer.LayerShape = new Fill(layer);
+        }
+    }
+}
@@ -0,0 +1,12 @@
+<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools.PolygonToolView"
+             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:local="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+{
+    /// <summary>
+    /// Interaction logic for PolygonToolView.xaml
+    /// </summary>
+    public partial class PolygonToolView : UserControl
+    {
+        public PolygonToolView()
+        {
+            InitializeComponent();
+        }
+    }
+}
@@ -0,0 +1,18 @@
+using System.IO;
+using System.Windows.Input;
+using Artemis.UI.Properties;
+using Artemis.UI.Services.Interfaces;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+{
+    public class PolygonToolViewModel : VisualizationToolViewModel
+    {
+        public PolygonToolViewModel(ProfileViewModel profileViewModel, IProfileEditorService profileEditorService) : base(profileViewModel, profileEditorService)
+        {
+            using (var stream = new MemoryStream(Resources.aero_crosshair))
+            {
+                Cursor = new Cursor(stream);
+            }
+        }
+    }
+}
@@ -0,0 +1,12 @@
+<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools.RectangleToolView"
+             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:local="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+{
+    /// <summary>
+    /// Interaction logic for RectangleToolView.xaml
+    /// </summary>
+    public partial class RectangleToolView : UserControl
+    {
+        public RectangleToolView()
+        {
+            InitializeComponent();
+        }
+    }
+}
@@ -0,0 +1,18 @@
+using System.IO;
+using System.Windows.Input;
+using Artemis.UI.Properties;
+using Artemis.UI.Services.Interfaces;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+{
+    public class RectangleToolViewModel : VisualizationToolViewModel
+    {
+        public RectangleToolViewModel(ProfileViewModel profileViewModel, IProfileEditorService profileEditorService) : base(profileViewModel, profileEditorService)
+        {
+            using (var stream = new MemoryStream(Resources.aero_crosshair))
+            {
+                Cursor = new Cursor(stream);
+            }
+        }
+    }
+}
@@ -0,0 +1,12 @@
+<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools.SelectionAddToolView"
+             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:local="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+{
+    /// <summary>
+    /// Interaction logic for SelectionAddToolView.xaml
+    /// </summary>
+    public partial class SelectionAddToolView : UserControl
+    {
+        public SelectionAddToolView()
+        {
+            InitializeComponent();
+        }
+    }
+}
@@ -0,0 +1,36 @@
+using System.IO;
+using System.Windows;
+using System.Windows.Input;
+using Artemis.UI.Properties;
+using Artemis.UI.Services.Interfaces;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+{
+    public class SelectionAddToolViewModel : VisualizationToolViewModel
+    {
+        public SelectionAddToolViewModel(ProfileViewModel profileViewModel, IProfileEditorService profileEditorService) : base(profileViewModel, profileEditorService)
+        {
+            using (var stream = new MemoryStream(Resources.aero_pen_plus))
+            {
+                Cursor = new Cursor(stream);
+            }
+        }
+
+        public override void MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            base.MouseUp(sender, e);
+
+            var position = e.GetPosition((IInputElement) sender);
+            var selectedRect = new Rect(MouseDownStartPosition, position);
+
+            foreach (var device in ProfileViewModel.Devices)
+            {
+                foreach (var ledViewModel in device.Leds)
+                {
+                    if (ProfileViewModel.PanZoomViewModel.TransformContainingRect(ledViewModel.Led.RgbLed.AbsoluteLedRectangle).IntersectsWith(selectedRect))
+                        ledViewModel.IsSelected = true;
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,12 @@
+<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools.SelectionRemoveToolView"
+             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:local="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+{
+    /// <summary>
+    /// Interaction logic for SelectionRemoveToolView.xaml
+    /// </summary>
+    public partial class SelectionRemoveToolView : UserControl
+    {
+        public SelectionRemoveToolView()
+        {
+            InitializeComponent();
+        }
+    }
+}
@@ -0,0 +1,36 @@
+using System.IO;
+using System.Windows;
+using System.Windows.Input;
+using Artemis.UI.Properties;
+using Artemis.UI.Services.Interfaces;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+{
+    public class SelectionRemoveToolViewModel : VisualizationToolViewModel
+    {
+        public SelectionRemoveToolViewModel(ProfileViewModel profileViewModel, IProfileEditorService profileEditorService) : base(profileViewModel, profileEditorService)
+        {
+            using (var stream = new MemoryStream(Resources.aero_pen_min))
+            {
+                Cursor = new Cursor(stream);
+            }
+        }
+
+        public override void MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            base.MouseUp(sender, e);
+
+            var position = e.GetPosition((IInputElement)sender);
+            var selectedRect = new Rect(MouseDownStartPosition, position);
+
+            foreach (var device in ProfileViewModel.Devices)
+            {
+                foreach (var ledViewModel in device.Leds)
+                {
+                    if (ProfileViewModel.PanZoomViewModel.TransformContainingRect(ledViewModel.Led.RgbLed.AbsoluteLedRectangle).IntersectsWith(selectedRect))
+                        ledViewModel.IsSelected = false;
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,12 @@
+<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools.SelectionToolView"
+             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:local="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+{
+    /// <summary>
+    /// Interaction logic for SelectionToolView.xaml
+    /// </summary>
+    public partial class SelectionToolView : UserControl
+    {
+        public SelectionToolView()
+        {
+            InitializeComponent();
+        }
+    }
+}
@@ -0,0 +1,64 @@
+using System.IO;
+using System.Windows;
+using System.Windows.Input;
+using Artemis.UI.Properties;
+using Artemis.UI.Services.Interfaces;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+{
+    public class SelectionToolViewModel : VisualizationToolViewModel
+    {
+        public SelectionToolViewModel(ProfileViewModel profileViewModel, IProfileEditorService profileEditorService) : base(profileViewModel, profileEditorService)
+        {
+            using (var stream = new MemoryStream(Resources.aero_crosshair))
+            {
+                Cursor = new Cursor(stream);
+            }
+        }
+
+        public override void MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            base.MouseDown(sender, e);
+//            ProfileViewModel.SelectionRectangle.Rect = new Rect();
+        }
+
+        public override void MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            base.MouseUp(sender, e);
+
+            var position = e.GetPosition((IInputElement) sender);
+            var selectedRect = new Rect(MouseDownStartPosition, position);
+
+            foreach (var device in ProfileViewModel.Devices)
+            {
+                foreach (var ledViewModel in device.Leds)
+                {
+                    if (ProfileViewModel.PanZoomViewModel.TransformContainingRect(ledViewModel.Led.RgbLed.AbsoluteLedRectangle).IntersectsWith(selectedRect))
+                        ledViewModel.IsSelected = true;
+                    else if (!Keyboard.IsKeyDown(Key.LeftShift) && !Keyboard.IsKeyDown(Key.RightShift))
+                        ledViewModel.IsSelected = false;
+                }
+            }
+        }
+
+        public override void MouseMove(object sender, MouseEventArgs e)
+        {
+            base.MouseMove(sender, e);
+
+            var position = e.GetPosition((IInputElement) sender);
+            var selectedRect = new Rect(MouseDownStartPosition, position);
+//            ProfileViewModel.SelectionRectangle.Rect = selectedRect;
+
+            foreach (var device in ProfileViewModel.Devices)
+            {
+                foreach (var ledViewModel in device.Leds)
+                {
+                    if (ProfileViewModel.PanZoomViewModel.TransformContainingRect(ledViewModel.Led.RgbLed.AbsoluteLedRectangle).IntersectsWith(selectedRect))
+                        ledViewModel.IsSelected = true;
+                    else if (!Keyboard.IsKeyDown(Key.LeftShift) && !Keyboard.IsKeyDown(Key.RightShift))
+                        ledViewModel.IsSelected = false;
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,12 @@
+<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools.ViewpointMoveToolView"
+             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:local="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+{
+    /// <summary>
+    /// Interaction logic for ViewpointMoveToolView.xaml
+    /// </summary>
+    public partial class ViewpointMoveToolView : UserControl
+    {
+        public ViewpointMoveToolView()
+        {
+            InitializeComponent();
+        }
+    }
+}
@@ -0,0 +1,26 @@
+using System.Windows.Input;
+using Artemis.UI.Services.Interfaces;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+{
+    public class ViewpointMoveToolViewModel : VisualizationToolViewModel
+    {
+        public ViewpointMoveToolViewModel(ProfileViewModel profileViewModel, IProfileEditorService profileEditorService) : base(profileViewModel, profileEditorService)
+        {
+            Cursor = Cursors.Hand;
+        }
+
+        public override void MouseMove(object sender, MouseEventArgs e)
+        {
+            base.MouseMove(sender, e);
+            if (IsMouseDown)
+                ProfileViewModel.PanZoomViewModel.ProcessMouseMove(sender, e);
+        }
+
+        public override void MouseWheel(object sender, MouseWheelEventArgs e)
+        {
+            base.MouseWheel(sender, e);
+            ProfileViewModel.PanZoomViewModel.ProcessMouseScroll(sender, e);
+        }
+    }
+}
@@ -0,0 +1,45 @@
+using System.Windows;
+using System.Windows.Input;
+using Artemis.UI.Services.Interfaces;
+
+namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+{
+    public abstract class VisualizationToolViewModel : CanvasViewModel
+    {
+        protected VisualizationToolViewModel(ProfileViewModel profileViewModel, IProfileEditorService profileEditorService)
+        {
+            // Not relevant for visualization tools as they overlay the entire canvas
+            X = 0;
+            Y = 0;
+
+            ProfileViewModel = profileViewModel;
+            ProfileEditorService = profileEditorService;
+            Cursor = Cursors.Arrow;
+        }
+
+        public ProfileViewModel ProfileViewModel { get; }
+        public IProfileEditorService ProfileEditorService { get; }
+        public Cursor Cursor { get; protected set; }
+        public bool IsMouseDown { get; protected set; }
+        public Point MouseDownStartPosition { get; protected set; }
+
+        public virtual void MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            IsMouseDown = true;
+            MouseDownStartPosition = e.GetPosition((IInputElement) sender);
+        }
+
+        public virtual void MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            IsMouseDown = false;
+        }
+
+        public virtual void MouseMove(object sender, MouseEventArgs e)
+        {
+        }
+
+        public virtual void MouseWheel(object sender, MouseWheelEventArgs e)
+        {
+        }
+    }
+}
@@ -3,7 +3,10 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
+using Artemis.UI.Extensions;
+using RGB.NET.Core;
 using Stylet;
+using Point = System.Windows.Point;

 namespace Artemis.UI.Screens.Shared
 {
@@ -71,6 +74,11 @@ namespace Artemis.UI.Screens.Shared
            PanY = 0;
        }

+        public Rect TransformContainingRect(Rectangle rect)
+        {
+            return TransformContainingRect(rect.ToWindowsRect(1));
+        }
+
        public Rect TransformContainingRect(Rect rect)
        {
            // Create the same transform group the view is using
@@ -26,8 +26,8 @@
            </Grid.LayoutTransform>

            <!-- Device image with fallback -->
-            <Image VerticalAlignment="Top"
-                   HorizontalAlignment="Left"
+            <Image VerticalAlignment="Stretch"
+                   HorizontalAlignment="Stretch"
                   Source="{Binding Device.RgbDevice.DeviceInfo.Image, Converter={StaticResource NullToImageConverter}}" />

            <Rectangle Fill="{DynamicResource MaterialDesignCardBackground}"
@@ -1,7 +1,5 @@
 using System;
 using Artemis.Core.Models.Profile;
-using Artemis.Core.Models.Profile.Abstract;
-using Artemis.Core.Plugins.LayerElement;

 namespace Artemis.UI.Services.Interfaces
 {
@@ -9,18 +7,15 @@ namespace Artemis.UI.Services.Interfaces
    {
        Profile SelectedProfile { get; }
        ProfileElement SelectedProfileElement { get; }
-        LayerElement SelectedLayerElement { get; }

        void ChangeSelectedProfile(Profile profile);
        void UpdateSelectedProfile();
        void ChangeSelectedProfileElement(ProfileElement profileElement);
        void UpdateSelectedProfileElement();
-        void ChangeSelectedLayerElement(LayerElement layerElement);

        event EventHandler SelectedProfileChanged;
        event EventHandler SelectedProfileUpdated;
        event EventHandler SelectedProfileElementChanged;
        event EventHandler SelectedProfileElementUpdated;
-        event EventHandler SelectedLayerElementChanged;
    }
 }
@@ -1,7 +1,5 @@
 using System;
 using Artemis.Core.Models.Profile;
-using Artemis.Core.Models.Profile.Abstract;
-using Artemis.Core.Plugins.LayerElement;
 using Artemis.Core.Services.Storage.Interfaces;
 using Artemis.UI.Services.Interfaces;

@@ -18,7 +16,6 @@ namespace Artemis.UI.Services

        public Profile SelectedProfile { get; private set; }
        public ProfileElement SelectedProfileElement { get; private set; }
-        public LayerElement SelectedLayerElement { get; private set; }

        public void ChangeSelectedProfile(Profile profile)
        {
@@ -44,17 +41,10 @@ namespace Artemis.UI.Services
            OnSelectedProfileElementUpdated();
        }

-        public void ChangeSelectedLayerElement(LayerElement layerElement)
-        {
-            SelectedLayerElement = layerElement;
-            OnSelectedLayerElementChanged();
-        }
-
        public event EventHandler SelectedProfileChanged;
        public event EventHandler SelectedProfileUpdated;
        public event EventHandler SelectedProfileElementChanged;
        public event EventHandler SelectedProfileElementUpdated;
-        public event EventHandler SelectedLayerElementChanged;

        protected virtual void OnSelectedProfileElementUpdated()
        {
@@ -75,10 +65,5 @@ namespace Artemis.UI.Services
        {
            SelectedProfileChanged?.Invoke(this, EventArgs.Empty);
        }
-
-        protected virtual void OnSelectedLayerElementChanged()
-        {
-            SelectedLayerElementChanged?.Invoke(this, EventArgs.Empty);
-        }
    }
 }