diff --git a/Effector.Plugin.Lib/MultipleCopyWnd/MultipleCopyWndV.xaml b/Effector.Plugin.Lib/MultipleCopyWnd/MultipleCopyWndV.xaml
index 8da3514..ba6708e 100644
--- a/Effector.Plugin.Lib/MultipleCopyWnd/MultipleCopyWndV.xaml
+++ b/Effector.Plugin.Lib/MultipleCopyWnd/MultipleCopyWndV.xaml
@@ -1,36 +1,42 @@
-
+
-
+ Margin="30,10">
-
+
+ Margin="0,0,5,0"
+ Style="{StaticResource TextBlock.MultipleCopy}"/>
+ HorizontalAlignment="Right"
+ Margin="5,0,0,0"
+ Style="{StaticResource TextBox.MultipleCopy}"/>
@@ -39,13 +45,15 @@
+ Margin="0,0,5,0"
+ Style="{StaticResource Button.Confirm}"/>
+ Margin="5,0,0,0"
+ Style="{StaticResource Button.Confirm}"/>
-
+
diff --git a/Effector.Plugin.Lib/Themes/Generic.xaml b/Effector.Plugin.Lib/Themes/Generic.xaml
index 1c35146..84bbb20 100644
--- a/Effector.Plugin.Lib/Themes/Generic.xaml
+++ b/Effector.Plugin.Lib/Themes/Generic.xaml
@@ -62,101 +62,60 @@
-
+
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Effector.Plugin.Lib/Utility/Converters.vb b/Effector.Plugin.Lib/Utility/Converters.vb
index 403f178..1e8b5b2 100644
--- a/Effector.Plugin.Lib/Utility/Converters.vb
+++ b/Effector.Plugin.Lib/Utility/Converters.vb
@@ -6,10 +6,9 @@
If dtValue < dtLuaMinValue.AddDays(1) Then
Return ""
ElseIf dtValue > DateTime.Today Then
- Dim d = dtValue.ToString("T")
Return dtValue.ToString("T")
Else
- Return dtValue.ToString("d T")
+ Return dtValue.ToString("d") & " " & dtValue.ToString("T")
End If
End Function