diff --git a/Samples/App.xaml b/Samples/App.xaml
index 2e212efc..9a4b08f4 100644
--- a/Samples/App.xaml
+++ b/Samples/App.xaml
@@ -126,8 +126,9 @@
-
-
+
+
+
diff --git a/Samples/Views/Examples/FormView.xaml b/Samples/Views/Examples/FormView.xaml
index a6733bf9..76682754 100644
--- a/Samples/Views/Examples/FormView.xaml
+++ b/Samples/Views/Examples/FormView.xaml
@@ -4,8 +4,8 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Samples.Views.Examples"
- xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
- xmlns:purs="clr-namespace:Panuon.WPF.UI.Resources;assembly=Panuon.WPF.UI"
+ xmlns:pw="https://opensource.panuon.com/wpf"
+ xmlns:pu="https://opensource.panuon.com/wpf-ui"
mc:Ignorable="d"
Title="Form"
SizeToContent="Height"
@@ -229,7 +229,7 @@
-
+
-
- netcoreapp3.1
- true
- false
-
-
-
- 5
- ..\..\Outputs\Debug\Core31\
-
-
-
- ..\..\Outputs\Release\Core31\
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ..\..\References\Core31\netcoreapp3.1\Panuon.WPF.dll
-
-
-
-
-
-
-
-
+
+ netcoreapp3.1
+ disable
+ true
+ false
+ false
+
+
+
+ 5
+ ..\..\outputs\Debug\core31\
+
+
+
+ ..\..\outputs\Release\core31\
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ..\..\references\core31\Panuon.WPF.dll
+
+
+
+
+
+
+
+
diff --git a/SourceCode/Core31/Panuon.WPF.UI/Themes/Generic.xaml b/SourceCode/Core31/Panuon.WPF.UI/Themes/Generic.xaml
index 31b05b7e..7804ea84 100644
--- a/SourceCode/Core31/Panuon.WPF.UI/Themes/Generic.xaml
+++ b/SourceCode/Core31/Panuon.WPF.UI/Themes/Generic.xaml
@@ -1,12 +1,12 @@
-
+
+ Value="{Binding Background, Converter={x:Static pw:Converters.LightenSolidColorBrushConverter}, ConverterParameter=0.8, RelativeSource={RelativeSource Self}, Mode=OneWay}" />
+ Value="{Binding Background, Converter={x:Static pw:Converters.LightenSolidColorBrushConverter}, ConverterParameter=0.6, RelativeSource={RelativeSource Self}, Mode=OneWay}" />
-
+
+ Value="{Binding Background, Converter={x:Static pw:Converters.LightenSolidColorBrushConverter}, ConverterParameter=0.8, RelativeSource={RelativeSource Self}, Mode=OneWay}" />
+ Value="{Binding Background, Converter={x:Static pw:Converters.LightenSolidColorBrushConverter}, ConverterParameter=0.6, RelativeSource={RelativeSource Self}, Mode=OneWay}" />
-
+
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/ScrollViewerStyle.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/ScrollViewerStyle.xaml
index 9cdf8e1f..c5373328 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/ScrollViewerStyle.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/ScrollViewerStyle.xaml
@@ -1,13 +1,13 @@
-
-
+
+
+ Value="{Binding Background, Converter={x:Static pw:Converters.LightenSolidColorBrushConverter}, ConverterParameter=0.5, RelativeSource={RelativeSource Self}, Mode=OneWay}" />
+ Value="{Binding Background, Converter={x:Static pw:Converters.LightenSolidColorBrushConverter}, ConverterParameter=2, RelativeSource={RelativeSource Self}, Mode=OneWay}" />
-
-
-
-
-
-
-
+
+ Value="{Binding Path=(local:ShadowHelper.BlurRadius), Converter={x:Static pw:Converters.DoubleMultiplyByConverter}, ConverterParameter=-1, RelativeSource={RelativeSource Self}, Mode=OneWay}" />
+ Value="{Binding Path=(local:ShadowHelper.BlurRadius), Converter={x:Static pw:Converters.DoubleMultiplyByConverter}, ConverterParameter=-1, RelativeSource={RelativeSource Self}, Mode=OneWay}" />
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/TransformControlStyle.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/TransformControlStyle.xaml
index 4fa3f3b2..457b57f9 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/TransformControlStyle.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/TransformControlStyle.xaml
@@ -1,12 +1,12 @@
-
+
@@ -83,7 +83,7 @@
+ Value="{Binding Path=(local:WindowXCaption.Height), Converter={x:Static pw:Converters.DoublePlusConverter}, ConverterParameter=5,RelativeSource={RelativeSource AncestorType=local:WindowX},Mode=OneWay}" />
+ Value="{Binding FontSize, Converter={x:Static pw:Converters.DoublePlusConverter}, ConverterParameter=4, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
@@ -125,7 +125,7 @@
+ Value="{Binding Path=(local:WindowXCaption.Height), Converter={x:Static pw:Converters.DoublePlusConverter}, ConverterParameter=5,RelativeSource={RelativeSource AncestorType=local:WindowX},Mode=OneWay}" />
+ Value="{Binding FontSize, Converter={x:Static pw:Converters.DoublePlusConverter}, ConverterParameter=4, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
-
+