From 0122ab00d9aac0482f977de0d019924ba36c4b85 Mon Sep 17 00:00:00 2001
From: Diogo Trindade <diogotr7@gmail.com>
Date: Mon, 5 Jun 2023 14:26:46 +0100
Subject: [PATCH 1/7] Added more Border styles

---
 src/Artemis.UI.Shared/Styles/Border.axaml | 28 +++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/Artemis.UI.Shared/Styles/Border.axaml b/src/Artemis.UI.Shared/Styles/Border.axaml
index afcd9dee8..d753809a0 100644
--- a/src/Artemis.UI.Shared/Styles/Border.axaml
+++ b/src/Artemis.UI.Shared/Styles/Border.axaml
@@ -10,6 +10,15 @@
                     <TextBlock>I'm in a panel yo!</TextBlock>
                     <Border Classes="card-separator" />
                     <TextBlock>I'm in a panel yo!</TextBlock>
+                    <Border Classes="card-separator-slim" />
+                    <TextBlock>I'm in a panel yo!</TextBlock>
+                </StackPanel>
+            </Border>
+            <Border Classes="card" Margin="20">
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock>I'm in a panel yo!</TextBlock>
+                    <Border Classes="card-separator-vertical" />
+                    <TextBlock>I'm in a panel yo!</TextBlock>
                 </StackPanel>
             </Border>
         </StackPanel>
@@ -50,4 +59,23 @@
         <Setter Property="Height" Value="1" />
 
     </Style>
+    
+    <Style Selector="Border.card-separator-slim">
+        <Setter Property="Background" Value="{DynamicResource ButtonBorderBrush}" />
+        <Setter Property="Margin" Value="-12 10" />
+        <Setter Property="Height" Value="1" />
+
+    </Style>
+    
+    <Style Selector="Border.card-separator-vertical">
+        <Setter Property="Background" Value="{DynamicResource ButtonBorderBrush}" />
+        <Setter Property="Margin" Value="15 -12" />
+        <Setter Property="Width" Value="1" />
+    </Style>
+    
+    <Style Selector="Border.card-separator-slim-vertical">
+        <Setter Property="Background" Value="{DynamicResource ButtonBorderBrush}" />
+        <Setter Property="Margin" Value="10 -12" />
+        <Setter Property="Width" Value="1" />
+    </Style>
 </Styles>
\ No newline at end of file

From cdfa14441ed2ccbe12a52de75fcb850efcaf5697 Mon Sep 17 00:00:00 2001
From: Diogo Trindade <diogotr7@gmail.com>
Date: Mon, 5 Jun 2023 14:26:53 +0100
Subject: [PATCH 2/7] Clean up csproj

---
 src/Artemis.UI/Artemis.UI.csproj | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj
index d57184629..fa8d34923 100644
--- a/src/Artemis.UI/Artemis.UI.csproj
+++ b/src/Artemis.UI/Artemis.UI.csproj
@@ -41,27 +41,4 @@
     <ItemGroup>
         <AvaloniaResource Include="Assets\**" />
     </ItemGroup>
-
-    <ItemGroup>
-      <Compile Update="Screens\Settings\Tabs\ReleasesTabView.axaml.cs">
-        <DependentUpon>UpdatingTabView.axaml</DependentUpon>
-        <SubType>Code</SubType>
-      </Compile>
-      <Compile Update="Screens\Settings\Updating\ReleaseView.axaml.cs">
-        <DependentUpon>UpdatingTabView.axaml</DependentUpon>
-        <SubType>Code</SubType>
-      </Compile>
-      <Compile Update="Screens\Plugins\Features\PluginFeatureView.axaml.cs">
-        <DependentUpon>PluginFeatureView.axaml</DependentUpon>
-        <SubType>Code</SubType>
-      </Compile>
-      <Compile Update="Screens\Plugins\Prerequisites\PluginPrerequisiteActionView.axaml.cs">
-        <DependentUpon>PluginPrerequisiteActionView.axaml</DependentUpon>
-        <SubType>Code</SubType>
-      </Compile>
-      <Compile Update="Screens\Plugins\Prerequisites\PluginPrerequisiteView.axaml.cs">
-        <DependentUpon>PluginPrerequisiteView.axaml</DependentUpon>
-        <SubType>Code</SubType>
-      </Compile>
-    </ItemGroup>
 </Project>
\ No newline at end of file

From db069ea8bf9580f13ced32dc2bd7767903f4e728 Mon Sep 17 00:00:00 2001
From: Diogo Trindade <diogotr7@gmail.com>
Date: Mon, 5 Jun 2023 18:48:07 +0100
Subject: [PATCH 3/7] Reworked device properties screen

---
 src/Artemis.UI/DryIoc/Factories/IVMFactory.cs |  15 +-
 .../Screens/Device/DevicePropertiesView.axaml |   6 +-
 .../Device/DevicePropertiesViewModel.cs       |   6 +-
 .../Device/Tabs/DeviceGeneralTabView.axaml    | 371 ++++++++++++++++++
 .../Device/Tabs/DeviceGeneralTabView.axaml.cs |  11 +
 .../Device/Tabs/DeviceGeneralTabViewModel.cs  | 256 ++++++++++++
 .../Device/Tabs/DeviceLayoutTabView.axaml     |  82 ++++
 .../Device/Tabs/DeviceLayoutTabView.axaml.cs  |  26 ++
 .../Device/Tabs/DeviceLayoutTabViewModel.cs   | 143 +++++++
 9 files changed, 910 insertions(+), 6 deletions(-)
 create mode 100644 src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabView.axaml
 create mode 100644 src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabView.axaml.cs
 create mode 100644 src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabViewModel.cs
 create mode 100644 src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml
 create mode 100644 src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml.cs
 create mode 100644 src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabViewModel.cs

diff --git a/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs b/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs
index d410e3cfc..8d94699dd 100644
--- a/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs
+++ b/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs
@@ -25,6 +25,7 @@ using Artemis.UI.Screens.Sidebar;
 using Artemis.UI.Screens.SurfaceEditor;
 using Artemis.UI.Screens.VisualScripting;
 using Artemis.UI.Screens.VisualScripting.Pins;
+using Artemis.UI.Shared;
 using DryIoc;
 using ReactiveUI;
 
@@ -40,9 +41,11 @@ public interface IDeviceVmFactory : IVmFactory
     DeviceSettingsViewModel DeviceSettingsViewModel(ArtemisDevice device, DevicesTabViewModel devicesTabViewModel);
     DeviceDetectInputViewModel DeviceDetectInputViewModel(ArtemisDevice device);
     DevicePropertiesTabViewModel DevicePropertiesTabViewModel(ArtemisDevice device);
+    DeviceLayoutTabViewModel DeviceLayoutTabViewModel(ArtemisDevice device);
     DeviceInfoTabViewModel DeviceInfoTabViewModel(ArtemisDevice device);
     DeviceLedsTabViewModel DeviceLedsTabViewModel(ArtemisDevice device, ObservableCollection<ArtemisLed> selectedLeds);
     InputMappingsTabViewModel InputMappingsTabViewModel(ArtemisDevice device, ObservableCollection<ArtemisLed> selectedLeds);
+    DeviceGeneralTabViewModel DeviceGeneralTabViewModel(ArtemisDevice device);
 }
 public class DeviceFactory : IDeviceVmFactory
 {
@@ -72,7 +75,12 @@ public class DeviceFactory : IDeviceVmFactory
     {
         return _container.Resolve<DevicePropertiesTabViewModel>(new object[] { device });
     }
-    
+
+    public DeviceLayoutTabViewModel DeviceLayoutTabViewModel(ArtemisDevice device)
+    {
+        return _container.Resolve<DeviceLayoutTabViewModel>(new object[] { device });
+    }
+
     public DeviceInfoTabViewModel DeviceInfoTabViewModel(ArtemisDevice device)
     {
         return _container.Resolve<DeviceInfoTabViewModel>(new object[] { device });
@@ -87,6 +95,11 @@ public class DeviceFactory : IDeviceVmFactory
     {
         return _container.Resolve<InputMappingsTabViewModel>(new object[] { device, selectedLeds });
     }
+
+    public DeviceGeneralTabViewModel DeviceGeneralTabViewModel(ArtemisDevice device)
+    {
+        return _container.Resolve<DeviceGeneralTabViewModel>(new object[] { device });
+    }
 }
 
 public interface ISettingsVmFactory : IVmFactory
diff --git a/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml b/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml
index 22b63510e..9b78bb060 100644
--- a/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml
+++ b/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml
@@ -11,8 +11,8 @@
                       Icon="/Assets/Images/Logo/application.ico"
                       Title="Artemis | Device Properties"
                       WindowStartupLocation="CenterOwner"
-                      Width="1250"
-                      Height="900">
+                      Width="1400"
+                      Height="800">
     <windowing:AppWindow.KeyBindings>
         <KeyBinding Gesture="Escape" Command="{CompiledBinding ClearSelectedLeds}" />
     </windowing:AppWindow.KeyBindings>
@@ -52,7 +52,7 @@
 
         <GridSplitter Grid.Column="1" Width="15" Margin="-15 0 0 0" Background="Transparent" HorizontalAlignment="Stretch" />
 
-        <Border Grid.Column="2" Classes="card-condensed" CornerRadius="10 0 0 0" Margin="0 10 0 0" Background="#ff323232">
+        <Border Grid.Column="2" Classes="card-condensed" Margin="5" Background="#ff323232">
             <Panel>
                 <TabControl ItemsSource="{CompiledBinding Tabs}" IsVisible="{CompiledBinding Tabs.Count}" Padding="12">
                     <TabControl.ItemTemplate>
diff --git a/src/Artemis.UI/Screens/Device/DevicePropertiesViewModel.cs b/src/Artemis.UI/Screens/Device/DevicePropertiesViewModel.cs
index 87ee3ae20..395a718f8 100644
--- a/src/Artemis.UI/Screens/Device/DevicePropertiesViewModel.cs
+++ b/src/Artemis.UI/Screens/Device/DevicePropertiesViewModel.cs
@@ -64,8 +64,10 @@ public class DevicePropertiesViewModel : DialogViewModelBase<object>
 
     private void AddTabs()
     {
-        Tabs.Add(_deviceVmFactory.DevicePropertiesTabViewModel(Device));
-        Tabs.Add(_deviceVmFactory.DeviceInfoTabViewModel(Device));
+        Tabs.Add(_deviceVmFactory.DeviceGeneralTabViewModel(Device));
+        Tabs.Add(_deviceVmFactory.DeviceLayoutTabViewModel(Device));
+        //Tabs.Add(_deviceVmFactory.DevicePropertiesTabViewModel(Device));
+        //Tabs.Add(_deviceVmFactory.DeviceInfoTabViewModel(Device));
         if (Device.DeviceType == RGBDeviceType.Keyboard)
             Tabs.Add(_deviceVmFactory.InputMappingsTabViewModel(Device, SelectedLeds));
         Tabs.Add(_deviceVmFactory.DeviceLedsTabViewModel(Device, SelectedLeds));
diff --git a/src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabView.axaml b/src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabView.axaml
new file mode 100644
index 000000000..a62df0f73
--- /dev/null
+++ b/src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabView.axaml
@@ -0,0 +1,371 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+             xmlns:converters="clr-namespace:Artemis.UI.Shared.Converters;assembly=Artemis.UI.Shared"
+             xmlns:device="clr-namespace:Artemis.UI.Screens.Device"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="1450"
+             x:Class="Artemis.UI.Screens.Device.DeviceGeneralTabView"
+             x:DataType="device:DeviceGeneralTabViewModel">
+    <UserControl.Resources>
+        <converters:SKColorToColorConverter x:Key="SKColorToColorConverter" />
+    </UserControl.Resources>
+    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+        <Grid RowDefinitions="*,Auto">
+            <StackPanel Grid.Row="0" Orientation="Vertical">
+                <!-- Device information and categories -->
+                <Grid ColumnDefinitions="*,*" RowDefinitions="*,*">
+                    <TextBlock Grid.Column="0" Grid.Row="0" Classes="card-title" Text="Information" Margin="10,0,0,0" />
+                    <Border Grid.Column="0" Grid.Row="1" Classes="card" Margin="5" x:Name="InformationBorder">
+                        <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,*,*,*,*,*">
+                            <StackPanel Grid.Row="0" Grid.Column="0">
+                                <TextBlock Text="Model" />
+                                <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="{CompiledBinding Device.RgbDevice.DeviceInfo.Model}" />
+                            </StackPanel>
+
+                            <StackPanel Grid.Row="1" Grid.Column="0">
+                                <TextBlock Text="Manufacturer" />
+                                <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="{CompiledBinding Device.RgbDevice.DeviceInfo.Manufacturer}" />
+                            </StackPanel>
+
+                            <StackPanel Grid.Row="2" Grid.Column="0">
+                                <TextBlock Text="Device Type" />
+                                <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="{CompiledBinding Device.RgbDevice.DeviceInfo.DeviceType}" />
+                            </StackPanel>
+
+                            <StackPanel Grid.Row="3" Grid.Column="0">
+                                <TextBlock Text="Size (1px = 1mm)" />
+                                <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="{CompiledBinding Device.RgbDevice.Size}" />
+                            </StackPanel>
+
+                            <StackPanel Grid.Row="4" Grid.Column="0" IsVisible="{CompiledBinding IsKeyboard}">
+                                <TextBlock Text="Physical Layout" />
+                                <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="{CompiledBinding Device.PhysicalLayout}" />
+                            </StackPanel>
+
+                            <StackPanel Grid.Row="5" Grid.Column="0" IsVisible="{CompiledBinding IsKeyboard}" >
+                                <TextBlock Text="Logical Layout" />
+                                <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="{CompiledBinding Device.LogicalLayout}" />
+                            </StackPanel>
+                        </Grid>
+                    </Border>
+
+                    <TextBlock Grid.Column="1" Grid.Row="0" Classes="card-title" Text="Categories" Margin="10,0,0,0" />
+                    <Border Grid.Row="1" Grid.Column="1" Classes="card" Margin="5" x:Name="CategoryBorder">
+                        <StackPanel>
+                            <TextBlock TextWrapping="Wrap" Text="Artemis uses categories to determine where the layers of imported profiles are applied to." />
+                            <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,*,*,*,*" Margin="0,10,0,0">
+                                <StackPanel Grid.Row="0" Grid.Column="0" Margin="0,0,0,10">
+                                    <TextBlock Text="Peripheral" />
+                                    <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="A peripheral such as a mouse or keyboard" />
+                                </StackPanel>
+                                <CheckBox Grid.Row="0" Grid.Column="1" IsChecked="{CompiledBinding HasPeripheralsCategory}" />
+
+                                <StackPanel Grid.Row="1" Grid.Column="0" Margin="0,0,0,10">
+                                    <TextBlock Text="Desk" />
+                                    <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="A device acting as desk ornamentation such as a LED strip" />
+                                </StackPanel>
+                                <CheckBox Grid.Row="1" Grid.Column="1" IsChecked="{CompiledBinding HasDeskCategory}" />
+
+                                <StackPanel Grid.Row="2" Grid.Column="0" Margin="0,0,0,10">
+                                    <TextBlock Text="Monitor" />
+                                    <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="A device attached to the monitor such as ambilight LEDs" />
+                                </StackPanel>
+                                <CheckBox Grid.Row="2" Grid.Column="1" IsChecked="{CompiledBinding HasMonitorCategory}" />
+
+                                <StackPanel Grid.Row="3" Grid.Column="0" Margin="0,0,0,10">
+                                    <TextBlock Text="Case" />
+                                    <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="A device inside your computer case" />
+                                </StackPanel>
+                                <CheckBox Grid.Row="3" Grid.Column="1" IsChecked="{CompiledBinding HasCaseCategory}" />
+
+                                <StackPanel Grid.Row="4" Grid.Column="0" Margin="0,0,0,10">
+                                    <TextBlock Text="Room" />
+                                    <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="A device elsewhere in the room" />
+                                </StackPanel>
+                                <CheckBox Grid.Row="4" Grid.Column="1" IsChecked="{CompiledBinding HasRoomCategory}" />
+                            </Grid>
+                        </StackPanel>
+                    </Border>
+                </Grid>
+
+                <!-- Surface and Calibration -->
+                <Grid ColumnDefinitions="*,*" RowDefinitions="*,*">
+                    <TextBlock Grid.Column="0" Grid.Row="0" Classes="card-title" Text="Surface" Margin="10,0,0,0" />
+                    <Border Grid.Column="0" Grid.Row="1" Classes="card" Margin="5" x:Name="SurfaceBorder">
+                        <StackPanel Orientation="Vertical">
+                            <TextBlock TextWrapping="Wrap" Text="The device can be rotated and scaled on the surface with the values below." />
+                            <Grid ColumnDefinitions="*,Auto,Auto" RowDefinitions="*,*,*,*">
+                                <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center">X-coordinate</TextBlock>
+                                <NumericUpDown Grid.Row="0"
+                                               Grid.Column="1"
+                                               Margin="10 5"
+                                               VerticalAlignment="Center"
+                                               Value="{CompiledBinding X}" />
+                                <TextBlock Grid.Row="0" Grid.Column="2" VerticalAlignment="Center">mm</TextBlock>
+
+                                <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center">Y-coordinate</TextBlock>
+                                <NumericUpDown Grid.Row="1"
+                                               Grid.Column="1"
+                                               Margin="10 5"
+                                               VerticalAlignment="Center"
+                                               Value="{CompiledBinding Y}" />
+                                <TextBlock Grid.Row="1" Grid.Column="2" VerticalAlignment="Center">mm</TextBlock>
+
+                                <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center">Scale</TextBlock>
+                                <NumericUpDown Grid.Row="2"
+                                               Grid.Column="1"
+                                               Margin="10 5"
+                                               VerticalAlignment="Center"
+                                               Increment="0.1"
+                                               FormatString="F1"
+                                               Value="{CompiledBinding Scale}" />
+                                <TextBlock Grid.Row="2" Grid.Column="2" VerticalAlignment="Center">times</TextBlock>
+
+                                <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center">Rotation</TextBlock>
+                                <NumericUpDown Grid.Row="3"
+                                               Grid.Column="1"
+                                               Margin="10 5"
+                                               VerticalAlignment="Center"
+                                               Value="{CompiledBinding Rotation}" />
+                                <TextBlock Grid.Row="3" Grid.Column="2" VerticalAlignment="Center">deg</TextBlock>
+                            </Grid>
+                        </StackPanel>
+                    </Border>
+
+                    <TextBlock Grid.Column="1" Grid.Row="0" Classes="card-title" Text="Calibration" Margin="10,0,0,0" />
+                    <Border Grid.Row="1" Grid.Column="1" Classes="card" Margin="5" x:Name="CalibrationBorder">
+                        <StackPanel Orientation="Vertical">
+                            <TextBlock TextWrapping="Wrap" Text="Use the sliders below to adjust the colors of your device so that it matches your other devices." />
+                            <Grid ColumnDefinitions="Auto,*,Auto" RowDefinitions="*,*,*,*">
+                                <Label Grid.Row="0" Grid.Column="0" Content="R" VerticalAlignment="Center" />
+                                <Slider Grid.Row="0" Grid.Column="1" Minimum="0" Maximum="200" Value="{CompiledBinding RedScale}" Margin="10 0" VerticalAlignment="Center" />
+                                <NumericUpDown Grid.Row="0"
+                                               Grid.Column="2"
+                                               VerticalAlignment="Center"
+                                               Width="65"
+                                               Value="{CompiledBinding RedScale}"
+                                               ShowButtonSpinner="False"
+                                               FormatString="{}{0:0.0}"
+                                               Minimum="0"
+                                               Maximum="200"
+                                               ClipValueToMinMax="True" />
+
+                                <Label Grid.Row="1" Grid.Column="0" Content="G" VerticalAlignment="Center" />
+                                <Slider Grid.Row="1" Grid.Column="1" Minimum="0" Maximum="200" Value="{CompiledBinding GreenScale}" Margin="10 0" VerticalAlignment="Center" />
+                                <NumericUpDown Grid.Row="1"
+                                               Grid.Column="2"
+                                               VerticalAlignment="Center"
+                                               Width="65"
+                                               Value="{CompiledBinding GreenScale}"
+                                               ShowButtonSpinner="False"
+                                               FormatString="{}{0:0.0}"
+                                               Minimum="0"
+                                               Maximum="200"
+                                               ClipValueToMinMax="True" />
+
+                                <Label Grid.Row="2" Grid.Column="0" Content="B" VerticalAlignment="Center" />
+                                <Slider Grid.Row="2" Grid.Column="1" Minimum="0" Maximum="200" Value="{CompiledBinding BlueScale}" Margin="10 0" Ticks="100" VerticalAlignment="Center" />
+                                <NumericUpDown Grid.Row="2"
+                                               Grid.Column="2"
+                                               VerticalAlignment="Center"
+                                               Width="65"
+                                               Value="{CompiledBinding BlueScale}"
+                                               ShowButtonSpinner="False"
+                                               FormatString="{}{0:0.0}"
+                                               Minimum="0"
+                                               Maximum="200"
+                                               ClipValueToMinMax="True" />
+
+                                <CheckBox Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" IsChecked="{CompiledBinding DisplayOnDevices}" Content="Show preview" VerticalAlignment="Center" />
+                                <controls:ColorPickerButton Grid.Row="3"
+                                                            Grid.Column="2"
+                                                            VerticalAlignment="Center"
+                                                            HorizontalAlignment="Right"
+                                                            Color="{CompiledBinding CurrentColor, Converter={StaticResource SKColorToColorConverter}}"
+                                                            ShowAcceptDismissButtons="False" />
+                            </Grid>
+                        </StackPanel>
+                    </Border>
+                </Grid>
+            </StackPanel>
+
+            <!-- Stacked instead of grid here: -->
+            <!-- <StackPanel Grid.Row="0"> -->
+            <!--     <TextBlock Classes="card-title" Text="Information" Margin="10,0,0,0" /> -->
+            <!--     <Border Classes="card" Margin="5" x:Name="InformationBorder"> -->
+            <!--         <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,*,*,*,*,*"> -->
+            <!--             <TextBlock Grid.Column="0" Grid.Row="0" Text="Model" /> -->
+            <!--             <TextBlock Grid.Column="1" Grid.Row="0" Classes="subtitle" TextWrapping="Wrap" Text="{CompiledBinding Device.RgbDevice.DeviceInfo.Model}" /> -->
+            <!-- -->
+            <!--             <TextBlock Grid.Column="0" Grid.Row="1" Text="Manufacturer" /> -->
+            <!--             <TextBlock Grid.Column="1" Grid.Row="1" Classes="subtitle" TextWrapping="Wrap" Text="{CompiledBinding Device.RgbDevice.DeviceInfo.Manufacturer}" /> -->
+            <!-- -->
+            <!--             <TextBlock Grid.Column="0" Grid.Row="2" Text="Device Type" /> -->
+            <!--             <TextBlock Grid.Column="1" Grid.Row="2" Classes="subtitle" TextWrapping="Wrap" Text="{CompiledBinding Device.RgbDevice.DeviceInfo.DeviceType}" /> -->
+            <!-- -->
+            <!--             <TextBlock Grid.Column="0" Grid.Row="3" Text="Size (1px = 1mm)" /> -->
+            <!--             <TextBlock Grid.Column="1" Grid.Row="3" Classes="subtitle" TextWrapping="Wrap" Text="{CompiledBinding Device.RgbDevice.Size}" /> -->
+            <!-- -->
+            <!--             <TextBlock IsVisible="{CompiledBinding IsKeyboard}" Grid.Column="0" Grid.Row="4" Text="Physical Layout" /> -->
+            <!--             <TextBlock IsVisible="{CompiledBinding IsKeyboard}" Grid.Column="1" Grid.Row="4" Classes="subtitle" TextWrapping="Wrap" Text="{CompiledBinding Device.PhysicalLayout}" /> -->
+            <!-- -->
+            <!--             <TextBlock IsVisible="{CompiledBinding IsKeyboard}" Grid.Column="0" Grid.Row="5" Text="Logical Layout" /> -->
+            <!--             <TextBlock IsVisible="{CompiledBinding IsKeyboard}" Grid.Column="1" Grid.Row="5" Classes="subtitle" TextWrapping="Wrap" Text="{CompiledBinding Device.LogicalLayout}" /> -->
+            <!--         </Grid> -->
+            <!--     </Border> -->
+            <!-- -->
+            <!--     <TextBlock Classes="card-title" Text="Categories" Margin="10,0,0,0" /> -->
+            <!--     <Border Classes="card" Margin="5" x:Name="CategoryBorder"> -->
+            <!--         <StackPanel> -->
+            <!--             <TextBlock TextWrapping="Wrap" Text="Artemis uses categories to determine where the layers of imported profiles are applied to." /> -->
+            <!--             <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,*,*,*,*" Margin="0,10,0,0"> -->
+            <!--                 <StackPanel Grid.Row="0" Grid.Column="0" Margin="0,0,0,10"> -->
+            <!--                     <TextBlock Text="Peripheral" /> -->
+            <!--                     <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="A peripheral such as a mouse or keyboard" /> -->
+            <!--                 </StackPanel> -->
+            <!--                 <CheckBox Grid.Row="0" Grid.Column="1" IsChecked="{CompiledBinding HasPeripheralsCategory}" /> -->
+            <!-- -->
+            <!--                 <StackPanel Grid.Row="1" Grid.Column="0" Margin="0,0,0,10"> -->
+            <!--                     <TextBlock Text="Desk" /> -->
+            <!--                     <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="A device acting as desk ornamentation such as a LED strip" /> -->
+            <!--                 </StackPanel> -->
+            <!--                 <CheckBox Grid.Row="1" Grid.Column="1" IsChecked="{CompiledBinding HasDeskCategory}" /> -->
+            <!-- -->
+            <!--                 <StackPanel Grid.Row="2" Grid.Column="0" Margin="0,0,0,10"> -->
+            <!--                     <TextBlock Text="Monitor" /> -->
+            <!--                     <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="A device attached to the monitor such as ambilight LEDs" /> -->
+            <!--                 </StackPanel> -->
+            <!--                 <CheckBox Grid.Row="2" Grid.Column="1" IsChecked="{CompiledBinding HasMonitorCategory}" /> -->
+            <!-- -->
+            <!--                 <StackPanel Grid.Row="3" Grid.Column="0" Margin="0,0,0,10"> -->
+            <!--                     <TextBlock Text="Case" /> -->
+            <!--                     <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="A device inside your computer case" /> -->
+            <!--                 </StackPanel> -->
+            <!--                 <CheckBox Grid.Row="3" Grid.Column="1" IsChecked="{CompiledBinding HasCaseCategory}" /> -->
+            <!-- -->
+            <!--                 <StackPanel Grid.Row="4" Grid.Column="0" Margin="0,0,0,10"> -->
+            <!--                     <TextBlock Text="Room" /> -->
+            <!--                     <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="A device elsewhere in the room" /> -->
+            <!--                 </StackPanel> -->
+            <!--                 <CheckBox Grid.Row="4" Grid.Column="1" IsChecked="{CompiledBinding HasRoomCategory}" /> -->
+            <!--             </Grid> -->
+            <!--         </StackPanel> -->
+            <!--     </Border> -->
+            <!-- -->
+            <!--     <TextBlock Classes="card-title" Text="Surface" Margin="10,0,0,0" /> -->
+            <!--     <Border Classes="card" Margin="5" x:Name="SurfaceBorder"> -->
+            <!--         <StackPanel Orientation="Vertical"> -->
+            <!--             <TextBlock TextWrapping="Wrap" Text="The device can be rotated and scaled on the surface with the values below." /> -->
+            <!--             <Grid ColumnDefinitions="*,Auto,Auto" RowDefinitions="*,*,*,*"> -->
+            <!--                 <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center">X-coordinate</TextBlock> -->
+            <!--                 <NumericUpDown Grid.Row="0" -->
+            <!--                                Grid.Column="1" -->
+            <!--                                Margin="10 5" -->
+            <!--                                VerticalAlignment="Center" -->
+            <!--                                Value="{CompiledBinding X}" /> -->
+            <!--                 <TextBlock Grid.Row="0" Grid.Column="2" VerticalAlignment="Center">mm</TextBlock> -->
+            <!-- -->
+            <!--                 <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center">Y-coordinate</TextBlock> -->
+            <!--                 <NumericUpDown Grid.Row="1" -->
+            <!--                                Grid.Column="1" -->
+            <!--                                Margin="10 5" -->
+            <!--                                VerticalAlignment="Center" -->
+            <!--                                Value="{CompiledBinding Y}" /> -->
+            <!--                 <TextBlock Grid.Row="1" Grid.Column="2" VerticalAlignment="Center">mm</TextBlock> -->
+            <!-- -->
+            <!--                 <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center">Scale</TextBlock> -->
+            <!--                 <NumericUpDown Grid.Row="2" -->
+            <!--                                Grid.Column="1" -->
+            <!--                                Margin="10 5" -->
+            <!--                                VerticalAlignment="Center" -->
+            <!--                                Increment="0.1" -->
+            <!--                                FormatString="F1" -->
+            <!--                                Value="{CompiledBinding Scale}" /> -->
+            <!--                 <TextBlock Grid.Row="2" Grid.Column="2" VerticalAlignment="Center">times</TextBlock> -->
+            <!-- -->
+            <!--                 <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center">Rotation</TextBlock> -->
+            <!--                 <NumericUpDown Grid.Row="3" -->
+            <!--                                Grid.Column="1" -->
+            <!--                                Margin="10 5" -->
+            <!--                                VerticalAlignment="Center" -->
+            <!--                                Value="{CompiledBinding Rotation}" /> -->
+            <!--                 <TextBlock Grid.Row="3" Grid.Column="2" VerticalAlignment="Center">deg</TextBlock> -->
+            <!--             </Grid> -->
+            <!--         </StackPanel> -->
+            <!--     </Border> -->
+            <!-- -->
+            <!--     <TextBlock Classes="card-title" Text="Calibration" Margin="10,0,0,0" /> -->
+            <!--     <Border Classes="card" Margin="5" x:Name="CalibrationBorder"> -->
+            <!--         <StackPanel Orientation="Vertical"> -->
+            <!--             <TextBlock TextWrapping="Wrap" Text="Use the sliders below to adjust the colors of your device so that it matches your other devices." /> -->
+            <!--             <Grid ColumnDefinitions="Auto,*,Auto" RowDefinitions="*,*,*,*"> -->
+            <!--                 <Label Grid.Row="0" Grid.Column="0" Content="R" VerticalAlignment="Center" /> -->
+            <!--                 <Slider Grid.Row="0" Grid.Column="1" Minimum="0" Maximum="200" Value="{CompiledBinding RedScale}" Margin="10 0" VerticalAlignment="Center" /> -->
+            <!--                 <NumericUpDown Grid.Row="0" -->
+            <!--                                Grid.Column="2" -->
+            <!--                                VerticalAlignment="Center" -->
+            <!--                                Width="65" -->
+            <!--                                Value="{CompiledBinding RedScale}" -->
+            <!--                                ShowButtonSpinner="False" -->
+            <!--                                FormatString="{}{0:0.0}" -->
+            <!--                                Minimum="0" -->
+            <!--                                Maximum="200" -->
+            <!--                                ClipValueToMinMax="True" /> -->
+            <!-- -->
+            <!--                 <Label Grid.Row="1" Grid.Column="0" Content="G" VerticalAlignment="Center" /> -->
+            <!--                 <Slider Grid.Row="1" Grid.Column="1" Minimum="0" Maximum="200" Value="{CompiledBinding GreenScale}" Margin="10 0" VerticalAlignment="Center" /> -->
+            <!--                 <NumericUpDown Grid.Row="1" -->
+            <!--                                Grid.Column="2" -->
+            <!--                                VerticalAlignment="Center" -->
+            <!--                                Width="65" -->
+            <!--                                Value="{CompiledBinding GreenScale}" -->
+            <!--                                ShowButtonSpinner="False" -->
+            <!--                                FormatString="{}{0:0.0}" -->
+            <!--                                Minimum="0" -->
+            <!--                                Maximum="200" -->
+            <!--                                ClipValueToMinMax="True" /> -->
+            <!-- -->
+            <!--                 <Label Grid.Row="2" Grid.Column="0" Content="B" VerticalAlignment="Center" /> -->
+            <!--                 <Slider Grid.Row="2" Grid.Column="1" Minimum="0" Maximum="200" Value="{CompiledBinding BlueScale}" Margin="10 0" Ticks="100" VerticalAlignment="Center" /> -->
+            <!--                 <NumericUpDown Grid.Row="2" -->
+            <!--                                Grid.Column="2" -->
+            <!--                                VerticalAlignment="Center" -->
+            <!--                                Width="65" -->
+            <!--                                Value="{CompiledBinding BlueScale}" -->
+            <!--                                ShowButtonSpinner="False" -->
+            <!--                                FormatString="{}{0:0.0}" -->
+            <!--                                Minimum="0" -->
+            <!--                                Maximum="200" -->
+            <!--                                ClipValueToMinMax="True" /> -->
+            <!-- -->
+            <!--                 <CheckBox Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" IsChecked="{CompiledBinding DisplayOnDevices}" Content="Show preview" VerticalAlignment="Center" /> -->
+            <!--                 <controls:ColorPickerButton Grid.Row="3" -->
+            <!--                                             Grid.Column="2" -->
+            <!--                                             VerticalAlignment="Center" -->
+            <!--                                             HorizontalAlignment="Right" -->
+            <!--                                             Color="{CompiledBinding CurrentColor, Converter={StaticResource SKColorToColorConverter}}" -->
+            <!--                                             ShowAcceptDismissButtons="False" /> -->
+            <!--             </Grid> -->
+            <!--         </StackPanel> -->
+            <!--     </Border> -->
+            <!-- </StackPanel> -->
+
+            <Grid Grid.Row="1" ColumnDefinitions="Auto,*" Margin="5">
+                <Button Grid.Column="0"
+                        IsVisible="{CompiledBinding RequiresManualSetup}"
+                        Command="{CompiledBinding RestartSetup}"
+                        ToolTip.Tip="Restart device setup, allowing you to select a new physical and logical layout">
+                    Restart setup
+                </Button>
+
+                <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
+                    <Button IsCancel="True" Command="{CompiledBinding Reset}" Margin="0 0 5 0" Content="Reset" />
+                    <Button Classes="accent" IsDefault="True" Command="{CompiledBinding Apply}" Content="Apply" />
+                </StackPanel>
+            </Grid>
+        </Grid>
+
+    </ScrollViewer>
+</UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabView.axaml.cs b/src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabView.axaml.cs
new file mode 100644
index 000000000..8c4dff8b0
--- /dev/null
+++ b/src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabView.axaml.cs
@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+using Avalonia.ReactiveUI;
+
+namespace Artemis.UI.Screens.Device;
+public partial class DeviceGeneralTabView : ReactiveUserControl<DeviceGeneralTabViewModel>
+{
+    public DeviceGeneralTabView()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabViewModel.cs b/src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabViewModel.cs
new file mode 100644
index 000000000..642e0dfd6
--- /dev/null
+++ b/src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabViewModel.cs
@@ -0,0 +1,256 @@
+using Artemis.UI.Shared;
+using Artemis.UI.Shared;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reactive.Disposables;
+using System.Text;
+using System.Threading.Tasks;
+using Artemis.Core;
+using Artemis.Core.Services;
+using Artemis.UI.Shared.Services;
+using ReactiveUI;
+using RGB.NET.Core;
+using SkiaSharp;
+
+namespace Artemis.UI.Screens.Device;
+public class DeviceGeneralTabViewModel : ActivatableViewModelBase
+{
+    private readonly ICoreService _coreService;
+    private readonly IRgbService _rgbService;
+    private readonly IWindowService _windowService;
+    private readonly List<DeviceCategory> _categories;
+    
+    private readonly float _initialBlueScale;
+    private readonly float _initialGreenScale;
+    private readonly float _initialRedScale;
+    
+    private int _rotation;
+    private float _scale;
+    private int _x;
+    private int _y;
+    
+    private float _redScale;
+    private float _greenScale;
+    private float _blueScale;
+    private SKColor _currentColor;
+    private bool _displayOnDevices;
+    
+    public DeviceGeneralTabViewModel(ArtemisDevice device, ICoreService coreService, IRgbService rgbService, IWindowService windowService)
+    {
+        _coreService = coreService;
+        _rgbService = rgbService;
+        _windowService = windowService;
+        _categories = new List<DeviceCategory>(device.Categories);
+
+        Device = device;
+        DisplayName = "General";
+        X = (int) Device.X;
+        Y = (int) Device.Y;
+        Scale = Device.Scale;
+        Rotation = (int) Device.Rotation;
+        RedScale = Device.RedScale * 100f;
+        GreenScale = Device.GreenScale * 100f;
+        BlueScale = Device.BlueScale * 100f;
+        CurrentColor = SKColors.White;
+
+        // We need to store the initial values to be able to restore them when the user clicks "Cancel"
+        _initialRedScale = Device.RedScale;
+        _initialGreenScale = Device.GreenScale;
+        _initialBlueScale = Device.BlueScale;
+
+        this.WhenAnyValue(x => x.RedScale, x => x.GreenScale, x => x.BlueScale).Subscribe(_ => ApplyScaling());
+
+        this.WhenActivated(d =>
+        {
+            Device.PropertyChanged += DeviceOnPropertyChanged;
+            _coreService.FrameRendering += OnFrameRendering;
+        
+            Disposable.Create(() =>
+            {
+                _coreService.FrameRendering -= OnFrameRendering;
+                Device.PropertyChanged -= DeviceOnPropertyChanged;
+            }).DisposeWith(d);
+        });
+    }
+    
+    public bool RequiresManualSetup => !Device.DeviceProvider.CanDetectPhysicalLayout || !Device.DeviceProvider.CanDetectLogicalLayout;
+
+    public ArtemisDevice Device { get; }
+    
+    public int X
+    {
+        get => _x;
+        set => RaiseAndSetIfChanged(ref _x, value);
+    }
+
+    public int Y
+    {
+        get => _y;
+        set => RaiseAndSetIfChanged(ref _y, value);
+    }
+
+    public float Scale
+    {
+        get => _scale;
+        set => RaiseAndSetIfChanged(ref _scale, value);
+    }
+
+    public int Rotation
+    {
+        get => _rotation;
+        set => RaiseAndSetIfChanged(ref _rotation, value);
+    }
+    
+    public bool IsKeyboard => Device.DeviceType == RGBDeviceType.Keyboard;
+    
+    public bool HasDeskCategory
+    {
+        get => GetCategory(DeviceCategory.Desk);
+        set => SetCategory(DeviceCategory.Desk, value);
+    }
+
+    public bool HasMonitorCategory
+    {
+        get => GetCategory(DeviceCategory.Monitor);
+        set => SetCategory(DeviceCategory.Monitor, value);
+    }
+
+    public bool HasCaseCategory
+    {
+        get => GetCategory(DeviceCategory.Case);
+        set => SetCategory(DeviceCategory.Case, value);
+    }
+
+    public bool HasRoomCategory
+    {
+        get => GetCategory(DeviceCategory.Room);
+        set => SetCategory(DeviceCategory.Room, value);
+    }
+
+    public bool HasPeripheralsCategory
+    {
+        get => GetCategory(DeviceCategory.Peripherals);
+        set => SetCategory(DeviceCategory.Peripherals, value);
+    }
+    
+    public float RedScale
+    {
+        get => _redScale;
+        set => RaiseAndSetIfChanged(ref _redScale, value);
+    }
+
+    public float GreenScale
+    {
+        get => _greenScale;
+        set => RaiseAndSetIfChanged(ref _greenScale, value);
+    }
+
+    public float BlueScale
+    {
+        get => _blueScale;
+        set => RaiseAndSetIfChanged(ref _blueScale, value);
+    }
+
+    public SKColor CurrentColor
+    {
+        get => _currentColor;
+        set => RaiseAndSetIfChanged(ref _currentColor, value);
+    }
+
+    public bool DisplayOnDevices
+    {
+        get => _displayOnDevices;
+        set => RaiseAndSetIfChanged(ref _displayOnDevices, value);
+    }
+    
+    public void ApplyScaling()
+    {
+        Device.RedScale = RedScale / 100f;
+        Device.GreenScale = GreenScale / 100f;
+        Device.BlueScale = BlueScale / 100f;
+
+        _rgbService.FlushLeds = true;
+    }
+
+    private bool GetCategory(DeviceCategory category)
+    {
+        return _categories.Contains(category);
+    }
+
+    private void SetCategory(DeviceCategory category, bool value)
+    {
+        if (value && !_categories.Contains(category))
+            _categories.Add(category);
+        else if (!value)
+            _categories.Remove(category);
+
+        this.RaisePropertyChanged($"Has{category}Category");
+    }
+    
+    public async Task RestartSetup()
+    {
+        if (!RequiresManualSetup)
+            return;
+        if (!Device.DeviceProvider.CanDetectPhysicalLayout && !await DevicePhysicalLayoutDialogViewModel.SelectPhysicalLayout(_windowService, Device))
+            return;
+        if (!Device.DeviceProvider.CanDetectLogicalLayout && !await DeviceLogicalLayoutDialogViewModel.SelectLogicalLayout(_windowService, Device))
+            return;
+
+        await Task.Delay(400);
+        _rgbService.SaveDevice(Device);
+        _rgbService.ApplyBestDeviceLayout(Device);
+    }
+    
+    public async Task Apply()
+    {
+        // TODO: Validation
+
+        _coreService.ProfileRenderingDisabled = true;
+        await Task.Delay(100);
+
+        Device.X = X;
+        Device.Y = Y;
+        Device.Scale = Scale;
+        Device.Rotation = Rotation;
+        Device.RedScale = RedScale / 100f;
+        Device.GreenScale = GreenScale / 100f;
+        Device.BlueScale = BlueScale / 100f;
+        Device.Categories.Clear();
+        foreach (DeviceCategory deviceCategory in _categories)
+            Device.Categories.Add(deviceCategory);
+
+        _rgbService.SaveDevice(Device);
+
+        _coreService.ProfileRenderingDisabled = false;
+    }
+
+    public void Reset()
+    {
+        HasDeskCategory = Device.Categories.Contains(DeviceCategory.Desk);
+        HasMonitorCategory = Device.Categories.Contains(DeviceCategory.Monitor);
+        HasCaseCategory = Device.Categories.Contains(DeviceCategory.Case);
+        HasRoomCategory = Device.Categories.Contains(DeviceCategory.Room);
+        HasPeripheralsCategory = Device.Categories.Contains(DeviceCategory.Peripherals);
+
+        RedScale = _initialRedScale * 100;
+        GreenScale = _initialGreenScale * 100;
+        BlueScale = _initialBlueScale * 100;
+    }
+    
+    private void OnFrameRendering(object? sender, FrameRenderingEventArgs e)
+    {
+        if (!DisplayOnDevices)
+            return;
+
+        using SKPaint overlayPaint = new() {Color = CurrentColor};
+        e.Canvas.DrawRect(0, 0, e.Canvas.LocalClipBounds.Width, e.Canvas.LocalClipBounds.Height, overlayPaint);
+    }
+
+    private void DeviceOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(Device.CustomLayoutPath) || e.PropertyName == nameof(Device.DisableDefaultLayout))
+            Task.Run(() => _rgbService.ApplyBestDeviceLayout(Device));
+    }
+}
diff --git a/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml b/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml
new file mode 100644
index 000000000..c09794871
--- /dev/null
+++ b/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml
@@ -0,0 +1,82 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+             xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+             xmlns:device="clr-namespace:Artemis.UI.Screens.Device"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="800"
+             x:Class="Artemis.UI.Screens.Device.DeviceLayoutTabView"
+             x:DataType="device:DeviceLayoutTabViewModel">
+    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+        <Border Classes="card" Margin="5">
+            <Grid RowDefinitions="*,Auto">
+                <StackPanel Grid.Row="0">
+                    <TextBlock
+                        TextWrapping="Wrap"
+                        Text="The device layout is used to determine the position of LEDs and to create the visual representation of the device." />
+                    <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,*,*,*,*" Margin="0, 20,0,0">
+                        <StackPanel Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Margin="0,0,0,10" >
+                            <TextBlock Text="Default layout file path" />
+                            <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="{CompiledBinding DefaultLayoutPath}" />
+                        </StackPanel>
+                        <Button
+                            Grid.Column="1"
+                            Grid.Row="0"
+                            Classes="icon-button"
+                            HorizontalAlignment="Right"
+                            ToolTip.Tip="Copy layout file path to clipboard"
+                            Click="LayoutPathButton_OnClick">
+                            <avalonia:MaterialIcon Kind="ContentCopy" Width="18" Height="18" />
+                        </Button>
+
+                        <StackPanel Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"  Margin="0,0,0,10">
+                            <TextBlock Text="Image file path" />
+                            <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="{CompiledBinding Device.Layout.Image.LocalPath}" />
+                        </StackPanel>
+                        <Button
+                            Grid.Column="1"
+                            Grid.Row="1"
+                            Classes="icon-button"
+                            HorizontalAlignment="Right"
+                            ToolTip.Tip="Copy image file path to clipboard"
+                            Click="ImagePathButton_OnClick">
+                            <avalonia:MaterialIcon Kind="ContentCopy" Width="18" Height="18" />
+                        </Button>
+
+                        <StackPanel Grid.Column="0" Grid.Row="2" Margin="0,0,0,10">
+                            <TextBlock Text="Disable default layout" />
+                            <TextBlock Classes="subtitle" FontSize="12" Text="With this checked, Artemis will not load a layout for this device unless you specifically provide one." />
+                        </StackPanel>
+                        <CheckBox Grid.Column="1" Grid.Row="2" HorizontalAlignment="Right" Margin="0,0,-10,0" />
+
+                        <StackPanel Grid.Column="0" Grid.Row="3" Margin="0,0,0,10">
+                            <TextBlock Text="Custom layout path" />
+                            <TextBlock Classes="subtitle" FontSize="12" Text="{CompiledBinding CustomLayoutPath}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
+                            <Button Content="Clear" Command="{CompiledBinding ClearCustomLayout}" IsEnabled="{CompiledBinding HasCustomLayout}" />
+                            <!-- 5 pixels of margin between the buttons -->
+                            <Button Margin="5,0,0,0" Content="Browse" Command="{CompiledBinding BrowseCustomLayout}" />
+                        </StackPanel>
+
+                        <StackPanel Grid.Column="0" Grid.Row="4" Margin="0,0,0,10">
+                            <TextBlock Text="Export current layout" />
+                            <TextBlock Classes="subtitle" FontSize="12" Text="If there is a layout used, export that. Otherwise, export the LEDs present." />
+                        </StackPanel>
+                        <Button Grid.Column="1" Grid.Row="4" Margin="0,0,0,0" HorizontalAlignment="Right" Content="Export" Command="{CompiledBinding ExportLayout}" />
+                    </Grid>
+                </StackPanel>
+                <controls:HyperlinkButton
+                    Content="Learn more about layouts on the wiki"
+                    NavigateUri="https://wiki.artemis-rgb.com/en/guides/developer/layouts"
+                    Grid.Row="1"
+                    Margin="0 20"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Bottom" />
+            </Grid>
+
+        </Border>
+
+    </ScrollViewer>
+</UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml.cs b/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml.cs
new file mode 100644
index 000000000..4ce6a72a5
--- /dev/null
+++ b/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml.cs
@@ -0,0 +1,26 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using Avalonia.ReactiveUI;
+
+namespace Artemis.UI.Screens.Device;
+
+public partial class DeviceLayoutTabView : ReactiveUserControl<DeviceLayoutTabViewModel>
+{
+    public DeviceLayoutTabView()
+    {
+        InitializeComponent();
+    }
+
+    private void LayoutPathButton_OnClick(object? sender, RoutedEventArgs e)
+    {
+        TopLevel.GetTopLevel(this).Clipboard.SetTextAsync(ViewModel.DefaultLayoutPath);
+    }
+
+    private void ImagePathButton_OnClick(object? sender, RoutedEventArgs e)
+    {
+        TopLevel.GetTopLevel(this).Clipboard.SetTextAsync(ViewModel.Device.Layout.Image.LocalPath);
+    }
+}
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabViewModel.cs b/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabViewModel.cs
new file mode 100644
index 000000000..b6370dd9d
--- /dev/null
+++ b/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabViewModel.cs
@@ -0,0 +1,143 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Reactive.Disposables;
+using System.Threading.Tasks;
+using System.Xml.Serialization;
+using Artemis.Core;
+using Artemis.Core.Services;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
+using Artemis.UI.Shared.Services.Builders;
+using Avalonia.Controls;
+using ReactiveUI;
+using RGB.NET.Layout;
+using SkiaSharp;
+
+namespace Artemis.UI.Screens.Device;
+
+public class DeviceLayoutTabViewModel : ActivatableViewModelBase
+{
+    private readonly IWindowService _windowService;
+    private readonly INotificationService _notificationService;
+
+    public DeviceLayoutTabViewModel(
+        IWindowService windowService,
+        INotificationService notificationService,
+        ArtemisDevice device)
+    {
+        _windowService = windowService;
+        _notificationService = notificationService;
+
+        Device = device;
+        DisplayName = "Layout";
+        DefaultLayoutPath = Device.DeviceProvider.LoadLayout(Device).FilePath;
+    }
+
+    public ArtemisDevice Device { get; }
+    
+    public string DefaultLayoutPath { get; }
+    
+    public string CustomLayoutPath => Device.CustomLayoutPath ?? "None";
+    
+    public bool HasCustomLayout => Device.CustomLayoutPath != null;
+    
+    private void RaiseCustomLayoutChanged()
+    {
+        this.RaisePropertyChanged(nameof(CustomLayoutPath));
+        this.RaisePropertyChanged(nameof(HasCustomLayout));
+    }
+
+    public void ClearCustomLayout()
+    {
+        Device.CustomLayoutPath = null;
+        _notificationService.CreateNotification()
+            .WithMessage("Cleared imported layout.")
+            .WithSeverity(NotificationSeverity.Informational);
+
+        RaiseCustomLayoutChanged();
+    }
+
+    public async Task BrowseCustomLayout()
+    {
+        string[]? files = await _windowService.CreateOpenFileDialog()
+            .WithTitle("Select device layout file")
+            .HavingFilter(f => f.WithName("Layout files").WithExtension("xml"))
+            .ShowAsync();
+
+        if (files?.Length > 0)
+        {
+            Device.CustomLayoutPath = files[0];
+            _notificationService.CreateNotification()
+                .WithTitle("Imported layout")
+                .WithMessage($"File loaded from {files[0]}")
+                .WithSeverity(NotificationSeverity.Informational);
+        }
+        
+        RaiseCustomLayoutChanged();
+    }
+
+    public async Task ExportLayout()
+    {
+        string fileName = Device.DeviceProvider.GetDeviceLayoutName(Device);
+        string layoutDir = Constants.LayoutsFolder;
+        string filePath = Path.Combine(
+            layoutDir,
+            Device.RgbDevice.DeviceInfo.Manufacturer,
+            Device.DeviceType.ToString(),
+            fileName
+        );
+        if (!Directory.Exists(filePath))
+            Directory.CreateDirectory(filePath);
+
+        string? result = await _windowService.CreateSaveFileDialog()
+            .HavingFilter(f => f.WithExtension("xml").WithName("Artemis layout"))
+            .WithDirectory(filePath)
+            .WithInitialFileName(fileName)
+            .ShowAsync();
+
+        if (result == null)
+            return;
+
+        ArtemisLayout? layout = Device.Layout;
+        if (layout?.IsValid == true)
+        {
+            string path = layout.FilePath;
+            File.Copy(path, result, true);
+        }
+        else
+        {
+            List<LedLayout> ledLayouts = Device.Leds.Select(x => new LedLayout()
+            {
+                Id = x.RgbLed.Id.ToString(),
+                DescriptiveX = x.Rectangle.Left.ToString(),
+                DescriptiveY = x.Rectangle.Top.ToString(),
+                DescriptiveWidth = $"{x.Rectangle.Width}mm",
+                DescriptiveHeight = $"{x.Rectangle.Height}mm",
+            }).ToList();
+
+            DeviceLayout emptyLayout = new()
+            {
+                Author = "Artemis",
+                Type = Device.DeviceType,
+                Vendor = Device.RgbDevice.DeviceInfo.Manufacturer,
+                Model = Device.RgbDevice.DeviceInfo.Model,
+                Width = Device.Rectangle.Width,
+                Height = Device.Rectangle.Height,
+                InternalLeds = ledLayouts,
+            };
+
+            XmlSerializer serializer = new(typeof(DeviceLayout));
+            await using StreamWriter writer = new(result);
+            serializer.Serialize(writer, emptyLayout);
+        }
+
+        _notificationService.CreateNotification()
+            .WithMessage("Layout exported")
+            .WithTimeout(TimeSpan.FromSeconds(5))
+            .WithSeverity(NotificationSeverity.Success)
+            .Show();
+    }
+}
\ No newline at end of file

From af03f291d3a3ed3992fd0bf28c78fe8798301a0d Mon Sep 17 00:00:00 2001
From: Diogo Trindade <diogotr7@gmail.com>
Date: Fri, 16 Jun 2023 19:26:19 +0100
Subject: [PATCH 4/7] Removed Device info and properties tabs

---
 src/Artemis.UI/DryIoc/Factories/IVMFactory.cs |  12 -
 .../Device/DevicePropertiesViewModel.cs       |   2 -
 .../Device/Tabs/DeviceInfoTabView.axaml       |  88 ------
 .../Device/Tabs/DeviceInfoTabView.axaml.cs    |  24 --
 .../Device/Tabs/DeviceInfoTabViewModel.cs     |  29 --
 .../Device/Tabs/DevicePropertiesTabView.axaml | 204 -------------
 .../Tabs/DevicePropertiesTabView.axaml.cs     |  19 --
 .../Tabs/DevicePropertiesTabViewModel.cs      | 279 ------------------
 8 files changed, 657 deletions(-)
 delete mode 100644 src/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabView.axaml
 delete mode 100644 src/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabView.axaml.cs
 delete mode 100644 src/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabViewModel.cs
 delete mode 100644 src/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabView.axaml
 delete mode 100644 src/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabView.axaml.cs
 delete mode 100644 src/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabViewModel.cs

diff --git a/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs b/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs
index 8d94699dd..81dca6eff 100644
--- a/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs
+++ b/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs
@@ -40,9 +40,7 @@ public interface IDeviceVmFactory : IVmFactory
     DevicePropertiesViewModel DevicePropertiesViewModel(ArtemisDevice device);
     DeviceSettingsViewModel DeviceSettingsViewModel(ArtemisDevice device, DevicesTabViewModel devicesTabViewModel);
     DeviceDetectInputViewModel DeviceDetectInputViewModel(ArtemisDevice device);
-    DevicePropertiesTabViewModel DevicePropertiesTabViewModel(ArtemisDevice device);
     DeviceLayoutTabViewModel DeviceLayoutTabViewModel(ArtemisDevice device);
-    DeviceInfoTabViewModel DeviceInfoTabViewModel(ArtemisDevice device);
     DeviceLedsTabViewModel DeviceLedsTabViewModel(ArtemisDevice device, ObservableCollection<ArtemisLed> selectedLeds);
     InputMappingsTabViewModel InputMappingsTabViewModel(ArtemisDevice device, ObservableCollection<ArtemisLed> selectedLeds);
     DeviceGeneralTabViewModel DeviceGeneralTabViewModel(ArtemisDevice device);
@@ -71,21 +69,11 @@ public class DeviceFactory : IDeviceVmFactory
         return _container.Resolve<DeviceDetectInputViewModel>(new object[] { device });
     }
     
-    public DevicePropertiesTabViewModel DevicePropertiesTabViewModel(ArtemisDevice device)
-    {
-        return _container.Resolve<DevicePropertiesTabViewModel>(new object[] { device });
-    }
-
     public DeviceLayoutTabViewModel DeviceLayoutTabViewModel(ArtemisDevice device)
     {
         return _container.Resolve<DeviceLayoutTabViewModel>(new object[] { device });
     }
 
-    public DeviceInfoTabViewModel DeviceInfoTabViewModel(ArtemisDevice device)
-    {
-        return _container.Resolve<DeviceInfoTabViewModel>(new object[] { device });
-    }
-    
     public DeviceLedsTabViewModel DeviceLedsTabViewModel(ArtemisDevice device, ObservableCollection<ArtemisLed> selectedLeds)
     {
         return _container.Resolve<DeviceLedsTabViewModel>(new object[] { device, selectedLeds });
diff --git a/src/Artemis.UI/Screens/Device/DevicePropertiesViewModel.cs b/src/Artemis.UI/Screens/Device/DevicePropertiesViewModel.cs
index 395a718f8..2c9cf056a 100644
--- a/src/Artemis.UI/Screens/Device/DevicePropertiesViewModel.cs
+++ b/src/Artemis.UI/Screens/Device/DevicePropertiesViewModel.cs
@@ -66,8 +66,6 @@ public class DevicePropertiesViewModel : DialogViewModelBase<object>
     {
         Tabs.Add(_deviceVmFactory.DeviceGeneralTabViewModel(Device));
         Tabs.Add(_deviceVmFactory.DeviceLayoutTabViewModel(Device));
-        //Tabs.Add(_deviceVmFactory.DevicePropertiesTabViewModel(Device));
-        //Tabs.Add(_deviceVmFactory.DeviceInfoTabViewModel(Device));
         if (Device.DeviceType == RGBDeviceType.Keyboard)
             Tabs.Add(_deviceVmFactory.InputMappingsTabViewModel(Device, SelectedLeds));
         Tabs.Add(_deviceVmFactory.DeviceLedsTabViewModel(Device, SelectedLeds));
diff --git a/src/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabView.axaml b/src/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabView.axaml
deleted file mode 100644
index 1cb69cd13..000000000
--- a/src/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabView.axaml
+++ /dev/null
@@ -1,88 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:device="clr-namespace:Artemis.UI.Screens.Device"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Device.DeviceInfoTabView"
-             x:DataType="device:DeviceInfoTabViewModel">
-    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-        <Grid RowDefinitions="Auto,*" ColumnDefinitions="*,*" Margin="-5">
-            <!-- First row -->
-            <Border Classes="card" Grid.Column="0" Grid.Row="0" Margin="5">
-                <StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Top">
-                    <TextBlock FontWeight="Bold">Device name</TextBlock>
-                    <TextBlock TextWrapping="Wrap" Text="{CompiledBinding Device.RgbDevice.DeviceInfo.DeviceName}" />
-                    <Border Classes="card-separator" />
-
-                    <TextBlock FontWeight="Bold">Manufacturer</TextBlock>
-                    <TextBlock TextWrapping="Wrap" Text="{CompiledBinding Device.RgbDevice.DeviceInfo.Manufacturer}" />
-                    <Border Classes="card-separator" />
-
-
-                    <TextBlock FontWeight="Bold">Device type</TextBlock>
-                    <TextBlock TextWrapping="Wrap" Text="{CompiledBinding Device.DeviceType}" />
-                    <Border Classes="card-separator" IsVisible="{CompiledBinding IsKeyboard}" />
-
-                    <StackPanel IsVisible="{CompiledBinding IsKeyboard}">
-                        <TextBlock FontWeight="Bold">Physical layout</TextBlock>
-                        <TextBlock TextWrapping="Wrap" Text="{CompiledBinding Device.PhysicalLayout}" />
-                    </StackPanel>
-                </StackPanel>
-            </Border>
-
-            <Border Classes="card" Grid.Row="0" Grid.Column="1" Margin="5">
-                <StackPanel VerticalAlignment="Top">
-                    <TextBlock FontWeight="Bold">Size (1px = 1mm)</TextBlock>
-                    <TextBlock TextWrapping="Wrap" Text="{CompiledBinding Device.RgbDevice.Size}" />
-                    <Border Classes="card-separator" />
-
-                    <TextBlock FontWeight="Bold">Location (1px = 1mm)</TextBlock>
-                    <TextBlock TextWrapping="Wrap" Text="{CompiledBinding Device.RgbDevice.Location}" />
-                    <Border Classes="card-separator" />
-
-                    <TextBlock FontWeight="Bold">Rotation (degrees)</TextBlock>
-                    <TextBlock TextWrapping="Wrap" Text="{CompiledBinding Device.RgbDevice.Rotation.Degrees}" />
-                    <Border Classes="card-separator" IsVisible="{CompiledBinding IsKeyboard}" />
-
-                    <StackPanel IsVisible="{CompiledBinding IsKeyboard}">
-                        <TextBlock FontWeight="Bold">Logical layout</TextBlock>
-                        <TextBlock TextWrapping="Wrap" Text="{CompiledBinding Device.LogicalLayout}" />
-                    </StackPanel>
-                </StackPanel>
-            </Border>
-
-            <!-- Second row -->
-            <Border Classes="card" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" Margin="5">
-                <StackPanel>
-                    <Grid ColumnDefinitions="*,Auto">
-                        <TextBlock FontWeight="Bold">Default layout file path</TextBlock>
-                        <Button Grid.Column="1"
-                                Classes="icon-button"
-                                ToolTip.Tip="Copy path to clipboard"
-                                Click="LayoutPathButton_OnClick">
-                            <avalonia:MaterialIcon Kind="ContentCopy" Width="18" Height="18" />
-                        </Button>
-                    </Grid>
-                    <TextBlock
-                        TextWrapping="Wrap"
-                        Text="{CompiledBinding DefaultLayoutPath}" />
-                    <Border Classes="card-separator" />
-
-                    <Grid ColumnDefinitions="*,Auto">
-                        <TextBlock FontWeight="Bold">Image file path</TextBlock>
-                        <Button Grid.Column="1"
-                                Classes="icon-button"
-                                ToolTip.Tip="Copy path to clipboard"
-                                Click="ImagePathButton_OnClick">
-                            <avalonia:MaterialIcon Kind="ContentCopy" Width="18" Height="18" />
-                        </Button>
-                    </Grid>
-                    <TextBlock TextWrapping="Wrap" Text="{CompiledBinding Device.Layout.Image.LocalPath}" />
-                </StackPanel>
-            </Border>
-        </Grid>
-    </ScrollViewer>
-
-</UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabView.axaml.cs b/src/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabView.axaml.cs
deleted file mode 100644
index 2a84f5581..000000000
--- a/src/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabView.axaml.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
-using Avalonia.ReactiveUI;
-
-namespace Artemis.UI.Screens.Device;
-
-public partial class DeviceInfoTabView : ReactiveUserControl<DeviceInfoTabViewModel>
-{
-    public DeviceInfoTabView()
-    {
-        InitializeComponent();
-    }
-
-    private void LayoutPathButton_OnClick(object? sender, RoutedEventArgs e)
-    {
-        TopLevel.GetTopLevel(this).Clipboard.SetTextAsync(ViewModel.DefaultLayoutPath);
-    }
-
-    private void ImagePathButton_OnClick(object? sender, RoutedEventArgs e)
-    {
-        TopLevel.GetTopLevel(this).Clipboard.SetTextAsync(ViewModel.Device.Layout.Image.LocalPath);
-    }
-}
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabViewModel.cs b/src/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabViewModel.cs
deleted file mode 100644
index 8ca43ad00..000000000
--- a/src/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabViewModel.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Threading.Tasks;
-using Artemis.Core;
-using Artemis.UI.Shared;
-using Artemis.UI.Shared.Services;
-using Avalonia;
-using Avalonia.Controls;
-using RGB.NET.Core;
-
-namespace Artemis.UI.Screens.Device;
-
-public class DeviceInfoTabViewModel : ActivatableViewModelBase
-{
-    private readonly INotificationService _notificationService;
-
-    public DeviceInfoTabViewModel(ArtemisDevice device, INotificationService notificationService)
-    {
-        _notificationService = notificationService;
-
-        Device = device;
-        DisplayName = "Info";
-
-        DefaultLayoutPath = Device.DeviceProvider.LoadLayout(Device).FilePath;
-    }
-
-    public bool IsKeyboard => Device.DeviceType == RGBDeviceType.Keyboard;
-    public ArtemisDevice Device { get; }
-
-    public string DefaultLayoutPath { get; }
-}
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabView.axaml b/src/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabView.axaml
deleted file mode 100644
index b4e0012af..000000000
--- a/src/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabView.axaml
+++ /dev/null
@@ -1,204 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-             xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:converters="clr-namespace:Artemis.UI.Shared.Converters;assembly=Artemis.UI.Shared"
-             xmlns:device="clr-namespace:Artemis.UI.Screens.Device"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="1200"
-             x:Class="Artemis.UI.Screens.Device.DevicePropertiesTabView"
-             x:DataType="device:DevicePropertiesTabViewModel">
-    <UserControl.Resources>
-        <converters:SKColorToColorConverter x:Key="SKColorToColorConverter" />
-    </UserControl.Resources>
-
-    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-        <!-- Body -->
-        <Grid RowDefinitions="*,Auto">
-            <StackPanel Grid.Row="0">
-                <!-- Layout -->
-                <TextBlock Classes="h4">
-                    Categories
-                </TextBlock>
-                <TextBlock TextWrapping="Wrap">
-                    Artemis uses categories to determine where the layers of imported profiles are applied to.
-                </TextBlock>
-                <TextBlock TextWrapping="Wrap">
-                    You can hover over a category for a more detailed description.
-                </TextBlock>
-                <StackPanel Orientation="Horizontal">
-                    <CheckBox IsChecked="{CompiledBinding HasDeskCategory}"
-                              ToolTip.Tip="A device acting as desk ornamentation such as a LED strip"
-                              Content="Desk" />
-                    <CheckBox IsChecked="{CompiledBinding HasMonitorCategory}"
-                              ToolTip.Tip="A device attached to the monitor such as ambilight LEDs"
-                              Content="Monitor" />
-                    <CheckBox ToolTip.Tip="A device inside your computer case"
-                              IsChecked="{CompiledBinding HasCaseCategory}"
-                              Content="Case" />
-                    <CheckBox IsChecked="{CompiledBinding HasRoomCategory}"
-                              ToolTip.Tip="A device elsewhere in the room"
-                              Content="Room" />
-                    <CheckBox IsChecked="{CompiledBinding HasPeripheralsCategory}"
-                              ToolTip.Tip="A peripheral such as a mouse or keyboard"
-                              Content="Peripheral" />
-                </StackPanel>
-
-                <Grid Margin="0 25" ColumnDefinitions="*,40,*">
-                    <Grid Grid.Column="0" ColumnDefinitions="*,Auto,Auto" RowDefinitions="*,*,*,*,*">
-                        <TextBlock Grid.Row="0" Grid.ColumnSpan="3" Classes="h4">
-                            Surface properties
-                        </TextBlock>
-
-                        <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center">X-coordinate</TextBlock>
-                        <NumericUpDown Grid.Row="1"
-                                       Grid.Column="1"
-                                       Margin="10 0"
-                                       VerticalAlignment="Center"
-                                       Value="{CompiledBinding X}" />
-                        <TextBlock Grid.Row="1" Grid.Column="2" VerticalAlignment="Center">mm</TextBlock>
-
-                        <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center">Y-coordinate</TextBlock>
-                        <NumericUpDown Grid.Row="2"
-                                       Grid.Column="1"
-                                       Margin="10 0"
-                                       VerticalAlignment="Center"
-                                       Value="{CompiledBinding Y}" />
-                        <TextBlock Grid.Row="2" Grid.Column="2" VerticalAlignment="Center">mm</TextBlock>
-
-                        <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center">Scale</TextBlock>
-                        <NumericUpDown Grid.Row="3"
-                                       Grid.Column="1"
-                                       Margin="10 0"
-                                       VerticalAlignment="Center"
-                                       Increment="0.1"
-                                       FormatString="F1"
-                                       Value="{CompiledBinding Scale}" />
-                        <TextBlock Grid.Row="3" Grid.Column="2" VerticalAlignment="Center">times</TextBlock>
-
-                        <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center">Rotation</TextBlock>
-                        <NumericUpDown Grid.Row="4"
-                                       Grid.Column="1"
-                                       Margin="10 0"
-                                       VerticalAlignment="Center"
-                                       Value="{CompiledBinding Rotation}" />
-                        <TextBlock Grid.Row="4" Grid.Column="2" VerticalAlignment="Center">deg</TextBlock>
-
-                    </Grid>
-
-                    <Rectangle Grid.Column="1" VerticalAlignment="Stretch" Width="1" Fill="{DynamicResource ButtonBorderBrush}" Margin="0 0 0 5" />
-
-                    <StackPanel Grid.Column="2">
-                        <TextBlock Classes="h4">
-                            Color calibration
-                        </TextBlock>
-
-                        <TextBlock TextWrapping="Wrap">
-                            Use the sliders below to adjust the colors of your device so that it matches your other devices.
-                        </TextBlock>
-
-                        <Grid ColumnDefinitions="Auto,*,Auto" RowDefinitions="*,*,*,*">
-                            <Label Grid.Row="0" Grid.Column="0" Content="R" VerticalAlignment="Center" />
-                            <Slider Grid.Row="0" Grid.Column="1" Minimum="0" Maximum="200" Value="{CompiledBinding RedScale}" Margin="10 0" VerticalAlignment="Center" />
-                            <NumericUpDown Grid.Row="0"
-                                           Grid.Column="2"
-                                           VerticalAlignment="Center"
-                                           Width="65"
-                                           Value="{CompiledBinding RedScale}"
-                                           ShowButtonSpinner="False"
-                                           FormatString="{}{0:0.0}"
-                                           Minimum="0"
-                                           Maximum="200"
-                                           ClipValueToMinMax="True" />
-
-                            <Label Grid.Row="1" Grid.Column="0" Content="G" VerticalAlignment="Center" />
-                            <Slider Grid.Row="1" Grid.Column="1" Minimum="0" Maximum="200" Value="{CompiledBinding GreenScale}" Margin="10 0" VerticalAlignment="Center" />
-                            <NumericUpDown Grid.Row="1"
-                                           Grid.Column="2"
-                                           VerticalAlignment="Center"
-                                           Width="65"
-                                           Value="{CompiledBinding GreenScale}"
-                                           ShowButtonSpinner="False"
-                                           FormatString="{}{0:0.0}"
-                                           Minimum="0"
-                                           Maximum="200"
-                                           ClipValueToMinMax="True" />
-
-                            <Label Grid.Row="2" Grid.Column="0" Content="B" VerticalAlignment="Center" />
-                            <Slider Grid.Row="2" Grid.Column="1" Minimum="0" Maximum="200" Value="{CompiledBinding BlueScale}" Margin="10 0" Ticks="100" VerticalAlignment="Center" />
-                            <NumericUpDown Grid.Row="2"
-                                           Grid.Column="2"
-                                           VerticalAlignment="Center"
-                                           Width="65"
-                                           Value="{CompiledBinding BlueScale}"
-                                           ShowButtonSpinner="False"
-                                           FormatString="{}{0:0.0}"
-                                           Minimum="0"
-                                           Maximum="200"
-                                           ClipValueToMinMax="True" />
-
-                            <CheckBox Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" IsChecked="{CompiledBinding DisplayOnDevices}" Content="Show preview" VerticalAlignment="Center" />
-                            <controls:ColorPickerButton Grid.Row="3"
-                                                        Grid.Column="2"
-                                                        VerticalAlignment="Center"
-                                                        HorizontalAlignment="Right"
-                                                        Color="{CompiledBinding CurrentColor, Converter={StaticResource SKColorToColorConverter}}"
-                                                        ShowAcceptDismissButtons="False" />
-                        </Grid>
-                    </StackPanel>
-                </Grid>
-
-                <!-- Layout -->
-                <TextBlock Classes="h4">
-                    Layout
-                </TextBlock>
-                <TextBlock TextWrapping="Wrap">
-                    The device layout is used to determine the position of LEDs and to create the visual representation of the device you see on the left side of this window.
-                </TextBlock>
-
-                <CheckBox Margin="0 0 0 5" IsChecked="{CompiledBinding Device.DisableDefaultLayout}">
-                    <CheckBox.Content>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock>Don't load default layout</TextBlock>
-                            <avalonia:MaterialIcon Kind="HelpCircle"
-                                                   Margin="5 0"
-                                                   ToolTip.Tip="With this enabled Artemis will not load a layout for this device unless you specifically provide one." />
-                        </StackPanel>
-                    </CheckBox.Content>
-                </CheckBox>
-
-                <Grid>
-                    <TextBox Text="{CompiledBinding Device.CustomLayoutPath}"
-                             Watermark="Custom layout path"
-                             UseFloatingWatermark="True"
-                             IsReadOnly="True"
-                             PointerReleased="InputElement_OnPointerReleased"
-                             Padding="10 5 36 6" />
-                    <Button Classes="AppBarButton" HorizontalAlignment="Right" Command="{CompiledBinding ClearCustomLayout}" Padding="6" Margin="5 0">
-                        <avalonia:MaterialIcon Kind="CloseCircle" />
-                    </Button>
-                </Grid>
-
-                <controls:HyperlinkButton NavigateUri="https://wiki.artemis-rgb.com/en/guides/developer/layouts" Margin="0 20" HorizontalAlignment="Right">
-                    Learn more about layouts on the wiki
-                </controls:HyperlinkButton>
-            </StackPanel>
-
-            <!-- Buttons -->
-            <Grid Grid.Row="1" ColumnDefinitions="Auto,*">
-                <Button Grid.Column="0"
-                        IsVisible="{CompiledBinding RequiresManualSetup}"
-                        Command="{CompiledBinding RestartSetup}"
-                        ToolTip.Tip="Restart device setup, allowing you to select a new physical and logical layout">
-                    Restart setup
-                </Button>
-
-                <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
-                    <Button IsCancel="True" Command="{CompiledBinding Reset}" Margin="0 0 5 0">Reset</Button>
-                    <Button Classes="accent" IsDefault="True" Command="{CompiledBinding Apply}">Apply</Button>
-                </StackPanel>
-            </Grid>
-        </Grid>
-    </ScrollViewer>
-</UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabView.axaml.cs b/src/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabView.axaml.cs
deleted file mode 100644
index f71b14155..000000000
--- a/src/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabView.axaml.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Avalonia.Input;
-using Avalonia.Markup.Xaml;
-using Avalonia.ReactiveUI;
-
-namespace Artemis.UI.Screens.Device;
-
-public partial class DevicePropertiesTabView : ReactiveUserControl<DevicePropertiesTabViewModel>
-{
-    public DevicePropertiesTabView()
-    {
-        InitializeComponent();
-    }
-
-
-    private void InputElement_OnPointerReleased(object? sender, PointerReleasedEventArgs e)
-    {
-        ViewModel?.BrowseCustomLayout();
-    }
-}
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabViewModel.cs b/src/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabViewModel.cs
deleted file mode 100644
index da3ac2fb3..000000000
--- a/src/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabViewModel.cs
+++ /dev/null
@@ -1,279 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Reactive.Disposables;
-using System.Threading.Tasks;
-using Artemis.Core;
-using Artemis.Core.Services;
-using Artemis.UI.Shared;
-using Artemis.UI.Shared.Services;
-using Artemis.UI.Shared.Services.Builders;
-using ReactiveUI;
-using SkiaSharp;
-
-namespace Artemis.UI.Screens.Device;
-
-public class DevicePropertiesTabViewModel : ActivatableViewModelBase
-{
-    private readonly List<DeviceCategory> _categories;
-    private readonly ICoreService _coreService;
-    private readonly float _initialBlueScale;
-    private readonly float _initialGreenScale;
-    private readonly float _initialRedScale;
-    private readonly INotificationService _notificationService;
-    private readonly IRgbService _rgbService;
-    private readonly IWindowService _windowService;
-    private float _blueScale;
-    private SKColor _currentColor;
-    private bool _displayOnDevices;
-    private float _greenScale;
-    private float _redScale;
-    private int _rotation;
-    private float _scale;
-    private int _x;
-    private int _y;
-
-    public DevicePropertiesTabViewModel(ArtemisDevice device, ICoreService coreService, IRgbService rgbService, IWindowService windowService, INotificationService notificationService)
-    {
-        _coreService = coreService;
-        _rgbService = rgbService;
-        _windowService = windowService;
-        _notificationService = notificationService;
-        _categories = new List<DeviceCategory>(device.Categories);
-
-        Device = device;
-        DisplayName = "Properties";
-
-        X = (int) Device.X;
-        Y = (int) Device.Y;
-        Scale = Device.Scale;
-        Rotation = (int) Device.Rotation;
-        RedScale = Device.RedScale * 100f;
-        GreenScale = Device.GreenScale * 100f;
-        BlueScale = Device.BlueScale * 100f;
-        CurrentColor = SKColors.White;
-
-        // We need to store the initial values to be able to restore them when the user clicks "Cancel"
-        _initialRedScale = Device.RedScale;
-        _initialGreenScale = Device.GreenScale;
-        _initialBlueScale = Device.BlueScale;
-
-        this.WhenAnyValue(x => x.RedScale, x => x.GreenScale, x => x.BlueScale).Subscribe(_ => ApplyScaling());
-
-        this.WhenActivated(d =>
-        {
-            Device.PropertyChanged += DeviceOnPropertyChanged;
-            _coreService.FrameRendering += OnFrameRendering;
-
-            Disposable.Create(() =>
-            {
-                _coreService.FrameRendering -= OnFrameRendering;
-                Device.PropertyChanged -= DeviceOnPropertyChanged;
-            }).DisposeWith(d);
-        });
-    }
-
-    public ArtemisDevice Device { get; }
-
-    public int X
-    {
-        get => _x;
-        set => RaiseAndSetIfChanged(ref _x, value);
-    }
-
-    public int Y
-    {
-        get => _y;
-        set => RaiseAndSetIfChanged(ref _y, value);
-    }
-
-    public float Scale
-    {
-        get => _scale;
-        set => RaiseAndSetIfChanged(ref _scale, value);
-    }
-
-    public int Rotation
-    {
-        get => _rotation;
-        set => RaiseAndSetIfChanged(ref _rotation, value);
-    }
-
-    public float RedScale
-    {
-        get => _redScale;
-        set => RaiseAndSetIfChanged(ref _redScale, value);
-    }
-
-    public float GreenScale
-    {
-        get => _greenScale;
-        set => RaiseAndSetIfChanged(ref _greenScale, value);
-    }
-
-    public float BlueScale
-    {
-        get => _blueScale;
-        set => RaiseAndSetIfChanged(ref _blueScale, value);
-    }
-
-    public SKColor CurrentColor
-    {
-        get => _currentColor;
-        set => RaiseAndSetIfChanged(ref _currentColor, value);
-    }
-
-    public bool DisplayOnDevices
-    {
-        get => _displayOnDevices;
-        set => RaiseAndSetIfChanged(ref _displayOnDevices, value);
-    }
-
-    // This solution won't scale well but I don't expect there to be many more categories.
-    // If for some reason there will be, dynamically creating a view model per category may be more appropriate
-    public bool HasDeskCategory
-    {
-        get => GetCategory(DeviceCategory.Desk);
-        set => SetCategory(DeviceCategory.Desk, value);
-    }
-
-    public bool HasMonitorCategory
-    {
-        get => GetCategory(DeviceCategory.Monitor);
-        set => SetCategory(DeviceCategory.Monitor, value);
-    }
-
-    public bool HasCaseCategory
-    {
-        get => GetCategory(DeviceCategory.Case);
-        set => SetCategory(DeviceCategory.Case, value);
-    }
-
-    public bool HasRoomCategory
-    {
-        get => GetCategory(DeviceCategory.Room);
-        set => SetCategory(DeviceCategory.Room, value);
-    }
-
-    public bool HasPeripheralsCategory
-    {
-        get => GetCategory(DeviceCategory.Peripherals);
-        set => SetCategory(DeviceCategory.Peripherals, value);
-    }
-
-    public bool RequiresManualSetup => !Device.DeviceProvider.CanDetectPhysicalLayout || !Device.DeviceProvider.CanDetectLogicalLayout;
-
-    public void ApplyScaling()
-    {
-        Device.RedScale = RedScale / 100f;
-        Device.GreenScale = GreenScale / 100f;
-        Device.BlueScale = BlueScale / 100f;
-
-        _rgbService.FlushLeds = true;
-    }
-
-    public void ClearCustomLayout()
-    {
-        Device.CustomLayoutPath = null;
-        _notificationService.CreateNotification()
-            .WithMessage("Cleared imported layout.")
-            .WithSeverity(NotificationSeverity.Informational);
-    }
-
-    public async Task BrowseCustomLayout()
-    {
-        string[]? files = await _windowService.CreateOpenFileDialog()
-            .WithTitle("Select device layout file")
-            .HavingFilter(f => f.WithName("Layout files").WithExtension("xml"))
-            .ShowAsync();
-
-        if (files?.Length > 0)
-        {
-            Device.CustomLayoutPath = files[0];
-            _notificationService.CreateNotification()
-                .WithTitle("Imported layout")
-                .WithMessage($"File loaded from {files[0]}")
-                .WithSeverity(NotificationSeverity.Informational);
-        }
-    }
-
-    public async Task RestartSetup()
-    {
-        if (!RequiresManualSetup)
-            return;
-        if (!Device.DeviceProvider.CanDetectPhysicalLayout && !await DevicePhysicalLayoutDialogViewModel.SelectPhysicalLayout(_windowService, Device))
-            return;
-        if (!Device.DeviceProvider.CanDetectLogicalLayout && !await DeviceLogicalLayoutDialogViewModel.SelectLogicalLayout(_windowService, Device))
-            return;
-
-        await Task.Delay(400);
-        _rgbService.SaveDevice(Device);
-        _rgbService.ApplyBestDeviceLayout(Device);
-    }
-
-    public async Task Apply()
-    {
-        // TODO: Validation
-
-        _coreService.ProfileRenderingDisabled = true;
-        await Task.Delay(100);
-
-        Device.X = X;
-        Device.Y = Y;
-        Device.Scale = Scale;
-        Device.Rotation = Rotation;
-        Device.RedScale = RedScale / 100f;
-        Device.GreenScale = GreenScale / 100f;
-        Device.BlueScale = BlueScale / 100f;
-        Device.Categories.Clear();
-        foreach (DeviceCategory deviceCategory in _categories)
-            Device.Categories.Add(deviceCategory);
-
-        _rgbService.SaveDevice(Device);
-
-        _coreService.ProfileRenderingDisabled = false;
-    }
-
-    public void Reset()
-    {
-        HasDeskCategory = Device.Categories.Contains(DeviceCategory.Desk);
-        HasMonitorCategory = Device.Categories.Contains(DeviceCategory.Monitor);
-        HasCaseCategory = Device.Categories.Contains(DeviceCategory.Case);
-        HasRoomCategory = Device.Categories.Contains(DeviceCategory.Room);
-        HasPeripheralsCategory = Device.Categories.Contains(DeviceCategory.Peripherals);
-
-        RedScale = _initialRedScale * 100;
-        GreenScale = _initialGreenScale * 100;
-        BlueScale = _initialBlueScale * 100;
-    }
-
-    private bool GetCategory(DeviceCategory category)
-    {
-        return _categories.Contains(category);
-    }
-
-    private void SetCategory(DeviceCategory category, bool value)
-    {
-        if (value && !_categories.Contains(category))
-            _categories.Add(category);
-        else if (!value)
-            _categories.Remove(category);
-
-        this.RaisePropertyChanged($"Has{category}Category");
-    }
-
-    private void OnFrameRendering(object? sender, FrameRenderingEventArgs e)
-    {
-        if (!_displayOnDevices)
-            return;
-
-        using SKPaint overlayPaint = new() {Color = CurrentColor};
-        e.Canvas.DrawRect(0, 0, e.Canvas.LocalClipBounds.Width, e.Canvas.LocalClipBounds.Height, overlayPaint);
-    }
-
-    private void DeviceOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
-    {
-        if (e.PropertyName == nameof(Device.CustomLayoutPath) || e.PropertyName == nameof(Device.DisableDefaultLayout))
-            Task.Run(() => _rgbService.ApplyBestDeviceLayout(Device));
-    }
-}
\ No newline at end of file

From 49d229cd2b5b706293c1a6dee78e85ddb1c349bc Mon Sep 17 00:00:00 2001
From: Robert <mail@rbeekman.nl>
Date: Fri, 16 Jun 2023 22:58:48 +0200
Subject: [PATCH 5/7] Tweak background

---
 .../Screens/Device/DevicePropertiesView.axaml | 91 ++++++++++---------
 1 file changed, 46 insertions(+), 45 deletions(-)

diff --git a/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml b/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml
index 9b78bb060..54c9d496b 100644
--- a/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml
+++ b/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml
@@ -1,58 +1,59 @@
 <windowing:AppWindow xmlns="https://github.com/avaloniaui"
-                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                      xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
-                      xmlns:device="clr-namespace:Artemis.UI.Screens.Device"
-                      xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia"
-                      mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="800"
-                      x:Class="Artemis.UI.Screens.Device.DevicePropertiesView"
-                      x:DataType="device:DevicePropertiesViewModel"
-                      Icon="/Assets/Images/Logo/application.ico"
-                      Title="Artemis | Device Properties"
-                      WindowStartupLocation="CenterOwner"
-                      Width="1400"
-                      Height="800">
+                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                     xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
+                     xmlns:device="clr-namespace:Artemis.UI.Screens.Device"
+                     xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia"
+                     mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="800"
+                     x:Class="Artemis.UI.Screens.Device.DevicePropertiesView"
+                     x:DataType="device:DevicePropertiesViewModel"
+                     Icon="/Assets/Images/Logo/application.ico"
+                     Title="Artemis | Device Properties"
+                     WindowStartupLocation="CenterOwner"
+                     Width="1400"
+                     Height="800">
     <windowing:AppWindow.KeyBindings>
         <KeyBinding Gesture="Escape" Command="{CompiledBinding ClearSelectedLeds}" />
     </windowing:AppWindow.KeyBindings>
     <Grid ColumnDefinitions="*,0,1.5*">
-        <Grid.Background>
-            <VisualBrush TileMode="Tile" Stretch="Uniform" DestinationRect="0,0,25,25">
-                <VisualBrush.Visual>
-                    <Grid Width="25" Height="25" RowDefinitions="*,*" ColumnDefinitions="*,*">
-                        <Rectangle Grid.Row="0" Grid.Column="0" Fill="Black" Opacity="0.15" />
-                        <Rectangle Grid.Row="0" Grid.Column="1" />
-                        <Rectangle Grid.Row="1" Grid.Column="0" />
-                        <Rectangle Grid.Row="1" Grid.Column="1" Fill="Black" Opacity="0.15" />
-                    </Grid>
-                </VisualBrush.Visual>
-            </VisualBrush>
-        </Grid.Background>
-        <Grid Grid.Column="0" Name="DeviceDisplayGrid" PointerReleased="DeviceDisplayGrid_OnPointerReleased">
-            <shared:DeviceVisualizer Device="{CompiledBinding Device}"
-                                     HorizontalAlignment="Center"
-                                     VerticalAlignment="Center"
-                                     ShowColors="True"
-                                     Margin="20"
-                                     RenderOptions.BitmapInterpolationMode="MediumQuality"
-                                     LedClicked="DeviceVisualizer_OnLedClicked"
-                                     Clicked="DeviceVisualizer_OnClicked" />
+        <Border Grid.Column="0" Classes="card" Margin="5">
+            <Border.Background>
+                <VisualBrush TileMode="Tile" Stretch="Uniform" DestinationRect="0,0,25,25">
+                    <VisualBrush.Visual>
+                        <Grid Width="25" Height="25" RowDefinitions="*,*" ColumnDefinitions="*,*">
+                            <Rectangle Grid.Row="0" Grid.Column="0" Fill="Black" Opacity="0.15" />
+                            <Rectangle Grid.Row="0" Grid.Column="1" />
+                            <Rectangle Grid.Row="1" Grid.Column="0" />
+                            <Rectangle Grid.Row="1" Grid.Column="1" Fill="Black" Opacity="0.15" />
+                        </Grid>
+                    </VisualBrush.Visual>
+                </VisualBrush>
+            </Border.Background>
+            <Grid Name="DeviceDisplayGrid" PointerReleased="DeviceDisplayGrid_OnPointerReleased">
+                <shared:DeviceVisualizer Device="{CompiledBinding Device}"
+                                         HorizontalAlignment="Center"
+                                         VerticalAlignment="Center"
+                                         ShowColors="True"
+                                         Margin="5"
+                                         RenderOptions.BitmapInterpolationMode="MediumQuality"
+                                         LedClicked="DeviceVisualizer_OnLedClicked"
+                                         Clicked="DeviceVisualizer_OnClicked" />
 
-            <StackPanel Orientation="Horizontal"
-                        VerticalAlignment="Bottom"
-                        HorizontalAlignment="Left"
-                        Margin="15"
-                        IsVisible="{CompiledBinding Device.Layout.RgbLayout.Author, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
-                <TextBlock Classes="h5" Text="Device layout by " />
-                <TextBlock Classes="h5" FontWeight="Bold" Text="{CompiledBinding Device.Layout.RgbLayout.Author}" />
-            </StackPanel>
-        </Grid>
+                <StackPanel Orientation="Horizontal"
+                            VerticalAlignment="Bottom"
+                            HorizontalAlignment="Left"
+                            IsVisible="{CompiledBinding Device.Layout.RgbLayout.Author, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+                    <TextBlock Classes="h5" Text="Device layout by " />
+                    <TextBlock Classes="h5" FontWeight="Bold" Text="{CompiledBinding Device.Layout.RgbLayout.Author}" />
+                </StackPanel>
+            </Grid>
+        </Border>
 
 
         <GridSplitter Grid.Column="1" Width="15" Margin="-15 0 0 0" Background="Transparent" HorizontalAlignment="Stretch" />
 
-        <Border Grid.Column="2" Classes="card-condensed" Margin="5" Background="#ff323232">
+        <Border Grid.Column="2" Classes="card-condensed" Margin="5">
             <Panel>
                 <TabControl ItemsSource="{CompiledBinding Tabs}" IsVisible="{CompiledBinding Tabs.Count}" Padding="12">
                     <TabControl.ItemTemplate>

From 480e0b9b12f9e9a2df392ee16d03986e41841e56 Mon Sep 17 00:00:00 2001
From: Diogo Trindade <diogotr7@gmail.com>
Date: Fri, 16 Jun 2023 22:52:42 +0100
Subject: [PATCH 6/7] Clean up layout view

---
 .../Screens/Device/DevicePropertiesView.axaml |  2 +-
 .../Device/Tabs/DeviceLayoutTabView.axaml     | 81 ++++++++++---------
 .../Device/Tabs/DeviceLayoutTabView.axaml.cs  |  2 +
 .../Device/Tabs/DeviceLayoutTabViewModel.cs   |  8 ++
 4 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml b/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml
index 54c9d496b..2d0bccd94 100644
--- a/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml
+++ b/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml
@@ -70,6 +70,6 @@
 
         </Border>
 
-        <StackPanel Grid.Column="0" Grid.ColumnSpan="3" Classes="notification-container" Name="NotificationContainer" VerticalAlignment="Bottom" HorizontalAlignment="Right" />
+        <StackPanel Grid.Column="0" Grid.ColumnSpan="3" Classes="notification-container" Name="NotificationContainer" VerticalAlignment="Top" HorizontalAlignment="Right" />
     </Grid>
 </windowing:AppWindow>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml b/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml
index c09794871..877afaaa4 100644
--- a/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml
+++ b/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml
@@ -12,71 +12,78 @@
         <Border Classes="card" Margin="5">
             <Grid RowDefinitions="*,Auto">
                 <StackPanel Grid.Row="0">
-                    <TextBlock
-                        TextWrapping="Wrap"
-                        Text="The device layout is used to determine the position of LEDs and to create the visual representation of the device." />
-                    <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,*,*,*,*" Margin="0, 20,0,0">
-                        <StackPanel Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Margin="0,0,0,10" >
+                    <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+                        <StackPanel Grid.Row="0" Grid.Column="0">
                             <TextBlock Text="Default layout file path" />
                             <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="{CompiledBinding DefaultLayoutPath}" />
                         </StackPanel>
-                        <Button
-                            Grid.Column="1"
-                            Grid.Row="0"
-                            Classes="icon-button"
-                            HorizontalAlignment="Right"
-                            ToolTip.Tip="Copy layout file path to clipboard"
-                            Click="LayoutPathButton_OnClick">
-                            <avalonia:MaterialIcon Kind="ContentCopy" Width="18" Height="18" />
-                        </Button>
-
-                        <StackPanel Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"  Margin="0,0,0,10">
+                        <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+                            <Button
+                                Classes="icon-button"
+                                HorizontalAlignment="Right"
+                                ToolTip.Tip="Copy layout file path to clipboard"
+                                Click="LayoutPathButton_OnClick">
+                                <avalonia:MaterialIcon Kind="ContentCopy" Width="18" Height="18" />
+                            </Button>
+                        </StackPanel>
+                    </Grid>
+                    <Border Classes="card-separator" />
+                    <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+                        <StackPanel Grid.Row="1" Grid.Column="0">
                             <TextBlock Text="Image file path" />
                             <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="{CompiledBinding Device.Layout.Image.LocalPath}" />
                         </StackPanel>
-                        <Button
-                            Grid.Column="1"
-                            Grid.Row="1"
-                            Classes="icon-button"
-                            HorizontalAlignment="Right"
-                            ToolTip.Tip="Copy image file path to clipboard"
-                            Click="ImagePathButton_OnClick">
-                            <avalonia:MaterialIcon Kind="ContentCopy" Width="18" Height="18" />
-                        </Button>
-
-                        <StackPanel Grid.Column="0" Grid.Row="2" Margin="0,0,0,10">
+                        <StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center">
+                            <Button
+                                Classes="icon-button"
+                                HorizontalAlignment="Right"
+                                ToolTip.Tip="Copy image file path to clipboard"
+                                Click="ImagePathButton_OnClick">
+                                <avalonia:MaterialIcon Kind="ContentCopy" Width="18" Height="18" />
+                            </Button>
+                        </StackPanel>
+                    </Grid>
+                    <Border Classes="card-separator" />
+                    <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+                        <StackPanel Grid.Row="1" Grid.Column="0">
                             <TextBlock Text="Disable default layout" />
                             <TextBlock Classes="subtitle" FontSize="12" Text="With this checked, Artemis will not load a layout for this device unless you specifically provide one." />
                         </StackPanel>
-                        <CheckBox Grid.Column="1" Grid.Row="2" HorizontalAlignment="Right" Margin="0,0,-10,0" />
-
-                        <StackPanel Grid.Column="0" Grid.Row="3" Margin="0,0,0,10">
+                        <StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center">
+                            <CheckBox HorizontalAlignment="Right" Margin="0,0,-10,0" />
+                        </StackPanel>
+                    </Grid>
+                    <Border Classes="card-separator" />
+                    <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+                        <StackPanel Grid.Row="1" Grid.Column="0">
                             <TextBlock Text="Custom layout path" />
                             <TextBlock Classes="subtitle" FontSize="12" Text="{CompiledBinding CustomLayoutPath}" />
                         </StackPanel>
-                        <StackPanel Grid.Column="1" Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
+                        <StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">
                             <Button Content="Clear" Command="{CompiledBinding ClearCustomLayout}" IsEnabled="{CompiledBinding HasCustomLayout}" />
                             <!-- 5 pixels of margin between the buttons -->
                             <Button Margin="5,0,0,0" Content="Browse" Command="{CompiledBinding BrowseCustomLayout}" />
                         </StackPanel>
-
-                        <StackPanel Grid.Column="0" Grid.Row="4" Margin="0,0,0,10">
+                    </Grid>
+                    <Border Classes="card-separator" />
+                    <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+                        <StackPanel Grid.Row="1" Grid.Column="0">
                             <TextBlock Text="Export current layout" />
                             <TextBlock Classes="subtitle" FontSize="12" Text="If there is a layout used, export that. Otherwise, export the LEDs present." />
                         </StackPanel>
-                        <Button Grid.Column="1" Grid.Row="4" Margin="0,0,0,0" HorizontalAlignment="Right" Content="Export" Command="{CompiledBinding ExportLayout}" />
+                        <StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">
+                            <Button HorizontalAlignment="Right" Content="Export" Command="{CompiledBinding ExportLayout}" />
+                        </StackPanel>
                     </Grid>
                 </StackPanel>
                 <controls:HyperlinkButton
+                    Grid.Row="1"
                     Content="Learn more about layouts on the wiki"
                     NavigateUri="https://wiki.artemis-rgb.com/en/guides/developer/layouts"
-                    Grid.Row="1"
                     Margin="0 20"
                     HorizontalAlignment="Right"
                     VerticalAlignment="Bottom" />
             </Grid>
-
         </Border>
-
     </ScrollViewer>
 </UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml.cs b/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml.cs
index 4ce6a72a5..3394a92bb 100644
--- a/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml.cs
+++ b/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml.cs
@@ -17,10 +17,12 @@ public partial class DeviceLayoutTabView : ReactiveUserControl<DeviceLayoutTabVi
     private void LayoutPathButton_OnClick(object? sender, RoutedEventArgs e)
     {
         TopLevel.GetTopLevel(this).Clipboard.SetTextAsync(ViewModel.DefaultLayoutPath);
+        ViewModel.ShowCopiedNotification();
     }
 
     private void ImagePathButton_OnClick(object? sender, RoutedEventArgs e)
     {
         TopLevel.GetTopLevel(this).Clipboard.SetTextAsync(ViewModel.Device.Layout.Image.LocalPath);
+        ViewModel.ShowCopiedNotification();
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabViewModel.cs b/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabViewModel.cs
index b6370dd9d..823a4cc86 100644
--- a/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabViewModel.cs
+++ b/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabViewModel.cs
@@ -140,4 +140,12 @@ public class DeviceLayoutTabViewModel : ActivatableViewModelBase
             .WithSeverity(NotificationSeverity.Success)
             .Show();
     }
+
+    public void ShowCopiedNotification()
+    {
+        _notificationService.CreateNotification()
+            .WithTitle("Copied!")
+            .WithSeverity(NotificationSeverity.Informational)
+            .Show();
+    }
 }
\ No newline at end of file

From 5ef6c4b8a7b459e0dfc36db8bfc2bfe227d4ef41 Mon Sep 17 00:00:00 2001
From: Diogo Trindade <diogotr7@gmail.com>
Date: Wed, 21 Jun 2023 23:07:56 +0100
Subject: [PATCH 7/7] Made the UI save automatically, removed apply and reset
 buttons

---
 .../Device/Tabs/DeviceGeneralTabView.axaml    | 207 ++----------------
 .../Device/Tabs/DeviceGeneralTabViewModel.cs  |  67 +++---
 2 files changed, 55 insertions(+), 219 deletions(-)

diff --git a/src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabView.axaml b/src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabView.axaml
index a62df0f73..5512743c0 100644
--- a/src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabView.axaml
+++ b/src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabView.axaml
@@ -5,7 +5,7 @@
              xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:converters="clr-namespace:Artemis.UI.Shared.Converters;assembly=Artemis.UI.Shared"
              xmlns:device="clr-namespace:Artemis.UI.Screens.Device"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="1450"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="650"
              x:Class="Artemis.UI.Screens.Device.DeviceGeneralTabView"
              x:DataType="device:DeviceGeneralTabViewModel">
     <UserControl.Resources>
@@ -138,7 +138,7 @@
                     <Border Grid.Row="1" Grid.Column="1" Classes="card" Margin="5" x:Name="CalibrationBorder">
                         <StackPanel Orientation="Vertical">
                             <TextBlock TextWrapping="Wrap" Text="Use the sliders below to adjust the colors of your device so that it matches your other devices." />
-                            <Grid ColumnDefinitions="Auto,*,Auto" RowDefinitions="*,*,*,*">
+                            <Grid ColumnDefinitions="Auto,*,Auto" RowDefinitions="*,*,*">
                                 <Label Grid.Row="0" Grid.Column="0" Content="R" VerticalAlignment="Center" />
                                 <Slider Grid.Row="0" Grid.Column="1" Minimum="0" Maximum="200" Value="{CompiledBinding RedScale}" Margin="10 0" VerticalAlignment="Center" />
                                 <NumericUpDown Grid.Row="0"
@@ -177,194 +177,33 @@
                                                Minimum="0"
                                                Maximum="200"
                                                ClipValueToMinMax="True" />
-
-                                <CheckBox Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" IsChecked="{CompiledBinding DisplayOnDevices}" Content="Show preview" VerticalAlignment="Center" />
-                                <controls:ColorPickerButton Grid.Row="3"
-                                                            Grid.Column="2"
-                                                            VerticalAlignment="Center"
-                                                            HorizontalAlignment="Right"
-                                                            Color="{CompiledBinding CurrentColor, Converter={StaticResource SKColorToColorConverter}}"
-                                                            ShowAcceptDismissButtons="False" />
+                            </Grid>
+                                                            
+                            <Grid ColumnDefinitions="Auto,*,Auto">
+                                <Button 
+                                    Grid.Column="0" 
+                                    Content="Reset"  
+                                    ToolTip.Tip="Reset the color scaling to what it had previously"
+                                    Command="{CompiledBinding ResetScaling}" 
+                                    HorizontalAlignment="Center"/>
+                                <CheckBox Grid.Column="1"  IsChecked="{CompiledBinding DisplayOnDevices}" Content="Preview specific color" VerticalAlignment="Center" HorizontalAlignment="Right" />
+                                
+                                <controls:ColorPickerButton Grid.Column="2"
+                                    VerticalAlignment="Center"
+                                    Color="{CompiledBinding CurrentColor, Converter={StaticResource SKColorToColorConverter}}"
+                                    ShowAcceptDismissButtons="False" />
                             </Grid>
                         </StackPanel>
                     </Border>
                 </Grid>
             </StackPanel>
 
-            <!-- Stacked instead of grid here: -->
-            <!-- <StackPanel Grid.Row="0"> -->
-            <!--     <TextBlock Classes="card-title" Text="Information" Margin="10,0,0,0" /> -->
-            <!--     <Border Classes="card" Margin="5" x:Name="InformationBorder"> -->
-            <!--         <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,*,*,*,*,*"> -->
-            <!--             <TextBlock Grid.Column="0" Grid.Row="0" Text="Model" /> -->
-            <!--             <TextBlock Grid.Column="1" Grid.Row="0" Classes="subtitle" TextWrapping="Wrap" Text="{CompiledBinding Device.RgbDevice.DeviceInfo.Model}" /> -->
-            <!-- -->
-            <!--             <TextBlock Grid.Column="0" Grid.Row="1" Text="Manufacturer" /> -->
-            <!--             <TextBlock Grid.Column="1" Grid.Row="1" Classes="subtitle" TextWrapping="Wrap" Text="{CompiledBinding Device.RgbDevice.DeviceInfo.Manufacturer}" /> -->
-            <!-- -->
-            <!--             <TextBlock Grid.Column="0" Grid.Row="2" Text="Device Type" /> -->
-            <!--             <TextBlock Grid.Column="1" Grid.Row="2" Classes="subtitle" TextWrapping="Wrap" Text="{CompiledBinding Device.RgbDevice.DeviceInfo.DeviceType}" /> -->
-            <!-- -->
-            <!--             <TextBlock Grid.Column="0" Grid.Row="3" Text="Size (1px = 1mm)" /> -->
-            <!--             <TextBlock Grid.Column="1" Grid.Row="3" Classes="subtitle" TextWrapping="Wrap" Text="{CompiledBinding Device.RgbDevice.Size}" /> -->
-            <!-- -->
-            <!--             <TextBlock IsVisible="{CompiledBinding IsKeyboard}" Grid.Column="0" Grid.Row="4" Text="Physical Layout" /> -->
-            <!--             <TextBlock IsVisible="{CompiledBinding IsKeyboard}" Grid.Column="1" Grid.Row="4" Classes="subtitle" TextWrapping="Wrap" Text="{CompiledBinding Device.PhysicalLayout}" /> -->
-            <!-- -->
-            <!--             <TextBlock IsVisible="{CompiledBinding IsKeyboard}" Grid.Column="0" Grid.Row="5" Text="Logical Layout" /> -->
-            <!--             <TextBlock IsVisible="{CompiledBinding IsKeyboard}" Grid.Column="1" Grid.Row="5" Classes="subtitle" TextWrapping="Wrap" Text="{CompiledBinding Device.LogicalLayout}" /> -->
-            <!--         </Grid> -->
-            <!--     </Border> -->
-            <!-- -->
-            <!--     <TextBlock Classes="card-title" Text="Categories" Margin="10,0,0,0" /> -->
-            <!--     <Border Classes="card" Margin="5" x:Name="CategoryBorder"> -->
-            <!--         <StackPanel> -->
-            <!--             <TextBlock TextWrapping="Wrap" Text="Artemis uses categories to determine where the layers of imported profiles are applied to." /> -->
-            <!--             <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,*,*,*,*" Margin="0,10,0,0"> -->
-            <!--                 <StackPanel Grid.Row="0" Grid.Column="0" Margin="0,0,0,10"> -->
-            <!--                     <TextBlock Text="Peripheral" /> -->
-            <!--                     <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="A peripheral such as a mouse or keyboard" /> -->
-            <!--                 </StackPanel> -->
-            <!--                 <CheckBox Grid.Row="0" Grid.Column="1" IsChecked="{CompiledBinding HasPeripheralsCategory}" /> -->
-            <!-- -->
-            <!--                 <StackPanel Grid.Row="1" Grid.Column="0" Margin="0,0,0,10"> -->
-            <!--                     <TextBlock Text="Desk" /> -->
-            <!--                     <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="A device acting as desk ornamentation such as a LED strip" /> -->
-            <!--                 </StackPanel> -->
-            <!--                 <CheckBox Grid.Row="1" Grid.Column="1" IsChecked="{CompiledBinding HasDeskCategory}" /> -->
-            <!-- -->
-            <!--                 <StackPanel Grid.Row="2" Grid.Column="0" Margin="0,0,0,10"> -->
-            <!--                     <TextBlock Text="Monitor" /> -->
-            <!--                     <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="A device attached to the monitor such as ambilight LEDs" /> -->
-            <!--                 </StackPanel> -->
-            <!--                 <CheckBox Grid.Row="2" Grid.Column="1" IsChecked="{CompiledBinding HasMonitorCategory}" /> -->
-            <!-- -->
-            <!--                 <StackPanel Grid.Row="3" Grid.Column="0" Margin="0,0,0,10"> -->
-            <!--                     <TextBlock Text="Case" /> -->
-            <!--                     <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="A device inside your computer case" /> -->
-            <!--                 </StackPanel> -->
-            <!--                 <CheckBox Grid.Row="3" Grid.Column="1" IsChecked="{CompiledBinding HasCaseCategory}" /> -->
-            <!-- -->
-            <!--                 <StackPanel Grid.Row="4" Grid.Column="0" Margin="0,0,0,10"> -->
-            <!--                     <TextBlock Text="Room" /> -->
-            <!--                     <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="A device elsewhere in the room" /> -->
-            <!--                 </StackPanel> -->
-            <!--                 <CheckBox Grid.Row="4" Grid.Column="1" IsChecked="{CompiledBinding HasRoomCategory}" /> -->
-            <!--             </Grid> -->
-            <!--         </StackPanel> -->
-            <!--     </Border> -->
-            <!-- -->
-            <!--     <TextBlock Classes="card-title" Text="Surface" Margin="10,0,0,0" /> -->
-            <!--     <Border Classes="card" Margin="5" x:Name="SurfaceBorder"> -->
-            <!--         <StackPanel Orientation="Vertical"> -->
-            <!--             <TextBlock TextWrapping="Wrap" Text="The device can be rotated and scaled on the surface with the values below." /> -->
-            <!--             <Grid ColumnDefinitions="*,Auto,Auto" RowDefinitions="*,*,*,*"> -->
-            <!--                 <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center">X-coordinate</TextBlock> -->
-            <!--                 <NumericUpDown Grid.Row="0" -->
-            <!--                                Grid.Column="1" -->
-            <!--                                Margin="10 5" -->
-            <!--                                VerticalAlignment="Center" -->
-            <!--                                Value="{CompiledBinding X}" /> -->
-            <!--                 <TextBlock Grid.Row="0" Grid.Column="2" VerticalAlignment="Center">mm</TextBlock> -->
-            <!-- -->
-            <!--                 <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center">Y-coordinate</TextBlock> -->
-            <!--                 <NumericUpDown Grid.Row="1" -->
-            <!--                                Grid.Column="1" -->
-            <!--                                Margin="10 5" -->
-            <!--                                VerticalAlignment="Center" -->
-            <!--                                Value="{CompiledBinding Y}" /> -->
-            <!--                 <TextBlock Grid.Row="1" Grid.Column="2" VerticalAlignment="Center">mm</TextBlock> -->
-            <!-- -->
-            <!--                 <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center">Scale</TextBlock> -->
-            <!--                 <NumericUpDown Grid.Row="2" -->
-            <!--                                Grid.Column="1" -->
-            <!--                                Margin="10 5" -->
-            <!--                                VerticalAlignment="Center" -->
-            <!--                                Increment="0.1" -->
-            <!--                                FormatString="F1" -->
-            <!--                                Value="{CompiledBinding Scale}" /> -->
-            <!--                 <TextBlock Grid.Row="2" Grid.Column="2" VerticalAlignment="Center">times</TextBlock> -->
-            <!-- -->
-            <!--                 <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center">Rotation</TextBlock> -->
-            <!--                 <NumericUpDown Grid.Row="3" -->
-            <!--                                Grid.Column="1" -->
-            <!--                                Margin="10 5" -->
-            <!--                                VerticalAlignment="Center" -->
-            <!--                                Value="{CompiledBinding Rotation}" /> -->
-            <!--                 <TextBlock Grid.Row="3" Grid.Column="2" VerticalAlignment="Center">deg</TextBlock> -->
-            <!--             </Grid> -->
-            <!--         </StackPanel> -->
-            <!--     </Border> -->
-            <!-- -->
-            <!--     <TextBlock Classes="card-title" Text="Calibration" Margin="10,0,0,0" /> -->
-            <!--     <Border Classes="card" Margin="5" x:Name="CalibrationBorder"> -->
-            <!--         <StackPanel Orientation="Vertical"> -->
-            <!--             <TextBlock TextWrapping="Wrap" Text="Use the sliders below to adjust the colors of your device so that it matches your other devices." /> -->
-            <!--             <Grid ColumnDefinitions="Auto,*,Auto" RowDefinitions="*,*,*,*"> -->
-            <!--                 <Label Grid.Row="0" Grid.Column="0" Content="R" VerticalAlignment="Center" /> -->
-            <!--                 <Slider Grid.Row="0" Grid.Column="1" Minimum="0" Maximum="200" Value="{CompiledBinding RedScale}" Margin="10 0" VerticalAlignment="Center" /> -->
-            <!--                 <NumericUpDown Grid.Row="0" -->
-            <!--                                Grid.Column="2" -->
-            <!--                                VerticalAlignment="Center" -->
-            <!--                                Width="65" -->
-            <!--                                Value="{CompiledBinding RedScale}" -->
-            <!--                                ShowButtonSpinner="False" -->
-            <!--                                FormatString="{}{0:0.0}" -->
-            <!--                                Minimum="0" -->
-            <!--                                Maximum="200" -->
-            <!--                                ClipValueToMinMax="True" /> -->
-            <!-- -->
-            <!--                 <Label Grid.Row="1" Grid.Column="0" Content="G" VerticalAlignment="Center" /> -->
-            <!--                 <Slider Grid.Row="1" Grid.Column="1" Minimum="0" Maximum="200" Value="{CompiledBinding GreenScale}" Margin="10 0" VerticalAlignment="Center" /> -->
-            <!--                 <NumericUpDown Grid.Row="1" -->
-            <!--                                Grid.Column="2" -->
-            <!--                                VerticalAlignment="Center" -->
-            <!--                                Width="65" -->
-            <!--                                Value="{CompiledBinding GreenScale}" -->
-            <!--                                ShowButtonSpinner="False" -->
-            <!--                                FormatString="{}{0:0.0}" -->
-            <!--                                Minimum="0" -->
-            <!--                                Maximum="200" -->
-            <!--                                ClipValueToMinMax="True" /> -->
-            <!-- -->
-            <!--                 <Label Grid.Row="2" Grid.Column="0" Content="B" VerticalAlignment="Center" /> -->
-            <!--                 <Slider Grid.Row="2" Grid.Column="1" Minimum="0" Maximum="200" Value="{CompiledBinding BlueScale}" Margin="10 0" Ticks="100" VerticalAlignment="Center" /> -->
-            <!--                 <NumericUpDown Grid.Row="2" -->
-            <!--                                Grid.Column="2" -->
-            <!--                                VerticalAlignment="Center" -->
-            <!--                                Width="65" -->
-            <!--                                Value="{CompiledBinding BlueScale}" -->
-            <!--                                ShowButtonSpinner="False" -->
-            <!--                                FormatString="{}{0:0.0}" -->
-            <!--                                Minimum="0" -->
-            <!--                                Maximum="200" -->
-            <!--                                ClipValueToMinMax="True" /> -->
-            <!-- -->
-            <!--                 <CheckBox Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" IsChecked="{CompiledBinding DisplayOnDevices}" Content="Show preview" VerticalAlignment="Center" /> -->
-            <!--                 <controls:ColorPickerButton Grid.Row="3" -->
-            <!--                                             Grid.Column="2" -->
-            <!--                                             VerticalAlignment="Center" -->
-            <!--                                             HorizontalAlignment="Right" -->
-            <!--                                             Color="{CompiledBinding CurrentColor, Converter={StaticResource SKColorToColorConverter}}" -->
-            <!--                                             ShowAcceptDismissButtons="False" /> -->
-            <!--             </Grid> -->
-            <!--         </StackPanel> -->
-            <!--     </Border> -->
-            <!-- </StackPanel> -->
-
-            <Grid Grid.Row="1" ColumnDefinitions="Auto,*" Margin="5">
-                <Button Grid.Column="0"
-                        IsVisible="{CompiledBinding RequiresManualSetup}"
-                        Command="{CompiledBinding RestartSetup}"
-                        ToolTip.Tip="Restart device setup, allowing you to select a new physical and logical layout">
-                    Restart setup
-                </Button>
-
-                <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
-                    <Button IsCancel="True" Command="{CompiledBinding Reset}" Margin="0 0 5 0" Content="Reset" />
-                    <Button Classes="accent" IsDefault="True" Command="{CompiledBinding Apply}" Content="Apply" />
-                </StackPanel>
-            </Grid>
+            <Button Grid.Row="1" Margin="5"
+                    IsVisible="{CompiledBinding RequiresManualSetup}"
+                    Command="{CompiledBinding RestartSetup}"
+                    ToolTip.Tip="Restart device setup, allowing you to select a new physical and logical layout">
+                Restart setup
+            </Button>
         </Grid>
 
     </ScrollViewer>
diff --git a/src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabViewModel.cs b/src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabViewModel.cs
index 642e0dfd6..40945c443 100644
--- a/src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabViewModel.cs
+++ b/src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabViewModel.cs
@@ -6,6 +6,7 @@ using System.ComponentModel;
 using System.Linq;
 using System.Reactive.Disposables;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
@@ -15,28 +16,29 @@ using RGB.NET.Core;
 using SkiaSharp;
 
 namespace Artemis.UI.Screens.Device;
+
 public class DeviceGeneralTabViewModel : ActivatableViewModelBase
 {
     private readonly ICoreService _coreService;
     private readonly IRgbService _rgbService;
     private readonly IWindowService _windowService;
     private readonly List<DeviceCategory> _categories;
-    
+
     private readonly float _initialBlueScale;
     private readonly float _initialGreenScale;
     private readonly float _initialRedScale;
-    
+
     private int _rotation;
     private float _scale;
     private int _x;
     private int _y;
-    
+
     private float _redScale;
     private float _greenScale;
     private float _blueScale;
     private SKColor _currentColor;
     private bool _displayOnDevices;
-    
+
     public DeviceGeneralTabViewModel(ArtemisDevice device, ICoreService coreService, IRgbService rgbService, IWindowService windowService)
     {
         _coreService = coreService;
@@ -46,10 +48,10 @@ public class DeviceGeneralTabViewModel : ActivatableViewModelBase
 
         Device = device;
         DisplayName = "General";
-        X = (int) Device.X;
-        Y = (int) Device.Y;
+        X = (int)Device.X;
+        Y = (int)Device.Y;
         Scale = Device.Scale;
-        Rotation = (int) Device.Rotation;
+        Rotation = (int)Device.Rotation;
         RedScale = Device.RedScale * 100f;
         GreenScale = Device.GreenScale * 100f;
         BlueScale = Device.BlueScale * 100f;
@@ -66,19 +68,20 @@ public class DeviceGeneralTabViewModel : ActivatableViewModelBase
         {
             Device.PropertyChanged += DeviceOnPropertyChanged;
             _coreService.FrameRendering += OnFrameRendering;
-        
+
             Disposable.Create(() =>
             {
                 _coreService.FrameRendering -= OnFrameRendering;
                 Device.PropertyChanged -= DeviceOnPropertyChanged;
+                Apply();
             }).DisposeWith(d);
         });
     }
-    
+
     public bool RequiresManualSetup => !Device.DeviceProvider.CanDetectPhysicalLayout || !Device.DeviceProvider.CanDetectLogicalLayout;
 
     public ArtemisDevice Device { get; }
-    
+
     public int X
     {
         get => _x;
@@ -102,9 +105,9 @@ public class DeviceGeneralTabViewModel : ActivatableViewModelBase
         get => _rotation;
         set => RaiseAndSetIfChanged(ref _rotation, value);
     }
-    
+
     public bool IsKeyboard => Device.DeviceType == RGBDeviceType.Keyboard;
-    
+
     public bool HasDeskCategory
     {
         get => GetCategory(DeviceCategory.Desk);
@@ -134,7 +137,7 @@ public class DeviceGeneralTabViewModel : ActivatableViewModelBase
         get => GetCategory(DeviceCategory.Peripherals);
         set => SetCategory(DeviceCategory.Peripherals, value);
     }
-    
+
     public float RedScale
     {
         get => _redScale;
@@ -164,15 +167,6 @@ public class DeviceGeneralTabViewModel : ActivatableViewModelBase
         get => _displayOnDevices;
         set => RaiseAndSetIfChanged(ref _displayOnDevices, value);
     }
-    
-    public void ApplyScaling()
-    {
-        Device.RedScale = RedScale / 100f;
-        Device.GreenScale = GreenScale / 100f;
-        Device.BlueScale = BlueScale / 100f;
-
-        _rgbService.FlushLeds = true;
-    }
 
     private bool GetCategory(DeviceCategory category)
     {
@@ -188,7 +182,7 @@ public class DeviceGeneralTabViewModel : ActivatableViewModelBase
 
         this.RaisePropertyChanged($"Has{category}Category");
     }
-    
+
     public async Task RestartSetup()
     {
         if (!RequiresManualSetup)
@@ -202,13 +196,13 @@ public class DeviceGeneralTabViewModel : ActivatableViewModelBase
         _rgbService.SaveDevice(Device);
         _rgbService.ApplyBestDeviceLayout(Device);
     }
-    
-    public async Task Apply()
+
+    private void Apply()
     {
         // TODO: Validation
 
         _coreService.ProfileRenderingDisabled = true;
-        await Task.Delay(100);
+        Thread.Sleep(100);
 
         Device.X = X;
         Device.Y = Y;
@@ -226,25 +220,28 @@ public class DeviceGeneralTabViewModel : ActivatableViewModelBase
         _coreService.ProfileRenderingDisabled = false;
     }
 
-    public void Reset()
+    public void ApplyScaling()
     {
-        HasDeskCategory = Device.Categories.Contains(DeviceCategory.Desk);
-        HasMonitorCategory = Device.Categories.Contains(DeviceCategory.Monitor);
-        HasCaseCategory = Device.Categories.Contains(DeviceCategory.Case);
-        HasRoomCategory = Device.Categories.Contains(DeviceCategory.Room);
-        HasPeripheralsCategory = Device.Categories.Contains(DeviceCategory.Peripherals);
+        Device.RedScale = RedScale / 100f;
+        Device.GreenScale = GreenScale / 100f;
+        Device.BlueScale = BlueScale / 100f;
 
+        _rgbService.FlushLeds = true;
+    }
+
+    public void ResetScaling()
+    {
         RedScale = _initialRedScale * 100;
         GreenScale = _initialGreenScale * 100;
         BlueScale = _initialBlueScale * 100;
     }
-    
+
     private void OnFrameRendering(object? sender, FrameRenderingEventArgs e)
     {
         if (!DisplayOnDevices)
             return;
 
-        using SKPaint overlayPaint = new() {Color = CurrentColor};
+        using SKPaint overlayPaint = new() { Color = CurrentColor };
         e.Canvas.DrawRect(0, 0, e.Canvas.LocalClipBounds.Width, e.Canvas.LocalClipBounds.Height, overlayPaint);
     }
 
@@ -253,4 +250,4 @@ public class DeviceGeneralTabViewModel : ActivatableViewModelBase
         if (e.PropertyName == nameof(Device.CustomLayoutPath) || e.PropertyName == nameof(Device.DisableDefaultLayout))
             Task.Run(() => _rgbService.ApplyBestDeviceLayout(Device));
     }
-}
+}
\ No newline at end of file