diff --git a/src/Avalonia.Themes.Fluent/ContextMenu.xaml b/src/Avalonia.Themes.Fluent/ContextMenu.xaml
index 33405ddc57..a6b6156944 100644
--- a/src/Avalonia.Themes.Fluent/ContextMenu.xaml
+++ b/src/Avalonia.Themes.Fluent/ContextMenu.xaml
@@ -35,7 +35,7 @@
   <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
   <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
   <Setter Property="HorizontalAlignment" Value="Stretch" />
-  <Setter Property="TextBlock.FontSize" Value="{DynamicResource FontSizeNormal}" />
+  <Setter Property="TextBlock.FontSize" Value="{DynamicResource ContentControlFontSize}" />
   <Setter Property="TextBlock.FontWeight" Value="Normal" />
   <Setter Property="Template">
     <ControlTemplate>
diff --git a/src/Avalonia.Themes.Fluent/EmbeddableControlRoot.xaml b/src/Avalonia.Themes.Fluent/EmbeddableControlRoot.xaml
index 9ffe51fae8..3ff47111eb 100644
--- a/src/Avalonia.Themes.Fluent/EmbeddableControlRoot.xaml
+++ b/src/Avalonia.Themes.Fluent/EmbeddableControlRoot.xaml
@@ -1,6 +1,6 @@
 <Style xmlns="https://github.com/avaloniaui" Selector="EmbeddableControlRoot">
-  <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-  <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
+  <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
+  <Setter Property="FontSize" Value="{DynamicResource ContentControlFontSize}"/>
   <Setter Property="Template">
     <ControlTemplate>
       <Panel>
diff --git a/src/Avalonia.Themes.Fluent/Expander.xaml b/src/Avalonia.Themes.Fluent/Expander.xaml
index d63f785e77..e9eb939798 100644
--- a/src/Avalonia.Themes.Fluent/Expander.xaml
+++ b/src/Avalonia.Themes.Fluent/Expander.xaml
@@ -89,7 +89,7 @@
         <Border BorderThickness="1">
           <Grid ColumnDefinitions="Auto,Auto">
             <Border Grid.Column="0" Width="20" Height="20" HorizontalAlignment="Center" VerticalAlignment="Center">
-              <Path Fill="{DynamicResource ThemeForegroundBrush}"
+              <Path Fill="{DynamicResource SystemControlForegroundAltMediumHighBrush}"
                       HorizontalAlignment="Center"
                       VerticalAlignment="Center"
                       Data="M 0 2 L 4 6 L 0 10 Z" />
@@ -108,7 +108,7 @@
     </Setter>
   </Style>
   <Style Selector="Expander /template/ ToggleButton#PART_toggle:pointerover /template/ Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlTransientBorderBrush}" />
   </Style>
   <Style Selector="Expander:down:expanded /template/ ToggleButton#PART_toggle /template/ Path">
     <Setter Property="RenderTransform">
diff --git a/src/Avalonia.Themes.Fluent/FluentTheme.xaml b/src/Avalonia.Themes.Fluent/FluentTheme.xaml
index 3d54f082bd..0242a81e44 100644
--- a/src/Avalonia.Themes.Fluent/FluentTheme.xaml
+++ b/src/Avalonia.Themes.Fluent/FluentTheme.xaml
@@ -57,4 +57,7 @@
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/SplitView.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/DatePicker.xaml"/>  
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/TimePicker.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ColorPicker.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ColorPickerSlider.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ColorSpectrum.xaml"/>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/GridSplitter.xaml b/src/Avalonia.Themes.Fluent/GridSplitter.xaml
index dc5cd002dc..d68d74d884 100644
--- a/src/Avalonia.Themes.Fluent/GridSplitter.xaml
+++ b/src/Avalonia.Themes.Fluent/GridSplitter.xaml
@@ -4,10 +4,10 @@
     <Setter Property="Focusable" Value="True" />
     <Setter Property="MinWidth" Value="6" />
     <Setter Property="MinHeight" Value="6" />
-    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
+    <Setter Property="Background" Value="{DynamicResource SystemAltMediumLowColor}" />
     <Setter Property="PreviewContent">
       <Template>
-        <Rectangle Fill="{DynamicResource HighlightBrush}" />
+        <Rectangle Fill="{DynamicResource SystemAccentColor}" />
       </Template>
     </Setter>
     <Setter Property="Template">
diff --git a/src/Avalonia.Themes.Fluent/ListBox.xaml b/src/Avalonia.Themes.Fluent/ListBox.xaml
index 5e03540641..ae4fdca490 100644
--- a/src/Avalonia.Themes.Fluent/ListBox.xaml
+++ b/src/Avalonia.Themes.Fluent/ListBox.xaml
@@ -36,7 +36,4 @@
       </ControlTemplate>
     </Setter>
   </Style>
-  <Style Selector="ListBox:disabled /template/ Border#border">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-  </Style>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/OverlayPopupHost.xaml b/src/Avalonia.Themes.Fluent/OverlayPopupHost.xaml
index 36dbc1b761..3809e11251 100644
--- a/src/Avalonia.Themes.Fluent/OverlayPopupHost.xaml
+++ b/src/Avalonia.Themes.Fluent/OverlayPopupHost.xaml
@@ -1,5 +1,5 @@
 <Style xmlns="https://github.com/avaloniaui" Selector="OverlayPopupHost">
-  <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
+  <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
   <Setter Property="Template">
     <ControlTemplate>
       <Panel>
diff --git a/src/Avalonia.Themes.Fluent/TextBox.xaml b/src/Avalonia.Themes.Fluent/TextBox.xaml
index 30d1039ece..c1b60d061c 100644
--- a/src/Avalonia.Themes.Fluent/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/TextBox.xaml
@@ -102,7 +102,6 @@
   </Style>
 
   <Style Selector="TextBox:disabled /template/ Border#border">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
     <Setter Property="Background" Value="{DynamicResource TextControlBackgroundDisabled}" />
     <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
   </Style>