diff --git a/Directory.Packages.props b/Directory.Packages.props
index 9e4e83cef..a9500ac82 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,5 +1,7 @@
 <Project>
 	<ItemGroup>
+		<PackageVersion Include="ActiproSoftware.Controls.Avalonia" Version="23.1.3"/>
+		<PackageVersion Include="ActiproSoftware.Controls.Avalonia.Themes.DataGrid" Version="23.1.3"/>
 		<PackageVersion Include="Ardalis.SmartEnum" Version="2.1.0"/>
 		<PackageVersion Include="AdysTech.CredentialManager" Version="2.6.0"/>
 		<PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="8.0.0"/>
@@ -7,7 +9,6 @@
 		<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.9"/>
 		<PackageVersion Include="Avalonia.Desktop" Version="11.0.9"/>
 		<PackageVersion Include="Avalonia.Diagnostics" Version="11.0.9"/>
-		<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.0.9"/>
 		<PackageVersion Include="Avalonia.Xaml.Behaviors" Version="11.0.6"/>
 		<PackageVersion Include="Avalonia.Xaml.Interactivity" Version="11.0.6"/>
 		<PackageVersion Include="Bogus" Version="35.4.0"/>
diff --git a/source/Gnomeshade.Avalonia.Core/Help/licenses.json b/source/Gnomeshade.Avalonia.Core/Help/licenses.json
index 6264edb4a..ebb13de3d 100644
Binary files a/source/Gnomeshade.Avalonia.Core/Help/licenses.json and b/source/Gnomeshade.Avalonia.Core/Help/licenses.json differ
diff --git a/source/Gnomeshade.Avalonia.Core/Help/override.json b/source/Gnomeshade.Avalonia.Core/Help/override.json
index 5d4f4d9d9..afaf33aa0 100644
--- a/source/Gnomeshade.Avalonia.Core/Help/override.json
+++ b/source/Gnomeshade.Avalonia.Core/Help/override.json
@@ -1,4 +1,14 @@
 [
+	{
+		"Id": "ActiproSoftware.Controls.Avalonia",
+		"Version": "23.1.3",
+		"License": "https://www.nuget.org/packages/ActiproSoftware.Controls.Avalonia/23.1.3/License"
+	},
+	{
+		"Id": "ActiproSoftware.Controls.Avalonia.Themes.DataGrid",
+		"Version": "23.1.3",
+		"License": "https://www.nuget.org/packages/ActiproSoftware.Controls.Avalonia/23.1.3/License"
+	},
 	{
 		"Id": "Ardalis.SmartEnum",
 		"Version": "2.1.0",
diff --git a/source/Gnomeshade.Desktop/App.axaml b/source/Gnomeshade.Desktop/App.axaml
index 32b39e69b..1969ef6fa 100644
--- a/source/Gnomeshade.Desktop/App.axaml
+++ b/source/Gnomeshade.Desktop/App.axaml
@@ -7,8 +7,10 @@
 	xmlns:products="clr-namespace:Gnomeshade.WebApi.Models.Products;assembly=Gnomeshade.WebApi.Models"
 	xmlns:owners="clr-namespace:Gnomeshade.WebApi.Models.Owners;assembly=Gnomeshade.WebApi.Models"
 	xmlns:loans="clr-namespace:Gnomeshade.WebApi.Models.Loans;assembly=Gnomeshade.WebApi.Models"
+	xmlns:actipro="http://schemas.actiprosoftware.com/avaloniaui"
+	xmlns:generation="clr-namespace:ActiproSoftware.UI.Avalonia.Themes.Generation;assembly=ActiproSoftware.Avalonia.Shared"
 	x:Class="Gnomeshade.Desktop.App"
-	RequestedThemeVariant="Dark">
+	RequestedThemeVariant="Default">
 
 	<Application.DataTemplates>
 		<core:ViewLocator x:TypeArguments="desktop:App" />
@@ -49,41 +51,17 @@
 			<TextBlock Text="{Binding Name}" />
 		</DataTemplate>
 	</Application.DataTemplates>
-
-	<Application.Resources>
-		<SolidColorBrush x:Key="DataGridColumnHeaderBackgroundBrush" />
-		<SolidColorBrush x:Key="DataGridGridLinesBrush" />
-		<x:Double x:Key="DataGridSortIconMinWidth">0</x:Double>
-
-		<!-- Override default values for expander -->
-		<Thickness x:Key="ExpanderChevronMargin">0</Thickness>
-		<x:Double x:Key="FlyoutThemeMinWidth">0</x:Double>
-		<SolidColorBrush x:Key="ExpanderHeaderBackground" />
-		<SolidColorBrush x:Key="ExpanderHeaderBackgroundPointerOver" />
-		<SolidColorBrush x:Key="ExpanderChevronBackground" />
-	</Application.Resources>
-
 	<Application.Styles>
-		<FluentTheme />
-		<StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml" />
+		<actipro:ModernTheme Includes="NativeDataGrid">
+			<actipro:ModernTheme.Definition>
+				<generation:ThemeDefinition BaseFontSize="13" UserInterfaceDensity="Compact" />
+			</actipro:ModernTheme.Definition>
+		</actipro:ModernTheme>
 
 		<Style Selector="DataGridColumnHeader">
 			<Setter Property="Padding" Value="5 0" />
 		</Style>
 
-		<Style Selector="DataGridCell">
-			<Setter Property="MinHeight" Value="20" />
-			<Setter Property="FontSize" Value="14" />
-		</Style>
-
-		<Style Selector="DataGridCell:focus Grid#FocusVisual">
-			<Setter Property="IsVisible" Value="False" />
-		</Style>
-
-		<Style Selector="DataGridRow:selected /template/ Rectangle#BackgroundRectangle">
-			<Setter Property="Fill" Value="#05769d" />
-		</Style>
-
 		<Style Selector="AutoCompleteBox TextBox#PART_TextBox">
 			<Setter Property="UseFloatingWatermark" Value="True" />
 		</Style>
@@ -114,9 +92,5 @@
 			<Setter Property="MinWidth" Value="150" />
 			<Setter Property="UseFloatingWatermark" Value="True" />
 		</Style>
-
-		<Style Selector="Expander ToggleButton">
-			<Setter Property="Padding" Value="0" />
-		</Style>
 	</Application.Styles>
 </Application>
diff --git a/source/Gnomeshade.Desktop/Assets/Hack-Regular.ttf b/source/Gnomeshade.Desktop/Assets/Hack-Regular.ttf
deleted file mode 100644
index 7c8e65b84..000000000
Binary files a/source/Gnomeshade.Desktop/Assets/Hack-Regular.ttf and /dev/null differ
diff --git a/source/Gnomeshade.Desktop/Assets/Hack-RegularOblique.ttf b/source/Gnomeshade.Desktop/Assets/Hack-RegularOblique.ttf
deleted file mode 100644
index f4925891c..000000000
Binary files a/source/Gnomeshade.Desktop/Assets/Hack-RegularOblique.ttf and /dev/null differ
diff --git a/source/Gnomeshade.Desktop/Assets/Inconsolata-Regular.ttf b/source/Gnomeshade.Desktop/Assets/Inconsolata-Regular.ttf
deleted file mode 100644
index c3acd3e04..000000000
Binary files a/source/Gnomeshade.Desktop/Assets/Inconsolata-Regular.ttf and /dev/null differ
diff --git a/source/Gnomeshade.Desktop/Gnomeshade.Desktop.csproj b/source/Gnomeshade.Desktop/Gnomeshade.Desktop.csproj
index bbcbbe724..49256b9b1 100644
--- a/source/Gnomeshade.Desktop/Gnomeshade.Desktop.csproj
+++ b/source/Gnomeshade.Desktop/Gnomeshade.Desktop.csproj
@@ -21,9 +21,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="ActiproSoftware.Controls.Avalonia" />
+		<PackageReference Include="ActiproSoftware.Controls.Avalonia.Themes.DataGrid" />
 		<PackageReference Include="AdysTech.CredentialManager" />
 		<PackageReference Include="Avalonia.Desktop" />
-		<PackageReference Include="Avalonia.Themes.Fluent" />
 		<PackageReference Include="Avalonia.Xaml.Behaviors" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
 		<PackageReference Include="Serilog" />
diff --git a/source/Gnomeshade.Desktop/Views/MainWindow.axaml b/source/Gnomeshade.Desktop/Views/MainWindow.axaml
index 4bad0de7a..902cb41e1 100644
--- a/source/Gnomeshade.Desktop/Views/MainWindow.axaml
+++ b/source/Gnomeshade.Desktop/Views/MainWindow.axaml
@@ -11,7 +11,6 @@
 	x:Class="Gnomeshade.Desktop.Views.MainWindow"
 	Icon="/Assets/avalonia-logo.ico"
 	Title="Gnomeshade"
-	FontFamily="/Assets/Inconsolata-Regular.ttf"
 
 	WindowStartupLocation="CenterScreen"
 	ExtendClientAreaToDecorationsHint="False"
@@ -23,18 +22,8 @@
 	x:DataType="core:MainWindowViewModel">
 
 	<Panel>
-		<ExperimentalAcrylicBorder IsHitTestVisible="False">
-			<ExperimentalAcrylicBorder.Material>
-				<ExperimentalAcrylicMaterial
-					BackgroundSource="Digger"
-					TintColor="Black"
-					TintOpacity="1"
-					MaterialOpacity="0.65" />
-			</ExperimentalAcrylicBorder.Material>
-		</ExperimentalAcrylicBorder>
-
 		<Grid RowDefinitions="Auto,*,Auto">
-			<Menu DockPanel.Dock="Top" FontSize="18">
+			<Menu DockPanel.Dock="Top">
 				<MenuItem Header="_File">
 					<MenuItem
 						x:Name="Logout" Header="_Logout"
diff --git a/source/Gnomeshade.Desktop/Views/Transactions/TransactionView.axaml b/source/Gnomeshade.Desktop/Views/Transactions/TransactionView.axaml
index 444c1a878..7673483c1 100644
--- a/source/Gnomeshade.Desktop/Views/Transactions/TransactionView.axaml
+++ b/source/Gnomeshade.Desktop/Views/Transactions/TransactionView.axaml
@@ -12,52 +12,50 @@
 	x:DataType="transactions:TransactionViewModel">
 
 	<Grid RowDefinitions="*" ColumnDefinitions="Auto,Auto,Auto,Auto,*" x:Name="Container">
-		<Expander Grid.Column="0" ExpandDirection="Right" VerticalAlignment="Stretch" IsExpanded="True">
-			<StackPanel Orientation="Vertical" Spacing="5">
-				<UserControl Content="{Binding Filter, Mode=OneWay}" />
+		<StackPanel Grid.Column="0" Orientation="Vertical" Spacing="5">
+			<UserControl Content="{Binding Filter, Mode=OneWay}" />
 
-				<Grid ColumnDefinitions="*, *" RowDefinitions="Auto, 5, Auto, Auto, Auto">
-					<Button
-						Grid.Row="0" Grid.Column="0"
-						HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
-						IsEnabled="{Binding CanRefresh}" Command="{Binding RefreshAsync}">
-						Refresh
-					</Button>
-					<Button
-						Grid.Row="0" Grid.Column="1" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
-						IsEnabled="{Binding CanDelete}" Command="{Binding DeleteSelectedAsync}">
-						Delete Selected
-					</Button>
-					<Button
-						Grid.Row="2" Grid.Column="0"
-						HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
-						IsEnabled="{Binding CanSelectSource}" Command="{Binding SelectSource}">
-						Select Source
-					</Button>
-					<Button
-						Grid.Row="2" Grid.Column="1" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
-						IsEnabled="{Binding CanSelectTarget}" Command="{Binding SelectTarget}">
-						Select Target
-					</Button>
-					<Button
-						Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2"
-						HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
-						Command="{Binding ClearMerge}">
-						Clear
-					</Button>
-					<Button
-						Grid.Row="4" Grid.Column="0" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
-						IsEnabled="{Binding Merge.CanMerge}" Command="{Binding Merge.MergeAsync}">
-						Merge
-					</Button>
-					<Button
-						Grid.Row="4" Grid.Column="1" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
-						IsEnabled="{Binding Refund.CanRefund}" Command="{Binding Refund.RefundAsync}">
-						Refund
-					</Button>
-				</Grid>
-			</StackPanel>
-		</Expander>
+			<Grid ColumnDefinitions="*, *" RowDefinitions="Auto, 5, Auto, Auto, Auto">
+				<Button
+					Grid.Row="0" Grid.Column="0"
+					HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+					IsEnabled="{Binding CanRefresh}" Command="{Binding RefreshAsync}">
+					Refresh
+				</Button>
+				<Button
+					Grid.Row="0" Grid.Column="1" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+					IsEnabled="{Binding CanDelete}" Command="{Binding DeleteSelectedAsync}">
+					Delete Selected
+				</Button>
+				<Button
+					Grid.Row="2" Grid.Column="0"
+					HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+					IsEnabled="{Binding CanSelectSource}" Command="{Binding SelectSource}">
+					Select Source
+				</Button>
+				<Button
+					Grid.Row="2" Grid.Column="1" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+					IsEnabled="{Binding CanSelectTarget}" Command="{Binding SelectTarget}">
+					Select Target
+				</Button>
+				<Button
+					Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2"
+					HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+					Command="{Binding ClearMerge}">
+					Clear
+				</Button>
+				<Button
+					Grid.Row="4" Grid.Column="0" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+					IsEnabled="{Binding Merge.CanMerge}" Command="{Binding Merge.MergeAsync}">
+					Merge
+				</Button>
+				<Button
+					Grid.Row="4" Grid.Column="1" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+					IsEnabled="{Binding Refund.CanRefund}" Command="{Binding Refund.RefundAsync}">
+					Refund
+				</Button>
+			</Grid>
+		</StackPanel>
 
 		<Grid Grid.Column="2" ColumnDefinitions="*" RowDefinitions="*, Auto">
 			<DataGrid
@@ -70,18 +68,10 @@
 				AutoGenerateColumns="False" IsReadOnly="False"
 				CanUserReorderColumns="False" CanUserResizeColumns="True" CanUserSortColumns="True">
 				<DataGrid.Columns>
-					<DataGridTemplateColumn Header="Rec" IsReadOnly="True" CanUserSort="False">
-						<DataGridTemplateColumn.CellTemplate>
-							<DataTemplate DataType="transactions:TransactionOverview">
-								<LayoutTransformControl HorizontalAlignment="Center" VerticalAlignment="Top">
-									<CheckBox IsChecked="{Binding Reconciled}" Padding="0" IsEnabled="False" />
-									<LayoutTransformControl.LayoutTransform>
-										<ScaleTransform ScaleX="0.6" ScaleY="0.6" />
-									</LayoutTransformControl.LayoutTransform>
-								</LayoutTransformControl>
-							</DataTemplate>
-						</DataGridTemplateColumn.CellTemplate>
-					</DataGridTemplateColumn>
+					<DataGridCheckBoxColumn
+						x:DataType="transactions:TransactionOverview"
+						Header="Rec" IsReadOnly="True" CanUserSort="False"
+						Binding="{Binding Reconciled}" />
 					<DataGridTemplateColumn
 						Header="Date" IsReadOnly="True"
 						SortMemberPath="Date" CanUserSort="True">
diff --git a/source/Gnomeshade.Desktop/packages.lock.json b/source/Gnomeshade.Desktop/packages.lock.json
index 1f22f4168..2387b1212 100644
--- a/source/Gnomeshade.Desktop/packages.lock.json
+++ b/source/Gnomeshade.Desktop/packages.lock.json
@@ -2,6 +2,26 @@
   "version": 2,
   "dependencies": {
     "net8.0": {
+      "ActiproSoftware.Controls.Avalonia": {
+        "type": "Direct",
+        "requested": "[23.1.3, )",
+        "resolved": "23.1.3",
+        "contentHash": "FJ8oTYb/WynFe1faXU8wcEgN8KH6va7BH/2fsp644r40qiQaaKQ9zOV1G2e/Je3TgfnEK/daF4z4ch2XjS6dVA==",
+        "dependencies": {
+          "Avalonia": "11.0.5"
+        }
+      },
+      "ActiproSoftware.Controls.Avalonia.Themes.DataGrid": {
+        "type": "Direct",
+        "requested": "[23.1.3, )",
+        "resolved": "23.1.3",
+        "contentHash": "gB+Jh+EzttayAV4z1I06M8W2181EF8yVqS59R+u4kNExLt4GZ1+E/v4UxhdfvVtE6K3tGOhUKeLTql2R5aibdQ==",
+        "dependencies": {
+          "ActiproSoftware.Controls.Avalonia": "[23.1.3]",
+          "Avalonia": "11.0.5",
+          "Avalonia.Controls.DataGrid": "11.0.5"
+        }
+      },
       "AdysTech.CredentialManager": {
         "type": "Direct",
         "requested": "[2.6.0, )",
@@ -21,15 +41,6 @@
           "Avalonia.X11": "11.0.9"
         }
       },
-      "Avalonia.Themes.Fluent": {
-        "type": "Direct",
-        "requested": "[11.0.9, )",
-        "resolved": "11.0.9",
-        "contentHash": "cRycTh9SZPHIi64c90xu0QI9d3jXMFY3VDWeIMHot+1Qek7Q9qYRXWmeJvStfYSYXDKOI7113IBJ7MIQiUshgg==",
-        "dependencies": {
-          "Avalonia": "11.0.9"
-        }
-      },
       "Avalonia.Xaml.Behaviors": {
         "type": "Direct",
         "requested": "[11.0.6, )",
diff --git a/tests/Gnomeshade.Desktop.Tests/packages.lock.json b/tests/Gnomeshade.Desktop.Tests/packages.lock.json
index 1ab76bd1e..d5c2d557b 100644
--- a/tests/Gnomeshade.Desktop.Tests/packages.lock.json
+++ b/tests/Gnomeshade.Desktop.Tests/packages.lock.json
@@ -628,9 +628,10 @@
       "gnomeshade.desktop": {
         "type": "Project",
         "dependencies": {
+          "ActiproSoftware.Controls.Avalonia": "[23.1.3, )",
+          "ActiproSoftware.Controls.Avalonia.Themes.DataGrid": "[23.1.3, )",
           "AdysTech.CredentialManager": "[2.6.0, )",
           "Avalonia.Desktop": "[11.0.9, )",
-          "Avalonia.Themes.Fluent": "[11.0.9, )",
           "Avalonia.Xaml.Behaviors": "[11.0.6, )",
           "Gnomeshade.Avalonia.Core": "[1.0.0, )",
           "Microsoft.Extensions.Configuration.Json": "[8.0.0, )",
@@ -661,6 +662,26 @@
           "NodaTime": "[3.1.11, )"
         }
       },
+      "ActiproSoftware.Controls.Avalonia": {
+        "type": "CentralTransitive",
+        "requested": "[23.1.3, )",
+        "resolved": "23.1.3",
+        "contentHash": "FJ8oTYb/WynFe1faXU8wcEgN8KH6va7BH/2fsp644r40qiQaaKQ9zOV1G2e/Je3TgfnEK/daF4z4ch2XjS6dVA==",
+        "dependencies": {
+          "Avalonia": "11.0.5"
+        }
+      },
+      "ActiproSoftware.Controls.Avalonia.Themes.DataGrid": {
+        "type": "CentralTransitive",
+        "requested": "[23.1.3, )",
+        "resolved": "23.1.3",
+        "contentHash": "gB+Jh+EzttayAV4z1I06M8W2181EF8yVqS59R+u4kNExLt4GZ1+E/v4UxhdfvVtE6K3tGOhUKeLTql2R5aibdQ==",
+        "dependencies": {
+          "ActiproSoftware.Controls.Avalonia": "[23.1.3]",
+          "Avalonia": "11.0.5",
+          "Avalonia.Controls.DataGrid": "11.0.5"
+        }
+      },
       "AdysTech.CredentialManager": {
         "type": "CentralTransitive",
         "requested": "[2.6.0, )",
@@ -690,15 +711,6 @@
           "Avalonia.X11": "11.0.9"
         }
       },
-      "Avalonia.Themes.Fluent": {
-        "type": "CentralTransitive",
-        "requested": "[11.0.9, )",
-        "resolved": "11.0.9",
-        "contentHash": "cRycTh9SZPHIi64c90xu0QI9d3jXMFY3VDWeIMHot+1Qek7Q9qYRXWmeJvStfYSYXDKOI7113IBJ7MIQiUshgg==",
-        "dependencies": {
-          "Avalonia": "11.0.9"
-        }
-      },
       "Avalonia.Xaml.Behaviors": {
         "type": "CentralTransitive",
         "requested": "[11.0.6, )",