diff --git a/src/Artemis.Core/Models/Surface/ArtemisDevice.cs b/src/Artemis.Core/Models/Surface/ArtemisDevice.cs
index 2f5e618d3..4052f2cfd 100644
--- a/src/Artemis.Core/Models/Surface/ArtemisDevice.cs
+++ b/src/Artemis.Core/Models/Surface/ArtemisDevice.cs
@@ -174,6 +174,9 @@ namespace Artemis.Core
             }
         }
 
+        /// <summary>
+        ///     Gets or sets the scale of the red color component used for calibration
+        /// </summary>
         public double RedScale
         {
             get => DeviceEntity.RedScale;
@@ -184,6 +187,9 @@ namespace Artemis.Core
             }
         }
 
+        /// <summary>
+        ///     Gets or sets the scale of the green color component used for calibration
+        /// </summary>
         public double GreenScale
         {
             get => DeviceEntity.GreenScale;
@@ -194,6 +200,9 @@ namespace Artemis.Core
             }
         }
 
+        /// <summary>
+        ///     Gets or sets the scale of the blue color component used for calibration
+        /// </summary>
         public double BlueScale
         {
             get => DeviceEntity.BlueScale;
diff --git a/src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceDeviceConfigView.xaml b/src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceDeviceConfigView.xaml
index c11e806d3..52b34bab4 100644
--- a/src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceDeviceConfigView.xaml
+++ b/src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceDeviceConfigView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Artemis.UI.Screens.SurfaceEditor.Dialogs.SurfaceDeviceConfigView"
+<UserControl x:Class="Artemis.UI.Screens.SurfaceEditor.Dialogs.SurfaceDeviceConfigView"
              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"
@@ -15,7 +15,7 @@
     <StackPanel Margin="16" Width="400">
         <!-- Title -->
         <TextBlock Text="{Binding Device.RgbDevice.DeviceInfo.DeviceName}" Style="{StaticResource MaterialDesignHeadline6TextBlock}" />
-        
+
         <!-- Body -->
         <Grid Margin="0 25 0 0">
             <Grid.ColumnDefinitions>
@@ -75,17 +75,20 @@
                     Color calibration
                 </TextBlock>
 
-                <TextBlock Grid.Row="1" 
+                <TextBlock Grid.Row="1"
                            Grid.Column="0"
                            Grid.ColumnSpan="3"
-                           Style="{StaticResource MaterialDesignCaptionTextBlock}" 
+                           Style="{StaticResource MaterialDesignCaptionTextBlock}"
                            Foreground="{DynamicResource MaterialDesignBodyLight}"
-                           TextWrapping="Wrap" 
+                           TextWrapping="Wrap"
                            TextAlignment="Justify">
                     Use the sliders below to adjust the colors of your device so that it matches your other devices.
                 </TextBlock>
 
-                <Label Grid.Row="2" Grid.Column="0" Content="R-" VerticalAlignment="Center" />
+                <Label Grid.Row="2"
+                       Grid.Column="0"
+                       Content="R"
+                       VerticalAlignment="Center" />
                 <Slider Grid.Row="2"
                         Grid.Column="1"
                         Minimum="0"
@@ -94,9 +97,17 @@
                         Value="{Binding RedScale, UpdateSourceTrigger=PropertyChanged}"
                         Margin="10 0"
                         VerticalAlignment="Center" />
-                <Label Grid.Row="2" Grid.Column="2" Content="R+" VerticalAlignment="Center" />
+                <TextBox Grid.Row="2"
+                         Grid.Column="2"
+                         VerticalAlignment="Center"
+                         Text="{Binding RedScale, StringFormat={}{0:0.0}, UpdateSourceTrigger=PropertyChanged}"
+                         materialDesign:TextFieldAssist.SuffixText="%"
+                         Width="50" />
 
-                <Label Grid.Row="3" Grid.Column="0" Content="G-" VerticalAlignment="Center" />
+                <Label Grid.Row="3"
+                       Grid.Column="0"
+                       Content="G"
+                       VerticalAlignment="Center" />
                 <Slider Grid.Row="3"
                         Grid.Column="1"
                         Minimum="0"
@@ -105,9 +116,17 @@
                         Value="{Binding GreenScale, UpdateSourceTrigger=PropertyChanged}"
                         Margin="10 0"
                         VerticalAlignment="Center" />
-                <Label Grid.Row="3" Grid.Column="2" Content="G+" VerticalAlignment="Center" />
+                <TextBox Grid.Row="3"
+                         Grid.Column="2"
+                         VerticalAlignment="Center"
+                         Text="{Binding GreenScale, StringFormat={}{0:0.0}, UpdateSourceTrigger=PropertyChanged}"
+                         materialDesign:TextFieldAssist.SuffixText="%"
+                         Width="50" />
 
-                <Label Grid.Row="4" Grid.Column="0" Content="B-" VerticalAlignment="Center" />
+                <Label Grid.Row="4"
+                       Grid.Column="0"
+                       Content="B"
+                       VerticalAlignment="Center" />
                 <Slider Grid.Row="4"
                         Grid.Column="1"
                         Minimum="0"
@@ -115,8 +134,14 @@
                         ValueChanged="{s:Action ApplyScaling}"
                         Value="{Binding BlueScale, UpdateSourceTrigger=PropertyChanged}"
                         Margin="10 0"
+                        Ticks="100"
                         VerticalAlignment="Center" />
-                <Label Grid.Row="4" Grid.Column="2" Content="B+" VerticalAlignment="Center" />
+                <TextBox Grid.Row="4"
+                         Grid.Column="2"
+                         VerticalAlignment="Center"
+                         Text="{Binding BlueScale, StringFormat={}{0:0.0}, UpdateSourceTrigger=PropertyChanged}"
+                         materialDesign:TextFieldAssist.SuffixText="%"
+                         Width="50" />
 
                 <Grid Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="3">
                     <Grid.ColumnDefinitions>