diff --git a/samples/ControlCatalog/App.xaml b/samples/ControlCatalog/App.xaml
index 66d9565747..d20e0100a0 100644
--- a/samples/ControlCatalog/App.xaml
+++ b/samples/ControlCatalog/App.xaml
@@ -4,7 +4,7 @@
   <Application.Styles>
       <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
       <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
-      <StyleInclude Source="resm:Avalonia.Controls.DataGrid.Default.xaml?assembly=Avalonia.Controls.DataGrid"/>
+      <StyleInclude Source="resm:Avalonia.Controls.DataGrid.Themes.Default.xaml?assembly=Avalonia.Controls.DataGrid"/>
     <Style Selector="TextBlock.h1">
       <Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}"/>
       <Setter Property="FontWeight" Value="Medium"/>
diff --git a/src/Avalonia.Controls.DataGrid/Default.xaml b/src/Avalonia.Controls.DataGrid/Themes/Default.xaml
similarity index 100%
rename from src/Avalonia.Controls.DataGrid/Default.xaml
rename to src/Avalonia.Controls.DataGrid/Themes/Default.xaml