diff --git a/src/Artemis.Core/Services/Input/InputService.cs b/src/Artemis.Core/Services/Input/InputService.cs
index 17082f7df..088eb1666 100644
--- a/src/Artemis.Core/Services/Input/InputService.cs
+++ b/src/Artemis.Core/Services/Input/InputService.cs
@@ -90,8 +90,10 @@ namespace Artemis.Core.Services
 
         public void StopIdentify()
         {
+            if (_identifyingDevice == null)
+                return;
+            
             _logger.Debug("Stop identifying device {device}", _identifyingDevice);
-
             _identifyingDevice = null;
             _rgbService.SaveDevices();
 
diff --git a/src/Artemis.UI.Shared/ReactiveCoreWindow.cs b/src/Artemis.UI.Shared/ReactiveCoreWindow.cs
index 9c82b0afd..e2b33f871 100644
--- a/src/Artemis.UI.Shared/ReactiveCoreWindow.cs
+++ b/src/Artemis.UI.Shared/ReactiveCoreWindow.cs
@@ -1,7 +1,12 @@
 using System;
+using System.Runtime.InteropServices;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.Media.Immutable;
+using FluentAvalonia.Styling;
 using FluentAvalonia.UI.Controls;
+using FluentAvalonia.UI.Media;
 using ReactiveUI;
 
 namespace Artemis.UI.Shared
@@ -30,20 +35,6 @@ namespace Artemis.UI.Shared
             this.GetObservable(ViewModelProperty).Subscribe(OnViewModelChanged);
         }
 
-        private void OnDataContextChanged(object? value)
-        {
-            if (value is TViewModel viewModel)
-                ViewModel = viewModel;
-            else
-                ViewModel = null;
-        }
-
-        private void OnViewModelChanged(object? value)
-        {
-            if (value == null)
-                ClearValue(DataContextProperty);
-            else if (DataContext != value) DataContext = value;
-        }
 
         /// <summary>
         ///     The ViewModel.
@@ -59,5 +50,64 @@ namespace Artemis.UI.Shared
             get => ViewModel;
             set => ViewModel = (TViewModel?) value;
         }
+
+        /// <inheritdoc />
+        protected override void OnOpened(EventArgs e)
+        {
+            base.OnOpened(e);
+
+            // Enable Mica on Windows 11
+            FluentAvaloniaTheme? thm = AvaloniaLocator.Current.GetService<FluentAvaloniaTheme>();
+            if (thm != null && RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                // TODO: add Windows version to CoreWindow
+                if (IsWindows11 && thm.RequestedTheme != FluentAvaloniaTheme.HighContrastModeString)
+                {
+                    TransparencyBackgroundFallback = Brushes.Transparent;
+                    TransparencyLevelHint = WindowTransparencyLevel.Mica;
+                
+                    TryEnableMicaEffect(thm);
+                }
+            }
+        }
+
+        private void OnDataContextChanged(object? value)
+        {
+            if (value is TViewModel viewModel)
+                ViewModel = viewModel;
+            else
+                ViewModel = null;
+        }
+
+        private void OnViewModelChanged(object? value)
+        {
+            if (value == null)
+                ClearValue(DataContextProperty);
+            else if (DataContext != value) DataContext = value;
+        }
+
+        private void TryEnableMicaEffect(FluentAvaloniaTheme thm)
+        {
+            // The background colors for the Mica brush are still based around SolidBackgroundFillColorBase resource
+            // BUT since we can't control the actual Mica brush color, we have to use the window background to create
+            // the same effect. However, we can't use SolidBackgroundFillColorBase directly since its opaque, and if
+            // we set the opacity the color become lighter than we want. So we take the normal color, darken it and 
+            // apply the opacity until we get the roughly the correct color
+            // NOTE that the effect still doesn't look right, but it suffices. Ideally we need access to the Mica
+            // CompositionBrush to properly change the color but I don't know if we can do that or not
+            if (thm.RequestedTheme == FluentAvaloniaTheme.DarkModeString)
+            {
+                Color2 color = this.TryFindResource("SolidBackgroundFillColorBase", out object? value) ? (Color) value : new Color2(32, 32, 32);
+                color = color.LightenPercent(-0.8f);
+                Background = new ImmutableSolidColorBrush(color, 0.78);
+            }
+            else if (thm.RequestedTheme == FluentAvaloniaTheme.LightModeString)
+            {
+                // Similar effect here
+                Color2 color = this.TryFindResource("SolidBackgroundFillColorBase", out object? value) ? (Color) value : new Color2(243, 243, 243);
+                color = color.LightenPercent(0.5f);
+                Background = new ImmutableSolidColorBrush(color, 0.9);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI.Shared/Styles/Artemis.axaml b/src/Artemis.UI.Shared/Styles/Artemis.axaml
index cf068ddac..97dafc8a1 100644
--- a/src/Artemis.UI.Shared/Styles/Artemis.axaml
+++ b/src/Artemis.UI.Shared/Styles/Artemis.axaml
@@ -32,14 +32,14 @@
     <StyleInclude Source="/Styles/NumberBox.axaml" />
     <StyleInclude Source="/Styles/TreeView.axaml" />
 
-    <Style Selector="Window:windows:windows10 /template/ Border#RootBorder">
-        <!-- This will show if custom accent color setting is used in Settings page-->
-        <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColor}" />
-        <Setter Property="BorderThickness" Value="0 1 0 0" />
-    </Style>
-
-    <Style Selector="Window[IsActive=False]:windows:windows10 /template/ Border#RootBorder">
-        <Setter Property="BorderBrush" Value="#3d3d3d" />
-        <Setter Property="BorderThickness" Value="0 1 0 0" />
-    </Style>
+    <!-- <Style Selector="Window:windows:windows10 /template/ Border#RootBorder"> -->
+    <!--     ~1~ This will show if custom accent color setting is used in Settings page@1@ -->
+    <!--     <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColor}" /> -->
+    <!--     <Setter Property="BorderThickness" Value="0 1 0 0" /> -->
+    <!-- </Style> -->
+    <!-- -->
+    <!-- <Style Selector="Window[IsActive=False]:windows:windows10 /template/ Border#RootBorder"> -->
+    <!--     <Setter Property="BorderBrush" Value="#3d3d3d" /> -->
+    <!--     <Setter Property="BorderThickness" Value="0 1 0 0" /> -->
+    <!-- </Style> -->
 </Styles>
\ No newline at end of file
diff --git a/src/Artemis.UI.Shared/Styles/Border.axaml b/src/Artemis.UI.Shared/Styles/Border.axaml
index 76fccda64..e82655006 100644
--- a/src/Artemis.UI.Shared/Styles/Border.axaml
+++ b/src/Artemis.UI.Shared/Styles/Border.axaml
@@ -21,7 +21,7 @@
 
     <!-- Add Styles Here -->
     <Style Selector="Border.router-container">
-        <Setter Property="Background" Value="{DynamicResource SolidBackgroundFillColorTertiary}" />
+        <Setter Property="Background" Value="{DynamicResource ControlFillColorDefaultBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource CardStrokeColorDefaultBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CornerRadius" Value="8 0 0 0" />
diff --git a/src/Artemis.UI.Windows/Program.cs b/src/Artemis.UI.Windows/Program.cs
index 37d6e82f7..b458fd7be 100644
--- a/src/Artemis.UI.Windows/Program.cs
+++ b/src/Artemis.UI.Windows/Program.cs
@@ -28,7 +28,15 @@ namespace Artemis.UI.Windows
         // Avalonia configuration, don't remove; also used by visual designer.
         public static AppBuilder BuildAvaloniaApp()
         {
-            return AppBuilder.Configure<App>().UsePlatformDetect().LogToTrace().UseReactiveUI();
+            return AppBuilder.Configure<App>()
+                .UsePlatformDetect()
+                .LogToTrace()
+                .With(new Win32PlatformOptions()
+                {
+                    UseWindowsUIComposition = true,
+                    CompositionBackdropCornerRadius = 8f
+                })
+                .UseReactiveUI();
         }
 
         private static ILogger? Logger { get; set; }
diff --git a/src/Artemis.UI/Screens/Device/DeviceDetectInputViewModel.cs b/src/Artemis.UI/Screens/Device/DeviceDetectInputViewModel.cs
index 1eade3222..319b71dcd 100644
--- a/src/Artemis.UI/Screens/Device/DeviceDetectInputViewModel.cs
+++ b/src/Artemis.UI/Screens/Device/DeviceDetectInputViewModel.cs
@@ -7,6 +7,7 @@ using Artemis.Core.Services;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.Builders;
+using FluentAvalonia.UI.Controls;
 using ReactiveUI;
 using RGB.NET.Core;
 
@@ -36,11 +37,16 @@ namespace Artemis.UI.Screens.Device
 
             this.WhenActivated(disposables =>
             {
+                _inputService.IdentifyDevice(device);
                 Observable.FromEventPattern(x => _inputService.DeviceIdentified += x, x => _inputService.DeviceIdentified -= x)
                     .Subscribe(_ => InputServiceOnDeviceIdentified())
                     .DisposeWith(disposables);
 
-                Disposable.Create(() => _ledGroup.Detach()).DisposeWith(disposables);
+                Disposable.Create(() =>
+                {
+                    _inputService.StopIdentify();
+                    _ledGroup.Detach();
+                }).DisposeWith(disposables);
             });
         }
 
@@ -51,6 +57,7 @@ namespace Artemis.UI.Screens.Device
 
         private void InputServiceOnDeviceIdentified()
         {
+            ContentDialog?.Hide(ContentDialogResult.Primary);
             _notificationService.CreateNotification()
                 .WithMessage($"{Device.RgbDevice.DeviceInfo.DeviceName} identified 😁")
                 .WithSeverity(NotificationSeverity.Success)
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml
index d102a1eb5..f339a35f5 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml
@@ -9,7 +9,7 @@
              x:Class="Artemis.UI.Screens.ProfileEditor.Properties.DataBinding.DataBindingView"
              x:DataType="dataBinding:DataBindingViewModel">
     <Grid RowDefinitions="48,*">
-        <Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,*">
+        <Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,*" Background="{DynamicResource ControlFillColorDefaultBrush}">
             <TextBlock Grid.Column="0"
                        Classes="h5"
                        VerticalAlignment="Center"
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertiesView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertiesView.axaml
index 078e31fe5..953cb4fc8 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertiesView.axaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertiesView.axaml
@@ -21,13 +21,12 @@
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
         <Grid RowDefinitions="48,*">
-            <ContentControl Grid.Row="0" Content="{CompiledBinding PlaybackViewModel}" />
+            <ContentControl Grid.Row="0" Content="{CompiledBinding PlaybackViewModel}" Background="{DynamicResource ControlFillColorDefaultBrush}" />
 
             <ScrollViewer Grid.Row="1"
                           Grid.Column="0"
                           Name="TreeScrollViewer"
-                          Offset="{CompiledBinding #TimelineScrollViewer.Offset, Mode=OneWay}"
-                          Background="{DynamicResource CardStrokeColorDefaultSolidBrush}">
+                          Offset="{CompiledBinding #TimelineScrollViewer.Offset, Mode=OneWay}">
                 <Grid RowDefinitions="*,Auto">
                     <ItemsControl Items="{CompiledBinding PropertyGroupViewModels}" Padding="0 0 8 0">
                         <ItemsControl.ItemTemplate>
@@ -68,6 +67,7 @@
                                          Name="TimelineHeader"
                                          Margin="0 18 0 0"
                                          Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                                         Background="{DynamicResource ControlFillColorDefaultBrush}"
                                          HorizontalAlignment="Left"
                                          PixelsPerSecond="{CompiledBinding PixelsPerSecond}"
                                          HorizontalOffset="{CompiledBinding #TimelineScrollViewer.Offset.X, Mode=OneWay}"
@@ -144,8 +144,7 @@
                               Name="TimelineScrollViewer"
                               Offset="{CompiledBinding #TreeScrollViewer.Offset, Mode=OneWay}"
                               VerticalScrollBarVisibility="Hidden">
-                    <ContentControl Content="{CompiledBinding TimelineViewModel}"
-                                    Background="{DynamicResource CardStrokeColorDefaultSolidBrush}" />
+                    <ContentControl Content="{CompiledBinding TimelineViewModel}" />
                 </ScrollViewer>
             </Grid>
         </ScrollViewer>
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml
index 20ad810f4..f26745983 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml
@@ -12,7 +12,7 @@
     </UserControl.Styles>
     <Border Classes="segment-container">
         <Grid Name="SegmentGrid"
-              Background="{DynamicResource CardStrokeColorDefaultSolidBrush}"
+              Background="{DynamicResource ControlFillColorDefaultBrush}"
               Width="{CompiledBinding Width}"
               ColumnDefinitions="Auto, Auto,*,Auto">
 
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml
index 031bc44b5..222038f88 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml
@@ -12,7 +12,7 @@
     </UserControl.Styles>
     <Border Classes="segment-container">
         <Grid Name="SegmentGrid"
-              Background="{DynamicResource CardStrokeColorDefaultSolidBrush}"
+              Background="{DynamicResource ControlFillColorDefaultBrush}"
               Width="{CompiledBinding Width}"
               ColumnDefinitions="Auto,Auto,*,Auto,Auto">
 
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml
index 3ef9f2586..fa6fd084a 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml
@@ -9,7 +9,7 @@
     <Style Selector="ContentControl.segment-content-control" />
 
     <Style Selector="Border.segment-container">
-        <Setter Property="Height" Value="18" />
+        <Setter Property="Height" Value="17" />
     </Style>
 
     <Style Selector="Rectangle.resize-visual">
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml
index 527a04d72..1a9ffedc4 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml
@@ -12,7 +12,7 @@
     </UserControl.Styles>
     <Border Classes="segment-container">
         <Grid Name="SegmentGrid"
-              Background="{DynamicResource CardStrokeColorDefaultSolidBrush}"
+              Background="{DynamicResource ControlFillColorDefaultBrush}"
               Width="{CompiledBinding Width}"
               ColumnDefinitions="*,Auto,Auto">
 
diff --git a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml
index 8d5878c43..d5fbb3307 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml
@@ -69,7 +69,7 @@
             </Grid.RowDefinitions>
             <Border Grid.Row="0" Classes="card" Padding="0" Margin="4 0 4 4" ClipToBounds="True">
                 <Grid ColumnDefinitions="Auto,*">
-                    <Border Grid.Column="0" Background="{DynamicResource CardStrokeColorDefaultSolidBrush}">
+                    <Border Grid.Column="0">
                         <ItemsControl Items="{CompiledBinding Tools}">
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate DataType="shared:IToolViewModel">
diff --git a/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml b/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml
index 6c252bcfa..cadf0fd41 100644
--- a/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml
+++ b/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml
@@ -52,20 +52,7 @@
 						</StackPanel>
 					</Grid>
 					<Separator Classes="card-separator" />
-
-					<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
-						<StackPanel Grid.Column="0">
-							<TextBlock>Color scheme</TextBlock>
-							<TextBlock Classes="subtitle" TextWrapping="Wrap">
-								Pick between a light and dark color scheme, the automatic option copies your system settings.
-							</TextBlock>
-						</StackPanel>
-						<StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
-							<shared:EnumComboBox Width="150" Value="{CompiledBinding UIColorScheme.Value}" />
-						</StackPanel>
-					</Grid>
-					<Separator Classes="card-separator" />
-
+					
 					<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
 						<StackPanel Grid.Column="0">
 							<TextBlock>
diff --git a/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabViewModel.cs b/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabViewModel.cs
index 312829b1b..3c25cef39 100644
--- a/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabViewModel.cs
+++ b/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabViewModel.cs
@@ -25,14 +25,12 @@ namespace Artemis.UI.Screens.Settings
         private readonly PluginSetting<LayerBrushReference> _defaultLayerBrushDescriptor;
         private readonly ISettingsService _settingsService;
         private readonly IDebugService _debugService;
-        private readonly FluentAvaloniaTheme _fluentAvaloniaTheme;
 
         public GeneralTabViewModel(ISettingsService settingsService, IPluginManagementService pluginManagementService, IDebugService debugService, IGraphicsContextProvider? graphicsContextProvider = null)
         {
             DisplayName = "General";
             _settingsService = settingsService;
             _debugService = debugService;
-            _fluentAvaloniaTheme = AvaloniaLocator.Current.GetService<FluentAvaloniaTheme>() ?? throw new Exception($"Could not get required service of type {nameof(FluentAvaloniaTheme)}.");
 
             List<LayerBrushProvider> layerBrushProviders = pluginManagementService.GetFeaturesOfType<LayerBrushProvider>();
             LayerBrushDescriptors = new ObservableCollection<LayerBrushDescriptor>(layerBrushProviders.SelectMany(l => l.LayerBrushDescriptors));
@@ -51,24 +49,6 @@ namespace Artemis.UI.Screens.Settings
             ShowSetupWizard = ReactiveCommand.Create(ExecuteShowSetupWizard);
             ShowDebugger = ReactiveCommand.Create(ExecuteShowDebugger);
             ShowDataFolder = ReactiveCommand.Create(ExecuteShowDataFolder);
-
-            this.WhenActivated(d =>
-            {
-                UIColorScheme.SettingChanged += UIColorSchemeOnSettingChanged;
-                Disposable.Create(() => UIColorScheme.SettingChanged -= UIColorSchemeOnSettingChanged).DisposeWith(d);
-            });
-        }
-
-        private void UIColorSchemeOnSettingChanged(object? sender, EventArgs e)
-        {
-            if (UIColorScheme.Value == ApplicationColorScheme.Automatic)
-                _fluentAvaloniaTheme.RequestedTheme = null;
-            else if (UIColorScheme.Value == ApplicationColorScheme.Light)
-                _fluentAvaloniaTheme.RequestedTheme = "Light";
-            else if (UIColorScheme.Value == ApplicationColorScheme.Dark)
-                _fluentAvaloniaTheme.RequestedTheme = "Dark";
-            else
-                _fluentAvaloniaTheme.RequestedTheme = _fluentAvaloniaTheme.RequestedTheme;
         }
 
         public ReactiveCommand<Unit, Unit> ShowLogs { get; }
@@ -130,7 +110,6 @@ namespace Artemis.UI.Screens.Settings
         public PluginSetting<int> UIAutoRunDelay => _settingsService.GetSetting("UI.AutoRunDelay", 15);
         public PluginSetting<bool> UIShowOnStartup => _settingsService.GetSetting("UI.ShowOnStartup", true);
         public PluginSetting<bool> UICheckForUpdates => _settingsService.GetSetting("UI.CheckForUpdates", true);
-        public PluginSetting<ApplicationColorScheme> UIColorScheme => _settingsService.GetSetting("UI.ColorScheme", ApplicationColorScheme.Automatic);
         public PluginSetting<bool> ProfileEditorShowDataModelValues => _settingsService.GetSetting("ProfileEditor.ShowDataModelValues", false);
         public PluginSetting<LogEventLevel> CoreLoggingLevel => _settingsService.GetSetting("Core.LoggingLevel", LogEventLevel.Information);
         public PluginSetting<string> CorePreferredGraphicsContext => _settingsService.GetSetting("Core.PreferredGraphicsContext", "Software");
diff --git a/src/Artemis.UI/Screens/SurfaceEditor/ListDeviceViewModel.cs b/src/Artemis.UI/Screens/SurfaceEditor/ListDeviceViewModel.cs
index fad0089f6..d0dd81897 100644
--- a/src/Artemis.UI/Screens/SurfaceEditor/ListDeviceViewModel.cs
+++ b/src/Artemis.UI/Screens/SurfaceEditor/ListDeviceViewModel.cs
@@ -1,27 +1,43 @@
 using System;
+using System.Reactive;
+using System.Threading.Tasks;
 using Artemis.Core;
+using Artemis.Core.Services;
+using Artemis.UI.Screens.Device;
 using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
+using ReactiveUI;
+using RGB.NET.Core;
 using SkiaSharp;
 
 namespace Artemis.UI.Screens.SurfaceEditor;
 
 public class ListDeviceViewModel : ViewModelBase
 {
+    private readonly IWindowService _windowService;
+    private readonly IRgbService _rgbService;
     private static readonly Random Random = new();
     
     private SKColor _color;
     private bool _isSelected;
 
-    public ListDeviceViewModel(ArtemisDevice device, SurfaceEditorViewModel surfaceEditorViewModel)
+    public ListDeviceViewModel(ArtemisDevice device, SurfaceEditorViewModel surfaceEditorViewModel, IWindowService windowService, IRgbService rgbService)
     {
+        _windowService = windowService;
+        _rgbService = rgbService;
+        
         Device = device;
         SurfaceEditorViewModel = surfaceEditorViewModel;
         Color = SKColor.FromHsv(Random.NextSingle() * 360, 95, 100);
+        DetectInput = ReactiveCommand.CreateFromTask(ExecuteDetectInput, this.WhenAnyValue(vm => vm.CanDetectInput));
     }
 
+    public ReactiveCommand<Unit,Unit> DetectInput { get; }
+    
     public ArtemisDevice Device { get; }
     public SurfaceEditorViewModel SurfaceEditorViewModel { get; }
-
+    public bool CanDetectInput => Device.DeviceType == RGBDeviceType.Keyboard || Device.DeviceType == RGBDeviceType.Mouse;
+    
     public bool IsSelected
     {
         get => _isSelected;
@@ -33,4 +49,19 @@ public class ListDeviceViewModel : ViewModelBase
         get => _color;
         set => RaiseAndSetIfChanged(ref _color, value);
     }
+    
+    private async Task ExecuteDetectInput()
+    {
+        if (!CanDetectInput)
+            return;
+
+        await _windowService.CreateContentDialog()
+            .WithTitle($"{Device.RgbDevice.DeviceInfo.DeviceName} - Detect input")
+            .WithViewModel<DeviceDetectInputViewModel>(out DeviceDetectInputViewModel? viewModel, ("device", Device))
+            .WithCloseButtonText("Cancel")
+            .ShowAsync();
+
+        if (viewModel.MadeChanges)
+            _rgbService.SaveDevice(Device);
+    }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceViewModel.cs b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceViewModel.cs
index 331054522..d21ceebc4 100644
--- a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceViewModel.cs
+++ b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceViewModel.cs
@@ -1,9 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive;
+using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
+using Artemis.UI.Screens.Device;
 using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
+using ReactiveUI;
 using RGB.NET.Core;
 using SkiaSharp;
 using Point = Avalonia.Point;
@@ -14,30 +19,34 @@ public class SurfaceDeviceViewModel : ActivatableViewModelBase
 {
     private readonly IRgbService _rgbService;
     private readonly ISettingsService _settingsService;
+    private readonly IWindowService _windowService;
     private double _dragOffsetX;
     private double _dragOffsetY;
     private bool _isSelected;
 
-    public SurfaceDeviceViewModel(ArtemisDevice device, SurfaceEditorViewModel surfaceEditorViewModel, IRgbService rgbService, ISettingsService settingsService)
+    public SurfaceDeviceViewModel(ArtemisDevice device, SurfaceEditorViewModel surfaceEditorViewModel, IRgbService rgbService, ISettingsService settingsService, IWindowService windowService)
     {
         _rgbService = rgbService;
         _settingsService = settingsService;
+        _windowService = windowService;
 
         Device = device;
         SurfaceEditorViewModel = surfaceEditorViewModel;
+        DetectInput = ReactiveCommand.CreateFromTask(ExecuteDetectInput, this.WhenAnyValue(vm => vm.CanDetectInput));
     }
 
+    public ReactiveCommand<Unit,Unit> DetectInput { get; }
+    
     public ArtemisDevice Device { get; }
     public SurfaceEditorViewModel SurfaceEditorViewModel { get; }
-
+    public bool CanDetectInput => Device.DeviceType == RGBDeviceType.Keyboard || Device.DeviceType == RGBDeviceType.Mouse;
+    
     public bool IsSelected
     {
         get => _isSelected;
         set => RaiseAndSetIfChanged(ref _isSelected, value);
     }
 
-    public bool CanDetectInput => Device.DeviceType == RGBDeviceType.Keyboard || Device.DeviceType == RGBDeviceType.Mouse;
-
     public void StartMouseDrag(Point mouseStartPosition)
     {
         if (!IsSelected)
@@ -98,4 +107,19 @@ public class SurfaceDeviceViewModel : ActivatableViewModelBase
 
         return !own.Any(o => others.Any(l => l.IntersectsWith(o)));
     }
+    
+    private async Task ExecuteDetectInput()
+    {
+        if (!CanDetectInput)
+            return;
+
+        await _windowService.CreateContentDialog()
+            .WithTitle($"{Device.RgbDevice.DeviceInfo.DeviceName} - Detect input")
+            .WithViewModel<DeviceDetectInputViewModel>(out DeviceDetectInputViewModel? viewModel, ("device", Device))
+            .WithCloseButtonText("Cancel")
+            .ShowAsync();
+
+        if (viewModel.MadeChanges)
+            _rgbService.SaveDevice(Device);
+    }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml
index 055f5602f..1e3299fd6 100644
--- a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml
+++ b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml
@@ -50,7 +50,6 @@
             <MenuItem Header="-" />
             <MenuItem Header="Identify input"
                       Command="{Binding DetectInput}"
-                      CommandParameter="{Binding Device}"
                       ToolTip.Tip="Teach Artemis which keypresses and/or button presses belong to this device">
                 <MenuItem.Icon>
                     <avalonia:MaterialIcon Kind="GestureDoubleTap" />