diff --git a/src/Avalonia/HandyControlDemo_Avalonia/HandyControlDemo_Avalonia.csproj b/src/Avalonia/HandyControlDemo_Avalonia/HandyControlDemo_Avalonia.csproj
index 67d39697..2589651b 100644
--- a/src/Avalonia/HandyControlDemo_Avalonia/HandyControlDemo_Avalonia.csproj
+++ b/src/Avalonia/HandyControlDemo_Avalonia/HandyControlDemo_Avalonia.csproj
@@ -39,38 +39,6 @@
     <EmbeddedResource Include="Data\DemoInfo.json" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="App.axaml.cs">
-      <DependentUpon>App.axaml</DependentUpon>
-    </Compile>
-    <Compile Update="Properties\Langs\Lang.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Lang.resx</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Main\LeftMainContent.axaml.cs">
-      <DependentUpon>LeftMainContent.axaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Main\MainContent.axaml.cs">
-      <DependentUpon>MainContent.axaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Styles\ButtonDemoCtrl.axaml.cs">
-      <DependentUpon>ButtonDemoCtrl.axaml</DependentUpon>
-    </Compile>
-    <Compile Update="UserControl\Styles\BrushDemoCtl.axaml.cs">
-      <DependentUpon>BoderDemoCtl.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="UserControl\Styles\BorderDemoCtl.axaml.cs">
-      <DependentUpon>BorderDemoCtl.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="UserControl\Styles\RepeatButtonDemoCtl.axaml.cs">
-      <DependentUpon>RepeatButtonDemoCtl.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Lang.Designer.cs">
       <DesignTime>True</DesignTime>
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/BorderDemoCtl.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/BorderDemo.axaml
similarity index 100%
rename from src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/BorderDemoCtl.axaml
rename to src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/BorderDemo.axaml
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/BorderDemoCtl.axaml.cs b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/BorderDemo.axaml.cs
similarity index 100%
rename from src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/BorderDemoCtl.axaml.cs
rename to src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/BorderDemo.axaml.cs
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/BrushDemoCtl.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/BrushDemo.axaml
similarity index 100%
rename from src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/BrushDemoCtl.axaml
rename to src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/BrushDemo.axaml
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/BrushDemoCtl.axaml.cs b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/BrushDemo.axaml.cs
similarity index 100%
rename from src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/BrushDemoCtl.axaml.cs
rename to src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/BrushDemo.axaml.cs
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ButtonDemoCtl.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ButtonDemo.axaml
similarity index 100%
rename from src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ButtonDemoCtl.axaml
rename to src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ButtonDemo.axaml
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ButtonDemoCtl.axaml.cs b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ButtonDemo.axaml.cs
similarity index 100%
rename from src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ButtonDemoCtl.axaml.cs
rename to src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ButtonDemo.axaml.cs
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/CheckBoxDemoCtl.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/CheckBoxDemo.axaml
similarity index 100%
rename from src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/CheckBoxDemoCtl.axaml
rename to src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/CheckBoxDemo.axaml
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/CheckBoxDemoCtl.axaml.cs b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/CheckBoxDemo.axaml.cs
similarity index 100%
rename from src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/CheckBoxDemoCtl.axaml.cs
rename to src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/CheckBoxDemo.axaml.cs
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NativeScrollViewerDemoCtl.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NativeScrollViewerDemo.axaml
similarity index 100%
rename from src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NativeScrollViewerDemoCtl.axaml
rename to src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NativeScrollViewerDemo.axaml
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NativeScrollViewerDemoCtl.axaml.cs b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NativeScrollViewerDemo.axaml.cs
similarity index 100%
rename from src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NativeScrollViewerDemoCtl.axaml.cs
rename to src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NativeScrollViewerDemo.axaml.cs
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/RadioButtonDemoCtl.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/RadioButtonDemo.axaml
similarity index 100%
rename from src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/RadioButtonDemoCtl.axaml
rename to src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/RadioButtonDemo.axaml
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/RadioButtonDemoCtl.axaml.cs b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/RadioButtonDemo.axaml.cs
similarity index 100%
rename from src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/RadioButtonDemoCtl.axaml.cs
rename to src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/RadioButtonDemo.axaml.cs
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/RepeatButtonDemoCtl.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/RepeatButtonDemo.axaml
similarity index 100%
rename from src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/RepeatButtonDemoCtl.axaml
rename to src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/RepeatButtonDemo.axaml
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/RepeatButtonDemoCtl.axaml.cs b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/RepeatButtonDemo.axaml.cs
similarity index 100%
rename from src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/RepeatButtonDemoCtl.axaml.cs
rename to src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/RepeatButtonDemo.axaml.cs
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ToggleButtonDemoCtl.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ToggleButtonDemo.axaml
similarity index 100%
rename from src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ToggleButtonDemoCtl.axaml
rename to src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ToggleButtonDemo.axaml
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ToggleButtonDemoCtl.axaml.cs b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ToggleButtonDemo.axaml.cs
similarity index 100%
rename from src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ToggleButtonDemoCtl.axaml.cs
rename to src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ToggleButtonDemo.axaml.cs