diff --git a/api/Avalonia.Controls.ColorPicker.nupkg.xml b/api/Avalonia.Controls.ColorPicker.nupkg.xml
new file mode 100644
index 0000000000..978aafcc88
--- /dev/null
+++ b/api/Avalonia.Controls.ColorPicker.nupkg.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Fluent/ColorPicker.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Fluent/ColorPreviewer.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Fluent/ColorSlider.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Fluent/ColorSpectrum.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Fluent/ColorView.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Simple/ColorPicker.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Simple/ColorPreviewer.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Simple/ColorSlider.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Simple/ColorSpectrum.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Simple/ColorView.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+  </Suppression>
+</Suppressions>
\ No newline at end of file
diff --git a/api/Avalonia.Themes.Fluent.nupkg.xml b/api/Avalonia.Themes.Fluent.nupkg.xml
new file mode 100644
index 0000000000..5204e75fdd
--- /dev/null
+++ b/api/Avalonia.Themes.Fluent.nupkg.xml
@@ -0,0 +1,418 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Accents/BaseResources.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Accents/FluentControlResources.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/AdornerLayer.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/AutoCompleteBox.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Button.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ButtonSpinner.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Calendar.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarButton.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarDatePicker.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarDayButton.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarItem.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CaptionButtons.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Carousel.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CheckBox.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ComboBox.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ComboBoxItem.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ContentControl.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ContextMenu.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DataValidationErrors.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DatePicker.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DateTimePickerShared.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DropDownButton.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/EmbeddableControlRoot.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Expander.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/FlyoutPresenter.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/GridSplitter.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ItemsControl.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Label.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ListBox.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ListBoxItem.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ManagedFileChooser.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Menu.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/MenuFlyoutPresenter.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/MenuItem.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/MenuScrollViewer.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/NativeMenuBar.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/NotificationCard.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/NumericUpDown.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/OverlayPopupHost.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/PathIcon.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/PopupRoot.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ProgressBar.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RadioButton.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RefreshContainer.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RefreshVisualizer.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RepeatButton.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ScrollBar.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ScrollViewer.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/SelectableTextBlock.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Separator.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Slider.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/SplitButton.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/SplitView.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabControl.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabItem.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabStrip.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabStripItem.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TextBox.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ThemeVariantScope.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TimePicker.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TitleBar.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ToggleButton.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ToggleSwitch.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ToolTip.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TransitioningContentControl.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TreeView.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TreeViewItem.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Window.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/WindowNotificationManager.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+  </Suppression>
+</Suppressions>
\ No newline at end of file
diff --git a/api/Avalonia.Themes.Simple.nupkg.xml b/api/Avalonia.Themes.Simple.nupkg.xml
new file mode 100644
index 0000000000..199ccd76df
--- /dev/null
+++ b/api/Avalonia.Themes.Simple.nupkg.xml
@@ -0,0 +1,406 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Accents/Base.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/AdornerLayer.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/AutoCompleteBox.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Button.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ButtonSpinner.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Calendar.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarButton.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarDatePicker.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarDayButton.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarItem.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CaptionButtons.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Carousel.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CheckBox.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ComboBox.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ComboBoxItem.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ContentControl.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ContextMenu.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DataValidationErrors.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DatePicker.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DateTimePickerShared.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DropDownButton.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/EmbeddableControlRoot.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Expander.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/FlyoutPresenter.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/GridSplitter.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ItemsControl.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Label.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ListBox.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ListBoxItem.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ManagedFileChooser.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Menu.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/MenuFlyoutPresenter.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/MenuItem.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/NativeMenuBar.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/NotificationCard.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/NumericUpDown.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/OverlayPopupHost.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/PathIcon.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/PopupRoot.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ProgressBar.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RadioButton.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RefreshContainer.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RefreshVisualizer.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RepeatButton.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ScrollBar.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ScrollViewer.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/SelectableTextBlock.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Separator.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Slider.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/SplitButton.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/SplitView.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabControl.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabItem.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabStrip.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabStripItem.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TextBox.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ThemeVariantScope.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TimePicker.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TitleBar.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ToggleButton.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ToggleSwitch.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ToolTip.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TransitioningContentControl.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TreeView.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TreeViewItem.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Window.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/WindowNotificationManager.xaml</Target>
+    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
+    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+  </Suppression>
+</Suppressions>
\ No newline at end of file
diff --git a/nukebuild/ApiDiffValidation.cs b/nukebuild/ApiDiffValidation.cs
index a236178c83..d0fc3d02e1 100644
--- a/nukebuild/ApiDiffValidation.cs
+++ b/nukebuild/ApiDiffValidation.cs
@@ -38,7 +38,7 @@ public static class ApiDiffValidation
             var left = new List<string>();
             var right = new List<string>();
 
-            var suppressionFile = Path.Combine(suppressionFilesFolder, Path.GetFileName(packagePath) + ".xml");
+            var suppressionFile = Path.Combine(suppressionFilesFolder, GetPackageId(packagePath) + ".nupkg.xml");
 
             foreach (var baselineDll in baselineDlls)
             {
@@ -113,20 +113,17 @@ public static class ApiDiffValidation
 
     static async Task<Stream> DownloadBaselinePackage(string packagePath, string baselineVersion)
     {
-        Build.Information("Downloading {0} baseline package for version {1}", Path.GetFileName(packagePath), baselineVersion);
+        /*
+         Gets package name from versions like:
+         Avalonia.0.10.0-preview1
+         Avalonia.11.0.999-cibuild0037534-beta
+         Avalonia.11.0.0
+         */
+        var packageId = GetPackageId(packagePath);
+        Build.Information("Downloading {0} {1} baseline package", packageId, baselineVersion);
 
         try
         {
-            /*
-             Gets package name from versions like:
-             Avalonia.0.10.0-preview1
-             Avalonia.11.0.999-cibuild0037534-beta
-             Avalonia.11.0.0
-             */
-            var packageId = Regex.Replace(
-                Path.GetFileNameWithoutExtension(packagePath),
-                """(\.\d+\.\d+\.\d+(?:-.+)?)$""", "");
-
             using var response = await s_httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Get,
                 $"https://www.nuget.org/api/v2/package/{packageId}/{baselineVersion}"), HttpCompletionOption.ResponseHeadersRead);
             response.EnsureSuccessStatusCode();
@@ -139,7 +136,14 @@ public static class ApiDiffValidation
         }
         catch (Exception ex)
         {
-            throw new InvalidOperationException($"Downloading baseline package for {packagePath} failed.\r" + ex.Message, ex);
+            throw new InvalidOperationException($"Downloading baseline package for {packageId} {baselineVersion} failed.\r" + ex.Message, ex);
         }
     }
+
+    static string GetPackageId(string packagePath)
+    {
+        return Regex.Replace(
+            Path.GetFileNameWithoutExtension(packagePath),
+            """(\.\d+\.\d+\.\d+(?:-.+)?)$""", "");
+    }
 }