diff --git a/src/Avalonia/Artemis.UI.Windows/App.axaml b/src/Avalonia/Artemis.UI.Windows/App.axaml
index 117be8559..73ac69a6c 100644
--- a/src/Avalonia/Artemis.UI.Windows/App.axaml
+++ b/src/Avalonia/Artemis.UI.Windows/App.axaml
@@ -8,6 +8,5 @@
 
     <Application.Styles>
         <StyleInclude Source="avares://Artemis.UI/Styles/Artemis.axaml" />
-        <StyleInclude Source="avares://Artemis.UI.Shared/Styles/Artemis.axaml" />
     </Application.Styles>
 </Application>
diff --git a/src/Avalonia/Artemis.UI/MainWindow.axaml b/src/Avalonia/Artemis.UI/MainWindow.axaml
index f0cd1495a..38ca7cdb6 100644
--- a/src/Avalonia/Artemis.UI/MainWindow.axaml
+++ b/src/Avalonia/Artemis.UI/MainWindow.axaml
@@ -5,22 +5,6 @@
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="Artemis.UI.MainWindow"
         Icon="/Assets/Images/Logo/bow.ico"
-        Title="Artemis.UI.Avalonia"
-        ExtendClientAreaToDecorationsHint="True"
-        TransparencyLevelHint="AcrylicBlur"
-        Background="Transparent">
-
-    <Panel>
-        <ExperimentalAcrylicBorder IsHitTestVisible="False">
-            <ExperimentalAcrylicBorder.Material>
-                <ExperimentalAcrylicMaterial
-                    BackgroundSource="Digger"
-                    TintColor="Black"
-                    TintOpacity="1"
-                    MaterialOpacity="0.85" />
-            </ExperimentalAcrylicBorder.Material>
-        </ExperimentalAcrylicBorder>
-
-        <ContentControl Content="{Binding}" />
-    </Panel>
+        Title="Artemis 2.0">
+    <ContentControl Content="{Binding}" />
 </Window>
\ No newline at end of file
diff --git a/src/Avalonia/Artemis.UI/Screens/Debugger/DebugView.axaml b/src/Avalonia/Artemis.UI/Screens/Debugger/DebugView.axaml
index aa48ee023..4cb14d0c0 100644
--- a/src/Avalonia/Artemis.UI/Screens/Debugger/DebugView.axaml
+++ b/src/Avalonia/Artemis.UI/Screens/Debugger/DebugView.axaml
@@ -7,10 +7,10 @@
         xmlns:reactiveUi="http://reactiveui.net"
         mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="800"
         x:Class="Artemis.UI.Screens.Debugger.DebugView"
+        Icon="/Assets/Images/Logo/bow.ico"
         Title="Artemis | Debugger"
         Width="1200"
-        Height="800"
-        ExtendClientAreaToDecorationsHint="True">
+        Height="800">
 
     <Window.Styles>
         <Style Selector="StackPanel.sidebar-stackpanel avalonia|MaterialIcon">
@@ -24,7 +24,7 @@
                              SelectedItem="{Binding SelectedItem}"
                              IsPaneToggleButtonVisible="False"
                              PaneDisplayMode="Left"
-                             Margin="0 30 0 0">
+                             Margin="0 10 0 0">
         <controls:NavigationView.MenuItems>
             <controls:NavigationViewItem Tag="Rendering">
                 <controls:NavigationViewItem.Content>
diff --git a/src/Avalonia/Artemis.UI/Screens/Device/DevicePropertiesView.axaml b/src/Avalonia/Artemis.UI/Screens/Device/DevicePropertiesView.axaml
index 3e51dbae6..861a997aa 100644
--- a/src/Avalonia/Artemis.UI/Screens/Device/DevicePropertiesView.axaml
+++ b/src/Avalonia/Artemis.UI/Screens/Device/DevicePropertiesView.axaml
@@ -5,66 +5,61 @@
         xmlns:controls="clr-namespace:Artemis.UI.Shared.Controls;assembly=Artemis.UI.Shared"
         mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="800"
         x:Class="Artemis.UI.Screens.Device.DevicePropertiesView"
+        Icon="/Assets/Images/Logo/bow.ico"
         Title="Artemis | Device Properties"
         Width="1250"
-        Height="900"
-        WindowStartupLocation="CenterOwner"
-        ExtendClientAreaToDecorationsHint="True">
-    <Grid>
-        <TextBlock Margin="10" IsHitTestVisible="False" Text="Artemis | Device Properties" />
+        Height="900">
 
-        <Grid Margin="0 32 0 0" ColumnDefinitions="*,0,1.5*">
-            <Grid Grid.Column="0" Name="DeviceDisplayGrid">
-                <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 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">
+            <!-- No need to provide LEDs to highlight as LEDs are already physically highlighted -->
+            <controls:DeviceVisualizer Device="{Binding Device}"
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center"
+                                       ShowColors="True"
+                                       Margin="20" />
 
-                <!-- No need to provide LEDs to highlight as LEDs are already physically highlighted -->
-                <controls:DeviceVisualizer Device="{Binding Device}"
-                                           HorizontalAlignment="Center"
-                                           VerticalAlignment="Center"
-                                           ShowColors="True"
-                                           Margin="20" />
-
-                <StackPanel Orientation="Horizontal"
-                            VerticalAlignment="Bottom"
-                            HorizontalAlignment="Left"
-                            Margin="15"
-                            IsVisible="{Binding Device.Layout.RgbLayout.Author, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
-                    <TextBlock Classes="h5" Text="Device layout by " />
-                    <TextBlock Classes="h5" FontWeight="Bold" Text="{Binding Device.Layout.RgbLayout.Author}" />
-                </StackPanel>
-            </Grid>
-
-
-            <GridSplitter Grid.Column="1" Width="15" Margin="-15 0 0 0" Background="Transparent" HorizontalAlignment="Stretch" />
-
-            <Border Grid.Column="2" Classes="card" CornerRadius="10 0 0 0">
-                <TabControl Items="{Binding Tabs}">
-                    <TabControl.ItemTemplate>
-                        <DataTemplate>
-                            <TextBlock Text="{Binding DisplayName}" />
-                        </DataTemplate>
-                    </TabControl.ItemTemplate>
-                    <TabControl.ContentTemplate>
-                        <DataTemplate>
-                            <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                                <ContentControl Content="{Binding}" Margin="0 10 0 0" />
-                            </ScrollViewer>
-                        </DataTemplate>
-                    </TabControl.ContentTemplate>
-                </TabControl>
-            </Border>
+            <StackPanel Orientation="Horizontal"
+                        VerticalAlignment="Bottom"
+                        HorizontalAlignment="Left"
+                        Margin="15"
+                        IsVisible="{Binding Device.Layout.RgbLayout.Author, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+                <TextBlock Classes="h5" Text="Device layout by " />
+                <TextBlock Classes="h5" FontWeight="Bold" Text="{Binding Device.Layout.RgbLayout.Author}" />
+            </StackPanel>
         </Grid>
+
+
+        <GridSplitter Grid.Column="1" Width="15" Margin="-15 0 0 0" Background="Transparent" HorizontalAlignment="Stretch" />
+
+        <Border Grid.Column="2" Classes="card" CornerRadius="10 0 0 0" Margin="0 10 0 0" Background="#ff323232">
+            <TabControl Items="{Binding Tabs}">
+                <TabControl.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding DisplayName}" />
+                    </DataTemplate>
+                </TabControl.ItemTemplate>
+                <TabControl.ContentTemplate>
+                    <DataTemplate>
+                        <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+                            <ContentControl Content="{Binding}" Margin="0 10 0 0" />
+                        </ScrollViewer>
+                    </DataTemplate>
+                </TabControl.ContentTemplate>
+            </TabControl>
+        </Border>
     </Grid>
 
 </Window>
\ No newline at end of file
diff --git a/src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml
index 788b5ff10..65821f1e8 100644
--- a/src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml
+++ b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml
@@ -4,14 +4,10 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="Artemis.UI.Screens.Plugins.PluginSettingsWindowView"
+        Icon="/Assets/Images/Logo/bow.ico"
         Title="{Binding DisplayName}"
-        ExtendClientAreaToDecorationsHint="True"
         Width="800" 
         Height="800"
         WindowStartupLocation="CenterOwner">
-	<Grid>
-		<TextBlock Margin="10" IsHitTestVisible="False" Text="{Binding DisplayName}"></TextBlock>
-        <ContentControl Margin="0 32 0 0" Content="{Binding ConfigurationViewModel}"></ContentControl>
-	</Grid>
-
+    <ContentControl Content="{Binding ConfigurationViewModel}"></ContentControl>
 </Window>
diff --git a/src/Avalonia/Artemis.UI/Screens/Root/RootView.axaml b/src/Avalonia/Artemis.UI/Screens/Root/RootView.axaml
index 967bd9260..de64614fe 100644
--- a/src/Avalonia/Artemis.UI/Screens/Root/RootView.axaml
+++ b/src/Avalonia/Artemis.UI/Screens/Root/RootView.axaml
@@ -13,7 +13,7 @@
 
         <ContentControl Grid.Column="0" Content="{Binding SidebarViewModel}" />
 
-        <Border Classes="router-container" Grid.Column="1" Margin="0 40 0 0">
+        <Border Classes="router-container" Grid.Column="1" Margin="0 10 0 0">
             <reactiveUi:RoutedViewHost Router="{Binding Router}">
                 <reactiveUi:RoutedViewHost.PageTransition>
                     <CrossFade Duration="0.1" />
diff --git a/src/Avalonia/Artemis.UI/Styles/Artemis.axaml b/src/Avalonia/Artemis.UI/Styles/Artemis.axaml
index 8ad567c01..daa01349c 100644
--- a/src/Avalonia/Artemis.UI/Styles/Artemis.axaml
+++ b/src/Avalonia/Artemis.UI/Styles/Artemis.axaml
@@ -5,9 +5,5 @@
     <!-- Third party styles -->
     <styling:FluentAvaloniaTheme RequestedTheme="Dark" />
     <StyleInclude Source="avares://Material.Icons.Avalonia/App.xaml" />
-
-    <!-- Grab the window styling from Avalonia -->
-    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Window.xaml" />
-    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TitleBar.xaml" />
-    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml" />
-</Styles>
+    <StyleInclude Source="avares://Artemis.UI.Shared/Styles/Artemis.axaml" />
+</Styles>
\ No newline at end of file