diff --git a/src/Artemis.UI/App.xaml b/src/Artemis.UI/App.xaml
index 19257ccf3..c1b40e14f 100644
--- a/src/Artemis.UI/App.xaml
+++ b/src/Artemis.UI/App.xaml
@@ -31,7 +31,7 @@
                     Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Teal.xaml" />
 
                 <!-- Include the Dragablz Material Design style -->
-                <ResourceDictionary Source="pack://application:,,,/Dragablz;component/Themes/materialdesign.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/Dragablz;component/Themes/materialdesign.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
             <!-- MahApps Brushes -->
@@ -59,7 +59,8 @@
                              Color="{DynamicResource Primary500Foreground}" />
 
             <!-- tell Dragablz tab control to use the Material Design theme -->
-            <Style TargetType="{x:Type dragablz:TabablzControl}" BasedOn="{StaticResource MaterialDesignTabablzControlStyle}" />
+            <Style TargetType="{x:Type dragablz:TabablzControl}"
+                   BasedOn="{StaticResource MaterialDesignTabablzControlStyle}" />
 
             <!-- Some general convertes etc. -->
             <BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
@@ -68,7 +69,7 @@
                 <DrawingImage.Drawing>
                     <DrawingGroup>
                         <GeometryDrawing Brush="{DynamicResource IdealForegroundColorBrush}"
-                                     Geometry="M1518 3378 c-48 -63 -61 -101 -66 -184 -4 -70 -1 -91 27 
+                                         Geometry="M1518 3378 c-48 -63 -61 -101 -66 -184 -4 -70 -1 -91 27 
                                      -170 l31 -89 -27 -20 c-32 -24 -849 -601 -981 -693 l-93 -64 -87 40 
                                      c-48 22 -91 37 -95 32 -5 -4 9 -41 29 -83 l37 -75 -28 -24 c-23 -20 
                                      -29 -35 -33 -81 l-4 -56 -82 -19 c-109 -25 -109 -41 4 -91 l85 -38 7 
diff --git a/src/Artemis.UI/ViewModels/Screens/SurfaceEditorViewModel.cs b/src/Artemis.UI/ViewModels/Screens/SurfaceEditorViewModel.cs
index ba4543113..7d2979125 100644
--- a/src/Artemis.UI/ViewModels/Screens/SurfaceEditorViewModel.cs
+++ b/src/Artemis.UI/ViewModels/Screens/SurfaceEditorViewModel.cs
@@ -36,7 +36,7 @@ namespace Artemis.UI.ViewModels.Screens
         public ObservableCollection<Surface> SurfaceConfigurations { get; set; }
         public RectangleGeometry SelectionRectangle { get; set; }
         public PanZoomViewModel PanZoomViewModel { get; set; }
-        
+
         public Surface SelectedSurface
         {
             get => _selectedSurface;
diff --git a/src/Artemis.UI/Views/Controls/ProfileEditor/ProfileDeviceView.xaml b/src/Artemis.UI/Views/Controls/ProfileEditor/ProfileDeviceView.xaml
index 5cd306525..f1d7319d3 100644
--- a/src/Artemis.UI/Views/Controls/ProfileEditor/ProfileDeviceView.xaml
+++ b/src/Artemis.UI/Views/Controls/ProfileEditor/ProfileDeviceView.xaml
@@ -10,12 +10,12 @@
              d:DataContext="{d:DesignInstance {x:Type profileEditor:ProfileDeviceViewModel}}"
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
-        <converters:NullToImageConverter x:Key="NullToImageConverter"/>
+        <converters:NullToImageConverter x:Key="NullToImageConverter" />
         <converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
     </UserControl.Resources>
     <Grid>
         <!-- Device image with fallback -->
-        <Image Source="{Binding Device.RgbDevice.DeviceInfo.Image, Converter={StaticResource NullToImageConverter}}"/>
+        <Image Source="{Binding Device.RgbDevice.DeviceInfo.Image, Converter={StaticResource NullToImageConverter}}" />
 
         <Rectangle Fill="{DynamicResource ControlBackgroundBrush}"
                    Stroke="{DynamicResource ControlBorderBrush}"
diff --git a/src/Artemis.UI/Views/Controls/ProfileEditor/ProfileEditorView.xaml b/src/Artemis.UI/Views/Controls/ProfileEditor/ProfileEditorView.xaml
index 52372dbe8..582ead8a5 100644
--- a/src/Artemis.UI/Views/Controls/ProfileEditor/ProfileEditorView.xaml
+++ b/src/Artemis.UI/Views/Controls/ProfileEditor/ProfileEditorView.xaml
@@ -1,14 +1,14 @@
 <UserControl x:Class="Artemis.UI.Views.Controls.ProfileEditor.ProfileEditorView"
              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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:Artemis.UI.Views.Controls.ProfileEditor"
              xmlns:profileEditor="clr-namespace:Artemis.UI.ViewModels.Controls.ProfileEditor"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:s="https://github.com/canton7/Stylet"
              xmlns:models="clr-namespace:Artemis.Core.Models.Surface;assembly=Artemis.Core"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
              d:DataContext="{d:DesignInstance {x:Type profileEditor:ProfileEditorViewModel}}">
     <UserControl.Resources>
@@ -86,71 +86,72 @@
                         </BeginStoryboard>
                     </EventTrigger>
                 </Grid.Triggers>
-                
-                 <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 Width="{Binding Device.RgbDevice.Size.Width}" 
-                                                 Height="{Binding Device.RgbDevice.Size.Height}" 
-                                                 s:View.Model="{Binding}"> 
-                                 </ContentControl> 
-                             </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 Orientation="Vertical" VerticalAlignment="Bottom" HorizontalAlignment="Right"
-                             Margin="0, 0, 15, 15">
-                     <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>
+
+                <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 Width="{Binding Device.RgbDevice.Size.Width}"
+                                                Height="{Binding Device.RgbDevice.Size.Height}"
+                                                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 Orientation="Vertical" VerticalAlignment="Bottom" HorizontalAlignment="Right"
+                            Margin="0, 0, 15, 15">
+                    <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>
             </Grid>
         </materialDesign:Card>
 
-        <materialDesign:Card materialDesign:ShadowAssist.ShadowDepth="Depth1" Grid.Row="2" Grid.Column="1" VerticalAlignment="Stretch" Margin="5,0,0,0">
-            <materialDesign:DialogHost Identifier="SurfaceListDialogHost" CloseOnClickAway="True" UseLayoutRounding="True">
+        <materialDesign:Card materialDesign:ShadowAssist.ShadowDepth="Depth1" Grid.Row="2" Grid.Column="1"
+                             VerticalAlignment="Stretch" Margin="5,0,0,0">
+            <materialDesign:DialogHost Identifier="SurfaceListDialogHost" CloseOnClickAway="True"
+                                       UseLayoutRounding="True">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="*" />
@@ -169,4 +170,4 @@
             <Run Text="and drag." />
         </TextBlock>
     </Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Views/Controls/ProfileEditor/ProfileLedView.xaml b/src/Artemis.UI/Views/Controls/ProfileEditor/ProfileLedView.xaml
index 7e0d1ec4b..ff9b31fd1 100644
--- a/src/Artemis.UI/Views/Controls/ProfileEditor/ProfileLedView.xaml
+++ b/src/Artemis.UI/Views/Controls/ProfileEditor/ProfileLedView.xaml
@@ -4,7 +4,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:profileEditor="clr-namespace:Artemis.UI.ViewModels.Controls.ProfileEditor"
-    xmlns:Converters="clr-namespace:Artemis.UI.Converters" x:Class="Artemis.UI.Views.Controls.ProfileEditor.ProfileLedView"
+    xmlns:Converters="clr-namespace:Artemis.UI.Converters"
+    x:Class="Artemis.UI.Views.Controls.ProfileEditor.ProfileLedView"
     mc:Ignorable="d"
     d:DataContext="{d:DesignInstance {x:Type profileEditor:ProfileLedViewModel}}"
     d:DesignHeight="25" d:DesignWidth="25"
@@ -14,7 +15,8 @@
     </UserControl.Resources>
     <Canvas Width="{Binding Width}" Height="{Binding Height}">
         <Canvas.Background>
-            <ImageBrush AlignmentX="Center" AlignmentY="Center" Stretch="Fill" ImageSource="{Binding Led.Image, Converter={StaticResource NullToImageConverter}}" />
+            <ImageBrush AlignmentX="Center" AlignmentY="Center" Stretch="Fill"
+                        ImageSource="{Binding Led.Image, Converter={StaticResource NullToImageConverter}}" />
         </Canvas.Background>
 
         <Path Data="{Binding DisplayGeometry}" ClipToBounds="False">