diff --git a/src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs b/src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs
index ea94d24b1..63ce526bd 100644
--- a/src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs
+++ b/src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs
@@ -550,7 +550,11 @@ namespace Artemis.Core
             try
             {
                 foreach (KeyframeEntity keyframeEntity in Entity.KeyframeEntities.Where(k => k.Position <= ProfileElement.Timeline.Length))
-                    CreateKeyframeFromEntity(keyframeEntity);
+                {
+                    LayerPropertyKeyframe<T>? keyframe = CreateKeyframeFromEntity(keyframeEntity) as LayerPropertyKeyframe<T>;
+                    if (keyframe != null)
+                        AddKeyframe(keyframe);
+                }
             }
             catch (JsonException)
             {
diff --git a/src/Artemis.UI.Shared/ReactiveCoreWindow.cs b/src/Artemis.UI.Shared/ReactiveCoreWindow.cs
index e2b33f871..67eac6a73 100644
--- a/src/Artemis.UI.Shared/ReactiveCoreWindow.cs
+++ b/src/Artemis.UI.Shared/ReactiveCoreWindow.cs
@@ -4,7 +4,6 @@ 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;
@@ -56,19 +55,16 @@ namespace Artemis.UI.Shared
         {
             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);
-                }
-            }
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || !IsWindows11)
+                return;
+
+            // Enable Mica on Windows 11, based on the FluentAvalonia sample application
+            TransparencyBackgroundFallback = Brushes.Transparent;
+            TransparencyLevelHint = WindowTransparencyLevel.Mica;
+
+            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);
         }
 
         private void OnDataContextChanged(object? value)
@@ -85,29 +81,5 @@ namespace Artemis.UI.Shared
                 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/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml
index 75b799e45..7d1777250 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml
@@ -8,6 +8,7 @@
                      mc:Ignorable="d"
                      x:Class="Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs.LayerHintsDialogView"
                      x:DataType="dialogs:LayerHintsDialogViewModel"
+                     WindowStartupLocation="CenterOwner"
                      Title="Artemis | Adaption hints"
                      Width="750"
                      Height="800">
@@ -15,10 +16,10 @@
     <Grid Margin="15" RowDefinitions="Auto,*,Auto">
         <Grid Grid.Row="0" ColumnDefinitions="*,Auto" RowDefinitions="Auto,Auto">
             <StackPanel Grid.Row="0" Orientation="Horizontal">
-                <avalonia:MaterialIcon Kind="{CompiledBinding Layer.LayerBrush.Descriptor.Icon}" Width="24" Height="24" Margin="0 0 5 10"/>
-                <TextBlock Classes="h4" Text="{CompiledBinding Layer.Name}" TextWrapping="Wrap"/>
+                <avalonia:MaterialIcon Kind="{CompiledBinding Layer.LayerBrush.Descriptor.Icon}" Width="24" Height="24" Margin="0 0 5 10" />
+                <TextBlock Classes="h4" Text="{CompiledBinding Layer.Name}" TextWrapping="Wrap" />
             </StackPanel>
-            
+
             <controls:HyperlinkButton Grid.Row="0"
                                       Grid.Column="1"
                                       VerticalAlignment="Top"
@@ -31,22 +32,37 @@
             </TextBlock>
         </Grid>
 
-        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Hidden" Margin="0 15">
-            <ItemsControl Items="{CompiledBinding AdaptionHints}" Classes="adaption-hints">
-                <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <StackPanel Spacing="10" />
-                    </ItemsPanelTemplate>
-                </ItemsControl.ItemsPanel>
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <Border Classes="card-condensed">
-                            <ContentControl Content="{Binding}"></ContentControl>
-                        </Border>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-        </ScrollViewer>
+        <Border Grid.Row="1" Classes="card" Margin="0 15">
+            <Panel>
+                <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Hidden" IsVisible="{CompiledBinding AdaptionHints.Count}">
+                    <ItemsControl Items="{CompiledBinding AdaptionHints}" Classes="adaption-hints">
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel Spacing="10" />
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <Border Classes="card-condensed">
+                                    <ContentControl Content="{Binding}"></ContentControl>
+                                </Border>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </ScrollViewer>
+
+                <StackPanel IsVisible="{CompiledBinding !AdaptionHints.Count}" VerticalAlignment="Center" HorizontalAlignment="Center">
+                    <avalonia:MaterialIcon Kind="AlertCircleOutline" HorizontalAlignment="Center" Width="48" Height="48" />
+                    <TextBlock Classes="h4" TextAlignment="Center" TextWrapping="Wrap">
+                        You haven't set up any adaption hints
+                    </TextBlock>
+                    <TextBlock Classes="subtitle" TextAlignment="Center" TextWrapping="Wrap">
+                        Artemis will attempt to directly map the LEDs of this layer to different surfaces but results may vary.
+                    </TextBlock>
+                </StackPanel>
+            </Panel>
+
+        </Border>
 
         <Grid Grid.Row="2" ColumnDefinitions="*,Auto">
             <Button Grid.Row="0" Grid.Column="0" Command="{Binding AutoDetermineHints}">Auto-determine hints</Button>
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs
index 71500bec7..8773076e5 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs
@@ -260,6 +260,7 @@ public abstract class TreeItemViewModel : ActivatableViewModelBase
             return;
 
         await _windowService.ShowDialogAsync<LayerHintsDialogViewModel, bool>(("layer", layer));
+        await ProfileEditorService.SaveProfileAsync();
     }
 
     private async void UpdateCanPaste(bool isFlyoutOpen)
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml
index 13f951a51..2c88bddea 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml
@@ -82,10 +82,7 @@
                 </ItemsControl>
             </Grid>
         </paz:ZoomBorder>
-        <Border CornerRadius="0 0 8 0" VerticalAlignment="Top" HorizontalAlignment="Left">
-            <Border.Background>
-                <SolidColorBrush Color="{DynamicResource CardStrokeColorDefaultSolid}" Opacity="0.65" />
-            </Border.Background>
+        <Border CornerRadius="0 0 8 0" VerticalAlignment="Top" HorizontalAlignment="Left" Background="{DynamicResource ControlFillColorDefaultBrush}">
             <StackPanel Orientation="Horizontal" Margin="8">
                 <shared:ProfileConfigurationIcon ConfigurationIcon="{CompiledBinding ProfileConfiguration.Icon}"
                                                  Foreground="{DynamicResource ToolTipForeground}"
diff --git a/src/Artemis.UI/Screens/Settings/Tabs/PluginsTabView.axaml b/src/Artemis.UI/Screens/Settings/Tabs/PluginsTabView.axaml
index e433ced72..0679fc101 100644
--- a/src/Artemis.UI/Screens/Settings/Tabs/PluginsTabView.axaml
+++ b/src/Artemis.UI/Screens/Settings/Tabs/PluginsTabView.axaml
@@ -3,21 +3,32 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:settings="clr-namespace:Artemis.UI.Screens.Settings"
+             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.Settings.PluginsTabView"
              x:DataType="settings:PluginsTabViewModel">
     <Grid RowDefinitions="Auto,*">
         <Grid Grid.Row="0" Grid.Column="0" MaxWidth="900" Margin="0 10">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition MinWidth="165" MaxWidth="400"/>
+                <ColumnDefinition MinWidth="165" MaxWidth="400" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
-            <TextBox Classes="clearButton" Text="{CompiledBinding SearchPluginInput}" Watermark="Search plugins" Margin="0 0 10 0"/>
-            <Button Grid.Row="0" Grid.Column="1" Classes="accent" Command="{CompiledBinding ImportPlugin}" HorizontalAlignment="Right">Import plugin</Button>
+            <TextBox Classes="clearButton" Text="{CompiledBinding SearchPluginInput}" Watermark="Search plugins" Margin="0 0 10 0" />
+
+            <StackPanel Spacing="5" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
+                <controls:HyperlinkButton Grid.Row="0"
+                                          Grid.Column="1"
+                                          VerticalAlignment="Top"
+                                          NavigateUri="https://wiki.artemis-rgb.com/en/guides/user/plugins">
+                    Get more plugins
+                </controls:HyperlinkButton>
+                <Button Classes="accent" Command="{CompiledBinding ImportPlugin}">Import plugin</Button>
+            </StackPanel>
+
         </Grid>
 
         <ScrollViewer Grid.Row="1" Grid.Column="0" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" VerticalAlignment="Top">
-            <ItemsControl Items="{CompiledBinding Plugins}" MaxWidth="900" VerticalAlignment="Center"/>
+            <ItemsControl Items="{CompiledBinding Plugins}" MaxWidth="900" VerticalAlignment="Center" />
         </ScrollViewer>
     </Grid>
 </UserControl>
\ No newline at end of file