diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj
index de5d77946..ab3b4c4f5 100644
--- a/src/Artemis.Core/Artemis.Core.csproj
+++ b/src/Artemis.Core/Artemis.Core.csproj
@@ -160,7 +160,7 @@
     <Compile Include="Extensions\DirectoryInfoExtensions.cs" />
     <Compile Include="Extensions\DoubleExtensions.cs" />
     <Compile Include="Extensions\FloatExtensions.cs" />
-    <Compile Include="Extensions\RgbColorExtensions.cs" />
+    <Compile Include="Extensions\SKColorExtensions.cs" />
     <Compile Include="Extensions\RgbDeviceExtensions.cs" />
     <Compile Include="Extensions\RgbRectangleExtensions.cs" />
     <Compile Include="Extensions\TypeExtensions.cs" />
@@ -194,6 +194,7 @@
     <Compile Include="Models\Profile\Profile.cs" />
     <Compile Include="Ninject\CoreModule.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RGB.NET\BitmapBrush.cs" />
     <Compile Include="RGB.NET\GraphicsDecorator.cs" />
     <Compile Include="Services\DeviceService.cs" />
     <Compile Include="Services\Interfaces\ILayerService.cs" />
diff --git a/src/Artemis.Core/Events/FrameRenderedEventArgs.cs b/src/Artemis.Core/Events/FrameRenderedEventArgs.cs
index d88bb89b7..5267bd344 100644
--- a/src/Artemis.Core/Events/FrameRenderedEventArgs.cs
+++ b/src/Artemis.Core/Events/FrameRenderedEventArgs.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Drawing;
 using Artemis.Core.RGB.NET;
 using RGB.NET.Core;
 
@@ -7,13 +6,13 @@ namespace Artemis.Core.Events
 {
     public class FrameRenderedEventArgs : EventArgs
     {
-        public FrameRenderedEventArgs(GraphicsDecorator graphicsDecorator, RGBSurface rgbSurface)
+        public FrameRenderedEventArgs(BitmapBrush bitmapBrush, RGBSurface rgbSurface)
         {
-            GraphicsDecorator = graphicsDecorator;
+            BitmapBrush = bitmapBrush;
             RgbSurface = rgbSurface;
         }
-        
-        public GraphicsDecorator GraphicsDecorator { get; }
+
+        public BitmapBrush BitmapBrush { get; }
         public RGBSurface RgbSurface { get; }
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.Core/Extensions/RgbColorExtensions.cs b/src/Artemis.Core/Extensions/RgbColorExtensions.cs
deleted file mode 100644
index e3dcef4c9..000000000
--- a/src/Artemis.Core/Extensions/RgbColorExtensions.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using RGB.NET.Core;
-using Color = System.Windows.Media.Color;
-
-namespace Artemis.Core.Extensions
-{
-    public static class RgbColorExtensions
-    {
-        public static Color ToMediaColor(this global::RGB.NET.Core.Color color)
-        {
-            var (_, r, g, b) = color.GetRGBBytes();
-            return Color.FromRgb(r, g, b);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Artemis.Core/Extensions/SKColorExtensions.cs b/src/Artemis.Core/Extensions/SKColorExtensions.cs
new file mode 100644
index 000000000..d7dfac717
--- /dev/null
+++ b/src/Artemis.Core/Extensions/SKColorExtensions.cs
@@ -0,0 +1,14 @@
+using RGB.NET.Core;
+using SkiaSharp;
+
+namespace Artemis.Core.Extensions
+{
+    // ReSharper disable once InconsistentNaming - I didn't come up with SKColor
+    public static class SKColorExtensions
+    {
+        public static Color ToRgbColor(this SKColor color)
+        {
+            return new Color(color.Alpha, color.Red, color.Green, color.Blue);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Artemis.Core/RGB.NET/BitmapBrush.cs b/src/Artemis.Core/RGB.NET/BitmapBrush.cs
new file mode 100644
index 000000000..7f8f3945f
--- /dev/null
+++ b/src/Artemis.Core/RGB.NET/BitmapBrush.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using Artemis.Core.Extensions;
+using RGB.NET.Core;
+using SkiaSharp;
+
+namespace Artemis.Core.RGB.NET
+{
+    public class BitmapBrush : AbstractDecoratable<IBrushDecorator>, IBrush, IDisposable
+    {
+        #region Constructors
+
+        public BitmapBrush(Scale scale)
+        {
+            Scale = scale;
+        }
+
+        #endregion
+
+        #region Properties & Fields
+
+        /// <inheritdoc />
+        public bool IsEnabled { get; set; } = true;
+
+        /// <inheritdoc />
+        public BrushCalculationMode BrushCalculationMode { get; set; } = BrushCalculationMode.Absolute;
+
+        /// <inheritdoc />
+        public double Brightness { get; set; }
+
+        /// <inheritdoc />
+        public double Opacity { get; set; }
+
+        /// <inheritdoc />
+        public IList<IColorCorrection> ColorCorrections { get; } = new List<IColorCorrection>();
+
+        /// <inheritdoc />
+        public Rectangle RenderedRectangle { get; private set; }
+
+        /// <inheritdoc />
+        public Dictionary<BrushRenderTarget, Color> RenderedTargets { get; } = new Dictionary<BrushRenderTarget, Color>();
+
+        public Scale Scale { get; set; }
+        public SKBitmap Bitmap { get; private set; }
+
+        #endregion
+
+        #region Methods
+
+        /// <inheritdoc />
+        public virtual void PerformRender(Rectangle rectangle, IEnumerable<BrushRenderTarget> renderTargets)
+        {
+            if (RenderedRectangle != rectangle || RenderedScale != Scale)
+                Bitmap = null;
+
+            if (renderTargets.Any())
+            {
+                var test = RGBSurface.Instance.SurfaceRectangle;
+                var width = renderTargets.Max(l => l.Led.AbsoluteLedRectangle.Location.X + l.Led.AbsoluteLedRectangle.Size.Width);
+                var height = renderTargets.Max(l => l.Led.AbsoluteLedRectangle.Location.Y + l.Led.AbsoluteLedRectangle.Size.Height);
+            }
+
+            RenderedRectangle = rectangle;
+            RenderedScale = Scale;
+            RenderedTargets.Clear();
+
+            if (Bitmap == null)
+                CreateBitmap(RenderedRectangle);
+
+            foreach (var renderTarget in renderTargets)
+            {
+                var scaledLocation = renderTarget.Point * Scale;
+                if (scaledLocation.X < Bitmap.Width && scaledLocation.Y < Bitmap.Height)
+                {
+                    RenderedTargets[renderTarget] = Bitmap.GetPixel(RoundToInt(scaledLocation.X), RoundToInt(scaledLocation.Y)).ToRgbColor();
+                }
+            }
+        }
+
+        public Scale RenderedScale { get; private set; }
+
+        private void CreateBitmap(Rectangle rectangle)
+        {
+            var width = Math.Min((rectangle.Location.X + rectangle.Size.Width) * Scale.Horizontal, 4096);
+            var height = Math.Min((rectangle.Location.Y + rectangle.Size.Height) * Scale.Vertical, 4096);
+            Bitmap = new SKBitmap(new SKImageInfo(width.RoundToInt(), height.RoundToInt()));
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private int RoundToInt(double number)
+        {
+            return (int) Math.Round(number, MidpointRounding.AwayFromZero);
+        }
+
+        /// <inheritdoc />
+        public virtual void PerformFinalize()
+        {
+        }
+
+        public void Dispose()
+        {
+            Bitmap?.Dispose();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Artemis.Core/RGB.NET/GraphicsDecorator.cs b/src/Artemis.Core/RGB.NET/GraphicsDecorator.cs
index f93cecb82..3cf61959b 100644
--- a/src/Artemis.Core/RGB.NET/GraphicsDecorator.cs
+++ b/src/Artemis.Core/RGB.NET/GraphicsDecorator.cs
@@ -22,7 +22,7 @@ namespace Artemis.Core.RGB.NET
             var height = Math.Min(leds.Max(l => l.AbsoluteLedRectangle.Location.Y + l.AbsoluteLedRectangle.Size.Height) * scale, 4096);
             Bitmap = new SKBitmap(new SKImageInfo(width.RoundToInt(), height.RoundToInt()));
         }
-        
+
         public SKBitmap Bitmap { get; private set; }
 
         public Color ManipulateColor(Rectangle rectangle, BrushRenderTarget renderTarget, Color color)
diff --git a/src/Artemis.Core/Services/CoreService.cs b/src/Artemis.Core/Services/CoreService.cs
index 606f5ccb3..9e0782079 100644
--- a/src/Artemis.Core/Services/CoreService.cs
+++ b/src/Artemis.Core/Services/CoreService.cs
@@ -89,14 +89,17 @@ namespace Artemis.Core.Services
                         module.Update(args.DeltaTime);
                 }
 
-                // If there is no ready graphics decorator, skip the frame
-                lock (_rgbService.GraphicsDecorator)
+                // If there is no ready bitmap brush, skip the frame
+                if (_rgbService.BitmapBrush == null)
+                    return;
+
+                lock (_rgbService.BitmapBrush)
                 {
-                    if (_rgbService.GraphicsDecorator?.Bitmap == null)
+                    if (_rgbService.BitmapBrush.Bitmap == null)
                         return;
 
                     // Render all active modules
-                    using (var canvas = new SKCanvas(_rgbService.GraphicsDecorator.Bitmap))
+                    using (var canvas = new SKCanvas(_rgbService.BitmapBrush.Bitmap))
                     {
                         canvas.Clear(new SKColor(0, 0, 0));
                         lock (_modules)
@@ -117,7 +120,7 @@ namespace Artemis.Core.Services
 
         private void SurfaceOnUpdated(UpdatedEventArgs args)
         {
-            OnFrameRendered(new FrameRenderedEventArgs(_rgbService.GraphicsDecorator, _rgbService.Surface));
+            OnFrameRendered(new FrameRenderedEventArgs(_rgbService.BitmapBrush, _rgbService.Surface));
         }
 
         protected virtual void OnFrameRendering(FrameRenderingEventArgs e)
diff --git a/src/Artemis.Core/Services/Interfaces/IRgbService.cs b/src/Artemis.Core/Services/Interfaces/IRgbService.cs
index ebf7298c0..1148bbaa1 100644
--- a/src/Artemis.Core/Services/Interfaces/IRgbService.cs
+++ b/src/Artemis.Core/Services/Interfaces/IRgbService.cs
@@ -9,7 +9,7 @@ namespace Artemis.Core.Services.Interfaces
     public interface IRgbService : IArtemisService
     {
         RGBSurface Surface { get; set; }
-        GraphicsDecorator GraphicsDecorator { get; }
+        BitmapBrush BitmapBrush { get; }
         IReadOnlyCollection<IRGBDevice> LoadedDevices { get; }
 
         void AddDeviceProvider(IRGBDeviceProvider deviceProvider);
@@ -25,6 +25,6 @@ namespace Artemis.Core.Services.Interfaces
         /// </summary>
         event EventHandler<DeviceEventArgs> DeviceReloaded;
 
-        void UpdateGraphicsDecorator();
+        void UpdateSurfaceLedGroup();
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.Core/Services/RgbService.cs b/src/Artemis.Core/Services/RgbService.cs
index fc2445c71..82040faaa 100644
--- a/src/Artemis.Core/Services/RgbService.cs
+++ b/src/Artemis.Core/Services/RgbService.cs
@@ -21,7 +21,7 @@ namespace Artemis.Core.Services
         private readonly PluginSetting<double> _renderScaleSetting;
         private readonly PluginSetting<int> _targetFrameRateSetting;
         private readonly TimerUpdateTrigger _updateTrigger;
-        private ListLedGroup _background;
+        private ListLedGroup _surfaceLedGroup;
 
         internal RgbService(ILogger logger, ISettingsService settingsService)
         {
@@ -30,7 +30,6 @@ namespace Artemis.Core.Services
             _targetFrameRateSetting = settingsService.GetSetting("Core.TargetFrameRate", 25);
 
             Surface = RGBSurface.Instance;
-            GraphicsDecorator = new GraphicsDecorator(new ListLedGroup(), 1);
 
             // Let's throw these for now
             Surface.Exception += SurfaceOnException;
@@ -44,7 +43,7 @@ namespace Artemis.Core.Services
         /// <inheritdoc />
         public RGBSurface Surface { get; set; }
 
-        public GraphicsDecorator GraphicsDecorator { get; private set; }
+        public BitmapBrush BitmapBrush { get; private set; }
 
         public IReadOnlyCollection<IRGBDevice> LoadedDevices => _loadedDevices.AsReadOnly();
 
@@ -57,7 +56,7 @@ namespace Artemis.Core.Services
                 _logger.Warning("RgbDevice provider {deviceProvider} has no devices", deviceProvider.GetType().Name);
                 return;
             }
-            
+
             foreach (var surfaceDevice in deviceProvider.Devices)
             {
                 if (!_loadedDevices.Contains(surfaceDevice))
@@ -80,7 +79,7 @@ namespace Artemis.Core.Services
 
         private void RenderScaleSettingOnSettingChanged(object sender, EventArgs e)
         {
-            UpdateGraphicsDecorator();
+            UpdateSurfaceLedGroup();
         }
 
         private void TargetFrameRateSettingOnSettingChanged(object sender, EventArgs e)
@@ -99,23 +98,28 @@ namespace Artemis.Core.Services
         public event EventHandler<DeviceEventArgs> DeviceLoaded;
         public event EventHandler<DeviceEventArgs> DeviceReloaded;
 
-        public void UpdateGraphicsDecorator()
+        public void UpdateSurfaceLedGroup()
         {
-            lock (GraphicsDecorator)
+            if (_surfaceLedGroup == null)
             {
-                // Clean up the old background if present
-                if (_background != null)
-                {
-                    _background.Brush?.RemoveAllDecorators();
-                    _background.Detach();
-                }
+                // Apply the application wide brush and decorator
+                BitmapBrush = new BitmapBrush(new Scale(_renderScaleSetting.Value));
+                _surfaceLedGroup = new ListLedGroup(Surface.Leds) { Brush = BitmapBrush };
+                return;
+            }
+
+            lock (_surfaceLedGroup)
+            {
+                // Clean up the old background
+                _surfaceLedGroup.Detach();
 
                 // Apply the application wide brush and decorator
-                _background = new ListLedGroup(Surface.Leds) {Brush = new SolidColorBrush(new Color(255, 255, 255, 255))};
-                GraphicsDecorator = new GraphicsDecorator(_background, _renderScaleSetting.Value);
-                _background.Brush.RemoveAllDecorators();
-
-                _background.Brush.AddDecorator(GraphicsDecorator);
+                BitmapBrush.Scale = new Scale(_renderScaleSetting.Value);
+                _surfaceLedGroup = new ListLedGroup(Surface.Leds) { Brush = BitmapBrush };
+            }
+            lock (BitmapBrush)
+            {
+                
             }
         }
 
diff --git a/src/Artemis.Core/Services/Storage/SurfaceService.cs b/src/Artemis.Core/Services/Storage/SurfaceService.cs
index f2a6e75b4..40704edf8 100644
--- a/src/Artemis.Core/Services/Storage/SurfaceService.cs
+++ b/src/Artemis.Core/Services/Storage/SurfaceService.cs
@@ -93,7 +93,7 @@ namespace Artemis.Core.Services.Storage
             }
 
             // Update the RGB service's graphics decorator to work with the new surface entity
-            _rgbService.UpdateGraphicsDecorator();
+            _rgbService.UpdateSurfaceLedGroup();
             OnActiveSurfaceConfigurationChanged(new SurfaceConfigurationEventArgs(ActiveSurface));
         }
 
@@ -111,7 +111,7 @@ namespace Artemis.Core.Services.Storage
             }
 
             _surfaceRepository.Save(surface.SurfaceEntity);
-            _rgbService.UpdateGraphicsDecorator();
+            _rgbService.UpdateSurfaceLedGroup();
             OnSurfaceConfigurationUpdated(new SurfaceConfigurationEventArgs(surface));
         }
 
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileView.xaml b/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileView.xaml
index 5097631f3..0bd189dab 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileView.xaml
+++ b/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileView.xaml
@@ -22,6 +22,9 @@
                                         <QuadraticEase EasingMode="EaseInOut" />
                                     </DoubleAnimation.EasingFunction>
                                 </DoubleAnimation>
+                                <ObjectAnimationUsingKeyFrames BeginTime="0:0:0.5" Storyboard.TargetProperty="Visibility">
+                                    <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{x:Static Visibility.Hidden}"/>
+                                </ObjectAnimationUsingKeyFrames>
                             </Storyboard>
                         </BeginStoryboard>
                     </DataTrigger.EnterActions>
diff --git a/src/Artemis.UI/Screens/Settings/Debug/DebugViewModel.cs b/src/Artemis.UI/Screens/Settings/Debug/DebugViewModel.cs
index 7746d7f43..7063d8888 100644
--- a/src/Artemis.UI/Screens/Settings/Debug/DebugViewModel.cs
+++ b/src/Artemis.UI/Screens/Settings/Debug/DebugViewModel.cs
@@ -40,16 +40,16 @@ namespace Artemis.UI.Screens.Settings.Debug
         {
             Execute.PostToUIThread(() =>
             {
-                if (e.GraphicsDecorator.Bitmap == null)
+                if (e.BitmapBrush.Bitmap == null)
                     return;
 
                 if (!(CurrentFrame is WriteableBitmap writeableBitmap))
                 {
-                    CurrentFrame = e.GraphicsDecorator.Bitmap.ToWriteableBitmap();
+                    CurrentFrame = e.BitmapBrush.Bitmap.ToWriteableBitmap();
                     return;
                 }
 
-                using (var skiaImage = SKImage.FromPixels(e.GraphicsDecorator.Bitmap.PeekPixels()))
+                using (var skiaImage = SKImage.FromPixels(e.BitmapBrush.Bitmap.PeekPixels()))
                 {
                     var info = new SKImageInfo(skiaImage.Width, skiaImage.Height);
                     writeableBitmap.Lock();
diff --git a/src/Artemis.UI/Screens/Settings/SettingsView.xaml b/src/Artemis.UI/Screens/Settings/SettingsView.xaml
index 5c6de26a3..55d956ea7 100644
--- a/src/Artemis.UI/Screens/Settings/SettingsView.xaml
+++ b/src/Artemis.UI/Screens/Settings/SettingsView.xaml
@@ -5,8 +5,10 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:xaml="https://github.com/canton7/Stylet"
+             xmlns:settings="clr-namespace:Artemis.UI.Screens.Settings"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d"
-             d:DataContext="{d:DesignInstance screens:SettingsViewModel}"
+             d:DataContext="{d:DesignInstance settings:SettingsViewModel}"
              d:DesignHeight="600" d:DesignWidth="600">
     <UserControl.Resources>
         <ResourceDictionary>
@@ -16,71 +18,206 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    <ScrollViewer>
-        <StackPanel Margin="16">
-            <TextBlock Style="{StaticResource MaterialDesignHeadlineTextBlock}">General</TextBlock>
-            <StackPanel>
-                <TextBlock>General settings like start up with Windows etc.</TextBlock>
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition />
-                        <RowDefinition />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
+    <TabControl Style="{StaticResource MaterialDesignTabControl}">
+        <TabItem Header="GENERAL" TextElement.Foreground="{DynamicResource MaterialDesignBody}">
+            <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
+                <StackPanel Margin="15" MaxWidth="800">
+                    <!-- General settings -->
+                    <TextBlock Style="{StaticResource MaterialDesignHeadlineTextBlock}" Margin="0 15">General</TextBlock>
+                    <materialDesign:Card materialDesign:ShadowAssist.ShadowDepth="Depth1" VerticalAlignment="Stretch" Margin="0,0,5,0">
+                        <StackPanel Margin="15">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <StackPanel Grid.Column="0">
+                                    <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}">Start up with Windows</TextBlock>
+                                </StackPanel>
+                                <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+                                    <ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" ToolTip="Default ToggleButton Style" />
+                                </StackPanel>
+                            </Grid>
+                            <Separator Style="{StaticResource MaterialDesignSeparator}" Margin="-15 5" />
 
-                    <TextBlock VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Render scale</TextBlock>
-                    <Slider Minimum="0.10"
-                            Maximum="1"
-                            TickFrequency="0.05"
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Style="{StaticResource MaterialDesignDiscreteSlider}"
-                            ToolTip="MaterialDesignDiscreteSlider"
-                            Value="{Binding RenderScale}" />
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <StackPanel Grid.Column="0">
+                                    <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}">Start up with Windows minimized</TextBlock>
+                                </StackPanel>
+                                <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+                                    <ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" ToolTip="Default ToggleButton Style" />
+                                </StackPanel>
+                            </Grid>
+                            <Separator Style="{StaticResource MaterialDesignSeparator}" Margin="-15 5" />
 
-                    <TextBlock VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="1">Target framerate</TextBlock>
-                    <Slider Minimum="5"
-                            Maximum="60"
-                            Grid.Row="1"
-                            Grid.Column="1"
-                            Style="{StaticResource MaterialDesignDiscreteSlider}"
-                            ToolTip="MaterialDesignDiscreteSlider"
-                            Value="{Binding TargetFrameRate}" />
-                </Grid>
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <StackPanel Grid.Column="0" VerticalAlignment="Center">
+                                    <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}">Debugger</TextBlock>
+                                    <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}">
+                                        Use the debugger to see the raw image Artemis is rendering on the surface.
+                                    </TextBlock>
+                                </StackPanel>
+                                <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+                                    <Button Style="{StaticResource MaterialDesignOutlinedButton}" Command="{s:Action ShowDebugger}">
+                                        SHOW DEBUGGER
+                                    </Button>
+                                </StackPanel>
+                            </Grid>
+                        </StackPanel>
+                    </materialDesign:Card>
 
-                <Button Command="{s:Action ShowDebugger}" Style="{StaticResource MaterialDesignRaisedButton}"
-                        HorizontalAlignment="Left" Margin="0, 10, 0, 0">
-                    Show debugger
-                </Button>
-            </StackPanel>
+                    <!-- Rendering settings -->
+                    <TextBlock Style="{StaticResource MaterialDesignHeadlineTextBlock}" Margin="0 15">Rendering</TextBlock>
+                    <materialDesign:Card materialDesign:ShadowAssist.ShadowDepth="Depth1" VerticalAlignment="Stretch" Margin="0,0,5,0">
+                        <StackPanel Margin="15">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <StackPanel Grid.Column="0">
+                                    <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}">Render scale</TextBlock>
+                                    <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}" TextWrapping="Wrap">
+                                        Sets the resolution Artemis renders at, higher scale means more CPU-usage, especially on large surfaces.
+                                    </TextBlock>
+                                </StackPanel>
+                                <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+                                    <ComboBox Width="80" SelectedItem="{Binding SelectedRenderScale}" ItemsSource="{Binding RenderScales}" DisplayMemberPath="Item1"/>
+                                </StackPanel>
+                            </Grid>
+                            <Separator Style="{StaticResource MaterialDesignSeparator}" Margin="-15 5" />
 
-            <TextBlock Style="{StaticResource MaterialDesignHeadlineTextBlock}">Devices</TextBlock>
-
-            <TextBlock>A list of devices and options to disable them</TextBlock>
-            <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Margin="0 12 0 0">
-                <ItemsControl ItemsSource="{Binding DeviceSettingsViewModels}">
-                    <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <WrapPanel />
-                        </ItemsPanelTemplate>
-                    </ItemsControl.ItemsPanel>
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                            <ContentControl xaml:View.Model="{Binding}" Margin="5" HorizontalAlignment="Left"
-                                            VerticalAlignment="Top" />
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </ItemsControl>
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <StackPanel Grid.Column="0">
+                                    <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}">Target framerate</TextBlock>
+                                    <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}" TextWrapping="Wrap">
+                                        Sets the FPS Artemis tries to render at, higher FPS means more CPU-usage but smoother animations.
+                                    </TextBlock>
+                                </StackPanel>
+                                <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+                                    <ComboBox Width="80" SelectedItem="{Binding SelectedTargetFrameRate}" ItemsSource="{Binding TargetFrameRates}" DisplayMemberPath="Item1"/>
+                                </StackPanel>
+                            </Grid>
+                        </StackPanel>
+                    </materialDesign:Card>
+                </StackPanel>
             </ScrollViewer>
-
-            <TextBlock Style="{StaticResource MaterialDesignHeadlineTextBlock}">Plugins</TextBlock>
-            <Grid>
-                <TextBlock>A list of plugins and options to disable them</TextBlock>
-            </Grid>
-        </StackPanel>
-    </ScrollViewer>
-
+        </TabItem>
+        <TabItem Header="PLUGINS" TextElement.Foreground="{DynamicResource MaterialDesignBody}">
+            <DockPanel Margin="15">
+                <TextBlock DockPanel.Dock="Top">Below you view and manage your plugins. To find and install new plugins use the workshop (TODO).</TextBlock>
+                <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
+                    <DataGrid Margin="0 8 0 0"
+                              ItemsSource="{Binding Items3}"
+                              CanUserSortColumns="True"
+                              CanUserAddRows="False"
+                              AutoGenerateColumns="False"
+                              materialDesign:DataGridAssist.CellPadding="13 8 8 8"
+                              materialDesign:DataGridAssist.ColumnHeaderPadding="8">
+                        <DataGrid.Columns>
+                            <DataGridCheckBoxColumn Binding="{Binding IsSelected}"
+                                                    ElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnStyle}"
+                                                    EditingElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnEditingStyle}">
+                                <DataGridCheckBoxColumn.Header>
+                                    <!--padding to allow hit test to pass thru for sorting -->
+                                    <Border Background="Transparent" Padding="6 0 6 0" HorizontalAlignment="Center">
+                                        <CheckBox HorizontalAlignment="Center"
+                                                  DataContext="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=DataContext}"
+                                                  IsChecked="{Binding IsAllItems3Selected}" />
+                                    </Border>
+                                </DataGridCheckBoxColumn.Header>
+                            </DataGridCheckBoxColumn>
+                            <DataGridTextColumn Binding="{Binding Code}" Header="Code" EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}" />
+                            <!-- if you want to use the pop up style (MaterialDesignDataGridTextColumnPopupEditingStyle), you must use MaterialDataGridTextColumn -->
+                            <materialDesign:MaterialDataGridTextColumn Binding="{Binding Name}"
+                                                                       Header="Name"
+                                                                       EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnPopupEditingStyle}" />
+                            <!-- set a max length to get an indicator in the editor -->
+                            <materialDesign:MaterialDataGridTextColumn Binding="{Binding Description}"
+                                                                       Header="Description"
+                                                                       MaxLength="255"
+                                                                       EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnPopupEditingStyle}" />
+                            <materialDesign:MaterialDataGridTextColumn Binding="{Binding Numeric}"
+                                                                       Header="Number with long header"
+                                                                       Width="120"
+                                                                       EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnPopupEditingStyle}">
+                                <DataGridTextColumn.HeaderStyle>
+                                    <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">
+                                        <Setter Property="HorizontalAlignment" Value="Right" />
+                                        <Setter Property="ContentTemplate">
+                                            <Setter.Value>
+                                                <DataTemplate>
+                                                    <TextBlock TextWrapping="Wrap" Text="{Binding}" TextAlignment="Right" />
+                                                </DataTemplate>
+                                            </Setter.Value>
+                                        </Setter>
+                                    </Style>
+                                </DataGridTextColumn.HeaderStyle>
+                                <DataGridTextColumn.ElementStyle>
+                                    <Style TargetType="{x:Type TextBlock}">
+                                        <Setter Property="HorizontalAlignment" Value="Right" />
+                                    </Style>
+                                </DataGridTextColumn.ElementStyle>
+                            </materialDesign:MaterialDataGridTextColumn>
+                            <!-- use custom combo box column to get better combos. Use ItemsSourceBinding as your binding template to be applied to each combo -->
+                            <materialDesign:MaterialDataGridComboBoxColumn Header="Food"
+                                                                           SelectedValueBinding="{Binding Food}"
+                                                                           ItemsSourceBinding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGrid}}, Path=DataContext.Foods}" />
+                        </DataGrid.Columns>
+                    </DataGrid>
+                </ScrollViewer>
+            </DockPanel>
+        </TabItem>
+        <TabItem Header="DEVICES" TextElement.Foreground="{DynamicResource MaterialDesignBody}">
+            <DockPanel Margin="15">
+                <TextBlock DockPanel.Dock="Top">Below you view and manage the devices that were detected by Artemis</TextBlock>
+                <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Margin="0 12 0 0">
+                    <ItemsControl ItemsSource="{Binding DeviceSettingsViewModels}">
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <WrapPanel />
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <ContentControl xaml:View.Model="{Binding}" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </ScrollViewer>
+            </DockPanel>
+        </TabItem>
+    </TabControl>
 </UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs b/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs
index 86e82a38e..83695cebf 100644
--- a/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs
+++ b/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs
@@ -1,4 +1,7 @@
-using Artemis.Core.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Artemis.Core.Services;
 using Artemis.Core.Services.Storage.Interfaces;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.Settings.Debug;
@@ -34,10 +37,32 @@ namespace Artemis.UI.Screens.Settings
             _deviceSettingsViewModelFactory = deviceSettingsViewModelFactory;
 
             DeviceSettingsViewModels = new BindableCollection<DeviceSettingsViewModel>();
+
+            RenderScales = new List<Tuple<string, double>> {new Tuple<string, double>("10%", 0.1)};
+            for (var i = 25; i <= 100; i += 25)
+                RenderScales.Add(new Tuple<string, double>(i + "%", i / 100.0));
+
+            TargetFrameRates = new List<Tuple<string, int>>();
+            for (var i = 10; i <= 30; i += 5)
+                TargetFrameRates.Add(new Tuple<string, int>(i + " FPS", i));
         }
 
         public BindableCollection<DeviceSettingsViewModel> DeviceSettingsViewModels { get; set; }
 
+        public List<Tuple<string, double>> RenderScales { get; set; }
+
+        public Tuple<string, double> SelectedRenderScale
+        {
+            get => RenderScales.FirstOrDefault(s => Math.Abs(s.Item2 - RenderScale) < 0.01);
+            set => RenderScale = value.Item2;
+        }
+
+        public Tuple<string, int> SelectedTargetFrameRate
+        {
+            get => TargetFrameRates.FirstOrDefault(t => Math.Abs(t.Item2 - TargetFrameRate) < 0.01);
+            set => TargetFrameRate = value.Item2;
+        }
+
         public double RenderScale
         {
             get => _settingsService.GetSetting("Core.RenderScale", 1.0).Value;
@@ -48,6 +73,8 @@ namespace Artemis.UI.Screens.Settings
             }
         }
 
+        public List<Tuple<string, int>> TargetFrameRates { get; set; }
+
         public int TargetFrameRate
         {
             get => _settingsService.GetSetting("Core.TargetFrameRate", 25).Value;
diff --git a/src/Artemis.UI/Screens/Splash/SplashView.xaml b/src/Artemis.UI/Screens/Splash/SplashView.xaml
index e26961e6f..4b41f103f 100644
--- a/src/Artemis.UI/Screens/Splash/SplashView.xaml
+++ b/src/Artemis.UI/Screens/Splash/SplashView.xaml
@@ -20,7 +20,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition />
         </Grid.RowDefinitions>
-        <Image Source="{StaticResource BowIcon}" Stretch="Uniform" Margin="6,50,6,6" />
+        <Image Source="{StaticResource BowIcon}" Stretch="Uniform" Margin="50" />
         <TextBlock Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Bottom" Foreground="White" FontSize="16">
             Artemis is initializing...
         </TextBlock>